]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-2.9-3.3.4-201204272006.patch
projects / thirdparty / grsecurity-scrape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-2.9-3.3.4-201204272006.patch
CommitLineData
c691d1ab
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index 0c083c5..bf13011 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -2,9 +2,11 @@
6 *.aux
7 *.bin
8 *.bz2
9+*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13+*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17@@ -14,6 +16,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21+*.gmo
22 *.grep
23 *.grp
24 *.gz
25@@ -48,9 +51,11 @@
26 *.tab.h
27 *.tex
28 *.ver
29+*.vim
30 *.xml
31 *.xz
32 *_MODULES
33+*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37@@ -69,6 +74,7 @@ Image
38 Module.markers
39 Module.symvers
40 PENDING
41+PERF*
42 SCCS
43 System.map*
44 TAGS
45@@ -92,19 +98,24 @@ bounds.h
46 bsetup
47 btfixupprep
48 build
49+builtin-policy.h
50 bvmlinux
51 bzImage*
52 capability_names.h
53 capflags.c
54 classlist.h*
55+clut_vga16.c
56+common-cmds.h
57 comp*.log
58 compile.h*
59 conf
60 config
61 config-*
62 config_data.h*
63+config.c
64 config.mak
65 config.mak.autogen
66+config.tmp
67 conmakehash
68 consolemap_deftbl.c*
69 cpustr.h
70@@ -115,9 +126,11 @@ devlist.h*
71 dnotify_test
72 docproc
73 dslm
74+dtc-lexer.lex.c
75 elf2ecoff
76 elfconfig.h*
77 evergreen_reg_safe.h
78+exception_policy.conf
79 fixdep
80 flask.h
81 fore200e_mkfirm
82@@ -125,12 +138,15 @@ fore200e_pca_fw.c*
83 gconf
84 gconf.glade.h
85 gen-devlist
86+gen-kdb_cmds.c
87 gen_crc32table
88 gen_init_cpio
89 generated
90 genheaders
91 genksyms
92 *_gray256.c
93+hash
94+hid-example
95 hpet_example
96 hugepage-mmap
97 hugepage-shm
98@@ -145,7 +161,7 @@ int32.c
99 int4.c
100 int8.c
101 kallsyms
102-kconfig
103+kern_constants.h
104 keywords.c
105 ksym.c*
106 ksym.h*
107@@ -153,7 +169,7 @@ kxgettext
108 lkc_defs.h
109 lex.c
110 lex.*.c
111-linux
112+lib1funcs.S
113 logo_*.c
114 logo_*_clut224.c
115 logo_*_mono.c
116@@ -165,14 +181,15 @@ machtypes.h
117 map
118 map_hugetlb
119 maui_boot.h
120-media
121 mconf
122+mdp
123 miboot*
124 mk_elfconfig
125 mkboot
126 mkbugboot
127 mkcpustr
128 mkdep
129+mkpiggy
130 mkprep
131 mkregtable
132 mktables
133@@ -208,6 +225,7 @@ r300_reg_safe.h
134 r420_reg_safe.h
135 r600_reg_safe.h
136 recordmcount
137+regdb.c
138 relocs
139 rlim_names.h
140 rn50_reg_safe.h
141@@ -218,6 +236,7 @@ setup
142 setup.bin
143 setup.elf
144 sImage
145+slabinfo
146 sm_tbl*
147 split-include
148 syscalltab.h
149@@ -228,6 +247,7 @@ tftpboot.img
150 timeconst.h
151 times.h*
152 trix_boot.h
153+user_constants.h
154 utsrelease.h*
155 vdso-syms.lds
156 vdso.lds
157@@ -245,7 +265,9 @@ vmlinux
158 vmlinux-*
159 vmlinux.aout
160 vmlinux.bin.all
161+vmlinux.bin.bz2
162 vmlinux.lds
163+vmlinux.relocs
164 vmlinuz
165 voffset.h
166 vsyscall.lds
167@@ -253,9 +275,11 @@ vsyscall_32.lds
168 wanxlfw.inc
169 uImage
170 unifdef
171+utsrelease.h
172 wakeup.bin
173 wakeup.elf
174 wakeup.lds
175 zImage*
176 zconf.hash.c
177+zconf.lex.c
178 zoffset.h
179diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
180index d99fd9c..8689fef 100644
181--- a/Documentation/kernel-parameters.txt
182+++ b/Documentation/kernel-parameters.txt
183@@ -1977,6 +1977,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
184 the specified number of seconds. This is to be used if
185 your oopses keep scrolling off the screen.
186
187+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
188+ virtualization environments that don't cope well with the
189+ expand down segment used by UDEREF on X86-32 or the frequent
190+ page table updates on X86-64.
191+
192+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
193+
194 pcbit= [HW,ISDN]
195
196 pcd. [PARIDE]
197diff --git a/Makefile b/Makefile
198index 44ef766..dac9410 100644
199--- a/Makefile
200+++ b/Makefile
201@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
202
203 HOSTCC = gcc
204 HOSTCXX = g++
205-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
206-HOSTCXXFLAGS = -O2
207+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
208+HOSTCLFAGS += $(call cc-option, -Wno-empty-body)
209+HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
210
211 # Decide whether to build built-in, modular, or both.
212 # Normally, just do built-in.
213@@ -407,8 +408,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exc
214 # Rules shared between *config targets and build targets
215
216 # Basic helpers built in scripts/
217-PHONY += scripts_basic
218-scripts_basic:
219+PHONY += scripts_basic gcc-plugins
220+scripts_basic: gcc-plugins
221 $(Q)$(MAKE) $(build)=scripts/basic
222 $(Q)rm -f .tmp_quiet_recordmcount
223
224@@ -564,6 +565,55 @@ else
225 KBUILD_CFLAGS += -O2
226 endif
227
228+ifndef DISABLE_PAX_PLUGINS
229+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
230+ifndef DISABLE_PAX_CONSTIFY_PLUGIN
231+ifndef CONFIG_UML
232+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
233+endif
234+endif
235+ifdef CONFIG_PAX_MEMORY_STACKLEAK
236+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
237+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
238+endif
239+ifdef CONFIG_KALLOCSTAT_PLUGIN
240+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
241+endif
242+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
243+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
244+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
245+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
246+endif
247+ifdef CONFIG_CHECKER_PLUGIN
248+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
249+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
250+endif
251+endif
252+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
253+ifdef CONFIG_PAX_SIZE_OVERFLOW
254+SIZE_OVERFLOW_PLUGIN := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
255+endif
256+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
257+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS) $(SIZE_OVERFLOW_PLUGIN)
258+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
259+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN SIZE_OVERFLOW_PLUGIN
260+ifeq ($(KBUILD_EXTMOD),)
261+gcc-plugins:
262+ $(Q)$(MAKE) $(build)=tools/gcc
263+else
264+gcc-plugins: ;
265+endif
266+else
267+gcc-plugins:
268+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
269+ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev. If you choose to ignore this error and lessen the improvements provided by this patch, re-run make with the DISABLE_PAX_PLUGINS=y argument.))
270+else
271+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
272+endif
273+ $(Q)echo "PAX_MEMORY_STACKLEAK and other features will be less secure"
274+endif
275+endif
276+
277 include $(srctree)/arch/$(SRCARCH)/Makefile
278
279 ifneq ($(CONFIG_FRAME_WARN),0)
280@@ -708,7 +758,7 @@ export mod_strip_cmd
281
282
283 ifeq ($(KBUILD_EXTMOD),)
284-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
285+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
286
287 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
288 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
289@@ -932,6 +982,8 @@ vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
290
291 # The actual objects are generated when descending,
292 # make sure no implicit rule kicks in
293+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
294+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
295 $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
296
297 # Handle descending into subdirectories listed in $(vmlinux-dirs)
298@@ -941,7 +993,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
299 # Error messages still appears in the original language
300
301 PHONY += $(vmlinux-dirs)
302-$(vmlinux-dirs): prepare scripts
303+$(vmlinux-dirs): gcc-plugins prepare scripts
304 $(Q)$(MAKE) $(build)=$@
305
306 # Store (new) KERNELRELASE string in include/config/kernel.release
307@@ -985,6 +1037,7 @@ prepare0: archprepare FORCE
308 $(Q)$(MAKE) $(build)=.
309
310 # All the preparing..
311+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
312 prepare: prepare0
313
314 # Generate some files
315@@ -1089,6 +1142,8 @@ all: modules
316 # using awk while concatenating to the final file.
317
318 PHONY += modules
319+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
320+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
321 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
322 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
323 @$(kecho) ' Building modules, stage 2.';
324@@ -1104,7 +1159,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
325
326 # Target to prepare building external modules
327 PHONY += modules_prepare
328-modules_prepare: prepare scripts
329+modules_prepare: gcc-plugins prepare scripts
330
331 # Target to install modules
332 PHONY += modules_install
333@@ -1201,6 +1256,7 @@ distclean: mrproper
334 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
335 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
336 -o -name '.*.rej' \
337+ -o -name '.*.rej' -o -name '*.so' \
338 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
339 -type f -print | xargs rm -f
340
341@@ -1361,6 +1417,8 @@ PHONY += $(module-dirs) modules
342 $(module-dirs): crmodverdir $(objtree)/Module.symvers
343 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
344
345+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
346+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
347 modules: $(module-dirs)
348 @$(kecho) ' Building modules, stage 2.';
349 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
350@@ -1487,17 +1545,21 @@ else
351 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
352 endif
353
354-%.s: %.c prepare scripts FORCE
355+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
356+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
357+%.s: %.c gcc-plugins prepare scripts FORCE
358 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
359 %.i: %.c prepare scripts FORCE
360 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
361-%.o: %.c prepare scripts FORCE
362+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
363+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
364+%.o: %.c gcc-plugins prepare scripts FORCE
365 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
366 %.lst: %.c prepare scripts FORCE
367 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
368-%.s: %.S prepare scripts FORCE
369+%.s: %.S gcc-plugins prepare scripts FORCE
370 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
371-%.o: %.S prepare scripts FORCE
372+%.o: %.S gcc-plugins prepare scripts FORCE
373 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
374 %.symtypes: %.c prepare scripts FORCE
375 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
376@@ -1507,11 +1569,15 @@ endif
377 $(cmd_crmodverdir)
378 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
379 $(build)=$(build-dir)
380-%/: prepare scripts FORCE
381+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
382+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
383+%/: gcc-plugins prepare scripts FORCE
384 $(cmd_crmodverdir)
385 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
386 $(build)=$(build-dir)
387-%.ko: prepare scripts FORCE
388+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
389+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
390+%.ko: gcc-plugins prepare scripts FORCE
391 $(cmd_crmodverdir)
392 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
393 $(build)=$(build-dir) $(@:.ko=.o)
394diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
395index 640f909..48b6597 100644
396--- a/arch/alpha/include/asm/atomic.h
397+++ b/arch/alpha/include/asm/atomic.h
398@@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
399 #define atomic_dec(v) atomic_sub(1,(v))
400 #define atomic64_dec(v) atomic64_sub(1,(v))
401
402+#define atomic64_read_unchecked(v) atomic64_read(v)
403+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
404+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
405+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
406+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
407+#define atomic64_inc_unchecked(v) atomic64_inc(v)
408+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
409+#define atomic64_dec_unchecked(v) atomic64_dec(v)
410+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
411+
412 #define smp_mb__before_atomic_dec() smp_mb()
413 #define smp_mb__after_atomic_dec() smp_mb()
414 #define smp_mb__before_atomic_inc() smp_mb()
415diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
416index ad368a9..fbe0f25 100644
417--- a/arch/alpha/include/asm/cache.h
418+++ b/arch/alpha/include/asm/cache.h
419@@ -4,19 +4,19 @@
420 #ifndef __ARCH_ALPHA_CACHE_H
421 #define __ARCH_ALPHA_CACHE_H
422
423+#include <linux/const.h>
424
425 /* Bytes per L1 (data) cache line. */
426 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
427-# define L1_CACHE_BYTES 64
428 # define L1_CACHE_SHIFT 6
429 #else
430 /* Both EV4 and EV5 are write-through, read-allocate,
431 direct-mapped, physical.
432 */
433-# define L1_CACHE_BYTES 32
434 # define L1_CACHE_SHIFT 5
435 #endif
436
437+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
438 #define SMP_CACHE_BYTES L1_CACHE_BYTES
439
440 #endif
441diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
442index da5449e..7418343 100644
443--- a/arch/alpha/include/asm/elf.h
444+++ b/arch/alpha/include/asm/elf.h
445@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
446
447 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
448
449+#ifdef CONFIG_PAX_ASLR
450+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
451+
452+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
453+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
454+#endif
455+
456 /* $0 is set by ld.so to a pointer to a function which might be
457 registered using atexit. This provides a mean for the dynamic
458 linker to call DT_FINI functions for shared libraries that have
459diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
460index de98a73..bd4f1f8 100644
461--- a/arch/alpha/include/asm/pgtable.h
462+++ b/arch/alpha/include/asm/pgtable.h
463@@ -101,6 +101,17 @@ struct vm_area_struct;
464 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
465 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
466 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
467+
468+#ifdef CONFIG_PAX_PAGEEXEC
469+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
470+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
471+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
472+#else
473+# define PAGE_SHARED_NOEXEC PAGE_SHARED
474+# define PAGE_COPY_NOEXEC PAGE_COPY
475+# define PAGE_READONLY_NOEXEC PAGE_READONLY
476+#endif
477+
478 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
479
480 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
481diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
482index 2fd00b7..cfd5069 100644
483--- a/arch/alpha/kernel/module.c
484+++ b/arch/alpha/kernel/module.c
485@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
486
487 /* The small sections were sorted to the end of the segment.
488 The following should definitely cover them. */
489- gp = (u64)me->module_core + me->core_size - 0x8000;
490+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
491 got = sechdrs[me->arch.gotsecindex].sh_addr;
492
493 for (i = 0; i < n; i++) {
494diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
495index 01e8715..be0e80f 100644
496--- a/arch/alpha/kernel/osf_sys.c
497+++ b/arch/alpha/kernel/osf_sys.c
498@@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
499 /* At this point: (!vma || addr < vma->vm_end). */
500 if (limit - len < addr)
501 return -ENOMEM;
502- if (!vma || addr + len <= vma->vm_start)
503+ if (check_heap_stack_gap(vma, addr, len))
504 return addr;
505 addr = vma->vm_end;
506 vma = vma->vm_next;
507@@ -1183,6 +1183,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
508 merely specific addresses, but regions of memory -- perhaps
509 this feature should be incorporated into all ports? */
510
511+#ifdef CONFIG_PAX_RANDMMAP
512+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
513+#endif
514+
515 if (addr) {
516 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
517 if (addr != (unsigned long) -ENOMEM)
518@@ -1190,8 +1194,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
519 }
520
521 /* Next, try allocating at TASK_UNMAPPED_BASE. */
522- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
523- len, limit);
524+ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
525+
526 if (addr != (unsigned long) -ENOMEM)
527 return addr;
528
529diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
530index fadd5f8..904e73a 100644
531--- a/arch/alpha/mm/fault.c
532+++ b/arch/alpha/mm/fault.c
533@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
534 __reload_thread(pcb);
535 }
536
537+#ifdef CONFIG_PAX_PAGEEXEC
538+/*
539+ * PaX: decide what to do with offenders (regs->pc = fault address)
540+ *
541+ * returns 1 when task should be killed
542+ * 2 when patched PLT trampoline was detected
543+ * 3 when unpatched PLT trampoline was detected
544+ */
545+static int pax_handle_fetch_fault(struct pt_regs *regs)
546+{
547+
548+#ifdef CONFIG_PAX_EMUPLT
549+ int err;
550+
551+ do { /* PaX: patched PLT emulation #1 */
552+ unsigned int ldah, ldq, jmp;
553+
554+ err = get_user(ldah, (unsigned int *)regs->pc);
555+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
556+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
557+
558+ if (err)
559+ break;
560+
561+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
562+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
563+ jmp == 0x6BFB0000U)
564+ {
565+ unsigned long r27, addr;
566+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
567+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
568+
569+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
570+ err = get_user(r27, (unsigned long *)addr);
571+ if (err)
572+ break;
573+
574+ regs->r27 = r27;
575+ regs->pc = r27;
576+ return 2;
577+ }
578+ } while (0);
579+
580+ do { /* PaX: patched PLT emulation #2 */
581+ unsigned int ldah, lda, br;
582+
583+ err = get_user(ldah, (unsigned int *)regs->pc);
584+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
585+ err |= get_user(br, (unsigned int *)(regs->pc+8));
586+
587+ if (err)
588+ break;
589+
590+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
591+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
592+ (br & 0xFFE00000U) == 0xC3E00000U)
593+ {
594+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
595+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
596+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
597+
598+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
599+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
600+ return 2;
601+ }
602+ } while (0);
603+
604+ do { /* PaX: unpatched PLT emulation */
605+ unsigned int br;
606+
607+ err = get_user(br, (unsigned int *)regs->pc);
608+
609+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
610+ unsigned int br2, ldq, nop, jmp;
611+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
612+
613+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
614+ err = get_user(br2, (unsigned int *)addr);
615+ err |= get_user(ldq, (unsigned int *)(addr+4));
616+ err |= get_user(nop, (unsigned int *)(addr+8));
617+ err |= get_user(jmp, (unsigned int *)(addr+12));
618+ err |= get_user(resolver, (unsigned long *)(addr+16));
619+
620+ if (err)
621+ break;
622+
623+ if (br2 == 0xC3600000U &&
624+ ldq == 0xA77B000CU &&
625+ nop == 0x47FF041FU &&
626+ jmp == 0x6B7B0000U)
627+ {
628+ regs->r28 = regs->pc+4;
629+ regs->r27 = addr+16;
630+ regs->pc = resolver;
631+ return 3;
632+ }
633+ }
634+ } while (0);
635+#endif
636+
637+ return 1;
638+}
639+
640+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
641+{
642+ unsigned long i;
643+
644+ printk(KERN_ERR "PAX: bytes at PC: ");
645+ for (i = 0; i < 5; i++) {
646+ unsigned int c;
647+ if (get_user(c, (unsigned int *)pc+i))
648+ printk(KERN_CONT "???????? ");
649+ else
650+ printk(KERN_CONT "%08x ", c);
651+ }
652+ printk("\n");
653+}
654+#endif
655
656 /*
657 * This routine handles page faults. It determines the address,
658@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
659 good_area:
660 si_code = SEGV_ACCERR;
661 if (cause < 0) {
662- if (!(vma->vm_flags & VM_EXEC))
663+ if (!(vma->vm_flags & VM_EXEC)) {
664+
665+#ifdef CONFIG_PAX_PAGEEXEC
666+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
667+ goto bad_area;
668+
669+ up_read(&mm->mmap_sem);
670+ switch (pax_handle_fetch_fault(regs)) {
671+
672+#ifdef CONFIG_PAX_EMUPLT
673+ case 2:
674+ case 3:
675+ return;
676+#endif
677+
678+ }
679+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
680+ do_group_exit(SIGKILL);
681+#else
682 goto bad_area;
683+#endif
684+
685+ }
686 } else if (!cause) {
687 /* Allow reads even for write-only mappings */
688 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
689diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
690index 86976d0..8e07f84 100644
691--- a/arch/arm/include/asm/atomic.h
692+++ b/arch/arm/include/asm/atomic.h
693@@ -15,6 +15,10 @@
694 #include <linux/types.h>
695 #include <asm/system.h>
696
697+#ifdef CONFIG_GENERIC_ATOMIC64
698+#include <asm-generic/atomic64.h>
699+#endif
700+
701 #define ATOMIC_INIT(i) { (i) }
702
703 #ifdef __KERNEL__
704@@ -25,7 +29,15 @@
705 * atomic_set() is the clrex or dummy strex done on every exception return.
706 */
707 #define atomic_read(v) (*(volatile int *)&(v)->counter)
708+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
709+{
710+ return v->counter;
711+}
712 #define atomic_set(v,i) (((v)->counter) = (i))
713+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
714+{
715+ v->counter = i;
716+}
717
718 #if __LINUX_ARM_ARCH__ >= 6
719
720@@ -40,6 +52,35 @@ static inline void atomic_add(int i, atomic_t *v)
721 int result;
722
723 __asm__ __volatile__("@ atomic_add\n"
724+"1: ldrex %1, [%3]\n"
725+" adds %0, %1, %4\n"
726+
727+#ifdef CONFIG_PAX_REFCOUNT
728+" bvc 3f\n"
729+"2: bkpt 0xf103\n"
730+"3:\n"
731+#endif
732+
733+" strex %1, %0, [%3]\n"
734+" teq %1, #0\n"
735+" bne 1b"
736+
737+#ifdef CONFIG_PAX_REFCOUNT
738+"\n4:\n"
739+ _ASM_EXTABLE(2b, 4b)
740+#endif
741+
742+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
743+ : "r" (&v->counter), "Ir" (i)
744+ : "cc");
745+}
746+
747+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
748+{
749+ unsigned long tmp;
750+ int result;
751+
752+ __asm__ __volatile__("@ atomic_add_unchecked\n"
753 "1: ldrex %0, [%3]\n"
754 " add %0, %0, %4\n"
755 " strex %1, %0, [%3]\n"
756@@ -58,6 +99,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
757 smp_mb();
758
759 __asm__ __volatile__("@ atomic_add_return\n"
760+"1: ldrex %1, [%3]\n"
761+" adds %0, %1, %4\n"
762+
763+#ifdef CONFIG_PAX_REFCOUNT
764+" bvc 3f\n"
765+" mov %0, %1\n"
766+"2: bkpt 0xf103\n"
767+"3:\n"
768+#endif
769+
770+" strex %1, %0, [%3]\n"
771+" teq %1, #0\n"
772+" bne 1b"
773+
774+#ifdef CONFIG_PAX_REFCOUNT
775+"\n4:\n"
776+ _ASM_EXTABLE(2b, 4b)
777+#endif
778+
779+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
780+ : "r" (&v->counter), "Ir" (i)
781+ : "cc");
782+
783+ smp_mb();
784+
785+ return result;
786+}
787+
788+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
789+{
790+ unsigned long tmp;
791+ int result;
792+
793+ smp_mb();
794+
795+ __asm__ __volatile__("@ atomic_add_return_unchecked\n"
796 "1: ldrex %0, [%3]\n"
797 " add %0, %0, %4\n"
798 " strex %1, %0, [%3]\n"
799@@ -78,6 +155,35 @@ static inline void atomic_sub(int i, atomic_t *v)
800 int result;
801
802 __asm__ __volatile__("@ atomic_sub\n"
803+"1: ldrex %1, [%3]\n"
804+" subs %0, %1, %4\n"
805+
806+#ifdef CONFIG_PAX_REFCOUNT
807+" bvc 3f\n"
808+"2: bkpt 0xf103\n"
809+"3:\n"
810+#endif
811+
812+" strex %1, %0, [%3]\n"
813+" teq %1, #0\n"
814+" bne 1b"
815+
816+#ifdef CONFIG_PAX_REFCOUNT
817+"\n4:\n"
818+ _ASM_EXTABLE(2b, 4b)
819+#endif
820+
821+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
822+ : "r" (&v->counter), "Ir" (i)
823+ : "cc");
824+}
825+
826+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
827+{
828+ unsigned long tmp;
829+ int result;
830+
831+ __asm__ __volatile__("@ atomic_sub_unchecked\n"
832 "1: ldrex %0, [%3]\n"
833 " sub %0, %0, %4\n"
834 " strex %1, %0, [%3]\n"
835@@ -96,11 +202,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
836 smp_mb();
837
838 __asm__ __volatile__("@ atomic_sub_return\n"
839-"1: ldrex %0, [%3]\n"
840-" sub %0, %0, %4\n"
841+"1: ldrex %1, [%3]\n"
842+" sub %0, %1, %4\n"
843+
844+#ifdef CONFIG_PAX_REFCOUNT
845+" bvc 3f\n"
846+" mov %0, %1\n"
847+"2: bkpt 0xf103\n"
848+"3:\n"
849+#endif
850+
851 " strex %1, %0, [%3]\n"
852 " teq %1, #0\n"
853 " bne 1b"
854+
855+#ifdef CONFIG_PAX_REFCOUNT
856+"\n4:\n"
857+ _ASM_EXTABLE(2b, 4b)
858+#endif
859+
860 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
861 : "r" (&v->counter), "Ir" (i)
862 : "cc");
863@@ -132,6 +252,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
864 return oldval;
865 }
866
867+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
868+{
869+ unsigned long oldval, res;
870+
871+ smp_mb();
872+
873+ do {
874+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
875+ "ldrex %1, [%3]\n"
876+ "mov %0, #0\n"
877+ "teq %1, %4\n"
878+ "strexeq %0, %5, [%3]\n"
879+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
880+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
881+ : "cc");
882+ } while (res);
883+
884+ smp_mb();
885+
886+ return oldval;
887+}
888+
889 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
890 {
891 unsigned long tmp, tmp2;
892@@ -165,7 +307,9 @@ static inline int atomic_add_return(int i, atomic_t *v)
893
894 return val;
895 }
896+#define atomic_add_return_unchecked(i, v) atomic_add_return(i, v)
897 #define atomic_add(i, v) (void) atomic_add_return(i, v)
898+#define atomic_add_unchecked(i, v) (void) atomic_add_return_unchecked(i, v)
899
900 static inline int atomic_sub_return(int i, atomic_t *v)
901 {
902@@ -179,7 +323,9 @@ static inline int atomic_sub_return(int i, atomic_t *v)
903
904 return val;
905 }
906+#define atomic_sub_return_unchecked(i, v) atomic_sub_return(i, v)
907 #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
908+#define atomic_sub_unchecked(i, v) (void) atomic_sub_return_unchecked(i, v)
909
910 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
911 {
912@@ -194,6 +340,7 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
913
914 return ret;
915 }
916+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg(v, o, n)
917
918 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
919 {
920@@ -207,6 +354,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
921 #endif /* __LINUX_ARM_ARCH__ */
922
923 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
924+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
925+{
926+ return xchg(&v->counter, new);
927+}
928
929 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
930 {
931@@ -219,11 +370,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
932 }
933
934 #define atomic_inc(v) atomic_add(1, v)
935+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
936+{
937+ atomic_add_unchecked(1, v);
938+}
939 #define atomic_dec(v) atomic_sub(1, v)
940+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
941+{
942+ atomic_sub_unchecked(1, v);
943+}
944
945 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
946+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
947+{
948+ return atomic_add_return_unchecked(1, v) == 0;
949+}
950 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
951 #define atomic_inc_return(v) (atomic_add_return(1, v))
952+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
953+{
954+ return atomic_add_return_unchecked(1, v);
955+}
956 #define atomic_dec_return(v) (atomic_sub_return(1, v))
957 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
958
959@@ -239,6 +406,14 @@ typedef struct {
960 u64 __aligned(8) counter;
961 } atomic64_t;
962
963+#ifdef CONFIG_PAX_REFCOUNT
964+typedef struct {
965+ u64 __aligned(8) counter;
966+} atomic64_unchecked_t;
967+#else
968+typedef atomic64_t atomic64_unchecked_t;
969+#endif
970+
971 #define ATOMIC64_INIT(i) { (i) }
972
973 static inline u64 atomic64_read(atomic64_t *v)
974@@ -254,6 +429,19 @@ static inline u64 atomic64_read(atomic64_t *v)
975 return result;
976 }
977
978+static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *v)
979+{
980+ u64 result;
981+
982+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
983+" ldrexd %0, %H0, [%1]"
984+ : "=&r" (result)
985+ : "r" (&v->counter), "Qo" (v->counter)
986+ );
987+
988+ return result;
989+}
990+
991 static inline void atomic64_set(atomic64_t *v, u64 i)
992 {
993 u64 tmp;
994@@ -268,6 +456,20 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
995 : "cc");
996 }
997
998+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
999+{
1000+ u64 tmp;
1001+
1002+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1003+"1: ldrexd %0, %H0, [%2]\n"
1004+" strexd %0, %3, %H3, [%2]\n"
1005+" teq %0, #0\n"
1006+" bne 1b"
1007+ : "=&r" (tmp), "=Qo" (v->counter)
1008+ : "r" (&v->counter), "r" (i)
1009+ : "cc");
1010+}
1011+
1012 static inline void atomic64_add(u64 i, atomic64_t *v)
1013 {
1014 u64 result;
1015@@ -276,6 +478,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1016 __asm__ __volatile__("@ atomic64_add\n"
1017 "1: ldrexd %0, %H0, [%3]\n"
1018 " adds %0, %0, %4\n"
1019+" adcs %H0, %H0, %H4\n"
1020+
1021+#ifdef CONFIG_PAX_REFCOUNT
1022+" bvc 3f\n"
1023+"2: bkpt 0xf103\n"
1024+"3:\n"
1025+#endif
1026+
1027+" strexd %1, %0, %H0, [%3]\n"
1028+" teq %1, #0\n"
1029+" bne 1b"
1030+
1031+#ifdef CONFIG_PAX_REFCOUNT
1032+"\n4:\n"
1033+ _ASM_EXTABLE(2b, 4b)
1034+#endif
1035+
1036+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1037+ : "r" (&v->counter), "r" (i)
1038+ : "cc");
1039+}
1040+
1041+static inline void atomic64_add_unchecked(u64 i, atomic64_unchecked_t *v)
1042+{
1043+ u64 result;
1044+ unsigned long tmp;
1045+
1046+ __asm__ __volatile__("@ atomic64_add_unchecked\n"
1047+"1: ldrexd %0, %H0, [%3]\n"
1048+" adds %0, %0, %4\n"
1049 " adc %H0, %H0, %H4\n"
1050 " strexd %1, %0, %H0, [%3]\n"
1051 " teq %1, #0\n"
1052@@ -287,12 +519,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1053
1054 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
1055 {
1056- u64 result;
1057- unsigned long tmp;
1058+ u64 result, tmp;
1059
1060 smp_mb();
1061
1062 __asm__ __volatile__("@ atomic64_add_return\n"
1063+"1: ldrexd %1, %H1, [%3]\n"
1064+" adds %0, %1, %4\n"
1065+" adcs %H0, %H1, %H4\n"
1066+
1067+#ifdef CONFIG_PAX_REFCOUNT
1068+" bvc 3f\n"
1069+" mov %0, %1\n"
1070+" mov %H0, %H1\n"
1071+"2: bkpt 0xf103\n"
1072+"3:\n"
1073+#endif
1074+
1075+" strexd %1, %0, %H0, [%3]\n"
1076+" teq %1, #0\n"
1077+" bne 1b"
1078+
1079+#ifdef CONFIG_PAX_REFCOUNT
1080+"\n4:\n"
1081+ _ASM_EXTABLE(2b, 4b)
1082+#endif
1083+
1084+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1085+ : "r" (&v->counter), "r" (i)
1086+ : "cc");
1087+
1088+ smp_mb();
1089+
1090+ return result;
1091+}
1092+
1093+static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
1094+{
1095+ u64 result;
1096+ unsigned long tmp;
1097+
1098+ smp_mb();
1099+
1100+ __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1101 "1: ldrexd %0, %H0, [%3]\n"
1102 " adds %0, %0, %4\n"
1103 " adc %H0, %H0, %H4\n"
1104@@ -316,6 +585,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1105 __asm__ __volatile__("@ atomic64_sub\n"
1106 "1: ldrexd %0, %H0, [%3]\n"
1107 " subs %0, %0, %4\n"
1108+" sbcs %H0, %H0, %H4\n"
1109+
1110+#ifdef CONFIG_PAX_REFCOUNT
1111+" bvc 3f\n"
1112+"2: bkpt 0xf103\n"
1113+"3:\n"
1114+#endif
1115+
1116+" strexd %1, %0, %H0, [%3]\n"
1117+" teq %1, #0\n"
1118+" bne 1b"
1119+
1120+#ifdef CONFIG_PAX_REFCOUNT
1121+"\n4:\n"
1122+ _ASM_EXTABLE(2b, 4b)
1123+#endif
1124+
1125+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1126+ : "r" (&v->counter), "r" (i)
1127+ : "cc");
1128+}
1129+
1130+static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
1131+{
1132+ u64 result;
1133+ unsigned long tmp;
1134+
1135+ __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1136+"1: ldrexd %0, %H0, [%3]\n"
1137+" subs %0, %0, %4\n"
1138 " sbc %H0, %H0, %H4\n"
1139 " strexd %1, %0, %H0, [%3]\n"
1140 " teq %1, #0\n"
1141@@ -327,18 +626,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1142
1143 static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
1144 {
1145- u64 result;
1146- unsigned long tmp;
1147+ u64 result, tmp;
1148
1149 smp_mb();
1150
1151 __asm__ __volatile__("@ atomic64_sub_return\n"
1152-"1: ldrexd %0, %H0, [%3]\n"
1153-" subs %0, %0, %4\n"
1154-" sbc %H0, %H0, %H4\n"
1155+"1: ldrexd %1, %H1, [%3]\n"
1156+" subs %0, %1, %4\n"
1157+" sbc %H0, %H1, %H4\n"
1158+
1159+#ifdef CONFIG_PAX_REFCOUNT
1160+" bvc 3f\n"
1161+" mov %0, %1\n"
1162+" mov %H0, %H1\n"
1163+"2: bkpt 0xf103\n"
1164+"3:\n"
1165+#endif
1166+
1167 " strexd %1, %0, %H0, [%3]\n"
1168 " teq %1, #0\n"
1169 " bne 1b"
1170+
1171+#ifdef CONFIG_PAX_REFCOUNT
1172+"\n4:\n"
1173+ _ASM_EXTABLE(2b, 4b)
1174+#endif
1175+
1176 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1177 : "r" (&v->counter), "r" (i)
1178 : "cc");
1179@@ -372,6 +685,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
1180 return oldval;
1181 }
1182
1183+static inline u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old, u64 new)
1184+{
1185+ u64 oldval;
1186+ unsigned long res;
1187+
1188+ smp_mb();
1189+
1190+ do {
1191+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1192+ "ldrexd %1, %H1, [%3]\n"
1193+ "mov %0, #0\n"
1194+ "teq %1, %4\n"
1195+ "teqeq %H1, %H4\n"
1196+ "strexdeq %0, %5, %H5, [%3]"
1197+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1198+ : "r" (&ptr->counter), "r" (old), "r" (new)
1199+ : "cc");
1200+ } while (res);
1201+
1202+ smp_mb();
1203+
1204+ return oldval;
1205+}
1206+
1207 static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1208 {
1209 u64 result;
1210@@ -395,21 +732,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1211
1212 static inline u64 atomic64_dec_if_positive(atomic64_t *v)
1213 {
1214- u64 result;
1215- unsigned long tmp;
1216+ u64 result, tmp;
1217
1218 smp_mb();
1219
1220 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1221-"1: ldrexd %0, %H0, [%3]\n"
1222-" subs %0, %0, #1\n"
1223-" sbc %H0, %H0, #0\n"
1224+"1: ldrexd %1, %H1, [%3]\n"
1225+" subs %0, %1, #1\n"
1226+" sbc %H0, %H1, #0\n"
1227+
1228+#ifdef CONFIG_PAX_REFCOUNT
1229+" bvc 3f\n"
1230+" mov %0, %1\n"
1231+" mov %H0, %H1\n"
1232+"2: bkpt 0xf103\n"
1233+"3:\n"
1234+#endif
1235+
1236 " teq %H0, #0\n"
1237-" bmi 2f\n"
1238+" bmi 4f\n"
1239 " strexd %1, %0, %H0, [%3]\n"
1240 " teq %1, #0\n"
1241 " bne 1b\n"
1242-"2:"
1243+"4:\n"
1244+
1245+#ifdef CONFIG_PAX_REFCOUNT
1246+ _ASM_EXTABLE(2b, 4b)
1247+#endif
1248+
1249 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1250 : "r" (&v->counter)
1251 : "cc");
1252@@ -432,13 +782,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1253 " teq %0, %5\n"
1254 " teqeq %H0, %H5\n"
1255 " moveq %1, #0\n"
1256-" beq 2f\n"
1257+" beq 4f\n"
1258 " adds %0, %0, %6\n"
1259 " adc %H0, %H0, %H6\n"
1260+
1261+#ifdef CONFIG_PAX_REFCOUNT
1262+" bvc 3f\n"
1263+"2: bkpt 0xf103\n"
1264+"3:\n"
1265+#endif
1266+
1267 " strexd %2, %0, %H0, [%4]\n"
1268 " teq %2, #0\n"
1269 " bne 1b\n"
1270-"2:"
1271+"4:\n"
1272+
1273+#ifdef CONFIG_PAX_REFCOUNT
1274+ _ASM_EXTABLE(2b, 4b)
1275+#endif
1276+
1277 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1278 : "r" (&v->counter), "r" (u), "r" (a)
1279 : "cc");
1280@@ -451,10 +813,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1281
1282 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1283 #define atomic64_inc(v) atomic64_add(1LL, (v))
1284+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1285 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1286+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1287 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1288 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1289 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1290+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1291 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1292 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1293 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1294diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1295index 75fe66b..2255c86 100644
1296--- a/arch/arm/include/asm/cache.h
1297+++ b/arch/arm/include/asm/cache.h
1298@@ -4,8 +4,10 @@
1299 #ifndef __ASMARM_CACHE_H
1300 #define __ASMARM_CACHE_H
1301
1302+#include <linux/const.h>
1303+
1304 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1305-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1306+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1307
1308 /*
1309 * Memory returned by kmalloc() may be used for DMA, so we must make
1310diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1311index d5d8d5c..ad92c96 100644
1312--- a/arch/arm/include/asm/cacheflush.h
1313+++ b/arch/arm/include/asm/cacheflush.h
1314@@ -108,7 +108,7 @@ struct cpu_cache_fns {
1315 void (*dma_unmap_area)(const void *, size_t, int);
1316
1317 void (*dma_flush_range)(const void *, const void *);
1318-};
1319+} __no_const;
1320
1321 /*
1322 * Select the calling method
1323diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1324index 0e9ce8d..6ef1e03 100644
1325--- a/arch/arm/include/asm/elf.h
1326+++ b/arch/arm/include/asm/elf.h
1327@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1328 the loader. We need to make sure that it is out of the way of the program
1329 that it will "exec", and that there is sufficient room for the brk. */
1330
1331-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1332+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1333+
1334+#ifdef CONFIG_PAX_ASLR
1335+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1336+
1337+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1338+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1339+#endif
1340
1341 /* When the program starts, a1 contains a pointer to a function to be
1342 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1343@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1344 extern void elf_set_personality(const struct elf32_hdr *);
1345 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1346
1347-struct mm_struct;
1348-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1349-#define arch_randomize_brk arch_randomize_brk
1350-
1351 extern int vectors_user_mapping(void);
1352 #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
1353 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
1354diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1355index e51b1e8..32a3113 100644
1356--- a/arch/arm/include/asm/kmap_types.h
1357+++ b/arch/arm/include/asm/kmap_types.h
1358@@ -21,6 +21,7 @@ enum km_type {
1359 KM_L1_CACHE,
1360 KM_L2_CACHE,
1361 KM_KDB,
1362+ KM_CLEARPAGE,
1363 KM_TYPE_NR
1364 };
1365
1366diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1367index 53426c6..c7baff3 100644
1368--- a/arch/arm/include/asm/outercache.h
1369+++ b/arch/arm/include/asm/outercache.h
1370@@ -35,7 +35,7 @@ struct outer_cache_fns {
1371 #endif
1372 void (*set_debug)(unsigned long);
1373 void (*resume)(void);
1374-};
1375+} __no_const;
1376
1377 #ifdef CONFIG_OUTER_CACHE
1378
1379diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1380index 97b440c..b7ff179 100644
1381--- a/arch/arm/include/asm/page.h
1382+++ b/arch/arm/include/asm/page.h
1383@@ -123,7 +123,7 @@ struct cpu_user_fns {
1384 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1385 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1386 unsigned long vaddr, struct vm_area_struct *vma);
1387-};
1388+} __no_const;
1389
1390 #ifdef MULTI_USER
1391 extern struct cpu_user_fns cpu_user;
1392diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
1393index e4c96cc..1145653 100644
1394--- a/arch/arm/include/asm/system.h
1395+++ b/arch/arm/include/asm/system.h
1396@@ -98,6 +98,8 @@ void hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int,
1397
1398 #define xchg(ptr,x) \
1399 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1400+#define xchg_unchecked(ptr,x) \
1401+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1402
1403 extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
1404
1405@@ -534,6 +536,13 @@ static inline unsigned long long __cmpxchg64_mb(volatile void *ptr,
1406
1407 #endif /* __LINUX_ARM_ARCH__ >= 6 */
1408
1409+#define _ASM_EXTABLE(from, to) \
1410+" .pushsection __ex_table,\"a\"\n"\
1411+" .align 3\n" \
1412+" .long " #from ", " #to"\n" \
1413+" .popsection"
1414+
1415+
1416 #endif /* __ASSEMBLY__ */
1417
1418 #define arch_align_stack(x) (x)
1419diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
1420index 2958976..12ccac4 100644
1421--- a/arch/arm/include/asm/uaccess.h
1422+++ b/arch/arm/include/asm/uaccess.h
1423@@ -22,6 +22,8 @@
1424 #define VERIFY_READ 0
1425 #define VERIFY_WRITE 1
1426
1427+extern void check_object_size(const void *ptr, unsigned long n, bool to);
1428+
1429 /*
1430 * The exception table consists of pairs of addresses: the first is the
1431 * address of an instruction that is allowed to fault, and the second is
1432@@ -387,8 +389,23 @@ do { \
1433
1434
1435 #ifdef CONFIG_MMU
1436-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
1437-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
1438+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
1439+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
1440+
1441+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
1442+{
1443+ if (!__builtin_constant_p(n))
1444+ check_object_size(to, n, false);
1445+ return ___copy_from_user(to, from, n);
1446+}
1447+
1448+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
1449+{
1450+ if (!__builtin_constant_p(n))
1451+ check_object_size(from, n, true);
1452+ return ___copy_to_user(to, from, n);
1453+}
1454+
1455 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
1456 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
1457 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
1458@@ -403,6 +420,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
1459
1460 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
1461 {
1462+ if ((long)n < 0)
1463+ return n;
1464+
1465 if (access_ok(VERIFY_READ, from, n))
1466 n = __copy_from_user(to, from, n);
1467 else /* security hole - plug it */
1468@@ -412,6 +432,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
1469
1470 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
1471 {
1472+ if ((long)n < 0)
1473+ return n;
1474+
1475 if (access_ok(VERIFY_WRITE, to, n))
1476 n = __copy_to_user(to, from, n);
1477 return n;
1478diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
1479index 5b0bce6..becd81c 100644
1480--- a/arch/arm/kernel/armksyms.c
1481+++ b/arch/arm/kernel/armksyms.c
1482@@ -95,8 +95,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
1483 #ifdef CONFIG_MMU
1484 EXPORT_SYMBOL(copy_page);
1485
1486-EXPORT_SYMBOL(__copy_from_user);
1487-EXPORT_SYMBOL(__copy_to_user);
1488+EXPORT_SYMBOL(___copy_from_user);
1489+EXPORT_SYMBOL(___copy_to_user);
1490 EXPORT_SYMBOL(__clear_user);
1491
1492 EXPORT_SYMBOL(__get_user_1);
1493diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
1494index 971d65c..cc936fb 100644
1495--- a/arch/arm/kernel/process.c
1496+++ b/arch/arm/kernel/process.c
1497@@ -28,7 +28,6 @@
1498 #include <linux/tick.h>
1499 #include <linux/utsname.h>
1500 #include <linux/uaccess.h>
1501-#include <linux/random.h>
1502 #include <linux/hw_breakpoint.h>
1503 #include <linux/cpuidle.h>
1504
1505@@ -273,9 +272,10 @@ void machine_power_off(void)
1506 machine_shutdown();
1507 if (pm_power_off)
1508 pm_power_off();
1509+ BUG();
1510 }
1511
1512-void machine_restart(char *cmd)
1513+__noreturn void machine_restart(char *cmd)
1514 {
1515 machine_shutdown();
1516
1517@@ -517,12 +517,6 @@ unsigned long get_wchan(struct task_struct *p)
1518 return 0;
1519 }
1520
1521-unsigned long arch_randomize_brk(struct mm_struct *mm)
1522-{
1523- unsigned long range_end = mm->brk + 0x02000000;
1524- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
1525-}
1526-
1527 #ifdef CONFIG_MMU
1528 /*
1529 * The vectors page is always readable from user space for the
1530diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
1531index a255c39..4a19b25 100644
1532--- a/arch/arm/kernel/setup.c
1533+++ b/arch/arm/kernel/setup.c
1534@@ -109,13 +109,13 @@ struct processor processor __read_mostly;
1535 struct cpu_tlb_fns cpu_tlb __read_mostly;
1536 #endif
1537 #ifdef MULTI_USER
1538-struct cpu_user_fns cpu_user __read_mostly;
1539+struct cpu_user_fns cpu_user __read_only;
1540 #endif
1541 #ifdef MULTI_CACHE
1542-struct cpu_cache_fns cpu_cache __read_mostly;
1543+struct cpu_cache_fns cpu_cache __read_only;
1544 #endif
1545 #ifdef CONFIG_OUTER_CACHE
1546-struct outer_cache_fns outer_cache __read_mostly;
1547+struct outer_cache_fns outer_cache __read_only;
1548 EXPORT_SYMBOL(outer_cache);
1549 #endif
1550
1551diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
1552index f84dfe6..13e94f7 100644
1553--- a/arch/arm/kernel/traps.c
1554+++ b/arch/arm/kernel/traps.c
1555@@ -259,6 +259,8 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt
1556
1557 static DEFINE_RAW_SPINLOCK(die_lock);
1558
1559+extern void gr_handle_kernel_exploit(void);
1560+
1561 /*
1562 * This function is protected against re-entrancy.
1563 */
1564@@ -291,6 +293,9 @@ void die(const char *str, struct pt_regs *regs, int err)
1565 panic("Fatal exception in interrupt");
1566 if (panic_on_oops)
1567 panic("Fatal exception");
1568+
1569+ gr_handle_kernel_exploit();
1570+
1571 if (ret != NOTIFY_STOP)
1572 do_exit(SIGSEGV);
1573 }
1574diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
1575index 66a477a..bee61d3 100644
1576--- a/arch/arm/lib/copy_from_user.S
1577+++ b/arch/arm/lib/copy_from_user.S
1578@@ -16,7 +16,7 @@
1579 /*
1580 * Prototype:
1581 *
1582- * size_t __copy_from_user(void *to, const void *from, size_t n)
1583+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
1584 *
1585 * Purpose:
1586 *
1587@@ -84,11 +84,11 @@
1588
1589 .text
1590
1591-ENTRY(__copy_from_user)
1592+ENTRY(___copy_from_user)
1593
1594 #include "copy_template.S"
1595
1596-ENDPROC(__copy_from_user)
1597+ENDPROC(___copy_from_user)
1598
1599 .pushsection .fixup,"ax"
1600 .align 0
1601diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
1602index 6ee2f67..d1cce76 100644
1603--- a/arch/arm/lib/copy_page.S
1604+++ b/arch/arm/lib/copy_page.S
1605@@ -10,6 +10,7 @@
1606 * ASM optimised string functions
1607 */
1608 #include <linux/linkage.h>
1609+#include <linux/const.h>
1610 #include <asm/assembler.h>
1611 #include <asm/asm-offsets.h>
1612 #include <asm/cache.h>
1613diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
1614index d066df6..df28194 100644
1615--- a/arch/arm/lib/copy_to_user.S
1616+++ b/arch/arm/lib/copy_to_user.S
1617@@ -16,7 +16,7 @@
1618 /*
1619 * Prototype:
1620 *
1621- * size_t __copy_to_user(void *to, const void *from, size_t n)
1622+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
1623 *
1624 * Purpose:
1625 *
1626@@ -88,11 +88,11 @@
1627 .text
1628
1629 ENTRY(__copy_to_user_std)
1630-WEAK(__copy_to_user)
1631+WEAK(___copy_to_user)
1632
1633 #include "copy_template.S"
1634
1635-ENDPROC(__copy_to_user)
1636+ENDPROC(___copy_to_user)
1637 ENDPROC(__copy_to_user_std)
1638
1639 .pushsection .fixup,"ax"
1640diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
1641index 5c908b1..e712687 100644
1642--- a/arch/arm/lib/uaccess.S
1643+++ b/arch/arm/lib/uaccess.S
1644@@ -20,7 +20,7 @@
1645
1646 #define PAGE_SHIFT 12
1647
1648-/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
1649+/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n)
1650 * Purpose : copy a block to user memory from kernel memory
1651 * Params : to - user memory
1652 * : from - kernel memory
1653@@ -40,7 +40,7 @@ USER( TUSER( strgtb) r3, [r0], #1) @ May fault
1654 sub r2, r2, ip
1655 b .Lc2u_dest_aligned
1656
1657-ENTRY(__copy_to_user)
1658+ENTRY(___copy_to_user)
1659 stmfd sp!, {r2, r4 - r7, lr}
1660 cmp r2, #4
1661 blt .Lc2u_not_enough
1662@@ -278,14 +278,14 @@ USER( TUSER( strgeb) r3, [r0], #1) @ May fault
1663 ldrgtb r3, [r1], #0
1664 USER( TUSER( strgtb) r3, [r0], #1) @ May fault
1665 b .Lc2u_finished
1666-ENDPROC(__copy_to_user)
1667+ENDPROC(___copy_to_user)
1668
1669 .pushsection .fixup,"ax"
1670 .align 0
1671 9001: ldmfd sp!, {r0, r4 - r7, pc}
1672 .popsection
1673
1674-/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
1675+/* Prototype: unsigned long ___copy_from_user(void *to,const void *from,unsigned long n);
1676 * Purpose : copy a block from user memory to kernel memory
1677 * Params : to - kernel memory
1678 * : from - user memory
1679@@ -304,7 +304,7 @@ USER( TUSER( ldrgtb) r3, [r1], #1) @ May fault
1680 sub r2, r2, ip
1681 b .Lcfu_dest_aligned
1682
1683-ENTRY(__copy_from_user)
1684+ENTRY(___copy_from_user)
1685 stmfd sp!, {r0, r2, r4 - r7, lr}
1686 cmp r2, #4
1687 blt .Lcfu_not_enough
1688@@ -544,7 +544,7 @@ USER( TUSER( ldrgeb) r3, [r1], #1) @ May fault
1689 USER( TUSER( ldrgtb) r3, [r1], #1) @ May fault
1690 strgtb r3, [r0], #1
1691 b .Lcfu_finished
1692-ENDPROC(__copy_from_user)
1693+ENDPROC(___copy_from_user)
1694
1695 .pushsection .fixup,"ax"
1696 .align 0
1697diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
1698index 025f742..8432b08 100644
1699--- a/arch/arm/lib/uaccess_with_memcpy.c
1700+++ b/arch/arm/lib/uaccess_with_memcpy.c
1701@@ -104,7 +104,7 @@ out:
1702 }
1703
1704 unsigned long
1705-__copy_to_user(void __user *to, const void *from, unsigned long n)
1706+___copy_to_user(void __user *to, const void *from, unsigned long n)
1707 {
1708 /*
1709 * This test is stubbed out of the main function above to keep
1710diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
1711index 6722627..8f97548c 100644
1712--- a/arch/arm/mach-omap2/board-n8x0.c
1713+++ b/arch/arm/mach-omap2/board-n8x0.c
1714@@ -597,7 +597,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
1715 }
1716 #endif
1717
1718-static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
1719+static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
1720 .late_init = n8x0_menelaus_late_init,
1721 };
1722
1723diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c
1724index 2b2d51c..0127490 100644
1725--- a/arch/arm/mach-ux500/mbox-db5500.c
1726+++ b/arch/arm/mach-ux500/mbox-db5500.c
1727@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct device *dev,
1728 return sprintf(buf, "0x%X\n", mbox_value);
1729 }
1730
1731-static DEVICE_ATTR(fifo, S_IWUGO | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
1732+static DEVICE_ATTR(fifo, S_IWUSR | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
1733
1734 static int mbox_show(struct seq_file *s, void *data)
1735 {
1736diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
1737index bb7eac3..3bade16 100644
1738--- a/arch/arm/mm/fault.c
1739+++ b/arch/arm/mm/fault.c
1740@@ -172,6 +172,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
1741 }
1742 #endif
1743
1744+#ifdef CONFIG_PAX_PAGEEXEC
1745+ if (fsr & FSR_LNX_PF) {
1746+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
1747+ do_group_exit(SIGKILL);
1748+ }
1749+#endif
1750+
1751 tsk->thread.address = addr;
1752 tsk->thread.error_code = fsr;
1753 tsk->thread.trap_no = 14;
1754@@ -393,6 +400,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
1755 }
1756 #endif /* CONFIG_MMU */
1757
1758+#ifdef CONFIG_PAX_PAGEEXEC
1759+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1760+{
1761+ long i;
1762+
1763+ printk(KERN_ERR "PAX: bytes at PC: ");
1764+ for (i = 0; i < 20; i++) {
1765+ unsigned char c;
1766+ if (get_user(c, (__force unsigned char __user *)pc+i))
1767+ printk(KERN_CONT "?? ");
1768+ else
1769+ printk(KERN_CONT "%02x ", c);
1770+ }
1771+ printk("\n");
1772+
1773+ printk(KERN_ERR "PAX: bytes at SP-4: ");
1774+ for (i = -1; i < 20; i++) {
1775+ unsigned long c;
1776+ if (get_user(c, (__force unsigned long __user *)sp+i))
1777+ printk(KERN_CONT "???????? ");
1778+ else
1779+ printk(KERN_CONT "%08lx ", c);
1780+ }
1781+ printk("\n");
1782+}
1783+#endif
1784+
1785 /*
1786 * First Level Translation Fault Handler
1787 *
1788@@ -573,6 +607,20 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
1789 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
1790 struct siginfo info;
1791
1792+#ifdef CONFIG_PAX_REFCOUNT
1793+ if (fsr_fs(ifsr) == 2) {
1794+ unsigned int bkpt;
1795+
1796+ if (!probe_kernel_address((unsigned int *)addr, bkpt) && bkpt == 0xe12f1073) {
1797+ current->thread.error_code = ifsr;
1798+ current->thread.trap_no = 0;
1799+ pax_report_refcount_overflow(regs);
1800+ fixup_exception(regs);
1801+ return;
1802+ }
1803+ }
1804+#endif
1805+
1806 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
1807 return;
1808
1809diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
1810index ce8cb19..3ec539d 100644
1811--- a/arch/arm/mm/mmap.c
1812+++ b/arch/arm/mm/mmap.c
1813@@ -93,6 +93,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1814 if (len > TASK_SIZE)
1815 return -ENOMEM;
1816
1817+#ifdef CONFIG_PAX_RANDMMAP
1818+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
1819+#endif
1820+
1821 if (addr) {
1822 if (do_align)
1823 addr = COLOUR_ALIGN(addr, pgoff);
1824@@ -100,15 +104,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1825 addr = PAGE_ALIGN(addr);
1826
1827 vma = find_vma(mm, addr);
1828- if (TASK_SIZE - len >= addr &&
1829- (!vma || addr + len <= vma->vm_start))
1830+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1831 return addr;
1832 }
1833 if (len > mm->cached_hole_size) {
1834- start_addr = addr = mm->free_area_cache;
1835+ start_addr = addr = mm->free_area_cache;
1836 } else {
1837- start_addr = addr = mm->mmap_base;
1838- mm->cached_hole_size = 0;
1839+ start_addr = addr = mm->mmap_base;
1840+ mm->cached_hole_size = 0;
1841 }
1842
1843 full_search:
1844@@ -124,14 +127,14 @@ full_search:
1845 * Start a new search - just in case we missed
1846 * some holes.
1847 */
1848- if (start_addr != TASK_UNMAPPED_BASE) {
1849- start_addr = addr = TASK_UNMAPPED_BASE;
1850+ if (start_addr != mm->mmap_base) {
1851+ start_addr = addr = mm->mmap_base;
1852 mm->cached_hole_size = 0;
1853 goto full_search;
1854 }
1855 return -ENOMEM;
1856 }
1857- if (!vma || addr + len <= vma->vm_start) {
1858+ if (check_heap_stack_gap(vma, addr, len)) {
1859 /*
1860 * Remember the place where we stopped the search:
1861 */
1862@@ -266,10 +269,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
1863
1864 if (mmap_is_legacy()) {
1865 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
1866+
1867+#ifdef CONFIG_PAX_RANDMMAP
1868+ if (mm->pax_flags & MF_PAX_RANDMMAP)
1869+ mm->mmap_base += mm->delta_mmap;
1870+#endif
1871+
1872 mm->get_unmapped_area = arch_get_unmapped_area;
1873 mm->unmap_area = arch_unmap_area;
1874 } else {
1875 mm->mmap_base = mmap_base(random_factor);
1876+
1877+#ifdef CONFIG_PAX_RANDMMAP
1878+ if (mm->pax_flags & MF_PAX_RANDMMAP)
1879+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
1880+#endif
1881+
1882 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
1883 mm->unmap_area = arch_unmap_area_topdown;
1884 }
1885diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
1886index 71a6827..e7fbc23 100644
1887--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
1888+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
1889@@ -43,7 +43,7 @@ struct samsung_dma_ops {
1890 int (*started)(unsigned ch);
1891 int (*flush)(unsigned ch);
1892 int (*stop)(unsigned ch);
1893-};
1894+} __no_const;
1895
1896 extern void *samsung_dmadev_get_ops(void);
1897 extern void *s3c_dma_get_ops(void);
1898diff --git a/arch/arm/plat-samsung/include/plat/ehci.h b/arch/arm/plat-samsung/include/plat/ehci.h
1899index 5f28cae..3d23723 100644
1900--- a/arch/arm/plat-samsung/include/plat/ehci.h
1901+++ b/arch/arm/plat-samsung/include/plat/ehci.h
1902@@ -14,7 +14,7 @@
1903 struct s5p_ehci_platdata {
1904 int (*phy_init)(struct platform_device *pdev, int type);
1905 int (*phy_exit)(struct platform_device *pdev, int type);
1906-};
1907+} __no_const;
1908
1909 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
1910
1911diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
1912index c3a58a1..78fbf54 100644
1913--- a/arch/avr32/include/asm/cache.h
1914+++ b/arch/avr32/include/asm/cache.h
1915@@ -1,8 +1,10 @@
1916 #ifndef __ASM_AVR32_CACHE_H
1917 #define __ASM_AVR32_CACHE_H
1918
1919+#include <linux/const.h>
1920+
1921 #define L1_CACHE_SHIFT 5
1922-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1923+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1924
1925 /*
1926 * Memory returned by kmalloc() may be used for DMA, so we must make
1927diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
1928index 3b3159b..425ea94 100644
1929--- a/arch/avr32/include/asm/elf.h
1930+++ b/arch/avr32/include/asm/elf.h
1931@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
1932 the loader. We need to make sure that it is out of the way of the program
1933 that it will "exec", and that there is sufficient room for the brk. */
1934
1935-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1936+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1937
1938+#ifdef CONFIG_PAX_ASLR
1939+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
1940+
1941+#define PAX_DELTA_MMAP_LEN 15
1942+#define PAX_DELTA_STACK_LEN 15
1943+#endif
1944
1945 /* This yields a mask that user programs can use to figure out what
1946 instruction set this CPU supports. This could be done in user space,
1947diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
1948index b7f5c68..556135c 100644
1949--- a/arch/avr32/include/asm/kmap_types.h
1950+++ b/arch/avr32/include/asm/kmap_types.h
1951@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
1952 D(11) KM_IRQ1,
1953 D(12) KM_SOFTIRQ0,
1954 D(13) KM_SOFTIRQ1,
1955-D(14) KM_TYPE_NR
1956+D(14) KM_CLEARPAGE,
1957+D(15) KM_TYPE_NR
1958 };
1959
1960 #undef D
1961diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
1962index f7040a1..db9f300 100644
1963--- a/arch/avr32/mm/fault.c
1964+++ b/arch/avr32/mm/fault.c
1965@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
1966
1967 int exception_trace = 1;
1968
1969+#ifdef CONFIG_PAX_PAGEEXEC
1970+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1971+{
1972+ unsigned long i;
1973+
1974+ printk(KERN_ERR "PAX: bytes at PC: ");
1975+ for (i = 0; i < 20; i++) {
1976+ unsigned char c;
1977+ if (get_user(c, (unsigned char *)pc+i))
1978+ printk(KERN_CONT "???????? ");
1979+ else
1980+ printk(KERN_CONT "%02x ", c);
1981+ }
1982+ printk("\n");
1983+}
1984+#endif
1985+
1986 /*
1987 * This routine handles page faults. It determines the address and the
1988 * problem, and then passes it off to one of the appropriate routines.
1989@@ -156,6 +173,16 @@ bad_area:
1990 up_read(&mm->mmap_sem);
1991
1992 if (user_mode(regs)) {
1993+
1994+#ifdef CONFIG_PAX_PAGEEXEC
1995+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
1996+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
1997+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
1998+ do_group_exit(SIGKILL);
1999+ }
2000+ }
2001+#endif
2002+
2003 if (exception_trace && printk_ratelimit())
2004 printk("%s%s[%d]: segfault at %08lx pc %08lx "
2005 "sp %08lx ecr %lu\n",
2006diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
2007index 568885a..f8008df 100644
2008--- a/arch/blackfin/include/asm/cache.h
2009+++ b/arch/blackfin/include/asm/cache.h
2010@@ -7,6 +7,7 @@
2011 #ifndef __ARCH_BLACKFIN_CACHE_H
2012 #define __ARCH_BLACKFIN_CACHE_H
2013
2014+#include <linux/const.h>
2015 #include <linux/linkage.h> /* for asmlinkage */
2016
2017 /*
2018@@ -14,7 +15,7 @@
2019 * Blackfin loads 32 bytes for cache
2020 */
2021 #define L1_CACHE_SHIFT 5
2022-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2023+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2024 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2025
2026 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2027diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
2028index aea2718..3639a60 100644
2029--- a/arch/cris/include/arch-v10/arch/cache.h
2030+++ b/arch/cris/include/arch-v10/arch/cache.h
2031@@ -1,8 +1,9 @@
2032 #ifndef _ASM_ARCH_CACHE_H
2033 #define _ASM_ARCH_CACHE_H
2034
2035+#include <linux/const.h>
2036 /* Etrax 100LX have 32-byte cache-lines. */
2037-#define L1_CACHE_BYTES 32
2038 #define L1_CACHE_SHIFT 5
2039+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2040
2041 #endif /* _ASM_ARCH_CACHE_H */
2042diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
2043index 1de779f..336fad3 100644
2044--- a/arch/cris/include/arch-v32/arch/cache.h
2045+++ b/arch/cris/include/arch-v32/arch/cache.h
2046@@ -1,11 +1,12 @@
2047 #ifndef _ASM_CRIS_ARCH_CACHE_H
2048 #define _ASM_CRIS_ARCH_CACHE_H
2049
2050+#include <linux/const.h>
2051 #include <arch/hwregs/dma.h>
2052
2053 /* A cache-line is 32 bytes. */
2054-#define L1_CACHE_BYTES 32
2055 #define L1_CACHE_SHIFT 5
2056+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2057
2058 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
2059
2060diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
2061index 0d8a7d6..d0c9ff5 100644
2062--- a/arch/frv/include/asm/atomic.h
2063+++ b/arch/frv/include/asm/atomic.h
2064@@ -241,6 +241,16 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v);
2065 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
2066 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
2067
2068+#define atomic64_read_unchecked(v) atomic64_read(v)
2069+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2070+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2071+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2072+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2073+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2074+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2075+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2076+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2077+
2078 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
2079 {
2080 int c, old;
2081diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
2082index 2797163..c2a401d 100644
2083--- a/arch/frv/include/asm/cache.h
2084+++ b/arch/frv/include/asm/cache.h
2085@@ -12,10 +12,11 @@
2086 #ifndef __ASM_CACHE_H
2087 #define __ASM_CACHE_H
2088
2089+#include <linux/const.h>
2090
2091 /* bytes per L1 cache line */
2092 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
2093-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2094+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2095
2096 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2097 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2098diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
2099index f8e16b2..c73ff79 100644
2100--- a/arch/frv/include/asm/kmap_types.h
2101+++ b/arch/frv/include/asm/kmap_types.h
2102@@ -23,6 +23,7 @@ enum km_type {
2103 KM_IRQ1,
2104 KM_SOFTIRQ0,
2105 KM_SOFTIRQ1,
2106+ KM_CLEARPAGE,
2107 KM_TYPE_NR
2108 };
2109
2110diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
2111index 385fd30..6c3d97e 100644
2112--- a/arch/frv/mm/elf-fdpic.c
2113+++ b/arch/frv/mm/elf-fdpic.c
2114@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2115 if (addr) {
2116 addr = PAGE_ALIGN(addr);
2117 vma = find_vma(current->mm, addr);
2118- if (TASK_SIZE - len >= addr &&
2119- (!vma || addr + len <= vma->vm_start))
2120+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
2121 goto success;
2122 }
2123
2124@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2125 for (; vma; vma = vma->vm_next) {
2126 if (addr > limit)
2127 break;
2128- if (addr + len <= vma->vm_start)
2129+ if (check_heap_stack_gap(vma, addr, len))
2130 goto success;
2131 addr = vma->vm_end;
2132 }
2133@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2134 for (; vma; vma = vma->vm_next) {
2135 if (addr > limit)
2136 break;
2137- if (addr + len <= vma->vm_start)
2138+ if (check_heap_stack_gap(vma, addr, len))
2139 goto success;
2140 addr = vma->vm_end;
2141 }
2142diff --git a/arch/h8300/include/asm/cache.h b/arch/h8300/include/asm/cache.h
2143index c635028..6d9445a 100644
2144--- a/arch/h8300/include/asm/cache.h
2145+++ b/arch/h8300/include/asm/cache.h
2146@@ -1,8 +1,10 @@
2147 #ifndef __ARCH_H8300_CACHE_H
2148 #define __ARCH_H8300_CACHE_H
2149
2150+#include <linux/const.h>
2151+
2152 /* bytes per L1 cache line */
2153-#define L1_CACHE_BYTES 4
2154+#define L1_CACHE_BYTES _AC(4,UL)
2155
2156 /* m68k-elf-gcc 2.95.2 doesn't like these */
2157
2158diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
2159index 0f01de2..d37d309 100644
2160--- a/arch/hexagon/include/asm/cache.h
2161+++ b/arch/hexagon/include/asm/cache.h
2162@@ -21,9 +21,11 @@
2163 #ifndef __ASM_CACHE_H
2164 #define __ASM_CACHE_H
2165
2166+#include <linux/const.h>
2167+
2168 /* Bytes per L1 cache line */
2169-#define L1_CACHE_SHIFT (5)
2170-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2171+#define L1_CACHE_SHIFT 5
2172+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2173
2174 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
2175 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
2176diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
2177index 3fad89e..3047da5 100644
2178--- a/arch/ia64/include/asm/atomic.h
2179+++ b/arch/ia64/include/asm/atomic.h
2180@@ -209,6 +209,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
2181 #define atomic64_inc(v) atomic64_add(1, (v))
2182 #define atomic64_dec(v) atomic64_sub(1, (v))
2183
2184+#define atomic64_read_unchecked(v) atomic64_read(v)
2185+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2186+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2187+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2188+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2189+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2190+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2191+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2192+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2193+
2194 /* Atomic operations are already serializing */
2195 #define smp_mb__before_atomic_dec() barrier()
2196 #define smp_mb__after_atomic_dec() barrier()
2197diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
2198index 988254a..e1ee885 100644
2199--- a/arch/ia64/include/asm/cache.h
2200+++ b/arch/ia64/include/asm/cache.h
2201@@ -1,6 +1,7 @@
2202 #ifndef _ASM_IA64_CACHE_H
2203 #define _ASM_IA64_CACHE_H
2204
2205+#include <linux/const.h>
2206
2207 /*
2208 * Copyright (C) 1998-2000 Hewlett-Packard Co
2209@@ -9,7 +10,7 @@
2210
2211 /* Bytes per L1 (data) cache line. */
2212 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
2213-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2214+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2215
2216 #ifdef CONFIG_SMP
2217 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2218diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
2219index b5298eb..67c6e62 100644
2220--- a/arch/ia64/include/asm/elf.h
2221+++ b/arch/ia64/include/asm/elf.h
2222@@ -42,6 +42,13 @@
2223 */
2224 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
2225
2226+#ifdef CONFIG_PAX_ASLR
2227+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
2228+
2229+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2230+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2231+#endif
2232+
2233 #define PT_IA_64_UNWIND 0x70000001
2234
2235 /* IA-64 relocations: */
2236diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
2237index 1a97af3..7529d31 100644
2238--- a/arch/ia64/include/asm/pgtable.h
2239+++ b/arch/ia64/include/asm/pgtable.h
2240@@ -12,7 +12,7 @@
2241 * David Mosberger-Tang <davidm@hpl.hp.com>
2242 */
2243
2244-
2245+#include <linux/const.h>
2246 #include <asm/mman.h>
2247 #include <asm/page.h>
2248 #include <asm/processor.h>
2249@@ -143,6 +143,17 @@
2250 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2251 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2252 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
2253+
2254+#ifdef CONFIG_PAX_PAGEEXEC
2255+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
2256+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2257+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2258+#else
2259+# define PAGE_SHARED_NOEXEC PAGE_SHARED
2260+# define PAGE_READONLY_NOEXEC PAGE_READONLY
2261+# define PAGE_COPY_NOEXEC PAGE_COPY
2262+#endif
2263+
2264 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
2265 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
2266 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
2267diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
2268index b77768d..e0795eb 100644
2269--- a/arch/ia64/include/asm/spinlock.h
2270+++ b/arch/ia64/include/asm/spinlock.h
2271@@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
2272 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
2273
2274 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
2275- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
2276+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
2277 }
2278
2279 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
2280diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
2281index 449c8c0..432a3d2 100644
2282--- a/arch/ia64/include/asm/uaccess.h
2283+++ b/arch/ia64/include/asm/uaccess.h
2284@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2285 const void *__cu_from = (from); \
2286 long __cu_len = (n); \
2287 \
2288- if (__access_ok(__cu_to, __cu_len, get_fs())) \
2289+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
2290 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
2291 __cu_len; \
2292 })
2293@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2294 long __cu_len = (n); \
2295 \
2296 __chk_user_ptr(__cu_from); \
2297- if (__access_ok(__cu_from, __cu_len, get_fs())) \
2298+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
2299 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
2300 __cu_len; \
2301 })
2302diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
2303index 24603be..948052d 100644
2304--- a/arch/ia64/kernel/module.c
2305+++ b/arch/ia64/kernel/module.c
2306@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
2307 void
2308 module_free (struct module *mod, void *module_region)
2309 {
2310- if (mod && mod->arch.init_unw_table &&
2311- module_region == mod->module_init) {
2312+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
2313 unw_remove_unwind_table(mod->arch.init_unw_table);
2314 mod->arch.init_unw_table = NULL;
2315 }
2316@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
2317 }
2318
2319 static inline int
2320+in_init_rx (const struct module *mod, uint64_t addr)
2321+{
2322+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
2323+}
2324+
2325+static inline int
2326+in_init_rw (const struct module *mod, uint64_t addr)
2327+{
2328+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
2329+}
2330+
2331+static inline int
2332 in_init (const struct module *mod, uint64_t addr)
2333 {
2334- return addr - (uint64_t) mod->module_init < mod->init_size;
2335+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
2336+}
2337+
2338+static inline int
2339+in_core_rx (const struct module *mod, uint64_t addr)
2340+{
2341+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
2342+}
2343+
2344+static inline int
2345+in_core_rw (const struct module *mod, uint64_t addr)
2346+{
2347+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
2348 }
2349
2350 static inline int
2351 in_core (const struct module *mod, uint64_t addr)
2352 {
2353- return addr - (uint64_t) mod->module_core < mod->core_size;
2354+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
2355 }
2356
2357 static inline int
2358@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
2359 break;
2360
2361 case RV_BDREL:
2362- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
2363+ if (in_init_rx(mod, val))
2364+ val -= (uint64_t) mod->module_init_rx;
2365+ else if (in_init_rw(mod, val))
2366+ val -= (uint64_t) mod->module_init_rw;
2367+ else if (in_core_rx(mod, val))
2368+ val -= (uint64_t) mod->module_core_rx;
2369+ else if (in_core_rw(mod, val))
2370+ val -= (uint64_t) mod->module_core_rw;
2371 break;
2372
2373 case RV_LTV:
2374@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
2375 * addresses have been selected...
2376 */
2377 uint64_t gp;
2378- if (mod->core_size > MAX_LTOFF)
2379+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
2380 /*
2381 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
2382 * at the end of the module.
2383 */
2384- gp = mod->core_size - MAX_LTOFF / 2;
2385+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
2386 else
2387- gp = mod->core_size / 2;
2388- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
2389+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
2390+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
2391 mod->arch.gp = gp;
2392 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
2393 }
2394diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
2395index 609d500..7dde2a8 100644
2396--- a/arch/ia64/kernel/sys_ia64.c
2397+++ b/arch/ia64/kernel/sys_ia64.c
2398@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2399 if (REGION_NUMBER(addr) == RGN_HPAGE)
2400 addr = 0;
2401 #endif
2402+
2403+#ifdef CONFIG_PAX_RANDMMAP
2404+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2405+ addr = mm->free_area_cache;
2406+ else
2407+#endif
2408+
2409 if (!addr)
2410 addr = mm->free_area_cache;
2411
2412@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2413 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
2414 /* At this point: (!vma || addr < vma->vm_end). */
2415 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
2416- if (start_addr != TASK_UNMAPPED_BASE) {
2417+ if (start_addr != mm->mmap_base) {
2418 /* Start a new search --- just in case we missed some holes. */
2419- addr = TASK_UNMAPPED_BASE;
2420+ addr = mm->mmap_base;
2421 goto full_search;
2422 }
2423 return -ENOMEM;
2424 }
2425- if (!vma || addr + len <= vma->vm_start) {
2426+ if (check_heap_stack_gap(vma, addr, len)) {
2427 /* Remember the address where we stopped this search: */
2428 mm->free_area_cache = addr + len;
2429 return addr;
2430diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
2431index 53c0ba0..2accdde 100644
2432--- a/arch/ia64/kernel/vmlinux.lds.S
2433+++ b/arch/ia64/kernel/vmlinux.lds.S
2434@@ -199,7 +199,7 @@ SECTIONS {
2435 /* Per-cpu data: */
2436 . = ALIGN(PERCPU_PAGE_SIZE);
2437 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
2438- __phys_per_cpu_start = __per_cpu_load;
2439+ __phys_per_cpu_start = per_cpu_load;
2440 /*
2441 * ensure percpu data fits
2442 * into percpu page size
2443diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
2444index 20b3593..1ce77f0 100644
2445--- a/arch/ia64/mm/fault.c
2446+++ b/arch/ia64/mm/fault.c
2447@@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned long address)
2448 return pte_present(pte);
2449 }
2450
2451+#ifdef CONFIG_PAX_PAGEEXEC
2452+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2453+{
2454+ unsigned long i;
2455+
2456+ printk(KERN_ERR "PAX: bytes at PC: ");
2457+ for (i = 0; i < 8; i++) {
2458+ unsigned int c;
2459+ if (get_user(c, (unsigned int *)pc+i))
2460+ printk(KERN_CONT "???????? ");
2461+ else
2462+ printk(KERN_CONT "%08x ", c);
2463+ }
2464+ printk("\n");
2465+}
2466+#endif
2467+
2468 void __kprobes
2469 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
2470 {
2471@@ -146,9 +163,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
2472 mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
2473 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
2474
2475- if ((vma->vm_flags & mask) != mask)
2476+ if ((vma->vm_flags & mask) != mask) {
2477+
2478+#ifdef CONFIG_PAX_PAGEEXEC
2479+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
2480+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
2481+ goto bad_area;
2482+
2483+ up_read(&mm->mmap_sem);
2484+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
2485+ do_group_exit(SIGKILL);
2486+ }
2487+#endif
2488+
2489 goto bad_area;
2490
2491+ }
2492+
2493 /*
2494 * If for any reason at all we couldn't handle the fault, make
2495 * sure we exit gracefully rather than endlessly redo the
2496diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
2497index 5ca674b..e0e1b70 100644
2498--- a/arch/ia64/mm/hugetlbpage.c
2499+++ b/arch/ia64/mm/hugetlbpage.c
2500@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
2501 /* At this point: (!vmm || addr < vmm->vm_end). */
2502 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
2503 return -ENOMEM;
2504- if (!vmm || (addr + len) <= vmm->vm_start)
2505+ if (check_heap_stack_gap(vmm, addr, len))
2506 return addr;
2507 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
2508 }
2509diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
2510index 13df239d..cb52116 100644
2511--- a/arch/ia64/mm/init.c
2512+++ b/arch/ia64/mm/init.c
2513@@ -121,6 +121,19 @@ ia64_init_addr_space (void)
2514 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
2515 vma->vm_end = vma->vm_start + PAGE_SIZE;
2516 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
2517+
2518+#ifdef CONFIG_PAX_PAGEEXEC
2519+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
2520+ vma->vm_flags &= ~VM_EXEC;
2521+
2522+#ifdef CONFIG_PAX_MPROTECT
2523+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
2524+ vma->vm_flags &= ~VM_MAYEXEC;
2525+#endif
2526+
2527+ }
2528+#endif
2529+
2530 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
2531 down_write(&current->mm->mmap_sem);
2532 if (insert_vm_struct(current->mm, vma)) {
2533diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
2534index 40b3ee9..8c2c112 100644
2535--- a/arch/m32r/include/asm/cache.h
2536+++ b/arch/m32r/include/asm/cache.h
2537@@ -1,8 +1,10 @@
2538 #ifndef _ASM_M32R_CACHE_H
2539 #define _ASM_M32R_CACHE_H
2540
2541+#include <linux/const.h>
2542+
2543 /* L1 cache line size */
2544 #define L1_CACHE_SHIFT 4
2545-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2546+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2547
2548 #endif /* _ASM_M32R_CACHE_H */
2549diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
2550index 82abd15..d95ae5d 100644
2551--- a/arch/m32r/lib/usercopy.c
2552+++ b/arch/m32r/lib/usercopy.c
2553@@ -14,6 +14,9 @@
2554 unsigned long
2555 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2556 {
2557+ if ((long)n < 0)
2558+ return n;
2559+
2560 prefetch(from);
2561 if (access_ok(VERIFY_WRITE, to, n))
2562 __copy_user(to,from,n);
2563@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2564 unsigned long
2565 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
2566 {
2567+ if ((long)n < 0)
2568+ return n;
2569+
2570 prefetchw(to);
2571 if (access_ok(VERIFY_READ, from, n))
2572 __copy_user_zeroing(to,from,n);
2573diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
2574index 0395c51..5f26031 100644
2575--- a/arch/m68k/include/asm/cache.h
2576+++ b/arch/m68k/include/asm/cache.h
2577@@ -4,9 +4,11 @@
2578 #ifndef __ARCH_M68K_CACHE_H
2579 #define __ARCH_M68K_CACHE_H
2580
2581+#include <linux/const.h>
2582+
2583 /* bytes per L1 cache line */
2584 #define L1_CACHE_SHIFT 4
2585-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
2586+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2587
2588 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2589
2590diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
2591index 4efe96a..60e8699 100644
2592--- a/arch/microblaze/include/asm/cache.h
2593+++ b/arch/microblaze/include/asm/cache.h
2594@@ -13,11 +13,12 @@
2595 #ifndef _ASM_MICROBLAZE_CACHE_H
2596 #define _ASM_MICROBLAZE_CACHE_H
2597
2598+#include <linux/const.h>
2599 #include <asm/registers.h>
2600
2601 #define L1_CACHE_SHIFT 5
2602 /* word-granular cache in microblaze */
2603-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2604+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2605
2606 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2607
2608diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
2609index 1d93f81..67794d0 100644
2610--- a/arch/mips/include/asm/atomic.h
2611+++ b/arch/mips/include/asm/atomic.h
2612@@ -21,6 +21,10 @@
2613 #include <asm/war.h>
2614 #include <asm/system.h>
2615
2616+#ifdef CONFIG_GENERIC_ATOMIC64
2617+#include <asm-generic/atomic64.h>
2618+#endif
2619+
2620 #define ATOMIC_INIT(i) { (i) }
2621
2622 /*
2623@@ -765,6 +769,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2624 */
2625 #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
2626
2627+#define atomic64_read_unchecked(v) atomic64_read(v)
2628+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2629+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2630+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2631+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2632+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2633+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2634+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2635+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2636+
2637 #endif /* CONFIG_64BIT */
2638
2639 /*
2640diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
2641index b4db69f..8f3b093 100644
2642--- a/arch/mips/include/asm/cache.h
2643+++ b/arch/mips/include/asm/cache.h
2644@@ -9,10 +9,11 @@
2645 #ifndef _ASM_CACHE_H
2646 #define _ASM_CACHE_H
2647
2648+#include <linux/const.h>
2649 #include <kmalloc.h>
2650
2651 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
2652-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2653+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2654
2655 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2656 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2657diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
2658index 455c0ac..ad65fbe 100644
2659--- a/arch/mips/include/asm/elf.h
2660+++ b/arch/mips/include/asm/elf.h
2661@@ -372,13 +372,16 @@ extern const char *__elf_platform;
2662 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
2663 #endif
2664
2665+#ifdef CONFIG_PAX_ASLR
2666+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2667+
2668+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2669+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2670+#endif
2671+
2672 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
2673 struct linux_binprm;
2674 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
2675 int uses_interp);
2676
2677-struct mm_struct;
2678-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2679-#define arch_randomize_brk arch_randomize_brk
2680-
2681 #endif /* _ASM_ELF_H */
2682diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
2683index da9bd7d..91aa7ab 100644
2684--- a/arch/mips/include/asm/page.h
2685+++ b/arch/mips/include/asm/page.h
2686@@ -98,7 +98,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
2687 #ifdef CONFIG_CPU_MIPS32
2688 typedef struct { unsigned long pte_low, pte_high; } pte_t;
2689 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
2690- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
2691+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
2692 #else
2693 typedef struct { unsigned long long pte; } pte_t;
2694 #define pte_val(x) ((x).pte)
2695diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
2696index 6018c80..7c37203 100644
2697--- a/arch/mips/include/asm/system.h
2698+++ b/arch/mips/include/asm/system.h
2699@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
2700 */
2701 #define __ARCH_WANT_UNLOCKED_CTXSW
2702
2703-extern unsigned long arch_align_stack(unsigned long sp);
2704+#define arch_align_stack(x) ((x) & ~0xfUL)
2705
2706 #endif /* _ASM_SYSTEM_H */
2707diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
2708index 9fdd8bc..4bd7f1a 100644
2709--- a/arch/mips/kernel/binfmt_elfn32.c
2710+++ b/arch/mips/kernel/binfmt_elfn32.c
2711@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2712 #undef ELF_ET_DYN_BASE
2713 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2714
2715+#ifdef CONFIG_PAX_ASLR
2716+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2717+
2718+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2719+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2720+#endif
2721+
2722 #include <asm/processor.h>
2723 #include <linux/module.h>
2724 #include <linux/elfcore.h>
2725diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
2726index ff44823..97f8906 100644
2727--- a/arch/mips/kernel/binfmt_elfo32.c
2728+++ b/arch/mips/kernel/binfmt_elfo32.c
2729@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2730 #undef ELF_ET_DYN_BASE
2731 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2732
2733+#ifdef CONFIG_PAX_ASLR
2734+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2735+
2736+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2737+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2738+#endif
2739+
2740 #include <asm/processor.h>
2741
2742 /*
2743diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
2744index 7955409..ceaea7c 100644
2745--- a/arch/mips/kernel/process.c
2746+++ b/arch/mips/kernel/process.c
2747@@ -483,15 +483,3 @@ unsigned long get_wchan(struct task_struct *task)
2748 out:
2749 return pc;
2750 }
2751-
2752-/*
2753- * Don't forget that the stack pointer must be aligned on a 8 bytes
2754- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
2755- */
2756-unsigned long arch_align_stack(unsigned long sp)
2757-{
2758- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2759- sp -= get_random_int() & ~PAGE_MASK;
2760-
2761- return sp & ALMASK;
2762-}
2763diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
2764index 69ebd58..e4bff83 100644
2765--- a/arch/mips/mm/fault.c
2766+++ b/arch/mips/mm/fault.c
2767@@ -28,6 +28,23 @@
2768 #include <asm/highmem.h> /* For VMALLOC_END */
2769 #include <linux/kdebug.h>
2770
2771+#ifdef CONFIG_PAX_PAGEEXEC
2772+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2773+{
2774+ unsigned long i;
2775+
2776+ printk(KERN_ERR "PAX: bytes at PC: ");
2777+ for (i = 0; i < 5; i++) {
2778+ unsigned int c;
2779+ if (get_user(c, (unsigned int *)pc+i))
2780+ printk(KERN_CONT "???????? ");
2781+ else
2782+ printk(KERN_CONT "%08x ", c);
2783+ }
2784+ printk("\n");
2785+}
2786+#endif
2787+
2788 /*
2789 * This routine handles page faults. It determines the address,
2790 * and the problem, and then passes it off to one of the appropriate
2791diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
2792index 302d779..7d35bf8 100644
2793--- a/arch/mips/mm/mmap.c
2794+++ b/arch/mips/mm/mmap.c
2795@@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2796 do_color_align = 1;
2797
2798 /* requesting a specific address */
2799+
2800+#ifdef CONFIG_PAX_RANDMMAP
2801+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
2802+#endif
2803+
2804 if (addr) {
2805 if (do_color_align)
2806 addr = COLOUR_ALIGN(addr, pgoff);
2807@@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2808 addr = PAGE_ALIGN(addr);
2809
2810 vma = find_vma(mm, addr);
2811- if (TASK_SIZE - len >= addr &&
2812- (!vma || addr + len <= vma->vm_start))
2813+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
2814 return addr;
2815 }
2816
2817@@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2818 /* At this point: (!vma || addr < vma->vm_end). */
2819 if (TASK_SIZE - len < addr)
2820 return -ENOMEM;
2821- if (!vma || addr + len <= vma->vm_start)
2822+ if (check_heap_stack_gap(vmm, addr, len))
2823 return addr;
2824 addr = vma->vm_end;
2825 if (do_color_align)
2826@@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2827 /* make sure it can fit in the remaining address space */
2828 if (likely(addr > len)) {
2829 vma = find_vma(mm, addr - len);
2830- if (!vma || addr <= vma->vm_start) {
2831+ if (check_heap_stack_gap(vmm, addr - len, len))
2832 /* cache the address as a hint for next time */
2833 return mm->free_area_cache = addr - len;
2834 }
2835@@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2836 * return with success:
2837 */
2838 vma = find_vma(mm, addr);
2839- if (likely(!vma || addr + len <= vma->vm_start)) {
2840+ if (check_heap_stack_gap(vmm, addr, len)) {
2841 /* cache the address as a hint for next time */
2842 return mm->free_area_cache = addr;
2843 }
2844@@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
2845 mm->unmap_area = arch_unmap_area_topdown;
2846 }
2847 }
2848-
2849-static inline unsigned long brk_rnd(void)
2850-{
2851- unsigned long rnd = get_random_int();
2852-
2853- rnd = rnd << PAGE_SHIFT;
2854- /* 8MB for 32bit, 256MB for 64bit */
2855- if (TASK_IS_32BIT_ADDR)
2856- rnd = rnd & 0x7ffffful;
2857- else
2858- rnd = rnd & 0xffffffful;
2859-
2860- return rnd;
2861-}
2862-
2863-unsigned long arch_randomize_brk(struct mm_struct *mm)
2864-{
2865- unsigned long base = mm->brk;
2866- unsigned long ret;
2867-
2868- ret = PAGE_ALIGN(base + brk_rnd());
2869-
2870- if (ret < mm->brk)
2871- return mm->brk;
2872-
2873- return ret;
2874-}
2875diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
2876index 967d144..db12197 100644
2877--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
2878+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
2879@@ -11,12 +11,14 @@
2880 #ifndef _ASM_PROC_CACHE_H
2881 #define _ASM_PROC_CACHE_H
2882
2883+#include <linux/const.h>
2884+
2885 /* L1 cache */
2886
2887 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
2888 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
2889-#define L1_CACHE_BYTES 16 /* bytes per entry */
2890 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
2891+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
2892 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
2893
2894 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
2895diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2896index bcb5df2..84fabd2 100644
2897--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2898+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2899@@ -16,13 +16,15 @@
2900 #ifndef _ASM_PROC_CACHE_H
2901 #define _ASM_PROC_CACHE_H
2902
2903+#include <linux/const.h>
2904+
2905 /*
2906 * L1 cache
2907 */
2908 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
2909 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
2910-#define L1_CACHE_BYTES 32 /* bytes per entry */
2911 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
2912+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
2913 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
2914
2915 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
2916diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
2917index 4ce7a01..449202a 100644
2918--- a/arch/openrisc/include/asm/cache.h
2919+++ b/arch/openrisc/include/asm/cache.h
2920@@ -19,11 +19,13 @@
2921 #ifndef __ASM_OPENRISC_CACHE_H
2922 #define __ASM_OPENRISC_CACHE_H
2923
2924+#include <linux/const.h>
2925+
2926 /* FIXME: How can we replace these with values from the CPU...
2927 * they shouldn't be hard-coded!
2928 */
2929
2930-#define L1_CACHE_BYTES 16
2931 #define L1_CACHE_SHIFT 4
2932+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2933
2934 #endif /* __ASM_OPENRISC_CACHE_H */
2935diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
2936index 4054b31..a10c105 100644
2937--- a/arch/parisc/include/asm/atomic.h
2938+++ b/arch/parisc/include/asm/atomic.h
2939@@ -335,6 +335,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2940
2941 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
2942
2943+#define atomic64_read_unchecked(v) atomic64_read(v)
2944+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2945+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2946+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2947+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2948+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2949+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2950+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2951+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2952+
2953 #endif /* !CONFIG_64BIT */
2954
2955
2956diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
2957index 47f11c7..3420df2 100644
2958--- a/arch/parisc/include/asm/cache.h
2959+++ b/arch/parisc/include/asm/cache.h
2960@@ -5,6 +5,7 @@
2961 #ifndef __ARCH_PARISC_CACHE_H
2962 #define __ARCH_PARISC_CACHE_H
2963
2964+#include <linux/const.h>
2965
2966 /*
2967 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
2968@@ -15,13 +16,13 @@
2969 * just ruin performance.
2970 */
2971 #ifdef CONFIG_PA20
2972-#define L1_CACHE_BYTES 64
2973 #define L1_CACHE_SHIFT 6
2974 #else
2975-#define L1_CACHE_BYTES 32
2976 #define L1_CACHE_SHIFT 5
2977 #endif
2978
2979+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2980+
2981 #ifndef __ASSEMBLY__
2982
2983 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2984diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
2985index 19f6cb1..6c78cf2 100644
2986--- a/arch/parisc/include/asm/elf.h
2987+++ b/arch/parisc/include/asm/elf.h
2988@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
2989
2990 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
2991
2992+#ifdef CONFIG_PAX_ASLR
2993+#define PAX_ELF_ET_DYN_BASE 0x10000UL
2994+
2995+#define PAX_DELTA_MMAP_LEN 16
2996+#define PAX_DELTA_STACK_LEN 16
2997+#endif
2998+
2999 /* This yields a mask that user programs can use to figure out what
3000 instruction set this CPU supports. This could be done in user space,
3001 but it's not easy, and we've already done it here. */
3002diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
3003index 22dadeb..f6c2be4 100644
3004--- a/arch/parisc/include/asm/pgtable.h
3005+++ b/arch/parisc/include/asm/pgtable.h
3006@@ -210,6 +210,17 @@ struct vm_area_struct;
3007 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
3008 #define PAGE_COPY PAGE_EXECREAD
3009 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
3010+
3011+#ifdef CONFIG_PAX_PAGEEXEC
3012+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
3013+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
3014+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
3015+#else
3016+# define PAGE_SHARED_NOEXEC PAGE_SHARED
3017+# define PAGE_COPY_NOEXEC PAGE_COPY
3018+# define PAGE_READONLY_NOEXEC PAGE_READONLY
3019+#endif
3020+
3021 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
3022 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
3023 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
3024diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
3025index 5e34ccf..672bc9c 100644
3026--- a/arch/parisc/kernel/module.c
3027+++ b/arch/parisc/kernel/module.c
3028@@ -98,16 +98,38 @@
3029
3030 /* three functions to determine where in the module core
3031 * or init pieces the location is */
3032+static inline int in_init_rx(struct module *me, void *loc)
3033+{
3034+ return (loc >= me->module_init_rx &&
3035+ loc < (me->module_init_rx + me->init_size_rx));
3036+}
3037+
3038+static inline int in_init_rw(struct module *me, void *loc)
3039+{
3040+ return (loc >= me->module_init_rw &&
3041+ loc < (me->module_init_rw + me->init_size_rw));
3042+}
3043+
3044 static inline int in_init(struct module *me, void *loc)
3045 {
3046- return (loc >= me->module_init &&
3047- loc <= (me->module_init + me->init_size));
3048+ return in_init_rx(me, loc) || in_init_rw(me, loc);
3049+}
3050+
3051+static inline int in_core_rx(struct module *me, void *loc)
3052+{
3053+ return (loc >= me->module_core_rx &&
3054+ loc < (me->module_core_rx + me->core_size_rx));
3055+}
3056+
3057+static inline int in_core_rw(struct module *me, void *loc)
3058+{
3059+ return (loc >= me->module_core_rw &&
3060+ loc < (me->module_core_rw + me->core_size_rw));
3061 }
3062
3063 static inline int in_core(struct module *me, void *loc)
3064 {
3065- return (loc >= me->module_core &&
3066- loc <= (me->module_core + me->core_size));
3067+ return in_core_rx(me, loc) || in_core_rw(me, loc);
3068 }
3069
3070 static inline int in_local(struct module *me, void *loc)
3071@@ -373,13 +395,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
3072 }
3073
3074 /* align things a bit */
3075- me->core_size = ALIGN(me->core_size, 16);
3076- me->arch.got_offset = me->core_size;
3077- me->core_size += gots * sizeof(struct got_entry);
3078+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
3079+ me->arch.got_offset = me->core_size_rw;
3080+ me->core_size_rw += gots * sizeof(struct got_entry);
3081
3082- me->core_size = ALIGN(me->core_size, 16);
3083- me->arch.fdesc_offset = me->core_size;
3084- me->core_size += fdescs * sizeof(Elf_Fdesc);
3085+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
3086+ me->arch.fdesc_offset = me->core_size_rw;
3087+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
3088
3089 me->arch.got_max = gots;
3090 me->arch.fdesc_max = fdescs;
3091@@ -397,7 +419,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3092
3093 BUG_ON(value == 0);
3094
3095- got = me->module_core + me->arch.got_offset;
3096+ got = me->module_core_rw + me->arch.got_offset;
3097 for (i = 0; got[i].addr; i++)
3098 if (got[i].addr == value)
3099 goto out;
3100@@ -415,7 +437,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3101 #ifdef CONFIG_64BIT
3102 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3103 {
3104- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
3105+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
3106
3107 if (!value) {
3108 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
3109@@ -433,7 +455,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3110
3111 /* Create new one */
3112 fdesc->addr = value;
3113- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3114+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3115 return (Elf_Addr)fdesc;
3116 }
3117 #endif /* CONFIG_64BIT */
3118@@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
3119
3120 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
3121 end = table + sechdrs[me->arch.unwind_section].sh_size;
3122- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3123+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3124
3125 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
3126 me->arch.unwind_section, table, end, gp);
3127diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
3128index c9b9322..02d8940 100644
3129--- a/arch/parisc/kernel/sys_parisc.c
3130+++ b/arch/parisc/kernel/sys_parisc.c
3131@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
3132 /* At this point: (!vma || addr < vma->vm_end). */
3133 if (TASK_SIZE - len < addr)
3134 return -ENOMEM;
3135- if (!vma || addr + len <= vma->vm_start)
3136+ if (check_heap_stack_gap(vma, addr, len))
3137 return addr;
3138 addr = vma->vm_end;
3139 }
3140@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
3141 /* At this point: (!vma || addr < vma->vm_end). */
3142 if (TASK_SIZE - len < addr)
3143 return -ENOMEM;
3144- if (!vma || addr + len <= vma->vm_start)
3145+ if (check_heap_stack_gap(vma, addr, len))
3146 return addr;
3147 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
3148 if (addr < vma->vm_end) /* handle wraparound */
3149@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
3150 if (flags & MAP_FIXED)
3151 return addr;
3152 if (!addr)
3153- addr = TASK_UNMAPPED_BASE;
3154+ addr = current->mm->mmap_base;
3155
3156 if (filp) {
3157 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
3158diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
3159index f19e660..414fe24 100644
3160--- a/arch/parisc/kernel/traps.c
3161+++ b/arch/parisc/kernel/traps.c
3162@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
3163
3164 down_read(&current->mm->mmap_sem);
3165 vma = find_vma(current->mm,regs->iaoq[0]);
3166- if (vma && (regs->iaoq[0] >= vma->vm_start)
3167- && (vma->vm_flags & VM_EXEC)) {
3168-
3169+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
3170 fault_address = regs->iaoq[0];
3171 fault_space = regs->iasq[0];
3172
3173diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
3174index 18162ce..94de376 100644
3175--- a/arch/parisc/mm/fault.c
3176+++ b/arch/parisc/mm/fault.c
3177@@ -15,6 +15,7 @@
3178 #include <linux/sched.h>
3179 #include <linux/interrupt.h>
3180 #include <linux/module.h>
3181+#include <linux/unistd.h>
3182
3183 #include <asm/uaccess.h>
3184 #include <asm/traps.h>
3185@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
3186 static unsigned long
3187 parisc_acctyp(unsigned long code, unsigned int inst)
3188 {
3189- if (code == 6 || code == 16)
3190+ if (code == 6 || code == 7 || code == 16)
3191 return VM_EXEC;
3192
3193 switch (inst & 0xf0000000) {
3194@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
3195 }
3196 #endif
3197
3198+#ifdef CONFIG_PAX_PAGEEXEC
3199+/*
3200+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
3201+ *
3202+ * returns 1 when task should be killed
3203+ * 2 when rt_sigreturn trampoline was detected
3204+ * 3 when unpatched PLT trampoline was detected
3205+ */
3206+static int pax_handle_fetch_fault(struct pt_regs *regs)
3207+{
3208+
3209+#ifdef CONFIG_PAX_EMUPLT
3210+ int err;
3211+
3212+ do { /* PaX: unpatched PLT emulation */
3213+ unsigned int bl, depwi;
3214+
3215+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
3216+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
3217+
3218+ if (err)
3219+ break;
3220+
3221+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
3222+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
3223+
3224+ err = get_user(ldw, (unsigned int *)addr);
3225+ err |= get_user(bv, (unsigned int *)(addr+4));
3226+ err |= get_user(ldw2, (unsigned int *)(addr+8));
3227+
3228+ if (err)
3229+ break;
3230+
3231+ if (ldw == 0x0E801096U &&
3232+ bv == 0xEAC0C000U &&
3233+ ldw2 == 0x0E881095U)
3234+ {
3235+ unsigned int resolver, map;
3236+
3237+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
3238+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
3239+ if (err)
3240+ break;
3241+
3242+ regs->gr[20] = instruction_pointer(regs)+8;
3243+ regs->gr[21] = map;
3244+ regs->gr[22] = resolver;
3245+ regs->iaoq[0] = resolver | 3UL;
3246+ regs->iaoq[1] = regs->iaoq[0] + 4;
3247+ return 3;
3248+ }
3249+ }
3250+ } while (0);
3251+#endif
3252+
3253+#ifdef CONFIG_PAX_EMUTRAMP
3254+
3255+#ifndef CONFIG_PAX_EMUSIGRT
3256+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
3257+ return 1;
3258+#endif
3259+
3260+ do { /* PaX: rt_sigreturn emulation */
3261+ unsigned int ldi1, ldi2, bel, nop;
3262+
3263+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
3264+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
3265+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
3266+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
3267+
3268+ if (err)
3269+ break;
3270+
3271+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
3272+ ldi2 == 0x3414015AU &&
3273+ bel == 0xE4008200U &&
3274+ nop == 0x08000240U)
3275+ {
3276+ regs->gr[25] = (ldi1 & 2) >> 1;
3277+ regs->gr[20] = __NR_rt_sigreturn;
3278+ regs->gr[31] = regs->iaoq[1] + 16;
3279+ regs->sr[0] = regs->iasq[1];
3280+ regs->iaoq[0] = 0x100UL;
3281+ regs->iaoq[1] = regs->iaoq[0] + 4;
3282+ regs->iasq[0] = regs->sr[2];
3283+ regs->iasq[1] = regs->sr[2];
3284+ return 2;
3285+ }
3286+ } while (0);
3287+#endif
3288+
3289+ return 1;
3290+}
3291+
3292+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3293+{
3294+ unsigned long i;
3295+
3296+ printk(KERN_ERR "PAX: bytes at PC: ");
3297+ for (i = 0; i < 5; i++) {
3298+ unsigned int c;
3299+ if (get_user(c, (unsigned int *)pc+i))
3300+ printk(KERN_CONT "???????? ");
3301+ else
3302+ printk(KERN_CONT "%08x ", c);
3303+ }
3304+ printk("\n");
3305+}
3306+#endif
3307+
3308 int fixup_exception(struct pt_regs *regs)
3309 {
3310 const struct exception_table_entry *fix;
3311@@ -192,8 +303,33 @@ good_area:
3312
3313 acc_type = parisc_acctyp(code,regs->iir);
3314
3315- if ((vma->vm_flags & acc_type) != acc_type)
3316+ if ((vma->vm_flags & acc_type) != acc_type) {
3317+
3318+#ifdef CONFIG_PAX_PAGEEXEC
3319+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
3320+ (address & ~3UL) == instruction_pointer(regs))
3321+ {
3322+ up_read(&mm->mmap_sem);
3323+ switch (pax_handle_fetch_fault(regs)) {
3324+
3325+#ifdef CONFIG_PAX_EMUPLT
3326+ case 3:
3327+ return;
3328+#endif
3329+
3330+#ifdef CONFIG_PAX_EMUTRAMP
3331+ case 2:
3332+ return;
3333+#endif
3334+
3335+ }
3336+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
3337+ do_group_exit(SIGKILL);
3338+ }
3339+#endif
3340+
3341 goto bad_area;
3342+ }
3343
3344 /*
3345 * If for any reason at all we couldn't handle the fault, make
3346diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
3347index 02e41b5..ec6e26c 100644
3348--- a/arch/powerpc/include/asm/atomic.h
3349+++ b/arch/powerpc/include/asm/atomic.h
3350@@ -469,6 +469,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
3351
3352 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3353
3354+#define atomic64_read_unchecked(v) atomic64_read(v)
3355+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
3356+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
3357+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
3358+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
3359+#define atomic64_inc_unchecked(v) atomic64_inc(v)
3360+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
3361+#define atomic64_dec_unchecked(v) atomic64_dec(v)
3362+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
3363+
3364 #endif /* __powerpc64__ */
3365
3366 #endif /* __KERNEL__ */
3367diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
3368index 4b50941..5605819 100644
3369--- a/arch/powerpc/include/asm/cache.h
3370+++ b/arch/powerpc/include/asm/cache.h
3371@@ -3,6 +3,7 @@
3372
3373 #ifdef __KERNEL__
3374
3375+#include <linux/const.h>
3376
3377 /* bytes per L1 cache line */
3378 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
3379@@ -22,7 +23,7 @@
3380 #define L1_CACHE_SHIFT 7
3381 #endif
3382
3383-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
3384+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3385
3386 #define SMP_CACHE_BYTES L1_CACHE_BYTES
3387
3388diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
3389index 3bf9cca..e7457d0 100644
3390--- a/arch/powerpc/include/asm/elf.h
3391+++ b/arch/powerpc/include/asm/elf.h
3392@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
3393 the loader. We need to make sure that it is out of the way of the program
3394 that it will "exec", and that there is sufficient room for the brk. */
3395
3396-extern unsigned long randomize_et_dyn(unsigned long base);
3397-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
3398+#define ELF_ET_DYN_BASE (0x20000000)
3399+
3400+#ifdef CONFIG_PAX_ASLR
3401+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
3402+
3403+#ifdef __powerpc64__
3404+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
3405+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
3406+#else
3407+#define PAX_DELTA_MMAP_LEN 15
3408+#define PAX_DELTA_STACK_LEN 15
3409+#endif
3410+#endif
3411
3412 /*
3413 * Our registers are always unsigned longs, whether we're a 32 bit
3414@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
3415 (0x7ff >> (PAGE_SHIFT - 12)) : \
3416 (0x3ffff >> (PAGE_SHIFT - 12)))
3417
3418-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
3419-#define arch_randomize_brk arch_randomize_brk
3420-
3421 #endif /* __KERNEL__ */
3422
3423 /*
3424diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
3425index bca8fdc..61e9580 100644
3426--- a/arch/powerpc/include/asm/kmap_types.h
3427+++ b/arch/powerpc/include/asm/kmap_types.h
3428@@ -27,6 +27,7 @@ enum km_type {
3429 KM_PPC_SYNC_PAGE,
3430 KM_PPC_SYNC_ICACHE,
3431 KM_KDB,
3432+ KM_CLEARPAGE,
3433 KM_TYPE_NR
3434 };
3435
3436diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
3437index d4a7f64..451de1c 100644
3438--- a/arch/powerpc/include/asm/mman.h
3439+++ b/arch/powerpc/include/asm/mman.h
3440@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
3441 }
3442 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
3443
3444-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
3445+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
3446 {
3447 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
3448 }
3449diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
3450index f072e97..b436dee 100644
3451--- a/arch/powerpc/include/asm/page.h
3452+++ b/arch/powerpc/include/asm/page.h
3453@@ -220,8 +220,9 @@ extern long long virt_phys_offset;
3454 * and needs to be executable. This means the whole heap ends
3455 * up being executable.
3456 */
3457-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3458- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3459+#define VM_DATA_DEFAULT_FLAGS32 \
3460+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3461+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3462
3463 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3464 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3465@@ -249,6 +250,9 @@ extern long long virt_phys_offset;
3466 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
3467 #endif
3468
3469+#define ktla_ktva(addr) (addr)
3470+#define ktva_ktla(addr) (addr)
3471+
3472 /*
3473 * Use the top bit of the higher-level page table entries to indicate whether
3474 * the entries we point to contain hugepages. This works because we know that
3475diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
3476index fed85e6..da5c71b 100644
3477--- a/arch/powerpc/include/asm/page_64.h
3478+++ b/arch/powerpc/include/asm/page_64.h
3479@@ -146,15 +146,18 @@ do { \
3480 * stack by default, so in the absence of a PT_GNU_STACK program header
3481 * we turn execute permission off.
3482 */
3483-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3484- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3485+#define VM_STACK_DEFAULT_FLAGS32 \
3486+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3487+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3488
3489 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3490 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3491
3492+#ifndef CONFIG_PAX_PAGEEXEC
3493 #define VM_STACK_DEFAULT_FLAGS \
3494 (is_32bit_task() ? \
3495 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
3496+#endif
3497
3498 #include <asm-generic/getorder.h>
3499
3500diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
3501index 2e0e411..7899c68 100644
3502--- a/arch/powerpc/include/asm/pgtable.h
3503+++ b/arch/powerpc/include/asm/pgtable.h
3504@@ -2,6 +2,7 @@
3505 #define _ASM_POWERPC_PGTABLE_H
3506 #ifdef __KERNEL__
3507
3508+#include <linux/const.h>
3509 #ifndef __ASSEMBLY__
3510 #include <asm/processor.h> /* For TASK_SIZE */
3511 #include <asm/mmu.h>
3512diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
3513index 4aad413..85d86bf 100644
3514--- a/arch/powerpc/include/asm/pte-hash32.h
3515+++ b/arch/powerpc/include/asm/pte-hash32.h
3516@@ -21,6 +21,7 @@
3517 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
3518 #define _PAGE_USER 0x004 /* usermode access allowed */
3519 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
3520+#define _PAGE_EXEC _PAGE_GUARDED
3521 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
3522 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
3523 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
3524diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
3525index 7fdc2c0..e47a9b02d3 100644
3526--- a/arch/powerpc/include/asm/reg.h
3527+++ b/arch/powerpc/include/asm/reg.h
3528@@ -212,6 +212,7 @@
3529 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
3530 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
3531 #define DSISR_NOHPTE 0x40000000 /* no translation found */
3532+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
3533 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
3534 #define DSISR_ISSTORE 0x02000000 /* access was a store */
3535 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
3536diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
3537index c377457..3c69fbc 100644
3538--- a/arch/powerpc/include/asm/system.h
3539+++ b/arch/powerpc/include/asm/system.h
3540@@ -539,7 +539,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
3541 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
3542 #endif
3543
3544-extern unsigned long arch_align_stack(unsigned long sp);
3545+#define arch_align_stack(x) ((x) & ~0xfUL)
3546
3547 /* Used in very early kernel initialization. */
3548 extern unsigned long reloc_offset(void);
3549diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
3550index bd0fb84..a42a14b 100644
3551--- a/arch/powerpc/include/asm/uaccess.h
3552+++ b/arch/powerpc/include/asm/uaccess.h
3553@@ -13,6 +13,8 @@
3554 #define VERIFY_READ 0
3555 #define VERIFY_WRITE 1
3556
3557+extern void check_object_size(const void *ptr, unsigned long n, bool to);
3558+
3559 /*
3560 * The fs value determines whether argument validity checking should be
3561 * performed or not. If get_fs() == USER_DS, checking is performed, with
3562@@ -327,52 +329,6 @@ do { \
3563 extern unsigned long __copy_tofrom_user(void __user *to,
3564 const void __user *from, unsigned long size);
3565
3566-#ifndef __powerpc64__
3567-
3568-static inline unsigned long copy_from_user(void *to,
3569- const void __user *from, unsigned long n)
3570-{
3571- unsigned long over;
3572-
3573- if (access_ok(VERIFY_READ, from, n))
3574- return __copy_tofrom_user((__force void __user *)to, from, n);
3575- if ((unsigned long)from < TASK_SIZE) {
3576- over = (unsigned long)from + n - TASK_SIZE;
3577- return __copy_tofrom_user((__force void __user *)to, from,
3578- n - over) + over;
3579- }
3580- return n;
3581-}
3582-
3583-static inline unsigned long copy_to_user(void __user *to,
3584- const void *from, unsigned long n)
3585-{
3586- unsigned long over;
3587-
3588- if (access_ok(VERIFY_WRITE, to, n))
3589- return __copy_tofrom_user(to, (__force void __user *)from, n);
3590- if ((unsigned long)to < TASK_SIZE) {
3591- over = (unsigned long)to + n - TASK_SIZE;
3592- return __copy_tofrom_user(to, (__force void __user *)from,
3593- n - over) + over;
3594- }
3595- return n;
3596-}
3597-
3598-#else /* __powerpc64__ */
3599-
3600-#define __copy_in_user(to, from, size) \
3601- __copy_tofrom_user((to), (from), (size))
3602-
3603-extern unsigned long copy_from_user(void *to, const void __user *from,
3604- unsigned long n);
3605-extern unsigned long copy_to_user(void __user *to, const void *from,
3606- unsigned long n);
3607-extern unsigned long copy_in_user(void __user *to, const void __user *from,
3608- unsigned long n);
3609-
3610-#endif /* __powerpc64__ */
3611-
3612 static inline unsigned long __copy_from_user_inatomic(void *to,
3613 const void __user *from, unsigned long n)
3614 {
3615@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
3616 if (ret == 0)
3617 return 0;
3618 }
3619+
3620+ if (!__builtin_constant_p(n))
3621+ check_object_size(to, n, false);
3622+
3623 return __copy_tofrom_user((__force void __user *)to, from, n);
3624 }
3625
3626@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
3627 if (ret == 0)
3628 return 0;
3629 }
3630+
3631+ if (!__builtin_constant_p(n))
3632+ check_object_size(from, n, true);
3633+
3634 return __copy_tofrom_user(to, (__force const void __user *)from, n);
3635 }
3636
3637@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to,
3638 return __copy_to_user_inatomic(to, from, size);
3639 }
3640
3641+#ifndef __powerpc64__
3642+
3643+static inline unsigned long __must_check copy_from_user(void *to,
3644+ const void __user *from, unsigned long n)
3645+{
3646+ unsigned long over;
3647+
3648+ if ((long)n < 0)
3649+ return n;
3650+
3651+ if (access_ok(VERIFY_READ, from, n)) {
3652+ if (!__builtin_constant_p(n))
3653+ check_object_size(to, n, false);
3654+ return __copy_tofrom_user((__force void __user *)to, from, n);
3655+ }
3656+ if ((unsigned long)from < TASK_SIZE) {
3657+ over = (unsigned long)from + n - TASK_SIZE;
3658+ if (!__builtin_constant_p(n - over))
3659+ check_object_size(to, n - over, false);
3660+ return __copy_tofrom_user((__force void __user *)to, from,
3661+ n - over) + over;
3662+ }
3663+ return n;
3664+}
3665+
3666+static inline unsigned long __must_check copy_to_user(void __user *to,
3667+ const void *from, unsigned long n)
3668+{
3669+ unsigned long over;
3670+
3671+ if ((long)n < 0)
3672+ return n;
3673+
3674+ if (access_ok(VERIFY_WRITE, to, n)) {
3675+ if (!__builtin_constant_p(n))
3676+ check_object_size(from, n, true);
3677+ return __copy_tofrom_user(to, (__force void __user *)from, n);
3678+ }
3679+ if ((unsigned long)to < TASK_SIZE) {
3680+ over = (unsigned long)to + n - TASK_SIZE;
3681+ if (!__builtin_constant_p(n))
3682+ check_object_size(from, n - over, true);
3683+ return __copy_tofrom_user(to, (__force void __user *)from,
3684+ n - over) + over;
3685+ }
3686+ return n;
3687+}
3688+
3689+#else /* __powerpc64__ */
3690+
3691+#define __copy_in_user(to, from, size) \
3692+ __copy_tofrom_user((to), (from), (size))
3693+
3694+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
3695+{
3696+ if ((long)n < 0 || n > INT_MAX)
3697+ return n;
3698+
3699+ if (!__builtin_constant_p(n))
3700+ check_object_size(to, n, false);
3701+
3702+ if (likely(access_ok(VERIFY_READ, from, n)))
3703+ n = __copy_from_user(to, from, n);
3704+ else
3705+ memset(to, 0, n);
3706+ return n;
3707+}
3708+
3709+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
3710+{
3711+ if ((long)n < 0 || n > INT_MAX)
3712+ return n;
3713+
3714+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
3715+ if (!__builtin_constant_p(n))
3716+ check_object_size(from, n, true);
3717+ n = __copy_to_user(to, from, n);
3718+ }
3719+ return n;
3720+}
3721+
3722+extern unsigned long copy_in_user(void __user *to, const void __user *from,
3723+ unsigned long n);
3724+
3725+#endif /* __powerpc64__ */
3726+
3727 extern unsigned long __clear_user(void __user *addr, unsigned long size);
3728
3729 static inline unsigned long clear_user(void __user *addr, unsigned long size)
3730diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
3731index 429983c..7af363b 100644
3732--- a/arch/powerpc/kernel/exceptions-64e.S
3733+++ b/arch/powerpc/kernel/exceptions-64e.S
3734@@ -587,6 +587,7 @@ storage_fault_common:
3735 std r14,_DAR(r1)
3736 std r15,_DSISR(r1)
3737 addi r3,r1,STACK_FRAME_OVERHEAD
3738+ bl .save_nvgprs
3739 mr r4,r14
3740 mr r5,r15
3741 ld r14,PACA_EXGEN+EX_R14(r13)
3742@@ -596,8 +597,7 @@ storage_fault_common:
3743 cmpdi r3,0
3744 bne- 1f
3745 b .ret_from_except_lite
3746-1: bl .save_nvgprs
3747- mr r5,r3
3748+1: mr r5,r3
3749 addi r3,r1,STACK_FRAME_OVERHEAD
3750 ld r4,_DAR(r1)
3751 bl .bad_page_fault
3752diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
3753index 15c5a4f..22a4000 100644
3754--- a/arch/powerpc/kernel/exceptions-64s.S
3755+++ b/arch/powerpc/kernel/exceptions-64s.S
3756@@ -1004,10 +1004,10 @@ handle_page_fault:
3757 11: ld r4,_DAR(r1)
3758 ld r5,_DSISR(r1)
3759 addi r3,r1,STACK_FRAME_OVERHEAD
3760+ bl .save_nvgprs
3761 bl .do_page_fault
3762 cmpdi r3,0
3763 beq+ 13f
3764- bl .save_nvgprs
3765 mr r5,r3
3766 addi r3,r1,STACK_FRAME_OVERHEAD
3767 lwz r4,_DAR(r1)
3768diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
3769index 01e2877..a1ba360 100644
3770--- a/arch/powerpc/kernel/irq.c
3771+++ b/arch/powerpc/kernel/irq.c
3772@@ -560,9 +560,6 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
3773 host->ops = ops;
3774 host->of_node = of_node_get(of_node);
3775
3776- if (host->ops->match == NULL)
3777- host->ops->match = default_irq_host_match;
3778-
3779 raw_spin_lock_irqsave(&irq_big_lock, flags);
3780
3781 /* If it's a legacy controller, check for duplicates and
3782@@ -635,7 +632,12 @@ struct irq_host *irq_find_host(struct device_node *node)
3783 */
3784 raw_spin_lock_irqsave(&irq_big_lock, flags);
3785 list_for_each_entry(h, &irq_hosts, link)
3786- if (h->ops->match(h, node)) {
3787+ if (h->ops->match) {
3788+ if (h->ops->match(h, node)) {
3789+ found = h;
3790+ break;
3791+ }
3792+ } else if (default_irq_host_match(h, node)) {
3793 found = h;
3794 break;
3795 }
3796diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
3797index 0b6d796..d760ddb 100644
3798--- a/arch/powerpc/kernel/module_32.c
3799+++ b/arch/powerpc/kernel/module_32.c
3800@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
3801 me->arch.core_plt_section = i;
3802 }
3803 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
3804- printk("Module doesn't contain .plt or .init.plt sections.\n");
3805+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
3806 return -ENOEXEC;
3807 }
3808
3809@@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
3810
3811 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
3812 /* Init, or core PLT? */
3813- if (location >= mod->module_core
3814- && location < mod->module_core + mod->core_size)
3815+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
3816+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
3817 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
3818- else
3819+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
3820+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
3821 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
3822+ else {
3823+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
3824+ return ~0UL;
3825+ }
3826
3827 /* Find this entry, or if that fails, the next avail. entry */
3828 while (entry->jump[0]) {
3829diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
3830index d817ab0..b23b18e 100644
3831--- a/arch/powerpc/kernel/process.c
3832+++ b/arch/powerpc/kernel/process.c
3833@@ -676,8 +676,8 @@ void show_regs(struct pt_regs * regs)
3834 * Lookup NIP late so we have the best change of getting the
3835 * above info out without failing
3836 */
3837- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
3838- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
3839+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
3840+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
3841 #endif
3842 show_stack(current, (unsigned long *) regs->gpr[1]);
3843 if (!user_mode(regs))
3844@@ -1181,10 +1181,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3845 newsp = stack[0];
3846 ip = stack[STACK_FRAME_LR_SAVE];
3847 if (!firstframe || ip != lr) {
3848- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
3849+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
3850 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
3851 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
3852- printk(" (%pS)",
3853+ printk(" (%pA)",
3854 (void *)current->ret_stack[curr_frame].ret);
3855 curr_frame--;
3856 }
3857@@ -1204,7 +1204,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3858 struct pt_regs *regs = (struct pt_regs *)
3859 (sp + STACK_FRAME_OVERHEAD);
3860 lr = regs->link;
3861- printk("--- Exception: %lx at %pS\n LR = %pS\n",
3862+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
3863 regs->trap, (void *)regs->nip, (void *)lr);
3864 firstframe = 1;
3865 }
3866@@ -1279,58 +1279,3 @@ void thread_info_cache_init(void)
3867 }
3868
3869 #endif /* THREAD_SHIFT < PAGE_SHIFT */
3870-
3871-unsigned long arch_align_stack(unsigned long sp)
3872-{
3873- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
3874- sp -= get_random_int() & ~PAGE_MASK;
3875- return sp & ~0xf;
3876-}
3877-
3878-static inline unsigned long brk_rnd(void)
3879-{
3880- unsigned long rnd = 0;
3881-
3882- /* 8MB for 32bit, 1GB for 64bit */
3883- if (is_32bit_task())
3884- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
3885- else
3886- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
3887-
3888- return rnd << PAGE_SHIFT;
3889-}
3890-
3891-unsigned long arch_randomize_brk(struct mm_struct *mm)
3892-{
3893- unsigned long base = mm->brk;
3894- unsigned long ret;
3895-
3896-#ifdef CONFIG_PPC_STD_MMU_64
3897- /*
3898- * If we are using 1TB segments and we are allowed to randomise
3899- * the heap, we can put it above 1TB so it is backed by a 1TB
3900- * segment. Otherwise the heap will be in the bottom 1TB
3901- * which always uses 256MB segments and this may result in a
3902- * performance penalty.
3903- */
3904- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
3905- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
3906-#endif
3907-
3908- ret = PAGE_ALIGN(base + brk_rnd());
3909-
3910- if (ret < mm->brk)
3911- return mm->brk;
3912-
3913- return ret;
3914-}
3915-
3916-unsigned long randomize_et_dyn(unsigned long base)
3917-{
3918- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
3919-
3920- if (ret < base)
3921- return base;
3922-
3923- return ret;
3924-}
3925diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
3926index 836a5a1..27289a3 100644
3927--- a/arch/powerpc/kernel/signal_32.c
3928+++ b/arch/powerpc/kernel/signal_32.c
3929@@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
3930 /* Save user registers on the stack */
3931 frame = &rt_sf->uc.uc_mcontext;
3932 addr = frame;
3933- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
3934+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3935 if (save_user_regs(regs, frame, 0, 1))
3936 goto badframe;
3937 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
3938diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
3939index a50b5ec..547078a 100644
3940--- a/arch/powerpc/kernel/signal_64.c
3941+++ b/arch/powerpc/kernel/signal_64.c
3942@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
3943 current->thread.fpscr.val = 0;
3944
3945 /* Set up to return from userspace. */
3946- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
3947+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3948 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
3949 } else {
3950 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
3951diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
3952index c091527..5592625 100644
3953--- a/arch/powerpc/kernel/traps.c
3954+++ b/arch/powerpc/kernel/traps.c
3955@@ -131,6 +131,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
3956 return flags;
3957 }
3958
3959+extern void gr_handle_kernel_exploit(void);
3960+
3961 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
3962 int signr)
3963 {
3964@@ -178,6 +180,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
3965 panic("Fatal exception in interrupt");
3966 if (panic_on_oops)
3967 panic("Fatal exception");
3968+
3969+ gr_handle_kernel_exploit();
3970+
3971 do_exit(signr);
3972 }
3973
3974diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
3975index 7d14bb6..1305601 100644
3976--- a/arch/powerpc/kernel/vdso.c
3977+++ b/arch/powerpc/kernel/vdso.c
3978@@ -35,6 +35,7 @@
3979 #include <asm/firmware.h>
3980 #include <asm/vdso.h>
3981 #include <asm/vdso_datapage.h>
3982+#include <asm/mman.h>
3983
3984 #include "setup.h"
3985
3986@@ -219,7 +220,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3987 vdso_base = VDSO32_MBASE;
3988 #endif
3989
3990- current->mm->context.vdso_base = 0;
3991+ current->mm->context.vdso_base = ~0UL;
3992
3993 /* vDSO has a problem and was disabled, just don't "enable" it for the
3994 * process
3995@@ -239,7 +240,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3996 vdso_base = get_unmapped_area(NULL, vdso_base,
3997 (vdso_pages << PAGE_SHIFT) +
3998 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
3999- 0, 0);
4000+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
4001 if (IS_ERR_VALUE(vdso_base)) {
4002 rc = vdso_base;
4003 goto fail_mmapsem;
4004diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
4005index 5eea6f3..5d10396 100644
4006--- a/arch/powerpc/lib/usercopy_64.c
4007+++ b/arch/powerpc/lib/usercopy_64.c
4008@@ -9,22 +9,6 @@
4009 #include <linux/module.h>
4010 #include <asm/uaccess.h>
4011
4012-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
4013-{
4014- if (likely(access_ok(VERIFY_READ, from, n)))
4015- n = __copy_from_user(to, from, n);
4016- else
4017- memset(to, 0, n);
4018- return n;
4019-}
4020-
4021-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
4022-{
4023- if (likely(access_ok(VERIFY_WRITE, to, n)))
4024- n = __copy_to_user(to, from, n);
4025- return n;
4026-}
4027-
4028 unsigned long copy_in_user(void __user *to, const void __user *from,
4029 unsigned long n)
4030 {
4031@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
4032 return n;
4033 }
4034
4035-EXPORT_SYMBOL(copy_from_user);
4036-EXPORT_SYMBOL(copy_to_user);
4037 EXPORT_SYMBOL(copy_in_user);
4038
4039diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
4040index 2f0d1b0..36fb5cc 100644
4041--- a/arch/powerpc/mm/fault.c
4042+++ b/arch/powerpc/mm/fault.c
4043@@ -32,6 +32,10 @@
4044 #include <linux/perf_event.h>
4045 #include <linux/magic.h>
4046 #include <linux/ratelimit.h>
4047+#include <linux/slab.h>
4048+#include <linux/pagemap.h>
4049+#include <linux/compiler.h>
4050+#include <linux/unistd.h>
4051
4052 #include <asm/firmware.h>
4053 #include <asm/page.h>
4054@@ -43,6 +47,7 @@
4055 #include <asm/tlbflush.h>
4056 #include <asm/siginfo.h>
4057 #include <mm/mmu_decl.h>
4058+#include <asm/ptrace.h>
4059
4060 #include "icswx.h"
4061
4062@@ -68,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
4063 }
4064 #endif
4065
4066+#ifdef CONFIG_PAX_PAGEEXEC
4067+/*
4068+ * PaX: decide what to do with offenders (regs->nip = fault address)
4069+ *
4070+ * returns 1 when task should be killed
4071+ */
4072+static int pax_handle_fetch_fault(struct pt_regs *regs)
4073+{
4074+ return 1;
4075+}
4076+
4077+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4078+{
4079+ unsigned long i;
4080+
4081+ printk(KERN_ERR "PAX: bytes at PC: ");
4082+ for (i = 0; i < 5; i++) {
4083+ unsigned int c;
4084+ if (get_user(c, (unsigned int __user *)pc+i))
4085+ printk(KERN_CONT "???????? ");
4086+ else
4087+ printk(KERN_CONT "%08x ", c);
4088+ }
4089+ printk("\n");
4090+}
4091+#endif
4092+
4093 /*
4094 * Check whether the instruction at regs->nip is a store using
4095 * an update addressing form which will update r1.
4096@@ -138,7 +170,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
4097 * indicate errors in DSISR but can validly be set in SRR1.
4098 */
4099 if (trap == 0x400)
4100- error_code &= 0x48200000;
4101+ error_code &= 0x58200000;
4102 else
4103 is_write = error_code & DSISR_ISSTORE;
4104 #else
4105@@ -276,7 +308,7 @@ good_area:
4106 * "undefined". Of those that can be set, this is the only
4107 * one which seems bad.
4108 */
4109- if (error_code & 0x10000000)
4110+ if (error_code & DSISR_GUARDED)
4111 /* Guarded storage error. */
4112 goto bad_area;
4113 #endif /* CONFIG_8xx */
4114@@ -291,7 +323,7 @@ good_area:
4115 * processors use the same I/D cache coherency mechanism
4116 * as embedded.
4117 */
4118- if (error_code & DSISR_PROTFAULT)
4119+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
4120 goto bad_area;
4121 #endif /* CONFIG_PPC_STD_MMU */
4122
4123@@ -360,6 +392,23 @@ bad_area:
4124 bad_area_nosemaphore:
4125 /* User mode accesses cause a SIGSEGV */
4126 if (user_mode(regs)) {
4127+
4128+#ifdef CONFIG_PAX_PAGEEXEC
4129+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4130+#ifdef CONFIG_PPC_STD_MMU
4131+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
4132+#else
4133+ if (is_exec && regs->nip == address) {
4134+#endif
4135+ switch (pax_handle_fetch_fault(regs)) {
4136+ }
4137+
4138+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
4139+ do_group_exit(SIGKILL);
4140+ }
4141+ }
4142+#endif
4143+
4144 _exception(SIGSEGV, regs, code, address);
4145 return 0;
4146 }
4147diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
4148index 67a42ed..1c7210c 100644
4149--- a/arch/powerpc/mm/mmap_64.c
4150+++ b/arch/powerpc/mm/mmap_64.c
4151@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4152 */
4153 if (mmap_is_legacy()) {
4154 mm->mmap_base = TASK_UNMAPPED_BASE;
4155+
4156+#ifdef CONFIG_PAX_RANDMMAP
4157+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4158+ mm->mmap_base += mm->delta_mmap;
4159+#endif
4160+
4161 mm->get_unmapped_area = arch_get_unmapped_area;
4162 mm->unmap_area = arch_unmap_area;
4163 } else {
4164 mm->mmap_base = mmap_base();
4165+
4166+#ifdef CONFIG_PAX_RANDMMAP
4167+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4168+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4169+#endif
4170+
4171 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4172 mm->unmap_area = arch_unmap_area_topdown;
4173 }
4174diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
4175index 73709f7..6b90313 100644
4176--- a/arch/powerpc/mm/slice.c
4177+++ b/arch/powerpc/mm/slice.c
4178@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
4179 if ((mm->task_size - len) < addr)
4180 return 0;
4181 vma = find_vma(mm, addr);
4182- return (!vma || (addr + len) <= vma->vm_start);
4183+ return check_heap_stack_gap(vma, addr, len);
4184 }
4185
4186 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
4187@@ -256,7 +256,7 @@ full_search:
4188 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
4189 continue;
4190 }
4191- if (!vma || addr + len <= vma->vm_start) {
4192+ if (check_heap_stack_gap(vma, addr, len)) {
4193 /*
4194 * Remember the place where we stopped the search:
4195 */
4196@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4197 }
4198 }
4199
4200- addr = mm->mmap_base;
4201- while (addr > len) {
4202+ if (mm->mmap_base < len)
4203+ addr = -ENOMEM;
4204+ else
4205+ addr = mm->mmap_base - len;
4206+
4207+ while (!IS_ERR_VALUE(addr)) {
4208 /* Go down by chunk size */
4209- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
4210+ addr = _ALIGN_DOWN(addr, 1ul << pshift);
4211
4212 /* Check for hit with different page size */
4213 mask = slice_range_to_mask(addr, len);
4214@@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4215 * return with success:
4216 */
4217 vma = find_vma(mm, addr);
4218- if (!vma || (addr + len) <= vma->vm_start) {
4219+ if (check_heap_stack_gap(vma, addr, len)) {
4220 /* remember the address as a hint for next time */
4221 if (use_cache)
4222 mm->free_area_cache = addr;
4223@@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4224 mm->cached_hole_size = vma->vm_start - addr;
4225
4226 /* try just below the current vma->vm_start */
4227- addr = vma->vm_start;
4228+ addr = skip_heap_stack_gap(vma, len);
4229 }
4230
4231 /*
4232@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
4233 if (fixed && addr > (mm->task_size - len))
4234 return -EINVAL;
4235
4236+#ifdef CONFIG_PAX_RANDMMAP
4237+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
4238+ addr = 0;
4239+#endif
4240+
4241 /* If hint, make sure it matches our alignment restrictions */
4242 if (!fixed && addr) {
4243 addr = _ALIGN_UP(addr, 1ul << pshift);
4244diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
4245index 8517d2a..d2738d4 100644
4246--- a/arch/s390/include/asm/atomic.h
4247+++ b/arch/s390/include/asm/atomic.h
4248@@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
4249 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
4250 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4251
4252+#define atomic64_read_unchecked(v) atomic64_read(v)
4253+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4254+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4255+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4256+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4257+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4258+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4259+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4260+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4261+
4262 #define smp_mb__before_atomic_dec() smp_mb()
4263 #define smp_mb__after_atomic_dec() smp_mb()
4264 #define smp_mb__before_atomic_inc() smp_mb()
4265diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
4266index 2a30d5a..5e5586f 100644
4267--- a/arch/s390/include/asm/cache.h
4268+++ b/arch/s390/include/asm/cache.h
4269@@ -11,8 +11,10 @@
4270 #ifndef __ARCH_S390_CACHE_H
4271 #define __ARCH_S390_CACHE_H
4272
4273-#define L1_CACHE_BYTES 256
4274+#include <linux/const.h>
4275+
4276 #define L1_CACHE_SHIFT 8
4277+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4278 #define NET_SKB_PAD 32
4279
4280 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4281diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
4282index 547f1a6..0b22b53 100644
4283--- a/arch/s390/include/asm/elf.h
4284+++ b/arch/s390/include/asm/elf.h
4285@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
4286 the loader. We need to make sure that it is out of the way of the program
4287 that it will "exec", and that there is sufficient room for the brk. */
4288
4289-extern unsigned long randomize_et_dyn(unsigned long base);
4290-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
4291+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
4292+
4293+#ifdef CONFIG_PAX_ASLR
4294+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
4295+
4296+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4297+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4298+#endif
4299
4300 /* This yields a mask that user programs can use to figure out what
4301 instruction set this CPU supports. */
4302@@ -211,7 +217,4 @@ struct linux_binprm;
4303 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
4304 int arch_setup_additional_pages(struct linux_binprm *, int);
4305
4306-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
4307-#define arch_randomize_brk arch_randomize_brk
4308-
4309 #endif
4310diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
4311index d73cc6b..1a296ad 100644
4312--- a/arch/s390/include/asm/system.h
4313+++ b/arch/s390/include/asm/system.h
4314@@ -260,7 +260,7 @@ extern void (*_machine_restart)(char *command);
4315 extern void (*_machine_halt)(void);
4316 extern void (*_machine_power_off)(void);
4317
4318-extern unsigned long arch_align_stack(unsigned long sp);
4319+#define arch_align_stack(x) ((x) & ~0xfUL)
4320
4321 static inline int tprot(unsigned long addr)
4322 {
4323diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
4324index 2b23885..e136e31 100644
4325--- a/arch/s390/include/asm/uaccess.h
4326+++ b/arch/s390/include/asm/uaccess.h
4327@@ -235,6 +235,10 @@ static inline unsigned long __must_check
4328 copy_to_user(void __user *to, const void *from, unsigned long n)
4329 {
4330 might_fault();
4331+
4332+ if ((long)n < 0)
4333+ return n;
4334+
4335 if (access_ok(VERIFY_WRITE, to, n))
4336 n = __copy_to_user(to, from, n);
4337 return n;
4338@@ -260,6 +264,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
4339 static inline unsigned long __must_check
4340 __copy_from_user(void *to, const void __user *from, unsigned long n)
4341 {
4342+ if ((long)n < 0)
4343+ return n;
4344+
4345 if (__builtin_constant_p(n) && (n <= 256))
4346 return uaccess.copy_from_user_small(n, from, to);
4347 else
4348@@ -294,6 +301,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
4349 unsigned int sz = __compiletime_object_size(to);
4350
4351 might_fault();
4352+
4353+ if ((long)n < 0)
4354+ return n;
4355+
4356 if (unlikely(sz != -1 && sz < n)) {
4357 copy_from_user_overflow();
4358 return n;
4359diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
4360index dfcb343..eda788a 100644
4361--- a/arch/s390/kernel/module.c
4362+++ b/arch/s390/kernel/module.c
4363@@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
4364
4365 /* Increase core size by size of got & plt and set start
4366 offsets for got and plt. */
4367- me->core_size = ALIGN(me->core_size, 4);
4368- me->arch.got_offset = me->core_size;
4369- me->core_size += me->arch.got_size;
4370- me->arch.plt_offset = me->core_size;
4371- me->core_size += me->arch.plt_size;
4372+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
4373+ me->arch.got_offset = me->core_size_rw;
4374+ me->core_size_rw += me->arch.got_size;
4375+ me->arch.plt_offset = me->core_size_rx;
4376+ me->core_size_rx += me->arch.plt_size;
4377 return 0;
4378 }
4379
4380@@ -242,7 +242,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4381 if (info->got_initialized == 0) {
4382 Elf_Addr *gotent;
4383
4384- gotent = me->module_core + me->arch.got_offset +
4385+ gotent = me->module_core_rw + me->arch.got_offset +
4386 info->got_offset;
4387 *gotent = val;
4388 info->got_initialized = 1;
4389@@ -266,7 +266,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4390 else if (r_type == R_390_GOTENT ||
4391 r_type == R_390_GOTPLTENT)
4392 *(unsigned int *) loc =
4393- (val + (Elf_Addr) me->module_core - loc) >> 1;
4394+ (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
4395 else if (r_type == R_390_GOT64 ||
4396 r_type == R_390_GOTPLT64)
4397 *(unsigned long *) loc = val;
4398@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4399 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
4400 if (info->plt_initialized == 0) {
4401 unsigned int *ip;
4402- ip = me->module_core + me->arch.plt_offset +
4403+ ip = me->module_core_rx + me->arch.plt_offset +
4404 info->plt_offset;
4405 #ifndef CONFIG_64BIT
4406 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
4407@@ -305,7 +305,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4408 val - loc + 0xffffUL < 0x1ffffeUL) ||
4409 (r_type == R_390_PLT32DBL &&
4410 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
4411- val = (Elf_Addr) me->module_core +
4412+ val = (Elf_Addr) me->module_core_rx +
4413 me->arch.plt_offset +
4414 info->plt_offset;
4415 val += rela->r_addend - loc;
4416@@ -327,7 +327,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4417 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
4418 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
4419 val = val + rela->r_addend -
4420- ((Elf_Addr) me->module_core + me->arch.got_offset);
4421+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
4422 if (r_type == R_390_GOTOFF16)
4423 *(unsigned short *) loc = val;
4424 else if (r_type == R_390_GOTOFF32)
4425@@ -337,7 +337,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4426 break;
4427 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
4428 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
4429- val = (Elf_Addr) me->module_core + me->arch.got_offset +
4430+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
4431 rela->r_addend - loc;
4432 if (r_type == R_390_GOTPC)
4433 *(unsigned int *) loc = val;
4434diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
4435index e795933..b32563c 100644
4436--- a/arch/s390/kernel/process.c
4437+++ b/arch/s390/kernel/process.c
4438@@ -323,39 +323,3 @@ unsigned long get_wchan(struct task_struct *p)
4439 }
4440 return 0;
4441 }
4442-
4443-unsigned long arch_align_stack(unsigned long sp)
4444-{
4445- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
4446- sp -= get_random_int() & ~PAGE_MASK;
4447- return sp & ~0xf;
4448-}
4449-
4450-static inline unsigned long brk_rnd(void)
4451-{
4452- /* 8MB for 32bit, 1GB for 64bit */
4453- if (is_32bit_task())
4454- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
4455- else
4456- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
4457-}
4458-
4459-unsigned long arch_randomize_brk(struct mm_struct *mm)
4460-{
4461- unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
4462-
4463- if (ret < mm->brk)
4464- return mm->brk;
4465- return ret;
4466-}
4467-
4468-unsigned long randomize_et_dyn(unsigned long base)
4469-{
4470- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
4471-
4472- if (!(current->flags & PF_RANDOMIZE))
4473- return base;
4474- if (ret < base)
4475- return base;
4476- return ret;
4477-}
4478diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
4479index a0155c0..34cc491 100644
4480--- a/arch/s390/mm/mmap.c
4481+++ b/arch/s390/mm/mmap.c
4482@@ -92,10 +92,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4483 */
4484 if (mmap_is_legacy()) {
4485 mm->mmap_base = TASK_UNMAPPED_BASE;
4486+
4487+#ifdef CONFIG_PAX_RANDMMAP
4488+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4489+ mm->mmap_base += mm->delta_mmap;
4490+#endif
4491+
4492 mm->get_unmapped_area = arch_get_unmapped_area;
4493 mm->unmap_area = arch_unmap_area;
4494 } else {
4495 mm->mmap_base = mmap_base();
4496+
4497+#ifdef CONFIG_PAX_RANDMMAP
4498+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4499+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4500+#endif
4501+
4502 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4503 mm->unmap_area = arch_unmap_area_topdown;
4504 }
4505@@ -167,10 +179,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4506 */
4507 if (mmap_is_legacy()) {
4508 mm->mmap_base = TASK_UNMAPPED_BASE;
4509+
4510+#ifdef CONFIG_PAX_RANDMMAP
4511+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4512+ mm->mmap_base += mm->delta_mmap;
4513+#endif
4514+
4515 mm->get_unmapped_area = s390_get_unmapped_area;
4516 mm->unmap_area = arch_unmap_area;
4517 } else {
4518 mm->mmap_base = mmap_base();
4519+
4520+#ifdef CONFIG_PAX_RANDMMAP
4521+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4522+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4523+#endif
4524+
4525 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
4526 mm->unmap_area = arch_unmap_area_topdown;
4527 }
4528diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
4529index ae3d59f..f65f075 100644
4530--- a/arch/score/include/asm/cache.h
4531+++ b/arch/score/include/asm/cache.h
4532@@ -1,7 +1,9 @@
4533 #ifndef _ASM_SCORE_CACHE_H
4534 #define _ASM_SCORE_CACHE_H
4535
4536+#include <linux/const.h>
4537+
4538 #define L1_CACHE_SHIFT 4
4539-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4540+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4541
4542 #endif /* _ASM_SCORE_CACHE_H */
4543diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
4544index 589d5c7..669e274 100644
4545--- a/arch/score/include/asm/system.h
4546+++ b/arch/score/include/asm/system.h
4547@@ -17,7 +17,7 @@ do { \
4548 #define finish_arch_switch(prev) do {} while (0)
4549
4550 typedef void (*vi_handler_t)(void);
4551-extern unsigned long arch_align_stack(unsigned long sp);
4552+#define arch_align_stack(x) (x)
4553
4554 #define mb() barrier()
4555 #define rmb() barrier()
4556diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
4557index 25d0803..d6c8e36 100644
4558--- a/arch/score/kernel/process.c
4559+++ b/arch/score/kernel/process.c
4560@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
4561
4562 return task_pt_regs(task)->cp0_epc;
4563 }
4564-
4565-unsigned long arch_align_stack(unsigned long sp)
4566-{
4567- return sp;
4568-}
4569diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
4570index ef9e555..331bd29 100644
4571--- a/arch/sh/include/asm/cache.h
4572+++ b/arch/sh/include/asm/cache.h
4573@@ -9,10 +9,11 @@
4574 #define __ASM_SH_CACHE_H
4575 #ifdef __KERNEL__
4576
4577+#include <linux/const.h>
4578 #include <linux/init.h>
4579 #include <cpu/cache.h>
4580
4581-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4582+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4583
4584 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4585
4586diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
4587index afeb710..d1d1289 100644
4588--- a/arch/sh/mm/mmap.c
4589+++ b/arch/sh/mm/mmap.c
4590@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
4591 addr = PAGE_ALIGN(addr);
4592
4593 vma = find_vma(mm, addr);
4594- if (TASK_SIZE - len >= addr &&
4595- (!vma || addr + len <= vma->vm_start))
4596+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4597 return addr;
4598 }
4599
4600@@ -106,7 +105,7 @@ full_search:
4601 }
4602 return -ENOMEM;
4603 }
4604- if (likely(!vma || addr + len <= vma->vm_start)) {
4605+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4606 /*
4607 * Remember the place where we stopped the search:
4608 */
4609@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4610 addr = PAGE_ALIGN(addr);
4611
4612 vma = find_vma(mm, addr);
4613- if (TASK_SIZE - len >= addr &&
4614- (!vma || addr + len <= vma->vm_start))
4615+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4616 return addr;
4617 }
4618
4619@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4620 /* make sure it can fit in the remaining address space */
4621 if (likely(addr > len)) {
4622 vma = find_vma(mm, addr-len);
4623- if (!vma || addr <= vma->vm_start) {
4624+ if (check_heap_stack_gap(vma, addr - len, len)) {
4625 /* remember the address as a hint for next time */
4626 return (mm->free_area_cache = addr-len);
4627 }
4628@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4629 if (unlikely(mm->mmap_base < len))
4630 goto bottomup;
4631
4632- addr = mm->mmap_base-len;
4633- if (do_colour_align)
4634- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4635+ addr = mm->mmap_base - len;
4636
4637 do {
4638+ if (do_colour_align)
4639+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4640 /*
4641 * Lookup failure means no vma is above this address,
4642 * else if new region fits below vma->vm_start,
4643 * return with success:
4644 */
4645 vma = find_vma(mm, addr);
4646- if (likely(!vma || addr+len <= vma->vm_start)) {
4647+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4648 /* remember the address as a hint for next time */
4649 return (mm->free_area_cache = addr);
4650 }
4651@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4652 mm->cached_hole_size = vma->vm_start - addr;
4653
4654 /* try just below the current vma->vm_start */
4655- addr = vma->vm_start-len;
4656- if (do_colour_align)
4657- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4658- } while (likely(len < vma->vm_start));
4659+ addr = skip_heap_stack_gap(vma, len);
4660+ } while (!IS_ERR_VALUE(addr));
4661
4662 bottomup:
4663 /*
4664diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
4665index eddcfb3..b117d90 100644
4666--- a/arch/sparc/Makefile
4667+++ b/arch/sparc/Makefile
4668@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
4669 # Export what is needed by arch/sparc/boot/Makefile
4670 export VMLINUX_INIT VMLINUX_MAIN
4671 VMLINUX_INIT := $(head-y) $(init-y)
4672-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
4673+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
4674 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
4675 VMLINUX_MAIN += $(drivers-y) $(net-y)
4676
4677diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
4678index 9f421df..b81fc12 100644
4679--- a/arch/sparc/include/asm/atomic_64.h
4680+++ b/arch/sparc/include/asm/atomic_64.h
4681@@ -14,18 +14,40 @@
4682 #define ATOMIC64_INIT(i) { (i) }
4683
4684 #define atomic_read(v) (*(volatile int *)&(v)->counter)
4685+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
4686+{
4687+ return v->counter;
4688+}
4689 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
4690+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
4691+{
4692+ return v->counter;
4693+}
4694
4695 #define atomic_set(v, i) (((v)->counter) = i)
4696+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
4697+{
4698+ v->counter = i;
4699+}
4700 #define atomic64_set(v, i) (((v)->counter) = i)
4701+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
4702+{
4703+ v->counter = i;
4704+}
4705
4706 extern void atomic_add(int, atomic_t *);
4707+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
4708 extern void atomic64_add(long, atomic64_t *);
4709+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
4710 extern void atomic_sub(int, atomic_t *);
4711+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
4712 extern void atomic64_sub(long, atomic64_t *);
4713+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
4714
4715 extern int atomic_add_ret(int, atomic_t *);
4716+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
4717 extern long atomic64_add_ret(long, atomic64_t *);
4718+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
4719 extern int atomic_sub_ret(int, atomic_t *);
4720 extern long atomic64_sub_ret(long, atomic64_t *);
4721
4722@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4723 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
4724
4725 #define atomic_inc_return(v) atomic_add_ret(1, v)
4726+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
4727+{
4728+ return atomic_add_ret_unchecked(1, v);
4729+}
4730 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
4731+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
4732+{
4733+ return atomic64_add_ret_unchecked(1, v);
4734+}
4735
4736 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
4737 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
4738
4739 #define atomic_add_return(i, v) atomic_add_ret(i, v)
4740+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
4741+{
4742+ return atomic_add_ret_unchecked(i, v);
4743+}
4744 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
4745+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
4746+{
4747+ return atomic64_add_ret_unchecked(i, v);
4748+}
4749
4750 /*
4751 * atomic_inc_and_test - increment and test
4752@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4753 * other cases.
4754 */
4755 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
4756+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
4757+{
4758+ return atomic_inc_return_unchecked(v) == 0;
4759+}
4760 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
4761
4762 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
4763@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4764 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
4765
4766 #define atomic_inc(v) atomic_add(1, v)
4767+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
4768+{
4769+ atomic_add_unchecked(1, v);
4770+}
4771 #define atomic64_inc(v) atomic64_add(1, v)
4772+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
4773+{
4774+ atomic64_add_unchecked(1, v);
4775+}
4776
4777 #define atomic_dec(v) atomic_sub(1, v)
4778+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
4779+{
4780+ atomic_sub_unchecked(1, v);
4781+}
4782 #define atomic64_dec(v) atomic64_sub(1, v)
4783+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
4784+{
4785+ atomic64_sub_unchecked(1, v);
4786+}
4787
4788 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
4789 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
4790
4791 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
4792+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
4793+{
4794+ return cmpxchg(&v->counter, old, new);
4795+}
4796 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
4797+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
4798+{
4799+ return xchg(&v->counter, new);
4800+}
4801
4802 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
4803 {
4804- int c, old;
4805+ int c, old, new;
4806 c = atomic_read(v);
4807 for (;;) {
4808- if (unlikely(c == (u)))
4809+ if (unlikely(c == u))
4810 break;
4811- old = atomic_cmpxchg((v), c, c + (a));
4812+
4813+ asm volatile("addcc %2, %0, %0\n"
4814+
4815+#ifdef CONFIG_PAX_REFCOUNT
4816+ "tvs %%icc, 6\n"
4817+#endif
4818+
4819+ : "=r" (new)
4820+ : "0" (c), "ir" (a)
4821+ : "cc");
4822+
4823+ old = atomic_cmpxchg(v, c, new);
4824 if (likely(old == c))
4825 break;
4826 c = old;
4827@@ -89,20 +166,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
4828 #define atomic64_cmpxchg(v, o, n) \
4829 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
4830 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
4831+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
4832+{
4833+ return xchg(&v->counter, new);
4834+}
4835
4836 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
4837 {
4838- long c, old;
4839+ long c, old, new;
4840 c = atomic64_read(v);
4841 for (;;) {
4842- if (unlikely(c == (u)))
4843+ if (unlikely(c == u))
4844 break;
4845- old = atomic64_cmpxchg((v), c, c + (a));
4846+
4847+ asm volatile("addcc %2, %0, %0\n"
4848+
4849+#ifdef CONFIG_PAX_REFCOUNT
4850+ "tvs %%xcc, 6\n"
4851+#endif
4852+
4853+ : "=r" (new)
4854+ : "0" (c), "ir" (a)
4855+ : "cc");
4856+
4857+ old = atomic64_cmpxchg(v, c, new);
4858 if (likely(old == c))
4859 break;
4860 c = old;
4861 }
4862- return c != (u);
4863+ return c != u;
4864 }
4865
4866 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4867diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
4868index 69358b5..9d0d492 100644
4869--- a/arch/sparc/include/asm/cache.h
4870+++ b/arch/sparc/include/asm/cache.h
4871@@ -7,10 +7,12 @@
4872 #ifndef _SPARC_CACHE_H
4873 #define _SPARC_CACHE_H
4874
4875+#include <linux/const.h>
4876+
4877 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
4878
4879 #define L1_CACHE_SHIFT 5
4880-#define L1_CACHE_BYTES 32
4881+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4882
4883 #ifdef CONFIG_SPARC32
4884 #define SMP_CACHE_BYTES_SHIFT 5
4885diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
4886index 4269ca6..e3da77f 100644
4887--- a/arch/sparc/include/asm/elf_32.h
4888+++ b/arch/sparc/include/asm/elf_32.h
4889@@ -114,6 +114,13 @@ typedef struct {
4890
4891 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
4892
4893+#ifdef CONFIG_PAX_ASLR
4894+#define PAX_ELF_ET_DYN_BASE 0x10000UL
4895+
4896+#define PAX_DELTA_MMAP_LEN 16
4897+#define PAX_DELTA_STACK_LEN 16
4898+#endif
4899+
4900 /* This yields a mask that user programs can use to figure out what
4901 instruction set this cpu supports. This can NOT be done in userspace
4902 on Sparc. */
4903diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
4904index 7df8b7f..4946269 100644
4905--- a/arch/sparc/include/asm/elf_64.h
4906+++ b/arch/sparc/include/asm/elf_64.h
4907@@ -180,6 +180,13 @@ typedef struct {
4908 #define ELF_ET_DYN_BASE 0x0000010000000000UL
4909 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
4910
4911+#ifdef CONFIG_PAX_ASLR
4912+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
4913+
4914+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
4915+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
4916+#endif
4917+
4918 extern unsigned long sparc64_elf_hwcap;
4919 #define ELF_HWCAP sparc64_elf_hwcap
4920
4921diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
4922index a790cc6..091ed94 100644
4923--- a/arch/sparc/include/asm/pgtable_32.h
4924+++ b/arch/sparc/include/asm/pgtable_32.h
4925@@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
4926 BTFIXUPDEF_INT(page_none)
4927 BTFIXUPDEF_INT(page_copy)
4928 BTFIXUPDEF_INT(page_readonly)
4929+
4930+#ifdef CONFIG_PAX_PAGEEXEC
4931+BTFIXUPDEF_INT(page_shared_noexec)
4932+BTFIXUPDEF_INT(page_copy_noexec)
4933+BTFIXUPDEF_INT(page_readonly_noexec)
4934+#endif
4935+
4936 BTFIXUPDEF_INT(page_kernel)
4937
4938 #define PMD_SHIFT SUN4C_PMD_SHIFT
4939@@ -66,6 +73,16 @@ extern pgprot_t PAGE_SHARED;
4940 #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy))
4941 #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly))
4942
4943+#ifdef CONFIG_PAX_PAGEEXEC
4944+extern pgprot_t PAGE_SHARED_NOEXEC;
4945+# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec))
4946+# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec))
4947+#else
4948+# define PAGE_SHARED_NOEXEC PAGE_SHARED
4949+# define PAGE_COPY_NOEXEC PAGE_COPY
4950+# define PAGE_READONLY_NOEXEC PAGE_READONLY
4951+#endif
4952+
4953 extern unsigned long page_kernel;
4954
4955 #ifdef MODULE
4956diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
4957index f6ae2b2..b03ffc7 100644
4958--- a/arch/sparc/include/asm/pgtsrmmu.h
4959+++ b/arch/sparc/include/asm/pgtsrmmu.h
4960@@ -115,6 +115,13 @@
4961 SRMMU_EXEC | SRMMU_REF)
4962 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
4963 SRMMU_EXEC | SRMMU_REF)
4964+
4965+#ifdef CONFIG_PAX_PAGEEXEC
4966+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
4967+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4968+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4969+#endif
4970+
4971 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
4972 SRMMU_DIRTY | SRMMU_REF)
4973
4974diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
4975index 9689176..63c18ea 100644
4976--- a/arch/sparc/include/asm/spinlock_64.h
4977+++ b/arch/sparc/include/asm/spinlock_64.h
4978@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
4979
4980 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
4981
4982-static void inline arch_read_lock(arch_rwlock_t *lock)
4983+static inline void arch_read_lock(arch_rwlock_t *lock)
4984 {
4985 unsigned long tmp1, tmp2;
4986
4987 __asm__ __volatile__ (
4988 "1: ldsw [%2], %0\n"
4989 " brlz,pn %0, 2f\n"
4990-"4: add %0, 1, %1\n"
4991+"4: addcc %0, 1, %1\n"
4992+
4993+#ifdef CONFIG_PAX_REFCOUNT
4994+" tvs %%icc, 6\n"
4995+#endif
4996+
4997 " cas [%2], %0, %1\n"
4998 " cmp %0, %1\n"
4999 " bne,pn %%icc, 1b\n"
5000@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
5001 " .previous"
5002 : "=&r" (tmp1), "=&r" (tmp2)
5003 : "r" (lock)
5004- : "memory");
5005+ : "memory", "cc");
5006 }
5007
5008-static int inline arch_read_trylock(arch_rwlock_t *lock)
5009+static inline int arch_read_trylock(arch_rwlock_t *lock)
5010 {
5011 int tmp1, tmp2;
5012
5013@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5014 "1: ldsw [%2], %0\n"
5015 " brlz,a,pn %0, 2f\n"
5016 " mov 0, %0\n"
5017-" add %0, 1, %1\n"
5018+" addcc %0, 1, %1\n"
5019+
5020+#ifdef CONFIG_PAX_REFCOUNT
5021+" tvs %%icc, 6\n"
5022+#endif
5023+
5024 " cas [%2], %0, %1\n"
5025 " cmp %0, %1\n"
5026 " bne,pn %%icc, 1b\n"
5027@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5028 return tmp1;
5029 }
5030
5031-static void inline arch_read_unlock(arch_rwlock_t *lock)
5032+static inline void arch_read_unlock(arch_rwlock_t *lock)
5033 {
5034 unsigned long tmp1, tmp2;
5035
5036 __asm__ __volatile__(
5037 "1: lduw [%2], %0\n"
5038-" sub %0, 1, %1\n"
5039+" subcc %0, 1, %1\n"
5040+
5041+#ifdef CONFIG_PAX_REFCOUNT
5042+" tvs %%icc, 6\n"
5043+#endif
5044+
5045 " cas [%2], %0, %1\n"
5046 " cmp %0, %1\n"
5047 " bne,pn %%xcc, 1b\n"
5048@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
5049 : "memory");
5050 }
5051
5052-static void inline arch_write_lock(arch_rwlock_t *lock)
5053+static inline void arch_write_lock(arch_rwlock_t *lock)
5054 {
5055 unsigned long mask, tmp1, tmp2;
5056
5057@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
5058 : "memory");
5059 }
5060
5061-static void inline arch_write_unlock(arch_rwlock_t *lock)
5062+static inline void arch_write_unlock(arch_rwlock_t *lock)
5063 {
5064 __asm__ __volatile__(
5065 " stw %%g0, [%0]"
5066@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
5067 : "memory");
5068 }
5069
5070-static int inline arch_write_trylock(arch_rwlock_t *lock)
5071+static inline int arch_write_trylock(arch_rwlock_t *lock)
5072 {
5073 unsigned long mask, tmp1, tmp2, result;
5074
5075diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
5076index c2a1080..21ed218 100644
5077--- a/arch/sparc/include/asm/thread_info_32.h
5078+++ b/arch/sparc/include/asm/thread_info_32.h
5079@@ -50,6 +50,8 @@ struct thread_info {
5080 unsigned long w_saved;
5081
5082 struct restart_block restart_block;
5083+
5084+ unsigned long lowest_stack;
5085 };
5086
5087 /*
5088diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
5089index 01d057f..0a02f7e 100644
5090--- a/arch/sparc/include/asm/thread_info_64.h
5091+++ b/arch/sparc/include/asm/thread_info_64.h
5092@@ -63,6 +63,8 @@ struct thread_info {
5093 struct pt_regs *kern_una_regs;
5094 unsigned int kern_una_insn;
5095
5096+ unsigned long lowest_stack;
5097+
5098 unsigned long fpregs[0] __attribute__ ((aligned(64)));
5099 };
5100
5101diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
5102index e88fbe5..96b0ce5 100644
5103--- a/arch/sparc/include/asm/uaccess.h
5104+++ b/arch/sparc/include/asm/uaccess.h
5105@@ -1,5 +1,13 @@
5106 #ifndef ___ASM_SPARC_UACCESS_H
5107 #define ___ASM_SPARC_UACCESS_H
5108+
5109+#ifdef __KERNEL__
5110+#ifndef __ASSEMBLY__
5111+#include <linux/types.h>
5112+extern void check_object_size(const void *ptr, unsigned long n, bool to);
5113+#endif
5114+#endif
5115+
5116 #if defined(__sparc__) && defined(__arch64__)
5117 #include <asm/uaccess_64.h>
5118 #else
5119diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
5120index 8303ac4..07f333d 100644
5121--- a/arch/sparc/include/asm/uaccess_32.h
5122+++ b/arch/sparc/include/asm/uaccess_32.h
5123@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
5124
5125 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
5126 {
5127- if (n && __access_ok((unsigned long) to, n))
5128+ if ((long)n < 0)
5129+ return n;
5130+
5131+ if (n && __access_ok((unsigned long) to, n)) {
5132+ if (!__builtin_constant_p(n))
5133+ check_object_size(from, n, true);
5134 return __copy_user(to, (__force void __user *) from, n);
5135- else
5136+ } else
5137 return n;
5138 }
5139
5140 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
5141 {
5142+ if ((long)n < 0)
5143+ return n;
5144+
5145+ if (!__builtin_constant_p(n))
5146+ check_object_size(from, n, true);
5147+
5148 return __copy_user(to, (__force void __user *) from, n);
5149 }
5150
5151 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
5152 {
5153- if (n && __access_ok((unsigned long) from, n))
5154+ if ((long)n < 0)
5155+ return n;
5156+
5157+ if (n && __access_ok((unsigned long) from, n)) {
5158+ if (!__builtin_constant_p(n))
5159+ check_object_size(to, n, false);
5160 return __copy_user((__force void __user *) to, from, n);
5161- else
5162+ } else
5163 return n;
5164 }
5165
5166 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
5167 {
5168+ if ((long)n < 0)
5169+ return n;
5170+
5171 return __copy_user((__force void __user *) to, from, n);
5172 }
5173
5174diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
5175index 3e1449f..5293a0e 100644
5176--- a/arch/sparc/include/asm/uaccess_64.h
5177+++ b/arch/sparc/include/asm/uaccess_64.h
5178@@ -10,6 +10,7 @@
5179 #include <linux/compiler.h>
5180 #include <linux/string.h>
5181 #include <linux/thread_info.h>
5182+#include <linux/kernel.h>
5183 #include <asm/asi.h>
5184 #include <asm/system.h>
5185 #include <asm/spitfire.h>
5186@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
5187 static inline unsigned long __must_check
5188 copy_from_user(void *to, const void __user *from, unsigned long size)
5189 {
5190- unsigned long ret = ___copy_from_user(to, from, size);
5191+ unsigned long ret;
5192
5193+ if ((long)size < 0 || size > INT_MAX)
5194+ return size;
5195+
5196+ if (!__builtin_constant_p(size))
5197+ check_object_size(to, size, false);
5198+
5199+ ret = ___copy_from_user(to, from, size);
5200 if (unlikely(ret))
5201 ret = copy_from_user_fixup(to, from, size);
5202
5203@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
5204 static inline unsigned long __must_check
5205 copy_to_user(void __user *to, const void *from, unsigned long size)
5206 {
5207- unsigned long ret = ___copy_to_user(to, from, size);
5208+ unsigned long ret;
5209
5210+ if ((long)size < 0 || size > INT_MAX)
5211+ return size;
5212+
5213+ if (!__builtin_constant_p(size))
5214+ check_object_size(from, size, true);
5215+
5216+ ret = ___copy_to_user(to, from, size);
5217 if (unlikely(ret))
5218 ret = copy_to_user_fixup(to, from, size);
5219 return ret;
5220diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
5221index cb85458..e063f17 100644
5222--- a/arch/sparc/kernel/Makefile
5223+++ b/arch/sparc/kernel/Makefile
5224@@ -3,7 +3,7 @@
5225 #
5226
5227 asflags-y := -ansi
5228-ccflags-y := -Werror
5229+#ccflags-y := -Werror
5230
5231 extra-y := head_$(BITS).o
5232 extra-y += init_task.o
5233diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
5234index f793742..4d880af 100644
5235--- a/arch/sparc/kernel/process_32.c
5236+++ b/arch/sparc/kernel/process_32.c
5237@@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
5238 rw->ins[4], rw->ins[5],
5239 rw->ins[6],
5240 rw->ins[7]);
5241- printk("%pS\n", (void *) rw->ins[7]);
5242+ printk("%pA\n", (void *) rw->ins[7]);
5243 rw = (struct reg_window32 *) rw->ins[6];
5244 }
5245 spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
5246@@ -271,14 +271,14 @@ void show_regs(struct pt_regs *r)
5247
5248 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
5249 r->psr, r->pc, r->npc, r->y, print_tainted());
5250- printk("PC: <%pS>\n", (void *) r->pc);
5251+ printk("PC: <%pA>\n", (void *) r->pc);
5252 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5253 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
5254 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
5255 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5256 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
5257 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
5258- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
5259+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
5260
5261 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5262 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
5263@@ -313,7 +313,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5264 rw = (struct reg_window32 *) fp;
5265 pc = rw->ins[7];
5266 printk("[%08lx : ", pc);
5267- printk("%pS ] ", (void *) pc);
5268+ printk("%pA ] ", (void *) pc);
5269 fp = rw->ins[6];
5270 } while (++count < 16);
5271 printk("\n");
5272diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
5273index 39d8b05..d1a7d90 100644
5274--- a/arch/sparc/kernel/process_64.c
5275+++ b/arch/sparc/kernel/process_64.c
5276@@ -182,14 +182,14 @@ static void show_regwindow(struct pt_regs *regs)
5277 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
5278 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
5279 if (regs->tstate & TSTATE_PRIV)
5280- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
5281+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
5282 }
5283
5284 void show_regs(struct pt_regs *regs)
5285 {
5286 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
5287 regs->tpc, regs->tnpc, regs->y, print_tainted());
5288- printk("TPC: <%pS>\n", (void *) regs->tpc);
5289+ printk("TPC: <%pA>\n", (void *) regs->tpc);
5290 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
5291 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
5292 regs->u_regs[3]);
5293@@ -202,7 +202,7 @@ void show_regs(struct pt_regs *regs)
5294 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
5295 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
5296 regs->u_regs[15]);
5297- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
5298+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
5299 show_regwindow(regs);
5300 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
5301 }
5302@@ -287,7 +287,7 @@ void arch_trigger_all_cpu_backtrace(void)
5303 ((tp && tp->task) ? tp->task->pid : -1));
5304
5305 if (gp->tstate & TSTATE_PRIV) {
5306- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
5307+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
5308 (void *) gp->tpc,
5309 (void *) gp->o7,
5310 (void *) gp->i7,
5311diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
5312index 42b282f..28ce9f2 100644
5313--- a/arch/sparc/kernel/sys_sparc_32.c
5314+++ b/arch/sparc/kernel/sys_sparc_32.c
5315@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5316 if (ARCH_SUN4C && len > 0x20000000)
5317 return -ENOMEM;
5318 if (!addr)
5319- addr = TASK_UNMAPPED_BASE;
5320+ addr = current->mm->mmap_base;
5321
5322 if (flags & MAP_SHARED)
5323 addr = COLOUR_ALIGN(addr);
5324@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5325 }
5326 if (TASK_SIZE - PAGE_SIZE - len < addr)
5327 return -ENOMEM;
5328- if (!vmm || addr + len <= vmm->vm_start)
5329+ if (check_heap_stack_gap(vmm, addr, len))
5330 return addr;
5331 addr = vmm->vm_end;
5332 if (flags & MAP_SHARED)
5333diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
5334index 232df99..cee1f9c 100644
5335--- a/arch/sparc/kernel/sys_sparc_64.c
5336+++ b/arch/sparc/kernel/sys_sparc_64.c
5337@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5338 /* We do not accept a shared mapping if it would violate
5339 * cache aliasing constraints.
5340 */
5341- if ((flags & MAP_SHARED) &&
5342+ if ((filp || (flags & MAP_SHARED)) &&
5343 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5344 return -EINVAL;
5345 return addr;
5346@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5347 if (filp || (flags & MAP_SHARED))
5348 do_color_align = 1;
5349
5350+#ifdef CONFIG_PAX_RANDMMAP
5351+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
5352+#endif
5353+
5354 if (addr) {
5355 if (do_color_align)
5356 addr = COLOUR_ALIGN(addr, pgoff);
5357@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5358 addr = PAGE_ALIGN(addr);
5359
5360 vma = find_vma(mm, addr);
5361- if (task_size - len >= addr &&
5362- (!vma || addr + len <= vma->vm_start))
5363+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5364 return addr;
5365 }
5366
5367 if (len > mm->cached_hole_size) {
5368- start_addr = addr = mm->free_area_cache;
5369+ start_addr = addr = mm->free_area_cache;
5370 } else {
5371- start_addr = addr = TASK_UNMAPPED_BASE;
5372+ start_addr = addr = mm->mmap_base;
5373 mm->cached_hole_size = 0;
5374 }
5375
5376@@ -174,14 +177,14 @@ full_search:
5377 vma = find_vma(mm, VA_EXCLUDE_END);
5378 }
5379 if (unlikely(task_size < addr)) {
5380- if (start_addr != TASK_UNMAPPED_BASE) {
5381- start_addr = addr = TASK_UNMAPPED_BASE;
5382+ if (start_addr != mm->mmap_base) {
5383+ start_addr = addr = mm->mmap_base;
5384 mm->cached_hole_size = 0;
5385 goto full_search;
5386 }
5387 return -ENOMEM;
5388 }
5389- if (likely(!vma || addr + len <= vma->vm_start)) {
5390+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5391 /*
5392 * Remember the place where we stopped the search:
5393 */
5394@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5395 /* We do not accept a shared mapping if it would violate
5396 * cache aliasing constraints.
5397 */
5398- if ((flags & MAP_SHARED) &&
5399+ if ((filp || (flags & MAP_SHARED)) &&
5400 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5401 return -EINVAL;
5402 return addr;
5403@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5404 addr = PAGE_ALIGN(addr);
5405
5406 vma = find_vma(mm, addr);
5407- if (task_size - len >= addr &&
5408- (!vma || addr + len <= vma->vm_start))
5409+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5410 return addr;
5411 }
5412
5413@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5414 /* make sure it can fit in the remaining address space */
5415 if (likely(addr > len)) {
5416 vma = find_vma(mm, addr-len);
5417- if (!vma || addr <= vma->vm_start) {
5418+ if (check_heap_stack_gap(vma, addr - len, len)) {
5419 /* remember the address as a hint for next time */
5420 return (mm->free_area_cache = addr-len);
5421 }
5422@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5423 if (unlikely(mm->mmap_base < len))
5424 goto bottomup;
5425
5426- addr = mm->mmap_base-len;
5427- if (do_color_align)
5428- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5429+ addr = mm->mmap_base - len;
5430
5431 do {
5432+ if (do_color_align)
5433+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5434 /*
5435 * Lookup failure means no vma is above this address,
5436 * else if new region fits below vma->vm_start,
5437 * return with success:
5438 */
5439 vma = find_vma(mm, addr);
5440- if (likely(!vma || addr+len <= vma->vm_start)) {
5441+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5442 /* remember the address as a hint for next time */
5443 return (mm->free_area_cache = addr);
5444 }
5445@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5446 mm->cached_hole_size = vma->vm_start - addr;
5447
5448 /* try just below the current vma->vm_start */
5449- addr = vma->vm_start-len;
5450- if (do_color_align)
5451- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5452- } while (likely(len < vma->vm_start));
5453+ addr = skip_heap_stack_gap(vma, len);
5454+ } while (!IS_ERR_VALUE(addr));
5455
5456 bottomup:
5457 /*
5458@@ -390,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5459 gap == RLIM_INFINITY ||
5460 sysctl_legacy_va_layout) {
5461 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
5462+
5463+#ifdef CONFIG_PAX_RANDMMAP
5464+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5465+ mm->mmap_base += mm->delta_mmap;
5466+#endif
5467+
5468 mm->get_unmapped_area = arch_get_unmapped_area;
5469 mm->unmap_area = arch_unmap_area;
5470 } else {
5471@@ -402,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5472 gap = (task_size / 6 * 5);
5473
5474 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
5475+
5476+#ifdef CONFIG_PAX_RANDMMAP
5477+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5478+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
5479+#endif
5480+
5481 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
5482 mm->unmap_area = arch_unmap_area_topdown;
5483 }
5484diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
5485index 591f20c..0f1b925 100644
5486--- a/arch/sparc/kernel/traps_32.c
5487+++ b/arch/sparc/kernel/traps_32.c
5488@@ -45,6 +45,8 @@ static void instruction_dump(unsigned long *pc)
5489 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
5490 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
5491
5492+extern void gr_handle_kernel_exploit(void);
5493+
5494 void die_if_kernel(char *str, struct pt_regs *regs)
5495 {
5496 static int die_counter;
5497@@ -77,15 +79,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5498 count++ < 30 &&
5499 (((unsigned long) rw) >= PAGE_OFFSET) &&
5500 !(((unsigned long) rw) & 0x7)) {
5501- printk("Caller[%08lx]: %pS\n", rw->ins[7],
5502+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
5503 (void *) rw->ins[7]);
5504 rw = (struct reg_window32 *)rw->ins[6];
5505 }
5506 }
5507 printk("Instruction DUMP:");
5508 instruction_dump ((unsigned long *) regs->pc);
5509- if(regs->psr & PSR_PS)
5510+ if(regs->psr & PSR_PS) {
5511+ gr_handle_kernel_exploit();
5512 do_exit(SIGKILL);
5513+ }
5514 do_exit(SIGSEGV);
5515 }
5516
5517diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
5518index 0cbdaa4..438e4c9 100644
5519--- a/arch/sparc/kernel/traps_64.c
5520+++ b/arch/sparc/kernel/traps_64.c
5521@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
5522 i + 1,
5523 p->trapstack[i].tstate, p->trapstack[i].tpc,
5524 p->trapstack[i].tnpc, p->trapstack[i].tt);
5525- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
5526+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
5527 }
5528 }
5529
5530@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
5531
5532 lvl -= 0x100;
5533 if (regs->tstate & TSTATE_PRIV) {
5534+
5535+#ifdef CONFIG_PAX_REFCOUNT
5536+ if (lvl == 6)
5537+ pax_report_refcount_overflow(regs);
5538+#endif
5539+
5540 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
5541 die_if_kernel(buffer, regs);
5542 }
5543@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
5544 void bad_trap_tl1(struct pt_regs *regs, long lvl)
5545 {
5546 char buffer[32];
5547-
5548+
5549 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
5550 0, lvl, SIGTRAP) == NOTIFY_STOP)
5551 return;
5552
5553+#ifdef CONFIG_PAX_REFCOUNT
5554+ if (lvl == 6)
5555+ pax_report_refcount_overflow(regs);
5556+#endif
5557+
5558 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
5559
5560 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
5561@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
5562 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
5563 printk("%s" "ERROR(%d): ",
5564 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
5565- printk("TPC<%pS>\n", (void *) regs->tpc);
5566+ printk("TPC<%pA>\n", (void *) regs->tpc);
5567 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
5568 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
5569 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
5570@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5571 smp_processor_id(),
5572 (type & 0x1) ? 'I' : 'D',
5573 regs->tpc);
5574- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
5575+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
5576 panic("Irrecoverable Cheetah+ parity error.");
5577 }
5578
5579@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5580 smp_processor_id(),
5581 (type & 0x1) ? 'I' : 'D',
5582 regs->tpc);
5583- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
5584+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
5585 }
5586
5587 struct sun4v_error_entry {
5588@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
5589
5590 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
5591 regs->tpc, tl);
5592- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
5593+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
5594 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5595- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
5596+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
5597 (void *) regs->u_regs[UREG_I7]);
5598 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
5599 "pte[%lx] error[%lx]\n",
5600@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
5601
5602 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
5603 regs->tpc, tl);
5604- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
5605+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
5606 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5607- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
5608+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
5609 (void *) regs->u_regs[UREG_I7]);
5610 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
5611 "pte[%lx] error[%lx]\n",
5612@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5613 fp = (unsigned long)sf->fp + STACK_BIAS;
5614 }
5615
5616- printk(" [%016lx] %pS\n", pc, (void *) pc);
5617+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5618 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
5619 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
5620 int index = tsk->curr_ret_stack;
5621 if (tsk->ret_stack && index >= graph) {
5622 pc = tsk->ret_stack[index - graph].ret;
5623- printk(" [%016lx] %pS\n", pc, (void *) pc);
5624+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5625 graph++;
5626 }
5627 }
5628@@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
5629 return (struct reg_window *) (fp + STACK_BIAS);
5630 }
5631
5632+extern void gr_handle_kernel_exploit(void);
5633+
5634 void die_if_kernel(char *str, struct pt_regs *regs)
5635 {
5636 static int die_counter;
5637@@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5638 while (rw &&
5639 count++ < 30 &&
5640 kstack_valid(tp, (unsigned long) rw)) {
5641- printk("Caller[%016lx]: %pS\n", rw->ins[7],
5642+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
5643 (void *) rw->ins[7]);
5644
5645 rw = kernel_stack_up(rw);
5646@@ -2267,8 +2280,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5647 }
5648 user_instruction_dump ((unsigned int __user *) regs->tpc);
5649 }
5650- if (regs->tstate & TSTATE_PRIV)
5651+ if (regs->tstate & TSTATE_PRIV) {
5652+ gr_handle_kernel_exploit();
5653 do_exit(SIGKILL);
5654+ }
5655 do_exit(SIGSEGV);
5656 }
5657 EXPORT_SYMBOL(die_if_kernel);
5658diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
5659index 76e4ac1..78f8bb1 100644
5660--- a/arch/sparc/kernel/unaligned_64.c
5661+++ b/arch/sparc/kernel/unaligned_64.c
5662@@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs *regs)
5663 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
5664
5665 if (__ratelimit(&ratelimit)) {
5666- printk("Kernel unaligned access at TPC[%lx] %pS\n",
5667+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
5668 regs->tpc, (void *) regs->tpc);
5669 }
5670 }
5671diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
5672index a3fc437..fea9957 100644
5673--- a/arch/sparc/lib/Makefile
5674+++ b/arch/sparc/lib/Makefile
5675@@ -2,7 +2,7 @@
5676 #
5677
5678 asflags-y := -ansi -DST_DIV0=0x02
5679-ccflags-y := -Werror
5680+#ccflags-y := -Werror
5681
5682 lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
5683 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
5684diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
5685index 59186e0..f747d7a 100644
5686--- a/arch/sparc/lib/atomic_64.S
5687+++ b/arch/sparc/lib/atomic_64.S
5688@@ -18,7 +18,12 @@
5689 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5690 BACKOFF_SETUP(%o2)
5691 1: lduw [%o1], %g1
5692- add %g1, %o0, %g7
5693+ addcc %g1, %o0, %g7
5694+
5695+#ifdef CONFIG_PAX_REFCOUNT
5696+ tvs %icc, 6
5697+#endif
5698+
5699 cas [%o1], %g1, %g7
5700 cmp %g1, %g7
5701 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5702@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5703 2: BACKOFF_SPIN(%o2, %o3, 1b)
5704 .size atomic_add, .-atomic_add
5705
5706+ .globl atomic_add_unchecked
5707+ .type atomic_add_unchecked,#function
5708+atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5709+ BACKOFF_SETUP(%o2)
5710+1: lduw [%o1], %g1
5711+ add %g1, %o0, %g7
5712+ cas [%o1], %g1, %g7
5713+ cmp %g1, %g7
5714+ bne,pn %icc, 2f
5715+ nop
5716+ retl
5717+ nop
5718+2: BACKOFF_SPIN(%o2, %o3, 1b)
5719+ .size atomic_add_unchecked, .-atomic_add_unchecked
5720+
5721 .globl atomic_sub
5722 .type atomic_sub,#function
5723 atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5724 BACKOFF_SETUP(%o2)
5725 1: lduw [%o1], %g1
5726- sub %g1, %o0, %g7
5727+ subcc %g1, %o0, %g7
5728+
5729+#ifdef CONFIG_PAX_REFCOUNT
5730+ tvs %icc, 6
5731+#endif
5732+
5733 cas [%o1], %g1, %g7
5734 cmp %g1, %g7
5735 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5736@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5737 2: BACKOFF_SPIN(%o2, %o3, 1b)
5738 .size atomic_sub, .-atomic_sub
5739
5740+ .globl atomic_sub_unchecked
5741+ .type atomic_sub_unchecked,#function
5742+atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5743+ BACKOFF_SETUP(%o2)
5744+1: lduw [%o1], %g1
5745+ sub %g1, %o0, %g7
5746+ cas [%o1], %g1, %g7
5747+ cmp %g1, %g7
5748+ bne,pn %icc, 2f
5749+ nop
5750+ retl
5751+ nop
5752+2: BACKOFF_SPIN(%o2, %o3, 1b)
5753+ .size atomic_sub_unchecked, .-atomic_sub_unchecked
5754+
5755 .globl atomic_add_ret
5756 .type atomic_add_ret,#function
5757 atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5758 BACKOFF_SETUP(%o2)
5759 1: lduw [%o1], %g1
5760- add %g1, %o0, %g7
5761+ addcc %g1, %o0, %g7
5762+
5763+#ifdef CONFIG_PAX_REFCOUNT
5764+ tvs %icc, 6
5765+#endif
5766+
5767 cas [%o1], %g1, %g7
5768 cmp %g1, %g7
5769 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5770@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5771 2: BACKOFF_SPIN(%o2, %o3, 1b)
5772 .size atomic_add_ret, .-atomic_add_ret
5773
5774+ .globl atomic_add_ret_unchecked
5775+ .type atomic_add_ret_unchecked,#function
5776+atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5777+ BACKOFF_SETUP(%o2)
5778+1: lduw [%o1], %g1
5779+ addcc %g1, %o0, %g7
5780+ cas [%o1], %g1, %g7
5781+ cmp %g1, %g7
5782+ bne,pn %icc, 2f
5783+ add %g7, %o0, %g7
5784+ sra %g7, 0, %o0
5785+ retl
5786+ nop
5787+2: BACKOFF_SPIN(%o2, %o3, 1b)
5788+ .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
5789+
5790 .globl atomic_sub_ret
5791 .type atomic_sub_ret,#function
5792 atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5793 BACKOFF_SETUP(%o2)
5794 1: lduw [%o1], %g1
5795- sub %g1, %o0, %g7
5796+ subcc %g1, %o0, %g7
5797+
5798+#ifdef CONFIG_PAX_REFCOUNT
5799+ tvs %icc, 6
5800+#endif
5801+
5802 cas [%o1], %g1, %g7
5803 cmp %g1, %g7
5804 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5805@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5806 atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5807 BACKOFF_SETUP(%o2)
5808 1: ldx [%o1], %g1
5809- add %g1, %o0, %g7
5810+ addcc %g1, %o0, %g7
5811+
5812+#ifdef CONFIG_PAX_REFCOUNT
5813+ tvs %xcc, 6
5814+#endif
5815+
5816 casx [%o1], %g1, %g7
5817 cmp %g1, %g7
5818 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5819@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5820 2: BACKOFF_SPIN(%o2, %o3, 1b)
5821 .size atomic64_add, .-atomic64_add
5822
5823+ .globl atomic64_add_unchecked
5824+ .type atomic64_add_unchecked,#function
5825+atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5826+ BACKOFF_SETUP(%o2)
5827+1: ldx [%o1], %g1
5828+ addcc %g1, %o0, %g7
5829+ casx [%o1], %g1, %g7
5830+ cmp %g1, %g7
5831+ bne,pn %xcc, 2f
5832+ nop
5833+ retl
5834+ nop
5835+2: BACKOFF_SPIN(%o2, %o3, 1b)
5836+ .size atomic64_add_unchecked, .-atomic64_add_unchecked
5837+
5838 .globl atomic64_sub
5839 .type atomic64_sub,#function
5840 atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5841 BACKOFF_SETUP(%o2)
5842 1: ldx [%o1], %g1
5843- sub %g1, %o0, %g7
5844+ subcc %g1, %o0, %g7
5845+
5846+#ifdef CONFIG_PAX_REFCOUNT
5847+ tvs %xcc, 6
5848+#endif
5849+
5850 casx [%o1], %g1, %g7
5851 cmp %g1, %g7
5852 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5853@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5854 2: BACKOFF_SPIN(%o2, %o3, 1b)
5855 .size atomic64_sub, .-atomic64_sub
5856
5857+ .globl atomic64_sub_unchecked
5858+ .type atomic64_sub_unchecked,#function
5859+atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5860+ BACKOFF_SETUP(%o2)
5861+1: ldx [%o1], %g1
5862+ subcc %g1, %o0, %g7
5863+ casx [%o1], %g1, %g7
5864+ cmp %g1, %g7
5865+ bne,pn %xcc, 2f
5866+ nop
5867+ retl
5868+ nop
5869+2: BACKOFF_SPIN(%o2, %o3, 1b)
5870+ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked
5871+
5872 .globl atomic64_add_ret
5873 .type atomic64_add_ret,#function
5874 atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5875 BACKOFF_SETUP(%o2)
5876 1: ldx [%o1], %g1
5877- add %g1, %o0, %g7
5878+ addcc %g1, %o0, %g7
5879+
5880+#ifdef CONFIG_PAX_REFCOUNT
5881+ tvs %xcc, 6
5882+#endif
5883+
5884 casx [%o1], %g1, %g7
5885 cmp %g1, %g7
5886 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5887@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5888 2: BACKOFF_SPIN(%o2, %o3, 1b)
5889 .size atomic64_add_ret, .-atomic64_add_ret
5890
5891+ .globl atomic64_add_ret_unchecked
5892+ .type atomic64_add_ret_unchecked,#function
5893+atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5894+ BACKOFF_SETUP(%o2)
5895+1: ldx [%o1], %g1
5896+ addcc %g1, %o0, %g7
5897+ casx [%o1], %g1, %g7
5898+ cmp %g1, %g7
5899+ bne,pn %xcc, 2f
5900+ add %g7, %o0, %g7
5901+ mov %g7, %o0
5902+ retl
5903+ nop
5904+2: BACKOFF_SPIN(%o2, %o3, 1b)
5905+ .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked
5906+
5907 .globl atomic64_sub_ret
5908 .type atomic64_sub_ret,#function
5909 atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5910 BACKOFF_SETUP(%o2)
5911 1: ldx [%o1], %g1
5912- sub %g1, %o0, %g7
5913+ subcc %g1, %o0, %g7
5914+
5915+#ifdef CONFIG_PAX_REFCOUNT
5916+ tvs %xcc, 6
5917+#endif
5918+
5919 casx [%o1], %g1, %g7
5920 cmp %g1, %g7
5921 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5922diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
5923index f73c224..662af10 100644
5924--- a/arch/sparc/lib/ksyms.c
5925+++ b/arch/sparc/lib/ksyms.c
5926@@ -136,12 +136,18 @@ EXPORT_SYMBOL(__downgrade_write);
5927
5928 /* Atomic counter implementation. */
5929 EXPORT_SYMBOL(atomic_add);
5930+EXPORT_SYMBOL(atomic_add_unchecked);
5931 EXPORT_SYMBOL(atomic_add_ret);
5932+EXPORT_SYMBOL(atomic_add_ret_unchecked);
5933 EXPORT_SYMBOL(atomic_sub);
5934+EXPORT_SYMBOL(atomic_sub_unchecked);
5935 EXPORT_SYMBOL(atomic_sub_ret);
5936 EXPORT_SYMBOL(atomic64_add);
5937+EXPORT_SYMBOL(atomic64_add_unchecked);
5938 EXPORT_SYMBOL(atomic64_add_ret);
5939+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
5940 EXPORT_SYMBOL(atomic64_sub);
5941+EXPORT_SYMBOL(atomic64_sub_unchecked);
5942 EXPORT_SYMBOL(atomic64_sub_ret);
5943
5944 /* Atomic bit operations. */
5945diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
5946index 301421c..e2535d1 100644
5947--- a/arch/sparc/mm/Makefile
5948+++ b/arch/sparc/mm/Makefile
5949@@ -2,7 +2,7 @@
5950 #
5951
5952 asflags-y := -ansi
5953-ccflags-y := -Werror
5954+#ccflags-y := -Werror
5955
5956 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
5957 obj-y += fault_$(BITS).o
5958diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
5959index 8023fd7..c8e89e9 100644
5960--- a/arch/sparc/mm/fault_32.c
5961+++ b/arch/sparc/mm/fault_32.c
5962@@ -21,6 +21,9 @@
5963 #include <linux/perf_event.h>
5964 #include <linux/interrupt.h>
5965 #include <linux/kdebug.h>
5966+#include <linux/slab.h>
5967+#include <linux/pagemap.h>
5968+#include <linux/compiler.h>
5969
5970 #include <asm/system.h>
5971 #include <asm/page.h>
5972@@ -208,6 +211,268 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
5973 return safe_compute_effective_address(regs, insn);
5974 }
5975
5976+#ifdef CONFIG_PAX_PAGEEXEC
5977+#ifdef CONFIG_PAX_DLRESOLVE
5978+static void pax_emuplt_close(struct vm_area_struct *vma)
5979+{
5980+ vma->vm_mm->call_dl_resolve = 0UL;
5981+}
5982+
5983+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
5984+{
5985+ unsigned int *kaddr;
5986+
5987+ vmf->page = alloc_page(GFP_HIGHUSER);
5988+ if (!vmf->page)
5989+ return VM_FAULT_OOM;
5990+
5991+ kaddr = kmap(vmf->page);
5992+ memset(kaddr, 0, PAGE_SIZE);
5993+ kaddr[0] = 0x9DE3BFA8U; /* save */
5994+ flush_dcache_page(vmf->page);
5995+ kunmap(vmf->page);
5996+ return VM_FAULT_MAJOR;
5997+}
5998+
5999+static const struct vm_operations_struct pax_vm_ops = {
6000+ .close = pax_emuplt_close,
6001+ .fault = pax_emuplt_fault
6002+};
6003+
6004+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6005+{
6006+ int ret;
6007+
6008+ INIT_LIST_HEAD(&vma->anon_vma_chain);
6009+ vma->vm_mm = current->mm;
6010+ vma->vm_start = addr;
6011+ vma->vm_end = addr + PAGE_SIZE;
6012+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6013+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6014+ vma->vm_ops = &pax_vm_ops;
6015+
6016+ ret = insert_vm_struct(current->mm, vma);
6017+ if (ret)
6018+ return ret;
6019+
6020+ ++current->mm->total_vm;
6021+ return 0;
6022+}
6023+#endif
6024+
6025+/*
6026+ * PaX: decide what to do with offenders (regs->pc = fault address)
6027+ *
6028+ * returns 1 when task should be killed
6029+ * 2 when patched PLT trampoline was detected
6030+ * 3 when unpatched PLT trampoline was detected
6031+ */
6032+static int pax_handle_fetch_fault(struct pt_regs *regs)
6033+{
6034+
6035+#ifdef CONFIG_PAX_EMUPLT
6036+ int err;
6037+
6038+ do { /* PaX: patched PLT emulation #1 */
6039+ unsigned int sethi1, sethi2, jmpl;
6040+
6041+ err = get_user(sethi1, (unsigned int *)regs->pc);
6042+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
6043+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
6044+
6045+ if (err)
6046+ break;
6047+
6048+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6049+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6050+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6051+ {
6052+ unsigned int addr;
6053+
6054+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6055+ addr = regs->u_regs[UREG_G1];
6056+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6057+ regs->pc = addr;
6058+ regs->npc = addr+4;
6059+ return 2;
6060+ }
6061+ } while (0);
6062+
6063+ { /* PaX: patched PLT emulation #2 */
6064+ unsigned int ba;
6065+
6066+ err = get_user(ba, (unsigned int *)regs->pc);
6067+
6068+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6069+ unsigned int addr;
6070+
6071+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6072+ regs->pc = addr;
6073+ regs->npc = addr+4;
6074+ return 2;
6075+ }
6076+ }
6077+
6078+ do { /* PaX: patched PLT emulation #3 */
6079+ unsigned int sethi, jmpl, nop;
6080+
6081+ err = get_user(sethi, (unsigned int *)regs->pc);
6082+ err |= get_user(jmpl, (unsigned int *)(regs->pc+4));
6083+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
6084+
6085+ if (err)
6086+ break;
6087+
6088+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6089+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6090+ nop == 0x01000000U)
6091+ {
6092+ unsigned int addr;
6093+
6094+ addr = (sethi & 0x003FFFFFU) << 10;
6095+ regs->u_regs[UREG_G1] = addr;
6096+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6097+ regs->pc = addr;
6098+ regs->npc = addr+4;
6099+ return 2;
6100+ }
6101+ } while (0);
6102+
6103+ do { /* PaX: unpatched PLT emulation step 1 */
6104+ unsigned int sethi, ba, nop;
6105+
6106+ err = get_user(sethi, (unsigned int *)regs->pc);
6107+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
6108+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
6109+
6110+ if (err)
6111+ break;
6112+
6113+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6114+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6115+ nop == 0x01000000U)
6116+ {
6117+ unsigned int addr, save, call;
6118+
6119+ if ((ba & 0xFFC00000U) == 0x30800000U)
6120+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6121+ else
6122+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6123+
6124+ err = get_user(save, (unsigned int *)addr);
6125+ err |= get_user(call, (unsigned int *)(addr+4));
6126+ err |= get_user(nop, (unsigned int *)(addr+8));
6127+ if (err)
6128+ break;
6129+
6130+#ifdef CONFIG_PAX_DLRESOLVE
6131+ if (save == 0x9DE3BFA8U &&
6132+ (call & 0xC0000000U) == 0x40000000U &&
6133+ nop == 0x01000000U)
6134+ {
6135+ struct vm_area_struct *vma;
6136+ unsigned long call_dl_resolve;
6137+
6138+ down_read(&current->mm->mmap_sem);
6139+ call_dl_resolve = current->mm->call_dl_resolve;
6140+ up_read(&current->mm->mmap_sem);
6141+ if (likely(call_dl_resolve))
6142+ goto emulate;
6143+
6144+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6145+
6146+ down_write(&current->mm->mmap_sem);
6147+ if (current->mm->call_dl_resolve) {
6148+ call_dl_resolve = current->mm->call_dl_resolve;
6149+ up_write(&current->mm->mmap_sem);
6150+ if (vma)
6151+ kmem_cache_free(vm_area_cachep, vma);
6152+ goto emulate;
6153+ }
6154+
6155+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6156+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6157+ up_write(&current->mm->mmap_sem);
6158+ if (vma)
6159+ kmem_cache_free(vm_area_cachep, vma);
6160+ return 1;
6161+ }
6162+
6163+ if (pax_insert_vma(vma, call_dl_resolve)) {
6164+ up_write(&current->mm->mmap_sem);
6165+ kmem_cache_free(vm_area_cachep, vma);
6166+ return 1;
6167+ }
6168+
6169+ current->mm->call_dl_resolve = call_dl_resolve;
6170+ up_write(&current->mm->mmap_sem);
6171+
6172+emulate:
6173+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6174+ regs->pc = call_dl_resolve;
6175+ regs->npc = addr+4;
6176+ return 3;
6177+ }
6178+#endif
6179+
6180+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6181+ if ((save & 0xFFC00000U) == 0x05000000U &&
6182+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6183+ nop == 0x01000000U)
6184+ {
6185+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6186+ regs->u_regs[UREG_G2] = addr + 4;
6187+ addr = (save & 0x003FFFFFU) << 10;
6188+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6189+ regs->pc = addr;
6190+ regs->npc = addr+4;
6191+ return 3;
6192+ }
6193+ }
6194+ } while (0);
6195+
6196+ do { /* PaX: unpatched PLT emulation step 2 */
6197+ unsigned int save, call, nop;
6198+
6199+ err = get_user(save, (unsigned int *)(regs->pc-4));
6200+ err |= get_user(call, (unsigned int *)regs->pc);
6201+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
6202+ if (err)
6203+ break;
6204+
6205+ if (save == 0x9DE3BFA8U &&
6206+ (call & 0xC0000000U) == 0x40000000U &&
6207+ nop == 0x01000000U)
6208+ {
6209+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
6210+
6211+ regs->u_regs[UREG_RETPC] = regs->pc;
6212+ regs->pc = dl_resolve;
6213+ regs->npc = dl_resolve+4;
6214+ return 3;
6215+ }
6216+ } while (0);
6217+#endif
6218+
6219+ return 1;
6220+}
6221+
6222+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6223+{
6224+ unsigned long i;
6225+
6226+ printk(KERN_ERR "PAX: bytes at PC: ");
6227+ for (i = 0; i < 8; i++) {
6228+ unsigned int c;
6229+ if (get_user(c, (unsigned int *)pc+i))
6230+ printk(KERN_CONT "???????? ");
6231+ else
6232+ printk(KERN_CONT "%08x ", c);
6233+ }
6234+ printk("\n");
6235+}
6236+#endif
6237+
6238 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
6239 int text_fault)
6240 {
6241@@ -280,6 +545,24 @@ good_area:
6242 if(!(vma->vm_flags & VM_WRITE))
6243 goto bad_area;
6244 } else {
6245+
6246+#ifdef CONFIG_PAX_PAGEEXEC
6247+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
6248+ up_read(&mm->mmap_sem);
6249+ switch (pax_handle_fetch_fault(regs)) {
6250+
6251+#ifdef CONFIG_PAX_EMUPLT
6252+ case 2:
6253+ case 3:
6254+ return;
6255+#endif
6256+
6257+ }
6258+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
6259+ do_group_exit(SIGKILL);
6260+ }
6261+#endif
6262+
6263 /* Allow reads even for write-only mappings */
6264 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
6265 goto bad_area;
6266diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
6267index 504c062..6fcb9c6 100644
6268--- a/arch/sparc/mm/fault_64.c
6269+++ b/arch/sparc/mm/fault_64.c
6270@@ -21,6 +21,9 @@
6271 #include <linux/kprobes.h>
6272 #include <linux/kdebug.h>
6273 #include <linux/percpu.h>
6274+#include <linux/slab.h>
6275+#include <linux/pagemap.h>
6276+#include <linux/compiler.h>
6277
6278 #include <asm/page.h>
6279 #include <asm/pgtable.h>
6280@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
6281 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
6282 regs->tpc);
6283 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
6284- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
6285+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
6286 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
6287 dump_stack();
6288 unhandled_fault(regs->tpc, current, regs);
6289@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
6290 show_regs(regs);
6291 }
6292
6293+#ifdef CONFIG_PAX_PAGEEXEC
6294+#ifdef CONFIG_PAX_DLRESOLVE
6295+static void pax_emuplt_close(struct vm_area_struct *vma)
6296+{
6297+ vma->vm_mm->call_dl_resolve = 0UL;
6298+}
6299+
6300+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6301+{
6302+ unsigned int *kaddr;
6303+
6304+ vmf->page = alloc_page(GFP_HIGHUSER);
6305+ if (!vmf->page)
6306+ return VM_FAULT_OOM;
6307+
6308+ kaddr = kmap(vmf->page);
6309+ memset(kaddr, 0, PAGE_SIZE);
6310+ kaddr[0] = 0x9DE3BFA8U; /* save */
6311+ flush_dcache_page(vmf->page);
6312+ kunmap(vmf->page);
6313+ return VM_FAULT_MAJOR;
6314+}
6315+
6316+static const struct vm_operations_struct pax_vm_ops = {
6317+ .close = pax_emuplt_close,
6318+ .fault = pax_emuplt_fault
6319+};
6320+
6321+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6322+{
6323+ int ret;
6324+
6325+ INIT_LIST_HEAD(&vma->anon_vma_chain);
6326+ vma->vm_mm = current->mm;
6327+ vma->vm_start = addr;
6328+ vma->vm_end = addr + PAGE_SIZE;
6329+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6330+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6331+ vma->vm_ops = &pax_vm_ops;
6332+
6333+ ret = insert_vm_struct(current->mm, vma);
6334+ if (ret)
6335+ return ret;
6336+
6337+ ++current->mm->total_vm;
6338+ return 0;
6339+}
6340+#endif
6341+
6342+/*
6343+ * PaX: decide what to do with offenders (regs->tpc = fault address)
6344+ *
6345+ * returns 1 when task should be killed
6346+ * 2 when patched PLT trampoline was detected
6347+ * 3 when unpatched PLT trampoline was detected
6348+ */
6349+static int pax_handle_fetch_fault(struct pt_regs *regs)
6350+{
6351+
6352+#ifdef CONFIG_PAX_EMUPLT
6353+ int err;
6354+
6355+ do { /* PaX: patched PLT emulation #1 */
6356+ unsigned int sethi1, sethi2, jmpl;
6357+
6358+ err = get_user(sethi1, (unsigned int *)regs->tpc);
6359+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
6360+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
6361+
6362+ if (err)
6363+ break;
6364+
6365+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6366+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6367+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6368+ {
6369+ unsigned long addr;
6370+
6371+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6372+ addr = regs->u_regs[UREG_G1];
6373+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6374+
6375+ if (test_thread_flag(TIF_32BIT))
6376+ addr &= 0xFFFFFFFFUL;
6377+
6378+ regs->tpc = addr;
6379+ regs->tnpc = addr+4;
6380+ return 2;
6381+ }
6382+ } while (0);
6383+
6384+ { /* PaX: patched PLT emulation #2 */
6385+ unsigned int ba;
6386+
6387+ err = get_user(ba, (unsigned int *)regs->tpc);
6388+
6389+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6390+ unsigned long addr;
6391+
6392+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6393+
6394+ if (test_thread_flag(TIF_32BIT))
6395+ addr &= 0xFFFFFFFFUL;
6396+
6397+ regs->tpc = addr;
6398+ regs->tnpc = addr+4;
6399+ return 2;
6400+ }
6401+ }
6402+
6403+ do { /* PaX: patched PLT emulation #3 */
6404+ unsigned int sethi, jmpl, nop;
6405+
6406+ err = get_user(sethi, (unsigned int *)regs->tpc);
6407+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+4));
6408+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6409+
6410+ if (err)
6411+ break;
6412+
6413+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6414+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6415+ nop == 0x01000000U)
6416+ {
6417+ unsigned long addr;
6418+
6419+ addr = (sethi & 0x003FFFFFU) << 10;
6420+ regs->u_regs[UREG_G1] = addr;
6421+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6422+
6423+ if (test_thread_flag(TIF_32BIT))
6424+ addr &= 0xFFFFFFFFUL;
6425+
6426+ regs->tpc = addr;
6427+ regs->tnpc = addr+4;
6428+ return 2;
6429+ }
6430+ } while (0);
6431+
6432+ do { /* PaX: patched PLT emulation #4 */
6433+ unsigned int sethi, mov1, call, mov2;
6434+
6435+ err = get_user(sethi, (unsigned int *)regs->tpc);
6436+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
6437+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
6438+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
6439+
6440+ if (err)
6441+ break;
6442+
6443+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6444+ mov1 == 0x8210000FU &&
6445+ (call & 0xC0000000U) == 0x40000000U &&
6446+ mov2 == 0x9E100001U)
6447+ {
6448+ unsigned long addr;
6449+
6450+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
6451+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6452+
6453+ if (test_thread_flag(TIF_32BIT))
6454+ addr &= 0xFFFFFFFFUL;
6455+
6456+ regs->tpc = addr;
6457+ regs->tnpc = addr+4;
6458+ return 2;
6459+ }
6460+ } while (0);
6461+
6462+ do { /* PaX: patched PLT emulation #5 */
6463+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
6464+
6465+ err = get_user(sethi, (unsigned int *)regs->tpc);
6466+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6467+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6468+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
6469+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
6470+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
6471+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
6472+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
6473+
6474+ if (err)
6475+ break;
6476+
6477+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6478+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6479+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6480+ (or1 & 0xFFFFE000U) == 0x82106000U &&
6481+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6482+ sllx == 0x83287020U &&
6483+ jmpl == 0x81C04005U &&
6484+ nop == 0x01000000U)
6485+ {
6486+ unsigned long addr;
6487+
6488+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6489+ regs->u_regs[UREG_G1] <<= 32;
6490+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6491+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6492+ regs->tpc = addr;
6493+ regs->tnpc = addr+4;
6494+ return 2;
6495+ }
6496+ } while (0);
6497+
6498+ do { /* PaX: patched PLT emulation #6 */
6499+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
6500+
6501+ err = get_user(sethi, (unsigned int *)regs->tpc);
6502+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6503+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6504+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
6505+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
6506+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
6507+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
6508+
6509+ if (err)
6510+ break;
6511+
6512+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6513+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6514+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6515+ sllx == 0x83287020U &&
6516+ (or & 0xFFFFE000U) == 0x8A116000U &&
6517+ jmpl == 0x81C04005U &&
6518+ nop == 0x01000000U)
6519+ {
6520+ unsigned long addr;
6521+
6522+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
6523+ regs->u_regs[UREG_G1] <<= 32;
6524+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
6525+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6526+ regs->tpc = addr;
6527+ regs->tnpc = addr+4;
6528+ return 2;
6529+ }
6530+ } while (0);
6531+
6532+ do { /* PaX: unpatched PLT emulation step 1 */
6533+ unsigned int sethi, ba, nop;
6534+
6535+ err = get_user(sethi, (unsigned int *)regs->tpc);
6536+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6537+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6538+
6539+ if (err)
6540+ break;
6541+
6542+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6543+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6544+ nop == 0x01000000U)
6545+ {
6546+ unsigned long addr;
6547+ unsigned int save, call;
6548+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
6549+
6550+ if ((ba & 0xFFC00000U) == 0x30800000U)
6551+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6552+ else
6553+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6554+
6555+ if (test_thread_flag(TIF_32BIT))
6556+ addr &= 0xFFFFFFFFUL;
6557+
6558+ err = get_user(save, (unsigned int *)addr);
6559+ err |= get_user(call, (unsigned int *)(addr+4));
6560+ err |= get_user(nop, (unsigned int *)(addr+8));
6561+ if (err)
6562+ break;
6563+
6564+#ifdef CONFIG_PAX_DLRESOLVE
6565+ if (save == 0x9DE3BFA8U &&
6566+ (call & 0xC0000000U) == 0x40000000U &&
6567+ nop == 0x01000000U)
6568+ {
6569+ struct vm_area_struct *vma;
6570+ unsigned long call_dl_resolve;
6571+
6572+ down_read(&current->mm->mmap_sem);
6573+ call_dl_resolve = current->mm->call_dl_resolve;
6574+ up_read(&current->mm->mmap_sem);
6575+ if (likely(call_dl_resolve))
6576+ goto emulate;
6577+
6578+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6579+
6580+ down_write(&current->mm->mmap_sem);
6581+ if (current->mm->call_dl_resolve) {
6582+ call_dl_resolve = current->mm->call_dl_resolve;
6583+ up_write(&current->mm->mmap_sem);
6584+ if (vma)
6585+ kmem_cache_free(vm_area_cachep, vma);
6586+ goto emulate;
6587+ }
6588+
6589+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6590+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6591+ up_write(&current->mm->mmap_sem);
6592+ if (vma)
6593+ kmem_cache_free(vm_area_cachep, vma);
6594+ return 1;
6595+ }
6596+
6597+ if (pax_insert_vma(vma, call_dl_resolve)) {
6598+ up_write(&current->mm->mmap_sem);
6599+ kmem_cache_free(vm_area_cachep, vma);
6600+ return 1;
6601+ }
6602+
6603+ current->mm->call_dl_resolve = call_dl_resolve;
6604+ up_write(&current->mm->mmap_sem);
6605+
6606+emulate:
6607+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6608+ regs->tpc = call_dl_resolve;
6609+ regs->tnpc = addr+4;
6610+ return 3;
6611+ }
6612+#endif
6613+
6614+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6615+ if ((save & 0xFFC00000U) == 0x05000000U &&
6616+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6617+ nop == 0x01000000U)
6618+ {
6619+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6620+ regs->u_regs[UREG_G2] = addr + 4;
6621+ addr = (save & 0x003FFFFFU) << 10;
6622+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6623+
6624+ if (test_thread_flag(TIF_32BIT))
6625+ addr &= 0xFFFFFFFFUL;
6626+
6627+ regs->tpc = addr;
6628+ regs->tnpc = addr+4;
6629+ return 3;
6630+ }
6631+
6632+ /* PaX: 64-bit PLT stub */
6633+ err = get_user(sethi1, (unsigned int *)addr);
6634+ err |= get_user(sethi2, (unsigned int *)(addr+4));
6635+ err |= get_user(or1, (unsigned int *)(addr+8));
6636+ err |= get_user(or2, (unsigned int *)(addr+12));
6637+ err |= get_user(sllx, (unsigned int *)(addr+16));
6638+ err |= get_user(add, (unsigned int *)(addr+20));
6639+ err |= get_user(jmpl, (unsigned int *)(addr+24));
6640+ err |= get_user(nop, (unsigned int *)(addr+28));
6641+ if (err)
6642+ break;
6643+
6644+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
6645+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6646+ (or1 & 0xFFFFE000U) == 0x88112000U &&
6647+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6648+ sllx == 0x89293020U &&
6649+ add == 0x8A010005U &&
6650+ jmpl == 0x89C14000U &&
6651+ nop == 0x01000000U)
6652+ {
6653+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6654+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6655+ regs->u_regs[UREG_G4] <<= 32;
6656+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6657+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
6658+ regs->u_regs[UREG_G4] = addr + 24;
6659+ addr = regs->u_regs[UREG_G5];
6660+ regs->tpc = addr;
6661+ regs->tnpc = addr+4;
6662+ return 3;
6663+ }
6664+ }
6665+ } while (0);
6666+
6667+#ifdef CONFIG_PAX_DLRESOLVE
6668+ do { /* PaX: unpatched PLT emulation step 2 */
6669+ unsigned int save, call, nop;
6670+
6671+ err = get_user(save, (unsigned int *)(regs->tpc-4));
6672+ err |= get_user(call, (unsigned int *)regs->tpc);
6673+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
6674+ if (err)
6675+ break;
6676+
6677+ if (save == 0x9DE3BFA8U &&
6678+ (call & 0xC0000000U) == 0x40000000U &&
6679+ nop == 0x01000000U)
6680+ {
6681+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6682+
6683+ if (test_thread_flag(TIF_32BIT))
6684+ dl_resolve &= 0xFFFFFFFFUL;
6685+
6686+ regs->u_regs[UREG_RETPC] = regs->tpc;
6687+ regs->tpc = dl_resolve;
6688+ regs->tnpc = dl_resolve+4;
6689+ return 3;
6690+ }
6691+ } while (0);
6692+#endif
6693+
6694+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
6695+ unsigned int sethi, ba, nop;
6696+
6697+ err = get_user(sethi, (unsigned int *)regs->tpc);
6698+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6699+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6700+
6701+ if (err)
6702+ break;
6703+
6704+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6705+ (ba & 0xFFF00000U) == 0x30600000U &&
6706+ nop == 0x01000000U)
6707+ {
6708+ unsigned long addr;
6709+
6710+ addr = (sethi & 0x003FFFFFU) << 10;
6711+ regs->u_regs[UREG_G1] = addr;
6712+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6713+
6714+ if (test_thread_flag(TIF_32BIT))
6715+ addr &= 0xFFFFFFFFUL;
6716+
6717+ regs->tpc = addr;
6718+ regs->tnpc = addr+4;
6719+ return 2;
6720+ }
6721+ } while (0);
6722+
6723+#endif
6724+
6725+ return 1;
6726+}
6727+
6728+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6729+{
6730+ unsigned long i;
6731+
6732+ printk(KERN_ERR "PAX: bytes at PC: ");
6733+ for (i = 0; i < 8; i++) {
6734+ unsigned int c;
6735+ if (get_user(c, (unsigned int *)pc+i))
6736+ printk(KERN_CONT "???????? ");
6737+ else
6738+ printk(KERN_CONT "%08x ", c);
6739+ }
6740+ printk("\n");
6741+}
6742+#endif
6743+
6744 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6745 {
6746 struct mm_struct *mm = current->mm;
6747@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6748 if (!vma)
6749 goto bad_area;
6750
6751+#ifdef CONFIG_PAX_PAGEEXEC
6752+ /* PaX: detect ITLB misses on non-exec pages */
6753+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
6754+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
6755+ {
6756+ if (address != regs->tpc)
6757+ goto good_area;
6758+
6759+ up_read(&mm->mmap_sem);
6760+ switch (pax_handle_fetch_fault(regs)) {
6761+
6762+#ifdef CONFIG_PAX_EMUPLT
6763+ case 2:
6764+ case 3:
6765+ return;
6766+#endif
6767+
6768+ }
6769+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
6770+ do_group_exit(SIGKILL);
6771+ }
6772+#endif
6773+
6774 /* Pure DTLB misses do not tell us whether the fault causing
6775 * load/store/atomic was a write or not, it only says that there
6776 * was no match. So in such a case we (carefully) read the
6777diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
6778index 07e1453..0a7d9e9 100644
6779--- a/arch/sparc/mm/hugetlbpage.c
6780+++ b/arch/sparc/mm/hugetlbpage.c
6781@@ -67,7 +67,7 @@ full_search:
6782 }
6783 return -ENOMEM;
6784 }
6785- if (likely(!vma || addr + len <= vma->vm_start)) {
6786+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6787 /*
6788 * Remember the place where we stopped the search:
6789 */
6790@@ -106,7 +106,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6791 /* make sure it can fit in the remaining address space */
6792 if (likely(addr > len)) {
6793 vma = find_vma(mm, addr-len);
6794- if (!vma || addr <= vma->vm_start) {
6795+ if (check_heap_stack_gap(vma, addr - len, len)) {
6796 /* remember the address as a hint for next time */
6797 return (mm->free_area_cache = addr-len);
6798 }
6799@@ -115,16 +115,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6800 if (unlikely(mm->mmap_base < len))
6801 goto bottomup;
6802
6803- addr = (mm->mmap_base-len) & HPAGE_MASK;
6804+ addr = mm->mmap_base - len;
6805
6806 do {
6807+ addr &= HPAGE_MASK;
6808 /*
6809 * Lookup failure means no vma is above this address,
6810 * else if new region fits below vma->vm_start,
6811 * return with success:
6812 */
6813 vma = find_vma(mm, addr);
6814- if (likely(!vma || addr+len <= vma->vm_start)) {
6815+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6816 /* remember the address as a hint for next time */
6817 return (mm->free_area_cache = addr);
6818 }
6819@@ -134,8 +135,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6820 mm->cached_hole_size = vma->vm_start - addr;
6821
6822 /* try just below the current vma->vm_start */
6823- addr = (vma->vm_start-len) & HPAGE_MASK;
6824- } while (likely(len < vma->vm_start));
6825+ addr = skip_heap_stack_gap(vma, len);
6826+ } while (!IS_ERR_VALUE(addr));
6827
6828 bottomup:
6829 /*
6830@@ -181,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
6831 if (addr) {
6832 addr = ALIGN(addr, HPAGE_SIZE);
6833 vma = find_vma(mm, addr);
6834- if (task_size - len >= addr &&
6835- (!vma || addr + len <= vma->vm_start))
6836+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
6837 return addr;
6838 }
6839 if (mm->get_unmapped_area == arch_get_unmapped_area)
6840diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
6841index 7b00de6..78239f4 100644
6842--- a/arch/sparc/mm/init_32.c
6843+++ b/arch/sparc/mm/init_32.c
6844@@ -316,6 +316,9 @@ extern void device_scan(void);
6845 pgprot_t PAGE_SHARED __read_mostly;
6846 EXPORT_SYMBOL(PAGE_SHARED);
6847
6848+pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
6849+EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
6850+
6851 void __init paging_init(void)
6852 {
6853 switch(sparc_cpu_model) {
6854@@ -344,17 +347,17 @@ void __init paging_init(void)
6855
6856 /* Initialize the protection map with non-constant, MMU dependent values. */
6857 protection_map[0] = PAGE_NONE;
6858- protection_map[1] = PAGE_READONLY;
6859- protection_map[2] = PAGE_COPY;
6860- protection_map[3] = PAGE_COPY;
6861+ protection_map[1] = PAGE_READONLY_NOEXEC;
6862+ protection_map[2] = PAGE_COPY_NOEXEC;
6863+ protection_map[3] = PAGE_COPY_NOEXEC;
6864 protection_map[4] = PAGE_READONLY;
6865 protection_map[5] = PAGE_READONLY;
6866 protection_map[6] = PAGE_COPY;
6867 protection_map[7] = PAGE_COPY;
6868 protection_map[8] = PAGE_NONE;
6869- protection_map[9] = PAGE_READONLY;
6870- protection_map[10] = PAGE_SHARED;
6871- protection_map[11] = PAGE_SHARED;
6872+ protection_map[9] = PAGE_READONLY_NOEXEC;
6873+ protection_map[10] = PAGE_SHARED_NOEXEC;
6874+ protection_map[11] = PAGE_SHARED_NOEXEC;
6875 protection_map[12] = PAGE_READONLY;
6876 protection_map[13] = PAGE_READONLY;
6877 protection_map[14] = PAGE_SHARED;
6878diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
6879index cbef74e..c38fead 100644
6880--- a/arch/sparc/mm/srmmu.c
6881+++ b/arch/sparc/mm/srmmu.c
6882@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
6883 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
6884 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
6885 BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
6886+
6887+#ifdef CONFIG_PAX_PAGEEXEC
6888+ PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC);
6889+ BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC));
6890+ BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC));
6891+#endif
6892+
6893 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
6894 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
6895
6896diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
6897index 27fe667..36d474c 100644
6898--- a/arch/tile/include/asm/atomic_64.h
6899+++ b/arch/tile/include/asm/atomic_64.h
6900@@ -142,6 +142,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
6901
6902 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
6903
6904+#define atomic64_read_unchecked(v) atomic64_read(v)
6905+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
6906+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
6907+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
6908+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
6909+#define atomic64_inc_unchecked(v) atomic64_inc(v)
6910+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
6911+#define atomic64_dec_unchecked(v) atomic64_dec(v)
6912+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
6913+
6914 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
6915 #define smp_mb__before_atomic_dec() smp_mb()
6916 #define smp_mb__after_atomic_dec() smp_mb()
6917diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
6918index 392e533..536b092 100644
6919--- a/arch/tile/include/asm/cache.h
6920+++ b/arch/tile/include/asm/cache.h
6921@@ -15,11 +15,12 @@
6922 #ifndef _ASM_TILE_CACHE_H
6923 #define _ASM_TILE_CACHE_H
6924
6925+#include <linux/const.h>
6926 #include <arch/chip.h>
6927
6928 /* bytes per L1 data cache line */
6929 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
6930-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6931+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6932
6933 /* bytes per L2 cache line */
6934 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
6935diff --git a/arch/um/Makefile b/arch/um/Makefile
6936index 28688e6..4c0aa1c 100644
6937--- a/arch/um/Makefile
6938+++ b/arch/um/Makefile
6939@@ -61,6 +61,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
6940 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
6941 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
6942
6943+ifdef CONSTIFY_PLUGIN
6944+USER_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
6945+endif
6946+
6947 #This will adjust *FLAGS accordingly to the platform.
6948 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
6949
6950diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
6951index 19e1bdd..3665b77 100644
6952--- a/arch/um/include/asm/cache.h
6953+++ b/arch/um/include/asm/cache.h
6954@@ -1,6 +1,7 @@
6955 #ifndef __UM_CACHE_H
6956 #define __UM_CACHE_H
6957
6958+#include <linux/const.h>
6959
6960 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
6961 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
6962@@ -12,6 +13,6 @@
6963 # define L1_CACHE_SHIFT 5
6964 #endif
6965
6966-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6967+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6968
6969 #endif
6970diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
6971index 6c03acd..a5e0215 100644
6972--- a/arch/um/include/asm/kmap_types.h
6973+++ b/arch/um/include/asm/kmap_types.h
6974@@ -23,6 +23,7 @@ enum km_type {
6975 KM_IRQ1,
6976 KM_SOFTIRQ0,
6977 KM_SOFTIRQ1,
6978+ KM_CLEARPAGE,
6979 KM_TYPE_NR
6980 };
6981
6982diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
6983index 7cfc3ce..cbd1a58 100644
6984--- a/arch/um/include/asm/page.h
6985+++ b/arch/um/include/asm/page.h
6986@@ -14,6 +14,9 @@
6987 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
6988 #define PAGE_MASK (~(PAGE_SIZE-1))
6989
6990+#define ktla_ktva(addr) (addr)
6991+#define ktva_ktla(addr) (addr)
6992+
6993 #ifndef __ASSEMBLY__
6994
6995 struct page;
6996diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
6997index 69f2490..2634831 100644
6998--- a/arch/um/kernel/process.c
6999+++ b/arch/um/kernel/process.c
7000@@ -408,22 +408,6 @@ int singlestepping(void * t)
7001 return 2;
7002 }
7003
7004-/*
7005- * Only x86 and x86_64 have an arch_align_stack().
7006- * All other arches have "#define arch_align_stack(x) (x)"
7007- * in their asm/system.h
7008- * As this is included in UML from asm-um/system-generic.h,
7009- * we can use it to behave as the subarch does.
7010- */
7011-#ifndef arch_align_stack
7012-unsigned long arch_align_stack(unsigned long sp)
7013-{
7014- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
7015- sp -= get_random_int() % 8192;
7016- return sp & ~0xf;
7017-}
7018-#endif
7019-
7020 unsigned long get_wchan(struct task_struct *p)
7021 {
7022 unsigned long stack_page, sp, ip;
7023diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
7024index ad8f795..2c7eec6 100644
7025--- a/arch/unicore32/include/asm/cache.h
7026+++ b/arch/unicore32/include/asm/cache.h
7027@@ -12,8 +12,10 @@
7028 #ifndef __UNICORE_CACHE_H__
7029 #define __UNICORE_CACHE_H__
7030
7031-#define L1_CACHE_SHIFT (5)
7032-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7033+#include <linux/const.h>
7034+
7035+#define L1_CACHE_SHIFT 5
7036+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7037
7038 /*
7039 * Memory returned by kmalloc() may be used for DMA, so we must make
7040diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
7041index 5bed94e..fbcf200 100644
7042--- a/arch/x86/Kconfig
7043+++ b/arch/x86/Kconfig
7044@@ -226,7 +226,7 @@ config X86_HT
7045
7046 config X86_32_LAZY_GS
7047 def_bool y
7048- depends on X86_32 && !CC_STACKPROTECTOR
7049+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
7050
7051 config ARCH_HWEIGHT_CFLAGS
7052 string
7053@@ -1058,7 +1058,7 @@ choice
7054
7055 config NOHIGHMEM
7056 bool "off"
7057- depends on !X86_NUMAQ
7058+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7059 ---help---
7060 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
7061 However, the address space of 32-bit x86 processors is only 4
7062@@ -1095,7 +1095,7 @@ config NOHIGHMEM
7063
7064 config HIGHMEM4G
7065 bool "4GB"
7066- depends on !X86_NUMAQ
7067+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7068 ---help---
7069 Select this if you have a 32-bit processor and between 1 and 4
7070 gigabytes of physical RAM.
7071@@ -1149,7 +1149,7 @@ config PAGE_OFFSET
7072 hex
7073 default 0xB0000000 if VMSPLIT_3G_OPT
7074 default 0x80000000 if VMSPLIT_2G
7075- default 0x78000000 if VMSPLIT_2G_OPT
7076+ default 0x70000000 if VMSPLIT_2G_OPT
7077 default 0x40000000 if VMSPLIT_1G
7078 default 0xC0000000
7079 depends on X86_32
7080@@ -1539,6 +1539,7 @@ config SECCOMP
7081
7082 config CC_STACKPROTECTOR
7083 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
7084+ depends on X86_64 || !PAX_MEMORY_UDEREF
7085 ---help---
7086 This option turns on the -fstack-protector GCC feature. This
7087 feature puts, at the beginning of functions, a canary value on
7088@@ -1596,6 +1597,7 @@ config KEXEC_JUMP
7089 config PHYSICAL_START
7090 hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
7091 default "0x1000000"
7092+ range 0x400000 0x40000000
7093 ---help---
7094 This gives the physical address where the kernel is loaded.
7095
7096@@ -1659,6 +1661,7 @@ config X86_NEED_RELOCS
7097 config PHYSICAL_ALIGN
7098 hex "Alignment value to which kernel should be aligned" if X86_32
7099 default "0x1000000"
7100+ range 0x400000 0x1000000 if PAX_KERNEXEC
7101 range 0x2000 0x1000000
7102 ---help---
7103 This value puts the alignment restrictions on physical address
7104@@ -1690,9 +1693,10 @@ config HOTPLUG_CPU
7105 Say N if you want to disable CPU hotplug.
7106
7107 config COMPAT_VDSO
7108- def_bool y
7109+ def_bool n
7110 prompt "Compat VDSO support"
7111 depends on X86_32 || IA32_EMULATION
7112+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
7113 ---help---
7114 Map the 32-bit VDSO to the predictable old-style address too.
7115
7116diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
7117index 3c57033..22d44aa 100644
7118--- a/arch/x86/Kconfig.cpu
7119+++ b/arch/x86/Kconfig.cpu
7120@@ -335,7 +335,7 @@ config X86_PPRO_FENCE
7121
7122 config X86_F00F_BUG
7123 def_bool y
7124- depends on M586MMX || M586TSC || M586 || M486 || M386
7125+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
7126
7127 config X86_INVD_BUG
7128 def_bool y
7129@@ -359,7 +359,7 @@ config X86_POPAD_OK
7130
7131 config X86_ALIGNMENT_16
7132 def_bool y
7133- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7134+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7135
7136 config X86_INTEL_USERCOPY
7137 def_bool y
7138@@ -405,7 +405,7 @@ config X86_CMPXCHG64
7139 # generates cmov.
7140 config X86_CMOV
7141 def_bool y
7142- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7143+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7144
7145 config X86_MINIMUM_CPU_FAMILY
7146 int
7147diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
7148index e46c214..7c72b55 100644
7149--- a/arch/x86/Kconfig.debug
7150+++ b/arch/x86/Kconfig.debug
7151@@ -84,7 +84,7 @@ config X86_PTDUMP
7152 config DEBUG_RODATA
7153 bool "Write protect kernel read-only data structures"
7154 default y
7155- depends on DEBUG_KERNEL
7156+ depends on DEBUG_KERNEL && BROKEN
7157 ---help---
7158 Mark the kernel read-only data as write-protected in the pagetables,
7159 in order to catch accidental (and incorrect) writes to such const
7160@@ -102,7 +102,7 @@ config DEBUG_RODATA_TEST
7161
7162 config DEBUG_SET_MODULE_RONX
7163 bool "Set loadable kernel module data as NX and text as RO"
7164- depends on MODULES
7165+ depends on MODULES && BROKEN
7166 ---help---
7167 This option helps catch unintended modifications to loadable
7168 kernel module's text and read-only data. It also prevents execution
7169diff --git a/arch/x86/Makefile b/arch/x86/Makefile
7170index 209ba12..15140db 100644
7171--- a/arch/x86/Makefile
7172+++ b/arch/x86/Makefile
7173@@ -46,6 +46,7 @@ else
7174 UTS_MACHINE := x86_64
7175 CHECKFLAGS += -D__x86_64__ -m64
7176
7177+ biarch := $(call cc-option,-m64)
7178 KBUILD_AFLAGS += -m64
7179 KBUILD_CFLAGS += -m64
7180
7181@@ -201,3 +202,12 @@ define archhelp
7182 echo ' FDARGS="..." arguments for the booted kernel'
7183 echo ' FDINITRD=file initrd for the booted kernel'
7184 endef
7185+
7186+define OLD_LD
7187+
7188+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
7189+*** Please upgrade your binutils to 2.18 or newer
7190+endef
7191+
7192+archprepare:
7193+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
7194diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
7195index 95365a8..52f857b 100644
7196--- a/arch/x86/boot/Makefile
7197+++ b/arch/x86/boot/Makefile
7198@@ -63,6 +63,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
7199 $(call cc-option, -fno-stack-protector) \
7200 $(call cc-option, -mpreferred-stack-boundary=2)
7201 KBUILD_CFLAGS += $(call cc-option, -m32)
7202+ifdef CONSTIFY_PLUGIN
7203+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7204+endif
7205 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7206 GCOV_PROFILE := n
7207
7208diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
7209index 878e4b9..20537ab 100644
7210--- a/arch/x86/boot/bitops.h
7211+++ b/arch/x86/boot/bitops.h
7212@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7213 u8 v;
7214 const u32 *p = (const u32 *)addr;
7215
7216- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7217+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7218 return v;
7219 }
7220
7221@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7222
7223 static inline void set_bit(int nr, void *addr)
7224 {
7225- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7226+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7227 }
7228
7229 #endif /* BOOT_BITOPS_H */
7230diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
7231index c7093bd..d4247ffe0 100644
7232--- a/arch/x86/boot/boot.h
7233+++ b/arch/x86/boot/boot.h
7234@@ -85,7 +85,7 @@ static inline void io_delay(void)
7235 static inline u16 ds(void)
7236 {
7237 u16 seg;
7238- asm("movw %%ds,%0" : "=rm" (seg));
7239+ asm volatile("movw %%ds,%0" : "=rm" (seg));
7240 return seg;
7241 }
7242
7243@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
7244 static inline int memcmp(const void *s1, const void *s2, size_t len)
7245 {
7246 u8 diff;
7247- asm("repe; cmpsb; setnz %0"
7248+ asm volatile("repe; cmpsb; setnz %0"
7249 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
7250 return diff;
7251 }
7252diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
7253index b123b9a..2cf2f23 100644
7254--- a/arch/x86/boot/compressed/Makefile
7255+++ b/arch/x86/boot/compressed/Makefile
7256@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
7257 KBUILD_CFLAGS += $(cflags-y)
7258 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
7259 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
7260+ifdef CONSTIFY_PLUGIN
7261+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7262+endif
7263
7264 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7265 GCOV_PROFILE := n
7266diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
7267index a055993..47e126c 100644
7268--- a/arch/x86/boot/compressed/head_32.S
7269+++ b/arch/x86/boot/compressed/head_32.S
7270@@ -98,7 +98,7 @@ preferred_addr:
7271 notl %eax
7272 andl %eax, %ebx
7273 #else
7274- movl $LOAD_PHYSICAL_ADDR, %ebx
7275+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7276 #endif
7277
7278 /* Target address to relocate to for decompression */
7279@@ -184,7 +184,7 @@ relocated:
7280 * and where it was actually loaded.
7281 */
7282 movl %ebp, %ebx
7283- subl $LOAD_PHYSICAL_ADDR, %ebx
7284+ subl $____LOAD_PHYSICAL_ADDR, %ebx
7285 jz 2f /* Nothing to be done if loaded at compiled addr. */
7286 /*
7287 * Process relocations.
7288@@ -192,8 +192,7 @@ relocated:
7289
7290 1: subl $4, %edi
7291 movl (%edi), %ecx
7292- testl %ecx, %ecx
7293- jz 2f
7294+ jecxz 2f
7295 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
7296 jmp 1b
7297 2:
7298diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
7299index 558d76c..606aa24 100644
7300--- a/arch/x86/boot/compressed/head_64.S
7301+++ b/arch/x86/boot/compressed/head_64.S
7302@@ -91,7 +91,7 @@ ENTRY(startup_32)
7303 notl %eax
7304 andl %eax, %ebx
7305 #else
7306- movl $LOAD_PHYSICAL_ADDR, %ebx
7307+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7308 #endif
7309
7310 /* Target address to relocate to for decompression */
7311@@ -253,7 +253,7 @@ preferred_addr:
7312 notq %rax
7313 andq %rax, %rbp
7314 #else
7315- movq $LOAD_PHYSICAL_ADDR, %rbp
7316+ movq $____LOAD_PHYSICAL_ADDR, %rbp
7317 #endif
7318
7319 /* Target address to relocate to for decompression */
7320diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
7321index 7116dcb..d9ae1d7 100644
7322--- a/arch/x86/boot/compressed/misc.c
7323+++ b/arch/x86/boot/compressed/misc.c
7324@@ -310,7 +310,7 @@ static void parse_elf(void *output)
7325 case PT_LOAD:
7326 #ifdef CONFIG_RELOCATABLE
7327 dest = output;
7328- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
7329+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
7330 #else
7331 dest = (void *)(phdr->p_paddr);
7332 #endif
7333@@ -365,7 +365,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
7334 error("Destination address too large");
7335 #endif
7336 #ifndef CONFIG_RELOCATABLE
7337- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
7338+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
7339 error("Wrong destination address");
7340 #endif
7341
7342diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
7343index 89bbf4e..869908e 100644
7344--- a/arch/x86/boot/compressed/relocs.c
7345+++ b/arch/x86/boot/compressed/relocs.c
7346@@ -13,8 +13,11 @@
7347
7348 static void die(char *fmt, ...);
7349
7350+#include "../../../../include/generated/autoconf.h"
7351+
7352 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
7353 static Elf32_Ehdr ehdr;
7354+static Elf32_Phdr *phdr;
7355 static unsigned long reloc_count, reloc_idx;
7356 static unsigned long *relocs;
7357
7358@@ -270,9 +273,39 @@ static void read_ehdr(FILE *fp)
7359 }
7360 }
7361
7362+static void read_phdrs(FILE *fp)
7363+{
7364+ unsigned int i;
7365+
7366+ phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
7367+ if (!phdr) {
7368+ die("Unable to allocate %d program headers\n",
7369+ ehdr.e_phnum);
7370+ }
7371+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
7372+ die("Seek to %d failed: %s\n",
7373+ ehdr.e_phoff, strerror(errno));
7374+ }
7375+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
7376+ die("Cannot read ELF program headers: %s\n",
7377+ strerror(errno));
7378+ }
7379+ for(i = 0; i < ehdr.e_phnum; i++) {
7380+ phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
7381+ phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
7382+ phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
7383+ phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
7384+ phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
7385+ phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
7386+ phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
7387+ phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
7388+ }
7389+
7390+}
7391+
7392 static void read_shdrs(FILE *fp)
7393 {
7394- int i;
7395+ unsigned int i;
7396 Elf32_Shdr shdr;
7397
7398 secs = calloc(ehdr.e_shnum, sizeof(struct section));
7399@@ -307,7 +340,7 @@ static void read_shdrs(FILE *fp)
7400
7401 static void read_strtabs(FILE *fp)
7402 {
7403- int i;
7404+ unsigned int i;
7405 for (i = 0; i < ehdr.e_shnum; i++) {
7406 struct section *sec = &secs[i];
7407 if (sec->shdr.sh_type != SHT_STRTAB) {
7408@@ -332,7 +365,7 @@ static void read_strtabs(FILE *fp)
7409
7410 static void read_symtabs(FILE *fp)
7411 {
7412- int i,j;
7413+ unsigned int i,j;
7414 for (i = 0; i < ehdr.e_shnum; i++) {
7415 struct section *sec = &secs[i];
7416 if (sec->shdr.sh_type != SHT_SYMTAB) {
7417@@ -365,7 +398,9 @@ static void read_symtabs(FILE *fp)
7418
7419 static void read_relocs(FILE *fp)
7420 {
7421- int i,j;
7422+ unsigned int i,j;
7423+ uint32_t base;
7424+
7425 for (i = 0; i < ehdr.e_shnum; i++) {
7426 struct section *sec = &secs[i];
7427 if (sec->shdr.sh_type != SHT_REL) {
7428@@ -385,9 +420,18 @@ static void read_relocs(FILE *fp)
7429 die("Cannot read symbol table: %s\n",
7430 strerror(errno));
7431 }
7432+ base = 0;
7433+ for (j = 0; j < ehdr.e_phnum; j++) {
7434+ if (phdr[j].p_type != PT_LOAD )
7435+ continue;
7436+ 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)
7437+ continue;
7438+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
7439+ break;
7440+ }
7441 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
7442 Elf32_Rel *rel = &sec->reltab[j];
7443- rel->r_offset = elf32_to_cpu(rel->r_offset);
7444+ rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
7445 rel->r_info = elf32_to_cpu(rel->r_info);
7446 }
7447 }
7448@@ -396,14 +440,14 @@ static void read_relocs(FILE *fp)
7449
7450 static void print_absolute_symbols(void)
7451 {
7452- int i;
7453+ unsigned int i;
7454 printf("Absolute symbols\n");
7455 printf(" Num: Value Size Type Bind Visibility Name\n");
7456 for (i = 0; i < ehdr.e_shnum; i++) {
7457 struct section *sec = &secs[i];
7458 char *sym_strtab;
7459 Elf32_Sym *sh_symtab;
7460- int j;
7461+ unsigned int j;
7462
7463 if (sec->shdr.sh_type != SHT_SYMTAB) {
7464 continue;
7465@@ -431,14 +475,14 @@ static void print_absolute_symbols(void)
7466
7467 static void print_absolute_relocs(void)
7468 {
7469- int i, printed = 0;
7470+ unsigned int i, printed = 0;
7471
7472 for (i = 0; i < ehdr.e_shnum; i++) {
7473 struct section *sec = &secs[i];
7474 struct section *sec_applies, *sec_symtab;
7475 char *sym_strtab;
7476 Elf32_Sym *sh_symtab;
7477- int j;
7478+ unsigned int j;
7479 if (sec->shdr.sh_type != SHT_REL) {
7480 continue;
7481 }
7482@@ -499,13 +543,13 @@ static void print_absolute_relocs(void)
7483
7484 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7485 {
7486- int i;
7487+ unsigned int i;
7488 /* Walk through the relocations */
7489 for (i = 0; i < ehdr.e_shnum; i++) {
7490 char *sym_strtab;
7491 Elf32_Sym *sh_symtab;
7492 struct section *sec_applies, *sec_symtab;
7493- int j;
7494+ unsigned int j;
7495 struct section *sec = &secs[i];
7496
7497 if (sec->shdr.sh_type != SHT_REL) {
7498@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7499 !is_rel_reloc(sym_name(sym_strtab, sym))) {
7500 continue;
7501 }
7502+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
7503+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
7504+ continue;
7505+
7506+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
7507+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
7508+ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
7509+ continue;
7510+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
7511+ continue;
7512+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
7513+ continue;
7514+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
7515+ continue;
7516+#endif
7517+
7518 switch (r_type) {
7519 case R_386_NONE:
7520 case R_386_PC32:
7521@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, const void *vb)
7522
7523 static void emit_relocs(int as_text)
7524 {
7525- int i;
7526+ unsigned int i;
7527 /* Count how many relocations I have and allocate space for them. */
7528 reloc_count = 0;
7529 walk_relocs(count_reloc);
7530@@ -665,6 +725,7 @@ int main(int argc, char **argv)
7531 fname, strerror(errno));
7532 }
7533 read_ehdr(fp);
7534+ read_phdrs(fp);
7535 read_shdrs(fp);
7536 read_strtabs(fp);
7537 read_symtabs(fp);
7538diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
7539index 4d3ff03..e4972ff 100644
7540--- a/arch/x86/boot/cpucheck.c
7541+++ b/arch/x86/boot/cpucheck.c
7542@@ -74,7 +74,7 @@ static int has_fpu(void)
7543 u16 fcw = -1, fsw = -1;
7544 u32 cr0;
7545
7546- asm("movl %%cr0,%0" : "=r" (cr0));
7547+ asm volatile("movl %%cr0,%0" : "=r" (cr0));
7548 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
7549 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
7550 asm volatile("movl %0,%%cr0" : : "r" (cr0));
7551@@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
7552 {
7553 u32 f0, f1;
7554
7555- asm("pushfl ; "
7556+ asm volatile("pushfl ; "
7557 "pushfl ; "
7558 "popl %0 ; "
7559 "movl %0,%1 ; "
7560@@ -115,7 +115,7 @@ static void get_flags(void)
7561 set_bit(X86_FEATURE_FPU, cpu.flags);
7562
7563 if (has_eflag(X86_EFLAGS_ID)) {
7564- asm("cpuid"
7565+ asm volatile("cpuid"
7566 : "=a" (max_intel_level),
7567 "=b" (cpu_vendor[0]),
7568 "=d" (cpu_vendor[1]),
7569@@ -124,7 +124,7 @@ static void get_flags(void)
7570
7571 if (max_intel_level >= 0x00000001 &&
7572 max_intel_level <= 0x0000ffff) {
7573- asm("cpuid"
7574+ asm volatile("cpuid"
7575 : "=a" (tfms),
7576 "=c" (cpu.flags[4]),
7577 "=d" (cpu.flags[0])
7578@@ -136,7 +136,7 @@ static void get_flags(void)
7579 cpu.model += ((tfms >> 16) & 0xf) << 4;
7580 }
7581
7582- asm("cpuid"
7583+ asm volatile("cpuid"
7584 : "=a" (max_amd_level)
7585 : "a" (0x80000000)
7586 : "ebx", "ecx", "edx");
7587@@ -144,7 +144,7 @@ static void get_flags(void)
7588 if (max_amd_level >= 0x80000001 &&
7589 max_amd_level <= 0x8000ffff) {
7590 u32 eax = 0x80000001;
7591- asm("cpuid"
7592+ asm volatile("cpuid"
7593 : "+a" (eax),
7594 "=c" (cpu.flags[6]),
7595 "=d" (cpu.flags[1])
7596@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7597 u32 ecx = MSR_K7_HWCR;
7598 u32 eax, edx;
7599
7600- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7601+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7602 eax &= ~(1 << 15);
7603- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7604+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7605
7606 get_flags(); /* Make sure it really did something */
7607 err = check_flags();
7608@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7609 u32 ecx = MSR_VIA_FCR;
7610 u32 eax, edx;
7611
7612- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7613+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7614 eax |= (1<<1)|(1<<7);
7615- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7616+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7617
7618 set_bit(X86_FEATURE_CX8, cpu.flags);
7619 err = check_flags();
7620@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7621 u32 eax, edx;
7622 u32 level = 1;
7623
7624- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7625- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7626- asm("cpuid"
7627+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7628+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7629+ asm volatile("cpuid"
7630 : "+a" (level), "=d" (cpu.flags[0])
7631 : : "ecx", "ebx");
7632- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7633+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7634
7635 err = check_flags();
7636 }
7637diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
7638index f1bbeeb..aff09cb 100644
7639--- a/arch/x86/boot/header.S
7640+++ b/arch/x86/boot/header.S
7641@@ -372,7 +372,7 @@ setup_data: .quad 0 # 64-bit physical pointer to
7642 # single linked list of
7643 # struct setup_data
7644
7645-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
7646+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
7647
7648 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
7649 #define VO_INIT_SIZE (VO__end - VO__text)
7650diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
7651index db75d07..8e6d0af 100644
7652--- a/arch/x86/boot/memory.c
7653+++ b/arch/x86/boot/memory.c
7654@@ -19,7 +19,7 @@
7655
7656 static int detect_memory_e820(void)
7657 {
7658- int count = 0;
7659+ unsigned int count = 0;
7660 struct biosregs ireg, oreg;
7661 struct e820entry *desc = boot_params.e820_map;
7662 static struct e820entry buf; /* static so it is zeroed */
7663diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
7664index 11e8c6e..fdbb1ed 100644
7665--- a/arch/x86/boot/video-vesa.c
7666+++ b/arch/x86/boot/video-vesa.c
7667@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
7668
7669 boot_params.screen_info.vesapm_seg = oreg.es;
7670 boot_params.screen_info.vesapm_off = oreg.di;
7671+ boot_params.screen_info.vesapm_size = oreg.cx;
7672 }
7673
7674 /*
7675diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
7676index 43eda28..5ab5fdb 100644
7677--- a/arch/x86/boot/video.c
7678+++ b/arch/x86/boot/video.c
7679@@ -96,7 +96,7 @@ static void store_mode_params(void)
7680 static unsigned int get_entry(void)
7681 {
7682 char entry_buf[4];
7683- int i, len = 0;
7684+ unsigned int i, len = 0;
7685 int key;
7686 unsigned int v;
7687
7688diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
7689index 5b577d5..3c1fed4 100644
7690--- a/arch/x86/crypto/aes-x86_64-asm_64.S
7691+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
7692@@ -8,6 +8,8 @@
7693 * including this sentence is retained in full.
7694 */
7695
7696+#include <asm/alternative-asm.h>
7697+
7698 .extern crypto_ft_tab
7699 .extern crypto_it_tab
7700 .extern crypto_fl_tab
7701@@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
7702 je B192; \
7703 leaq 32(r9),r9;
7704
7705+#define ret pax_force_retaddr 0, 1; ret
7706+
7707 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
7708 movq r1,r2; \
7709 movq r3,r4; \
7710diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
7711index be6d9e3..21fbbca 100644
7712--- a/arch/x86/crypto/aesni-intel_asm.S
7713+++ b/arch/x86/crypto/aesni-intel_asm.S
7714@@ -31,6 +31,7 @@
7715
7716 #include <linux/linkage.h>
7717 #include <asm/inst.h>
7718+#include <asm/alternative-asm.h>
7719
7720 #ifdef __x86_64__
7721 .data
7722@@ -1436,7 +1437,9 @@ _return_T_done_decrypt:
7723 pop %r14
7724 pop %r13
7725 pop %r12
7726+ pax_force_retaddr 0, 1
7727 ret
7728+ENDPROC(aesni_gcm_dec)
7729
7730
7731 /*****************************************************************************
7732@@ -1699,7 +1702,9 @@ _return_T_done_encrypt:
7733 pop %r14
7734 pop %r13
7735 pop %r12
7736+ pax_force_retaddr 0, 1
7737 ret
7738+ENDPROC(aesni_gcm_enc)
7739
7740 #endif
7741
7742@@ -1714,6 +1719,7 @@ _key_expansion_256a:
7743 pxor %xmm1, %xmm0
7744 movaps %xmm0, (TKEYP)
7745 add $0x10, TKEYP
7746+ pax_force_retaddr_bts
7747 ret
7748
7749 .align 4
7750@@ -1738,6 +1744,7 @@ _key_expansion_192a:
7751 shufps $0b01001110, %xmm2, %xmm1
7752 movaps %xmm1, 0x10(TKEYP)
7753 add $0x20, TKEYP
7754+ pax_force_retaddr_bts
7755 ret
7756
7757 .align 4
7758@@ -1757,6 +1764,7 @@ _key_expansion_192b:
7759
7760 movaps %xmm0, (TKEYP)
7761 add $0x10, TKEYP
7762+ pax_force_retaddr_bts
7763 ret
7764
7765 .align 4
7766@@ -1769,6 +1777,7 @@ _key_expansion_256b:
7767 pxor %xmm1, %xmm2
7768 movaps %xmm2, (TKEYP)
7769 add $0x10, TKEYP
7770+ pax_force_retaddr_bts
7771 ret
7772
7773 /*
7774@@ -1881,7 +1890,9 @@ ENTRY(aesni_set_key)
7775 #ifndef __x86_64__
7776 popl KEYP
7777 #endif
7778+ pax_force_retaddr 0, 1
7779 ret
7780+ENDPROC(aesni_set_key)
7781
7782 /*
7783 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
7784@@ -1902,7 +1913,9 @@ ENTRY(aesni_enc)
7785 popl KLEN
7786 popl KEYP
7787 #endif
7788+ pax_force_retaddr 0, 1
7789 ret
7790+ENDPROC(aesni_enc)
7791
7792 /*
7793 * _aesni_enc1: internal ABI
7794@@ -1959,6 +1972,7 @@ _aesni_enc1:
7795 AESENC KEY STATE
7796 movaps 0x70(TKEYP), KEY
7797 AESENCLAST KEY STATE
7798+ pax_force_retaddr_bts
7799 ret
7800
7801 /*
7802@@ -2067,6 +2081,7 @@ _aesni_enc4:
7803 AESENCLAST KEY STATE2
7804 AESENCLAST KEY STATE3
7805 AESENCLAST KEY STATE4
7806+ pax_force_retaddr_bts
7807 ret
7808
7809 /*
7810@@ -2089,7 +2104,9 @@ ENTRY(aesni_dec)
7811 popl KLEN
7812 popl KEYP
7813 #endif
7814+ pax_force_retaddr 0, 1
7815 ret
7816+ENDPROC(aesni_dec)
7817
7818 /*
7819 * _aesni_dec1: internal ABI
7820@@ -2146,6 +2163,7 @@ _aesni_dec1:
7821 AESDEC KEY STATE
7822 movaps 0x70(TKEYP), KEY
7823 AESDECLAST KEY STATE
7824+ pax_force_retaddr_bts
7825 ret
7826
7827 /*
7828@@ -2254,6 +2272,7 @@ _aesni_dec4:
7829 AESDECLAST KEY STATE2
7830 AESDECLAST KEY STATE3
7831 AESDECLAST KEY STATE4
7832+ pax_force_retaddr_bts
7833 ret
7834
7835 /*
7836@@ -2311,7 +2330,9 @@ ENTRY(aesni_ecb_enc)
7837 popl KEYP
7838 popl LEN
7839 #endif
7840+ pax_force_retaddr 0, 1
7841 ret
7842+ENDPROC(aesni_ecb_enc)
7843
7844 /*
7845 * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7846@@ -2369,7 +2390,9 @@ ENTRY(aesni_ecb_dec)
7847 popl KEYP
7848 popl LEN
7849 #endif
7850+ pax_force_retaddr 0, 1
7851 ret
7852+ENDPROC(aesni_ecb_dec)
7853
7854 /*
7855 * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7856@@ -2410,7 +2433,9 @@ ENTRY(aesni_cbc_enc)
7857 popl LEN
7858 popl IVP
7859 #endif
7860+ pax_force_retaddr 0, 1
7861 ret
7862+ENDPROC(aesni_cbc_enc)
7863
7864 /*
7865 * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7866@@ -2498,7 +2523,9 @@ ENTRY(aesni_cbc_dec)
7867 popl LEN
7868 popl IVP
7869 #endif
7870+ pax_force_retaddr 0, 1
7871 ret
7872+ENDPROC(aesni_cbc_dec)
7873
7874 #ifdef __x86_64__
7875 .align 16
7876@@ -2524,6 +2551,7 @@ _aesni_inc_init:
7877 mov $1, TCTR_LOW
7878 MOVQ_R64_XMM TCTR_LOW INC
7879 MOVQ_R64_XMM CTR TCTR_LOW
7880+ pax_force_retaddr_bts
7881 ret
7882
7883 /*
7884@@ -2552,6 +2580,7 @@ _aesni_inc:
7885 .Linc_low:
7886 movaps CTR, IV
7887 PSHUFB_XMM BSWAP_MASK IV
7888+ pax_force_retaddr_bts
7889 ret
7890
7891 /*
7892@@ -2612,5 +2641,7 @@ ENTRY(aesni_ctr_enc)
7893 .Lctr_enc_ret:
7894 movups IV, (IVP)
7895 .Lctr_enc_just_ret:
7896+ pax_force_retaddr 0, 1
7897 ret
7898+ENDPROC(aesni_ctr_enc)
7899 #endif
7900diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
7901index 545d0ce..14841a6 100644
7902--- a/arch/x86/crypto/aesni-intel_glue.c
7903+++ b/arch/x86/crypto/aesni-intel_glue.c
7904@@ -929,6 +929,8 @@ out_free_ablkcipher:
7905 }
7906
7907 static int rfc4106_set_key(struct crypto_aead *parent, const u8 *key,
7908+ unsigned int key_len) __size_overflow(3);
7909+static int rfc4106_set_key(struct crypto_aead *parent, const u8 *key,
7910 unsigned int key_len)
7911 {
7912 int ret = 0;
7913diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
7914index 391d245..67f35c2 100644
7915--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
7916+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
7917@@ -20,6 +20,8 @@
7918 *
7919 */
7920
7921+#include <asm/alternative-asm.h>
7922+
7923 .file "blowfish-x86_64-asm.S"
7924 .text
7925
7926@@ -151,9 +153,11 @@ __blowfish_enc_blk:
7927 jnz __enc_xor;
7928
7929 write_block();
7930+ pax_force_retaddr 0, 1
7931 ret;
7932 __enc_xor:
7933 xor_block();
7934+ pax_force_retaddr 0, 1
7935 ret;
7936
7937 .align 8
7938@@ -188,6 +192,7 @@ blowfish_dec_blk:
7939
7940 movq %r11, %rbp;
7941
7942+ pax_force_retaddr 0, 1
7943 ret;
7944
7945 /**********************************************************************
7946@@ -342,6 +347,7 @@ __blowfish_enc_blk_4way:
7947
7948 popq %rbx;
7949 popq %rbp;
7950+ pax_force_retaddr 0, 1
7951 ret;
7952
7953 __enc_xor4:
7954@@ -349,6 +355,7 @@ __enc_xor4:
7955
7956 popq %rbx;
7957 popq %rbp;
7958+ pax_force_retaddr 0, 1
7959 ret;
7960
7961 .align 8
7962@@ -386,5 +393,6 @@ blowfish_dec_blk_4way:
7963 popq %rbx;
7964 popq %rbp;
7965
7966+ pax_force_retaddr 0, 1
7967 ret;
7968
7969diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7970index 6214a9b..1f4fc9a 100644
7971--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
7972+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7973@@ -1,3 +1,5 @@
7974+#include <asm/alternative-asm.h>
7975+
7976 # enter ECRYPT_encrypt_bytes
7977 .text
7978 .p2align 5
7979@@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
7980 add %r11,%rsp
7981 mov %rdi,%rax
7982 mov %rsi,%rdx
7983+ pax_force_retaddr 0, 1
7984 ret
7985 # bytesatleast65:
7986 ._bytesatleast65:
7987@@ -891,6 +894,7 @@ ECRYPT_keysetup:
7988 add %r11,%rsp
7989 mov %rdi,%rax
7990 mov %rsi,%rdx
7991+ pax_force_retaddr
7992 ret
7993 # enter ECRYPT_ivsetup
7994 .text
7995@@ -917,4 +921,5 @@ ECRYPT_ivsetup:
7996 add %r11,%rsp
7997 mov %rdi,%rax
7998 mov %rsi,%rdx
7999+ pax_force_retaddr
8000 ret
8001diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8002index 7f24a15..9cd3ffe 100644
8003--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8004+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8005@@ -24,6 +24,8 @@
8006 *
8007 */
8008
8009+#include <asm/alternative-asm.h>
8010+
8011 .file "serpent-sse2-x86_64-asm_64.S"
8012 .text
8013
8014@@ -695,12 +697,14 @@ __serpent_enc_blk_8way:
8015 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
8016 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
8017
8018+ pax_force_retaddr
8019 ret;
8020
8021 __enc_xor8:
8022 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
8023 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
8024
8025+ pax_force_retaddr
8026 ret;
8027
8028 .align 8
8029@@ -758,4 +762,5 @@ serpent_dec_blk_8way:
8030 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
8031 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
8032
8033+ pax_force_retaddr
8034 ret;
8035diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
8036index b2c2f57..8470cab 100644
8037--- a/arch/x86/crypto/sha1_ssse3_asm.S
8038+++ b/arch/x86/crypto/sha1_ssse3_asm.S
8039@@ -28,6 +28,8 @@
8040 * (at your option) any later version.
8041 */
8042
8043+#include <asm/alternative-asm.h>
8044+
8045 #define CTX %rdi // arg1
8046 #define BUF %rsi // arg2
8047 #define CNT %rdx // arg3
8048@@ -104,6 +106,7 @@
8049 pop %r12
8050 pop %rbp
8051 pop %rbx
8052+ pax_force_retaddr 0, 1
8053 ret
8054
8055 .size \name, .-\name
8056diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8057index 5b012a2..36d5364 100644
8058--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8059+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8060@@ -20,6 +20,8 @@
8061 *
8062 */
8063
8064+#include <asm/alternative-asm.h>
8065+
8066 .file "twofish-x86_64-asm-3way.S"
8067 .text
8068
8069@@ -260,6 +262,7 @@ __twofish_enc_blk_3way:
8070 popq %r13;
8071 popq %r14;
8072 popq %r15;
8073+ pax_force_retaddr 0, 1
8074 ret;
8075
8076 __enc_xor3:
8077@@ -271,6 +274,7 @@ __enc_xor3:
8078 popq %r13;
8079 popq %r14;
8080 popq %r15;
8081+ pax_force_retaddr 0, 1
8082 ret;
8083
8084 .global twofish_dec_blk_3way
8085@@ -312,5 +316,6 @@ twofish_dec_blk_3way:
8086 popq %r13;
8087 popq %r14;
8088 popq %r15;
8089+ pax_force_retaddr 0, 1
8090 ret;
8091
8092diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
8093index 7bcf3fc..f53832f 100644
8094--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
8095+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
8096@@ -21,6 +21,7 @@
8097 .text
8098
8099 #include <asm/asm-offsets.h>
8100+#include <asm/alternative-asm.h>
8101
8102 #define a_offset 0
8103 #define b_offset 4
8104@@ -268,6 +269,7 @@ twofish_enc_blk:
8105
8106 popq R1
8107 movq $1,%rax
8108+ pax_force_retaddr 0, 1
8109 ret
8110
8111 twofish_dec_blk:
8112@@ -319,4 +321,5 @@ twofish_dec_blk:
8113
8114 popq R1
8115 movq $1,%rax
8116+ pax_force_retaddr 0, 1
8117 ret
8118diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
8119index 39e4909..887aa7e 100644
8120--- a/arch/x86/ia32/ia32_aout.c
8121+++ b/arch/x86/ia32/ia32_aout.c
8122@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
8123 unsigned long dump_start, dump_size;
8124 struct user32 dump;
8125
8126+ memset(&dump, 0, sizeof(dump));
8127+
8128 fs = get_fs();
8129 set_fs(KERNEL_DS);
8130 has_dumped = 1;
8131diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
8132index 6557769..ef6ae89 100644
8133--- a/arch/x86/ia32/ia32_signal.c
8134+++ b/arch/x86/ia32/ia32_signal.c
8135@@ -169,7 +169,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
8136 }
8137 seg = get_fs();
8138 set_fs(KERNEL_DS);
8139- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
8140+ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
8141 set_fs(seg);
8142 if (ret >= 0 && uoss_ptr) {
8143 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
8144@@ -370,7 +370,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
8145 */
8146 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8147 size_t frame_size,
8148- void **fpstate)
8149+ void __user **fpstate)
8150 {
8151 unsigned long sp;
8152
8153@@ -391,7 +391,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8154
8155 if (used_math()) {
8156 sp = sp - sig_xstate_ia32_size;
8157- *fpstate = (struct _fpstate_ia32 *) sp;
8158+ *fpstate = (struct _fpstate_ia32 __user *) sp;
8159 if (save_i387_xstate_ia32(*fpstate) < 0)
8160 return (void __user *) -1L;
8161 }
8162@@ -399,7 +399,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8163 sp -= frame_size;
8164 /* Align the stack pointer according to the i386 ABI,
8165 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
8166- sp = ((sp + 4) & -16ul) - 4;
8167+ sp = ((sp - 12) & -16ul) - 4;
8168 return (void __user *) sp;
8169 }
8170
8171@@ -457,7 +457,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
8172 * These are actually not used anymore, but left because some
8173 * gdb versions depend on them as a marker.
8174 */
8175- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8176+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8177 } put_user_catch(err);
8178
8179 if (err)
8180@@ -499,7 +499,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8181 0xb8,
8182 __NR_ia32_rt_sigreturn,
8183 0x80cd,
8184- 0,
8185+ 0
8186 };
8187
8188 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
8189@@ -529,16 +529,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8190
8191 if (ka->sa.sa_flags & SA_RESTORER)
8192 restorer = ka->sa.sa_restorer;
8193+ else if (current->mm->context.vdso)
8194+ /* Return stub is in 32bit vsyscall page */
8195+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
8196 else
8197- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
8198- rt_sigreturn);
8199+ restorer = &frame->retcode;
8200 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
8201
8202 /*
8203 * Not actually used anymore, but left because some gdb
8204 * versions need it.
8205 */
8206- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8207+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8208 } put_user_catch(err);
8209
8210 if (err)
8211diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
8212index e3e7340..05ed805 100644
8213--- a/arch/x86/ia32/ia32entry.S
8214+++ b/arch/x86/ia32/ia32entry.S
8215@@ -13,8 +13,10 @@
8216 #include <asm/thread_info.h>
8217 #include <asm/segment.h>
8218 #include <asm/irqflags.h>
8219+#include <asm/pgtable.h>
8220 #include <linux/linkage.h>
8221 #include <linux/err.h>
8222+#include <asm/alternative-asm.h>
8223
8224 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
8225 #include <linux/elf-em.h>
8226@@ -94,6 +96,32 @@ ENTRY(native_irq_enable_sysexit)
8227 ENDPROC(native_irq_enable_sysexit)
8228 #endif
8229
8230+ .macro pax_enter_kernel_user
8231+ pax_set_fptr_mask
8232+#ifdef CONFIG_PAX_MEMORY_UDEREF
8233+ call pax_enter_kernel_user
8234+#endif
8235+ .endm
8236+
8237+ .macro pax_exit_kernel_user
8238+#ifdef CONFIG_PAX_MEMORY_UDEREF
8239+ call pax_exit_kernel_user
8240+#endif
8241+#ifdef CONFIG_PAX_RANDKSTACK
8242+ pushq %rax
8243+ pushq %r11
8244+ call pax_randomize_kstack
8245+ popq %r11
8246+ popq %rax
8247+#endif
8248+ .endm
8249+
8250+.macro pax_erase_kstack
8251+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
8252+ call pax_erase_kstack
8253+#endif
8254+.endm
8255+
8256 /*
8257 * 32bit SYSENTER instruction entry.
8258 *
8259@@ -120,12 +148,6 @@ ENTRY(ia32_sysenter_target)
8260 CFI_REGISTER rsp,rbp
8261 SWAPGS_UNSAFE_STACK
8262 movq PER_CPU_VAR(kernel_stack), %rsp
8263- addq $(KERNEL_STACK_OFFSET),%rsp
8264- /*
8265- * No need to follow this irqs on/off section: the syscall
8266- * disabled irqs, here we enable it straight after entry:
8267- */
8268- ENABLE_INTERRUPTS(CLBR_NONE)
8269 movl %ebp,%ebp /* zero extension */
8270 pushq_cfi $__USER32_DS
8271 /*CFI_REL_OFFSET ss,0*/
8272@@ -133,24 +155,39 @@ ENTRY(ia32_sysenter_target)
8273 CFI_REL_OFFSET rsp,0
8274 pushfq_cfi
8275 /*CFI_REL_OFFSET rflags,0*/
8276- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
8277- CFI_REGISTER rip,r10
8278+ orl $X86_EFLAGS_IF,(%rsp)
8279+ GET_THREAD_INFO(%r11)
8280+ movl TI_sysenter_return(%r11), %r11d
8281+ CFI_REGISTER rip,r11
8282 pushq_cfi $__USER32_CS
8283 /*CFI_REL_OFFSET cs,0*/
8284 movl %eax, %eax
8285- pushq_cfi %r10
8286+ pushq_cfi %r11
8287 CFI_REL_OFFSET rip,0
8288 pushq_cfi %rax
8289 cld
8290 SAVE_ARGS 0,1,0
8291+ pax_enter_kernel_user
8292+ /*
8293+ * No need to follow this irqs on/off section: the syscall
8294+ * disabled irqs, here we enable it straight after entry:
8295+ */
8296+ ENABLE_INTERRUPTS(CLBR_NONE)
8297 /* no need to do an access_ok check here because rbp has been
8298 32bit zero extended */
8299+
8300+#ifdef CONFIG_PAX_MEMORY_UDEREF
8301+ mov $PAX_USER_SHADOW_BASE,%r11
8302+ add %r11,%rbp
8303+#endif
8304+
8305 1: movl (%rbp),%ebp
8306 .section __ex_table,"a"
8307 .quad 1b,ia32_badarg
8308 .previous
8309- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8310- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8311+ GET_THREAD_INFO(%r11)
8312+ orl $TS_COMPAT,TI_status(%r11)
8313+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8314 CFI_REMEMBER_STATE
8315 jnz sysenter_tracesys
8316 cmpq $(IA32_NR_syscalls-1),%rax
8317@@ -160,12 +197,15 @@ sysenter_do_call:
8318 sysenter_dispatch:
8319 call *ia32_sys_call_table(,%rax,8)
8320 movq %rax,RAX-ARGOFFSET(%rsp)
8321+ GET_THREAD_INFO(%r11)
8322 DISABLE_INTERRUPTS(CLBR_NONE)
8323 TRACE_IRQS_OFF
8324- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8325+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8326 jnz sysexit_audit
8327 sysexit_from_sys_call:
8328- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8329+ pax_exit_kernel_user
8330+ pax_erase_kstack
8331+ andl $~TS_COMPAT,TI_status(%r11)
8332 /* clear IF, that popfq doesn't enable interrupts early */
8333 andl $~0x200,EFLAGS-R11(%rsp)
8334 movl RIP-R11(%rsp),%edx /* User %eip */
8335@@ -191,6 +231,9 @@ sysexit_from_sys_call:
8336 movl %eax,%esi /* 2nd arg: syscall number */
8337 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
8338 call __audit_syscall_entry
8339+
8340+ pax_erase_kstack
8341+
8342 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
8343 cmpq $(IA32_NR_syscalls-1),%rax
8344 ja ia32_badsys
8345@@ -202,7 +245,7 @@ sysexit_from_sys_call:
8346 .endm
8347
8348 .macro auditsys_exit exit
8349- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8350+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8351 jnz ia32_ret_from_sys_call
8352 TRACE_IRQS_ON
8353 sti
8354@@ -213,11 +256,12 @@ sysexit_from_sys_call:
8355 1: setbe %al /* 1 if error, 0 if not */
8356 movzbl %al,%edi /* zero-extend that into %edi */
8357 call __audit_syscall_exit
8358+ GET_THREAD_INFO(%r11)
8359 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
8360 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
8361 cli
8362 TRACE_IRQS_OFF
8363- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8364+ testl %edi,TI_flags(%r11)
8365 jz \exit
8366 CLEAR_RREGS -ARGOFFSET
8367 jmp int_with_check
8368@@ -235,7 +279,7 @@ sysexit_audit:
8369
8370 sysenter_tracesys:
8371 #ifdef CONFIG_AUDITSYSCALL
8372- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8373+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8374 jz sysenter_auditsys
8375 #endif
8376 SAVE_REST
8377@@ -243,6 +287,9 @@ sysenter_tracesys:
8378 movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
8379 movq %rsp,%rdi /* &pt_regs -> arg1 */
8380 call syscall_trace_enter
8381+
8382+ pax_erase_kstack
8383+
8384 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8385 RESTORE_REST
8386 cmpq $(IA32_NR_syscalls-1),%rax
8387@@ -274,19 +321,20 @@ ENDPROC(ia32_sysenter_target)
8388 ENTRY(ia32_cstar_target)
8389 CFI_STARTPROC32 simple
8390 CFI_SIGNAL_FRAME
8391- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
8392+ CFI_DEF_CFA rsp,0
8393 CFI_REGISTER rip,rcx
8394 /*CFI_REGISTER rflags,r11*/
8395 SWAPGS_UNSAFE_STACK
8396 movl %esp,%r8d
8397 CFI_REGISTER rsp,r8
8398 movq PER_CPU_VAR(kernel_stack),%rsp
8399+ SAVE_ARGS 8*6,0,0
8400+ pax_enter_kernel_user
8401 /*
8402 * No need to follow this irqs on/off section: the syscall
8403 * disabled irqs and here we enable it straight after entry:
8404 */
8405 ENABLE_INTERRUPTS(CLBR_NONE)
8406- SAVE_ARGS 8,0,0
8407 movl %eax,%eax /* zero extension */
8408 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
8409 movq %rcx,RIP-ARGOFFSET(%rsp)
8410@@ -302,12 +350,19 @@ ENTRY(ia32_cstar_target)
8411 /* no need to do an access_ok check here because r8 has been
8412 32bit zero extended */
8413 /* hardware stack frame is complete now */
8414+
8415+#ifdef CONFIG_PAX_MEMORY_UDEREF
8416+ mov $PAX_USER_SHADOW_BASE,%r11
8417+ add %r11,%r8
8418+#endif
8419+
8420 1: movl (%r8),%r9d
8421 .section __ex_table,"a"
8422 .quad 1b,ia32_badarg
8423 .previous
8424- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8425- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
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@@ -317,12 +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(%r11)
8437 DISABLE_INTERRUPTS(CLBR_NONE)
8438 TRACE_IRQS_OFF
8439- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8440+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8441 jnz sysretl_audit
8442 sysretl_from_sys_call:
8443- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8444+ pax_exit_kernel_user
8445+ pax_erase_kstack
8446+ andl $~TS_COMPAT,TI_status(%r11)
8447 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
8448 movl RIP-ARGOFFSET(%rsp),%ecx
8449 CFI_REGISTER rip,rcx
8450@@ -350,7 +408,7 @@ sysretl_audit:
8451
8452 cstar_tracesys:
8453 #ifdef CONFIG_AUDITSYSCALL
8454- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8455+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8456 jz cstar_auditsys
8457 #endif
8458 xchgl %r9d,%ebp
8459@@ -359,6 +417,9 @@ cstar_tracesys:
8460 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8461 movq %rsp,%rdi /* &pt_regs -> arg1 */
8462 call syscall_trace_enter
8463+
8464+ pax_erase_kstack
8465+
8466 LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
8467 RESTORE_REST
8468 xchgl %ebp,%r9d
8469@@ -404,19 +465,21 @@ ENTRY(ia32_syscall)
8470 CFI_REL_OFFSET rip,RIP-RIP
8471 PARAVIRT_ADJUST_EXCEPTION_FRAME
8472 SWAPGS
8473- /*
8474- * No need to follow this irqs on/off section: the syscall
8475- * disabled irqs and here we enable it straight after entry:
8476- */
8477- ENABLE_INTERRUPTS(CLBR_NONE)
8478 movl %eax,%eax
8479 pushq_cfi %rax
8480 cld
8481 /* note the registers are not zero extended to the sf.
8482 this could be a problem. */
8483 SAVE_ARGS 0,1,0
8484- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8485- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8486+ pax_enter_kernel_user
8487+ /*
8488+ * No need to follow this irqs on/off section: the syscall
8489+ * disabled irqs and here we enable it straight after entry:
8490+ */
8491+ ENABLE_INTERRUPTS(CLBR_NONE)
8492+ GET_THREAD_INFO(%r11)
8493+ orl $TS_COMPAT,TI_status(%r11)
8494+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8495 jnz ia32_tracesys
8496 cmpq $(IA32_NR_syscalls-1),%rax
8497 ja ia32_badsys
8498@@ -435,6 +498,9 @@ ia32_tracesys:
8499 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8500 movq %rsp,%rdi /* &pt_regs -> arg1 */
8501 call syscall_trace_enter
8502+
8503+ pax_erase_kstack
8504+
8505 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8506 RESTORE_REST
8507 cmpq $(IA32_NR_syscalls-1),%rax
8508diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
8509index f6f5c53..b358b28 100644
8510--- a/arch/x86/ia32/sys_ia32.c
8511+++ b/arch/x86/ia32/sys_ia32.c
8512@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
8513 */
8514 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
8515 {
8516- typeof(ubuf->st_uid) uid = 0;
8517- typeof(ubuf->st_gid) gid = 0;
8518+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
8519+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
8520 SET_UID(uid, stat->uid);
8521 SET_GID(gid, stat->gid);
8522 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
8523@@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
8524 }
8525 set_fs(KERNEL_DS);
8526 ret = sys_rt_sigprocmask(how,
8527- set ? (sigset_t __user *)&s : NULL,
8528- oset ? (sigset_t __user *)&s : NULL,
8529+ set ? (sigset_t __force_user *)&s : NULL,
8530+ oset ? (sigset_t __force_user *)&s : NULL,
8531 sigsetsize);
8532 set_fs(old_fs);
8533 if (ret)
8534@@ -332,7 +332,7 @@ asmlinkage long sys32_alarm(unsigned int seconds)
8535 return alarm_setitimer(seconds);
8536 }
8537
8538-asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
8539+asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
8540 int options)
8541 {
8542 return compat_sys_wait4(pid, stat_addr, options, NULL);
8543@@ -353,7 +353,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
8544 mm_segment_t old_fs = get_fs();
8545
8546 set_fs(KERNEL_DS);
8547- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
8548+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
8549 set_fs(old_fs);
8550 if (put_compat_timespec(&t, interval))
8551 return -EFAULT;
8552@@ -369,7 +369,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
8553 mm_segment_t old_fs = get_fs();
8554
8555 set_fs(KERNEL_DS);
8556- ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
8557+ ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
8558 set_fs(old_fs);
8559 if (!ret) {
8560 switch (_NSIG_WORDS) {
8561@@ -394,7 +394,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
8562 if (copy_siginfo_from_user32(&info, uinfo))
8563 return -EFAULT;
8564 set_fs(KERNEL_DS);
8565- ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
8566+ ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
8567 set_fs(old_fs);
8568 return ret;
8569 }
8570@@ -439,7 +439,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
8571 return -EFAULT;
8572
8573 set_fs(KERNEL_DS);
8574- ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
8575+ ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
8576 count);
8577 set_fs(old_fs);
8578
8579diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
8580index 952bd01..7692c6f 100644
8581--- a/arch/x86/include/asm/alternative-asm.h
8582+++ b/arch/x86/include/asm/alternative-asm.h
8583@@ -15,6 +15,45 @@
8584 .endm
8585 #endif
8586
8587+#ifdef KERNEXEC_PLUGIN
8588+ .macro pax_force_retaddr_bts rip=0
8589+ btsq $63,\rip(%rsp)
8590+ .endm
8591+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
8592+ .macro pax_force_retaddr rip=0, reload=0
8593+ btsq $63,\rip(%rsp)
8594+ .endm
8595+ .macro pax_force_fptr ptr
8596+ btsq $63,\ptr
8597+ .endm
8598+ .macro pax_set_fptr_mask
8599+ .endm
8600+#endif
8601+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
8602+ .macro pax_force_retaddr rip=0, reload=0
8603+ .if \reload
8604+ pax_set_fptr_mask
8605+ .endif
8606+ orq %r10,\rip(%rsp)
8607+ .endm
8608+ .macro pax_force_fptr ptr
8609+ orq %r10,\ptr
8610+ .endm
8611+ .macro pax_set_fptr_mask
8612+ movabs $0x8000000000000000,%r10
8613+ .endm
8614+#endif
8615+#else
8616+ .macro pax_force_retaddr rip=0, reload=0
8617+ .endm
8618+ .macro pax_force_fptr ptr
8619+ .endm
8620+ .macro pax_force_retaddr_bts rip=0
8621+ .endm
8622+ .macro pax_set_fptr_mask
8623+ .endm
8624+#endif
8625+
8626 .macro altinstruction_entry orig alt feature orig_len alt_len
8627 .long \orig - .
8628 .long \alt - .
8629diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
8630index 37ad100..7d47faa 100644
8631--- a/arch/x86/include/asm/alternative.h
8632+++ b/arch/x86/include/asm/alternative.h
8633@@ -89,7 +89,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
8634 ".section .discard,\"aw\",@progbits\n" \
8635 " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
8636 ".previous\n" \
8637- ".section .altinstr_replacement, \"ax\"\n" \
8638+ ".section .altinstr_replacement, \"a\"\n" \
8639 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
8640 ".previous"
8641
8642diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
8643index 3ab9bdd..238033e 100644
8644--- a/arch/x86/include/asm/apic.h
8645+++ b/arch/x86/include/asm/apic.h
8646@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
8647
8648 #ifdef CONFIG_X86_LOCAL_APIC
8649
8650-extern unsigned int apic_verbosity;
8651+extern int apic_verbosity;
8652 extern int local_apic_timer_c2_ok;
8653
8654 extern int disable_apic;
8655diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
8656index 20370c6..a2eb9b0 100644
8657--- a/arch/x86/include/asm/apm.h
8658+++ b/arch/x86/include/asm/apm.h
8659@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
8660 __asm__ __volatile__(APM_DO_ZERO_SEGS
8661 "pushl %%edi\n\t"
8662 "pushl %%ebp\n\t"
8663- "lcall *%%cs:apm_bios_entry\n\t"
8664+ "lcall *%%ss:apm_bios_entry\n\t"
8665 "setc %%al\n\t"
8666 "popl %%ebp\n\t"
8667 "popl %%edi\n\t"
8668@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
8669 __asm__ __volatile__(APM_DO_ZERO_SEGS
8670 "pushl %%edi\n\t"
8671 "pushl %%ebp\n\t"
8672- "lcall *%%cs:apm_bios_entry\n\t"
8673+ "lcall *%%ss:apm_bios_entry\n\t"
8674 "setc %%bl\n\t"
8675 "popl %%ebp\n\t"
8676 "popl %%edi\n\t"
8677diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
8678index 58cb6d4..ca9010d 100644
8679--- a/arch/x86/include/asm/atomic.h
8680+++ b/arch/x86/include/asm/atomic.h
8681@@ -22,7 +22,18 @@
8682 */
8683 static inline int atomic_read(const atomic_t *v)
8684 {
8685- return (*(volatile int *)&(v)->counter);
8686+ return (*(volatile const int *)&(v)->counter);
8687+}
8688+
8689+/**
8690+ * atomic_read_unchecked - read atomic variable
8691+ * @v: pointer of type atomic_unchecked_t
8692+ *
8693+ * Atomically reads the value of @v.
8694+ */
8695+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8696+{
8697+ return (*(volatile const int *)&(v)->counter);
8698 }
8699
8700 /**
8701@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
8702 }
8703
8704 /**
8705+ * atomic_set_unchecked - set atomic variable
8706+ * @v: pointer of type atomic_unchecked_t
8707+ * @i: required value
8708+ *
8709+ * Atomically sets the value of @v to @i.
8710+ */
8711+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8712+{
8713+ v->counter = i;
8714+}
8715+
8716+/**
8717 * atomic_add - add integer to atomic variable
8718 * @i: integer value to add
8719 * @v: pointer of type atomic_t
8720@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
8721 */
8722 static inline void atomic_add(int i, atomic_t *v)
8723 {
8724- asm volatile(LOCK_PREFIX "addl %1,%0"
8725+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8726+
8727+#ifdef CONFIG_PAX_REFCOUNT
8728+ "jno 0f\n"
8729+ LOCK_PREFIX "subl %1,%0\n"
8730+ "int $4\n0:\n"
8731+ _ASM_EXTABLE(0b, 0b)
8732+#endif
8733+
8734+ : "+m" (v->counter)
8735+ : "ir" (i));
8736+}
8737+
8738+/**
8739+ * atomic_add_unchecked - add integer to atomic variable
8740+ * @i: integer value to add
8741+ * @v: pointer of type atomic_unchecked_t
8742+ *
8743+ * Atomically adds @i to @v.
8744+ */
8745+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
8746+{
8747+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8748 : "+m" (v->counter)
8749 : "ir" (i));
8750 }
8751@@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
8752 */
8753 static inline void atomic_sub(int i, atomic_t *v)
8754 {
8755- asm volatile(LOCK_PREFIX "subl %1,%0"
8756+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8757+
8758+#ifdef CONFIG_PAX_REFCOUNT
8759+ "jno 0f\n"
8760+ LOCK_PREFIX "addl %1,%0\n"
8761+ "int $4\n0:\n"
8762+ _ASM_EXTABLE(0b, 0b)
8763+#endif
8764+
8765+ : "+m" (v->counter)
8766+ : "ir" (i));
8767+}
8768+
8769+/**
8770+ * atomic_sub_unchecked - subtract integer from atomic variable
8771+ * @i: integer value to subtract
8772+ * @v: pointer of type atomic_unchecked_t
8773+ *
8774+ * Atomically subtracts @i from @v.
8775+ */
8776+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
8777+{
8778+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8779 : "+m" (v->counter)
8780 : "ir" (i));
8781 }
8782@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8783 {
8784 unsigned char c;
8785
8786- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
8787+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
8788+
8789+#ifdef CONFIG_PAX_REFCOUNT
8790+ "jno 0f\n"
8791+ LOCK_PREFIX "addl %2,%0\n"
8792+ "int $4\n0:\n"
8793+ _ASM_EXTABLE(0b, 0b)
8794+#endif
8795+
8796+ "sete %1\n"
8797 : "+m" (v->counter), "=qm" (c)
8798 : "ir" (i) : "memory");
8799 return c;
8800@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8801 */
8802 static inline void atomic_inc(atomic_t *v)
8803 {
8804- asm volatile(LOCK_PREFIX "incl %0"
8805+ asm volatile(LOCK_PREFIX "incl %0\n"
8806+
8807+#ifdef CONFIG_PAX_REFCOUNT
8808+ "jno 0f\n"
8809+ LOCK_PREFIX "decl %0\n"
8810+ "int $4\n0:\n"
8811+ _ASM_EXTABLE(0b, 0b)
8812+#endif
8813+
8814+ : "+m" (v->counter));
8815+}
8816+
8817+/**
8818+ * atomic_inc_unchecked - increment atomic variable
8819+ * @v: pointer of type atomic_unchecked_t
8820+ *
8821+ * Atomically increments @v by 1.
8822+ */
8823+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
8824+{
8825+ asm volatile(LOCK_PREFIX "incl %0\n"
8826 : "+m" (v->counter));
8827 }
8828
8829@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
8830 */
8831 static inline void atomic_dec(atomic_t *v)
8832 {
8833- asm volatile(LOCK_PREFIX "decl %0"
8834+ asm volatile(LOCK_PREFIX "decl %0\n"
8835+
8836+#ifdef CONFIG_PAX_REFCOUNT
8837+ "jno 0f\n"
8838+ LOCK_PREFIX "incl %0\n"
8839+ "int $4\n0:\n"
8840+ _ASM_EXTABLE(0b, 0b)
8841+#endif
8842+
8843+ : "+m" (v->counter));
8844+}
8845+
8846+/**
8847+ * atomic_dec_unchecked - decrement atomic variable
8848+ * @v: pointer of type atomic_unchecked_t
8849+ *
8850+ * Atomically decrements @v by 1.
8851+ */
8852+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
8853+{
8854+ asm volatile(LOCK_PREFIX "decl %0\n"
8855 : "+m" (v->counter));
8856 }
8857
8858@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
8859 {
8860 unsigned char c;
8861
8862- asm volatile(LOCK_PREFIX "decl %0; sete %1"
8863+ asm volatile(LOCK_PREFIX "decl %0\n"
8864+
8865+#ifdef CONFIG_PAX_REFCOUNT
8866+ "jno 0f\n"
8867+ LOCK_PREFIX "incl %0\n"
8868+ "int $4\n0:\n"
8869+ _ASM_EXTABLE(0b, 0b)
8870+#endif
8871+
8872+ "sete %1\n"
8873 : "+m" (v->counter), "=qm" (c)
8874 : : "memory");
8875 return c != 0;
8876@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
8877 {
8878 unsigned char c;
8879
8880- asm volatile(LOCK_PREFIX "incl %0; sete %1"
8881+ asm volatile(LOCK_PREFIX "incl %0\n"
8882+
8883+#ifdef CONFIG_PAX_REFCOUNT
8884+ "jno 0f\n"
8885+ LOCK_PREFIX "decl %0\n"
8886+ "int $4\n0:\n"
8887+ _ASM_EXTABLE(0b, 0b)
8888+#endif
8889+
8890+ "sete %1\n"
8891+ : "+m" (v->counter), "=qm" (c)
8892+ : : "memory");
8893+ return c != 0;
8894+}
8895+
8896+/**
8897+ * atomic_inc_and_test_unchecked - increment and test
8898+ * @v: pointer of type atomic_unchecked_t
8899+ *
8900+ * Atomically increments @v by 1
8901+ * and returns true if the result is zero, or false for all
8902+ * other cases.
8903+ */
8904+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
8905+{
8906+ unsigned char c;
8907+
8908+ asm volatile(LOCK_PREFIX "incl %0\n"
8909+ "sete %1\n"
8910 : "+m" (v->counter), "=qm" (c)
8911 : : "memory");
8912 return c != 0;
8913@@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
8914 {
8915 unsigned char c;
8916
8917- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
8918+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
8919+
8920+#ifdef CONFIG_PAX_REFCOUNT
8921+ "jno 0f\n"
8922+ LOCK_PREFIX "subl %2,%0\n"
8923+ "int $4\n0:\n"
8924+ _ASM_EXTABLE(0b, 0b)
8925+#endif
8926+
8927+ "sets %1\n"
8928 : "+m" (v->counter), "=qm" (c)
8929 : "ir" (i) : "memory");
8930 return c;
8931@@ -179,7 +341,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
8932 goto no_xadd;
8933 #endif
8934 /* Modern 486+ processor */
8935- return i + xadd(&v->counter, i);
8936+ return i + xadd_check_overflow(&v->counter, i);
8937
8938 #ifdef CONFIG_M386
8939 no_xadd: /* Legacy 386 processor */
8940@@ -192,6 +354,34 @@ no_xadd: /* Legacy 386 processor */
8941 }
8942
8943 /**
8944+ * atomic_add_return_unchecked - add integer and return
8945+ * @i: integer value to add
8946+ * @v: pointer of type atomic_unchecked_t
8947+ *
8948+ * Atomically adds @i to @v and returns @i + @v
8949+ */
8950+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
8951+{
8952+#ifdef CONFIG_M386
8953+ int __i;
8954+ unsigned long flags;
8955+ if (unlikely(boot_cpu_data.x86 <= 3))
8956+ goto no_xadd;
8957+#endif
8958+ /* Modern 486+ processor */
8959+ return i + xadd(&v->counter, i);
8960+
8961+#ifdef CONFIG_M386
8962+no_xadd: /* Legacy 386 processor */
8963+ raw_local_irq_save(flags);
8964+ __i = atomic_read_unchecked(v);
8965+ atomic_set_unchecked(v, i + __i);
8966+ raw_local_irq_restore(flags);
8967+ return i + __i;
8968+#endif
8969+}
8970+
8971+/**
8972 * atomic_sub_return - subtract integer and return
8973 * @v: pointer of type atomic_t
8974 * @i: integer value to subtract
8975@@ -204,6 +394,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
8976 }
8977
8978 #define atomic_inc_return(v) (atomic_add_return(1, v))
8979+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
8980+{
8981+ return atomic_add_return_unchecked(1, v);
8982+}
8983 #define atomic_dec_return(v) (atomic_sub_return(1, v))
8984
8985 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
8986@@ -211,11 +405,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
8987 return cmpxchg(&v->counter, old, new);
8988 }
8989
8990+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
8991+{
8992+ return cmpxchg(&v->counter, old, new);
8993+}
8994+
8995 static inline int atomic_xchg(atomic_t *v, int new)
8996 {
8997 return xchg(&v->counter, new);
8998 }
8999
9000+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9001+{
9002+ return xchg(&v->counter, new);
9003+}
9004+
9005 /**
9006 * __atomic_add_unless - add unless the number is already a given value
9007 * @v: pointer of type atomic_t
9008@@ -227,12 +431,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
9009 */
9010 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9011 {
9012- int c, old;
9013+ int c, old, new;
9014 c = atomic_read(v);
9015 for (;;) {
9016- if (unlikely(c == (u)))
9017+ if (unlikely(c == u))
9018 break;
9019- old = atomic_cmpxchg((v), c, c + (a));
9020+
9021+ asm volatile("addl %2,%0\n"
9022+
9023+#ifdef CONFIG_PAX_REFCOUNT
9024+ "jno 0f\n"
9025+ "subl %2,%0\n"
9026+ "int $4\n0:\n"
9027+ _ASM_EXTABLE(0b, 0b)
9028+#endif
9029+
9030+ : "=r" (new)
9031+ : "0" (c), "ir" (a));
9032+
9033+ old = atomic_cmpxchg(v, c, new);
9034 if (likely(old == c))
9035 break;
9036 c = old;
9037@@ -240,6 +457,48 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9038 return c;
9039 }
9040
9041+/**
9042+ * atomic_inc_not_zero_hint - increment if not null
9043+ * @v: pointer of type atomic_t
9044+ * @hint: probable value of the atomic before the increment
9045+ *
9046+ * This version of atomic_inc_not_zero() gives a hint of probable
9047+ * value of the atomic. This helps processor to not read the memory
9048+ * before doing the atomic read/modify/write cycle, lowering
9049+ * number of bus transactions on some arches.
9050+ *
9051+ * Returns: 0 if increment was not done, 1 otherwise.
9052+ */
9053+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
9054+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
9055+{
9056+ int val, c = hint, new;
9057+
9058+ /* sanity test, should be removed by compiler if hint is a constant */
9059+ if (!hint)
9060+ return __atomic_add_unless(v, 1, 0);
9061+
9062+ do {
9063+ asm volatile("incl %0\n"
9064+
9065+#ifdef CONFIG_PAX_REFCOUNT
9066+ "jno 0f\n"
9067+ "decl %0\n"
9068+ "int $4\n0:\n"
9069+ _ASM_EXTABLE(0b, 0b)
9070+#endif
9071+
9072+ : "=r" (new)
9073+ : "0" (c));
9074+
9075+ val = atomic_cmpxchg(v, c, new);
9076+ if (val == c)
9077+ return 1;
9078+ c = val;
9079+ } while (c);
9080+
9081+ return 0;
9082+}
9083
9084 /*
9085 * atomic_dec_if_positive - decrement by 1 if old value positive
9086diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
9087index fa13f0e..27c2e08 100644
9088--- a/arch/x86/include/asm/atomic64_32.h
9089+++ b/arch/x86/include/asm/atomic64_32.h
9090@@ -12,6 +12,14 @@ typedef struct {
9091 u64 __aligned(8) counter;
9092 } atomic64_t;
9093
9094+#ifdef CONFIG_PAX_REFCOUNT
9095+typedef struct {
9096+ u64 __aligned(8) counter;
9097+} atomic64_unchecked_t;
9098+#else
9099+typedef atomic64_t atomic64_unchecked_t;
9100+#endif
9101+
9102 #define ATOMIC64_INIT(val) { (val) }
9103
9104 #ifdef CONFIG_X86_CMPXCHG64
9105@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
9106 }
9107
9108 /**
9109+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
9110+ * @p: pointer to type atomic64_unchecked_t
9111+ * @o: expected value
9112+ * @n: new value
9113+ *
9114+ * Atomically sets @v to @n if it was equal to @o and returns
9115+ * the old value.
9116+ */
9117+
9118+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
9119+{
9120+ return cmpxchg64(&v->counter, o, n);
9121+}
9122+
9123+/**
9124 * atomic64_xchg - xchg atomic64 variable
9125 * @v: pointer to type atomic64_t
9126 * @n: value to assign
9127@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64_t *v, long long i)
9128 }
9129
9130 /**
9131+ * atomic64_set_unchecked - set atomic64 variable
9132+ * @v: pointer to type atomic64_unchecked_t
9133+ * @n: value to assign
9134+ *
9135+ * Atomically sets the value of @v to @n.
9136+ */
9137+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
9138+{
9139+ unsigned high = (unsigned)(i >> 32);
9140+ unsigned low = (unsigned)i;
9141+ asm volatile(ATOMIC64_ALTERNATIVE(set)
9142+ : "+b" (low), "+c" (high)
9143+ : "S" (v)
9144+ : "eax", "edx", "memory"
9145+ );
9146+}
9147+
9148+/**
9149 * atomic64_read - read atomic64 variable
9150 * @v: pointer to type atomic64_t
9151 *
9152@@ -93,6 +134,22 @@ static inline long long atomic64_read(const atomic64_t *v)
9153 }
9154
9155 /**
9156+ * atomic64_read_unchecked - read atomic64 variable
9157+ * @v: pointer to type atomic64_unchecked_t
9158+ *
9159+ * Atomically reads the value of @v and returns it.
9160+ */
9161+static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v)
9162+{
9163+ long long r;
9164+ asm volatile(ATOMIC64_ALTERNATIVE(read_unchecked)
9165+ : "=A" (r), "+c" (v)
9166+ : : "memory"
9167+ );
9168+ return r;
9169+ }
9170+
9171+/**
9172 * atomic64_add_return - add and return
9173 * @i: integer value to add
9174 * @v: pointer to type atomic64_t
9175@@ -108,6 +165,22 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
9176 return i;
9177 }
9178
9179+/**
9180+ * atomic64_add_return_unchecked - add and return
9181+ * @i: integer value to add
9182+ * @v: pointer to type atomic64_unchecked_t
9183+ *
9184+ * Atomically adds @i to @v and returns @i + *@v
9185+ */
9186+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
9187+{
9188+ asm volatile(ATOMIC64_ALTERNATIVE(add_return_unchecked)
9189+ : "+A" (i), "+c" (v)
9190+ : : "memory"
9191+ );
9192+ return i;
9193+}
9194+
9195 /*
9196 * Other variants with different arithmetic operators:
9197 */
9198@@ -131,6 +204,17 @@ static inline long long atomic64_inc_return(atomic64_t *v)
9199 return a;
9200 }
9201
9202+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9203+{
9204+ long long a;
9205+ asm volatile(ATOMIC64_ALTERNATIVE(inc_return_unchecked)
9206+ : "=A" (a)
9207+ : "S" (v)
9208+ : "memory", "ecx"
9209+ );
9210+ return a;
9211+}
9212+
9213 static inline long long atomic64_dec_return(atomic64_t *v)
9214 {
9215 long long a;
9216@@ -159,6 +243,22 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
9217 }
9218
9219 /**
9220+ * atomic64_add_unchecked - add integer to atomic64 variable
9221+ * @i: integer value to add
9222+ * @v: pointer to type atomic64_unchecked_t
9223+ *
9224+ * Atomically adds @i to @v.
9225+ */
9226+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
9227+{
9228+ asm volatile(ATOMIC64_ALTERNATIVE_(add_unchecked, add_return_unchecked)
9229+ : "+A" (i), "+c" (v)
9230+ : : "memory"
9231+ );
9232+ return i;
9233+}
9234+
9235+/**
9236 * atomic64_sub - subtract the atomic64 variable
9237 * @i: integer value to subtract
9238 * @v: pointer to type atomic64_t
9239diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
9240index 0e1cbfc..5623683 100644
9241--- a/arch/x86/include/asm/atomic64_64.h
9242+++ b/arch/x86/include/asm/atomic64_64.h
9243@@ -18,7 +18,19 @@
9244 */
9245 static inline long atomic64_read(const atomic64_t *v)
9246 {
9247- return (*(volatile long *)&(v)->counter);
9248+ return (*(volatile const long *)&(v)->counter);
9249+}
9250+
9251+/**
9252+ * atomic64_read_unchecked - read atomic64 variable
9253+ * @v: pointer of type atomic64_unchecked_t
9254+ *
9255+ * Atomically reads the value of @v.
9256+ * Doesn't imply a read memory barrier.
9257+ */
9258+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9259+{
9260+ return (*(volatile const long *)&(v)->counter);
9261 }
9262
9263 /**
9264@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
9265 }
9266
9267 /**
9268+ * atomic64_set_unchecked - set atomic64 variable
9269+ * @v: pointer to type atomic64_unchecked_t
9270+ * @i: required value
9271+ *
9272+ * Atomically sets the value of @v to @i.
9273+ */
9274+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9275+{
9276+ v->counter = i;
9277+}
9278+
9279+/**
9280 * atomic64_add - add integer to atomic64 variable
9281 * @i: integer value to add
9282 * @v: pointer to type atomic64_t
9283@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
9284 */
9285 static inline void atomic64_add(long i, atomic64_t *v)
9286 {
9287+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
9288+
9289+#ifdef CONFIG_PAX_REFCOUNT
9290+ "jno 0f\n"
9291+ LOCK_PREFIX "subq %1,%0\n"
9292+ "int $4\n0:\n"
9293+ _ASM_EXTABLE(0b, 0b)
9294+#endif
9295+
9296+ : "=m" (v->counter)
9297+ : "er" (i), "m" (v->counter));
9298+}
9299+
9300+/**
9301+ * atomic64_add_unchecked - add integer to atomic64 variable
9302+ * @i: integer value to add
9303+ * @v: pointer to type atomic64_unchecked_t
9304+ *
9305+ * Atomically adds @i to @v.
9306+ */
9307+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
9308+{
9309 asm volatile(LOCK_PREFIX "addq %1,%0"
9310 : "=m" (v->counter)
9311 : "er" (i), "m" (v->counter));
9312@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
9313 */
9314 static inline void atomic64_sub(long i, atomic64_t *v)
9315 {
9316- asm volatile(LOCK_PREFIX "subq %1,%0"
9317+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9318+
9319+#ifdef CONFIG_PAX_REFCOUNT
9320+ "jno 0f\n"
9321+ LOCK_PREFIX "addq %1,%0\n"
9322+ "int $4\n0:\n"
9323+ _ASM_EXTABLE(0b, 0b)
9324+#endif
9325+
9326+ : "=m" (v->counter)
9327+ : "er" (i), "m" (v->counter));
9328+}
9329+
9330+/**
9331+ * atomic64_sub_unchecked - subtract the atomic64 variable
9332+ * @i: integer value to subtract
9333+ * @v: pointer to type atomic64_unchecked_t
9334+ *
9335+ * Atomically subtracts @i from @v.
9336+ */
9337+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
9338+{
9339+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9340 : "=m" (v->counter)
9341 : "er" (i), "m" (v->counter));
9342 }
9343@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9344 {
9345 unsigned char c;
9346
9347- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
9348+ asm volatile(LOCK_PREFIX "subq %2,%0\n"
9349+
9350+#ifdef CONFIG_PAX_REFCOUNT
9351+ "jno 0f\n"
9352+ LOCK_PREFIX "addq %2,%0\n"
9353+ "int $4\n0:\n"
9354+ _ASM_EXTABLE(0b, 0b)
9355+#endif
9356+
9357+ "sete %1\n"
9358 : "=m" (v->counter), "=qm" (c)
9359 : "er" (i), "m" (v->counter) : "memory");
9360 return c;
9361@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9362 */
9363 static inline void atomic64_inc(atomic64_t *v)
9364 {
9365+ asm volatile(LOCK_PREFIX "incq %0\n"
9366+
9367+#ifdef CONFIG_PAX_REFCOUNT
9368+ "jno 0f\n"
9369+ LOCK_PREFIX "decq %0\n"
9370+ "int $4\n0:\n"
9371+ _ASM_EXTABLE(0b, 0b)
9372+#endif
9373+
9374+ : "=m" (v->counter)
9375+ : "m" (v->counter));
9376+}
9377+
9378+/**
9379+ * atomic64_inc_unchecked - increment atomic64 variable
9380+ * @v: pointer to type atomic64_unchecked_t
9381+ *
9382+ * Atomically increments @v by 1.
9383+ */
9384+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9385+{
9386 asm volatile(LOCK_PREFIX "incq %0"
9387 : "=m" (v->counter)
9388 : "m" (v->counter));
9389@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
9390 */
9391 static inline void atomic64_dec(atomic64_t *v)
9392 {
9393- asm volatile(LOCK_PREFIX "decq %0"
9394+ asm volatile(LOCK_PREFIX "decq %0\n"
9395+
9396+#ifdef CONFIG_PAX_REFCOUNT
9397+ "jno 0f\n"
9398+ LOCK_PREFIX "incq %0\n"
9399+ "int $4\n0:\n"
9400+ _ASM_EXTABLE(0b, 0b)
9401+#endif
9402+
9403+ : "=m" (v->counter)
9404+ : "m" (v->counter));
9405+}
9406+
9407+/**
9408+ * atomic64_dec_unchecked - decrement atomic64 variable
9409+ * @v: pointer to type atomic64_t
9410+ *
9411+ * Atomically decrements @v by 1.
9412+ */
9413+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9414+{
9415+ asm volatile(LOCK_PREFIX "decq %0\n"
9416 : "=m" (v->counter)
9417 : "m" (v->counter));
9418 }
9419@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
9420 {
9421 unsigned char c;
9422
9423- asm volatile(LOCK_PREFIX "decq %0; sete %1"
9424+ asm volatile(LOCK_PREFIX "decq %0\n"
9425+
9426+#ifdef CONFIG_PAX_REFCOUNT
9427+ "jno 0f\n"
9428+ LOCK_PREFIX "incq %0\n"
9429+ "int $4\n0:\n"
9430+ _ASM_EXTABLE(0b, 0b)
9431+#endif
9432+
9433+ "sete %1\n"
9434 : "=m" (v->counter), "=qm" (c)
9435 : "m" (v->counter) : "memory");
9436 return c != 0;
9437@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
9438 {
9439 unsigned char c;
9440
9441- asm volatile(LOCK_PREFIX "incq %0; sete %1"
9442+ asm volatile(LOCK_PREFIX "incq %0\n"
9443+
9444+#ifdef CONFIG_PAX_REFCOUNT
9445+ "jno 0f\n"
9446+ LOCK_PREFIX "decq %0\n"
9447+ "int $4\n0:\n"
9448+ _ASM_EXTABLE(0b, 0b)
9449+#endif
9450+
9451+ "sete %1\n"
9452 : "=m" (v->counter), "=qm" (c)
9453 : "m" (v->counter) : "memory");
9454 return c != 0;
9455@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9456 {
9457 unsigned char c;
9458
9459- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
9460+ asm volatile(LOCK_PREFIX "addq %2,%0\n"
9461+
9462+#ifdef CONFIG_PAX_REFCOUNT
9463+ "jno 0f\n"
9464+ LOCK_PREFIX "subq %2,%0\n"
9465+ "int $4\n0:\n"
9466+ _ASM_EXTABLE(0b, 0b)
9467+#endif
9468+
9469+ "sets %1\n"
9470 : "=m" (v->counter), "=qm" (c)
9471 : "er" (i), "m" (v->counter) : "memory");
9472 return c;
9473@@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9474 */
9475 static inline long atomic64_add_return(long i, atomic64_t *v)
9476 {
9477+ return i + xadd_check_overflow(&v->counter, i);
9478+}
9479+
9480+/**
9481+ * atomic64_add_return_unchecked - add and return
9482+ * @i: integer value to add
9483+ * @v: pointer to type atomic64_unchecked_t
9484+ *
9485+ * Atomically adds @i to @v and returns @i + @v
9486+ */
9487+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9488+{
9489 return i + xadd(&v->counter, i);
9490 }
9491
9492@@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
9493 }
9494
9495 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
9496+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9497+{
9498+ return atomic64_add_return_unchecked(1, v);
9499+}
9500 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
9501
9502 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9503@@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9504 return cmpxchg(&v->counter, old, new);
9505 }
9506
9507+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
9508+{
9509+ return cmpxchg(&v->counter, old, new);
9510+}
9511+
9512 static inline long atomic64_xchg(atomic64_t *v, long new)
9513 {
9514 return xchg(&v->counter, new);
9515@@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
9516 */
9517 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
9518 {
9519- long c, old;
9520+ long c, old, new;
9521 c = atomic64_read(v);
9522 for (;;) {
9523- if (unlikely(c == (u)))
9524+ if (unlikely(c == u))
9525 break;
9526- old = atomic64_cmpxchg((v), c, c + (a));
9527+
9528+ asm volatile("add %2,%0\n"
9529+
9530+#ifdef CONFIG_PAX_REFCOUNT
9531+ "jno 0f\n"
9532+ "sub %2,%0\n"
9533+ "int $4\n0:\n"
9534+ _ASM_EXTABLE(0b, 0b)
9535+#endif
9536+
9537+ : "=r" (new)
9538+ : "0" (c), "ir" (a));
9539+
9540+ old = atomic64_cmpxchg(v, c, new);
9541 if (likely(old == c))
9542 break;
9543 c = old;
9544 }
9545- return c != (u);
9546+ return c != u;
9547 }
9548
9549 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9550diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
9551index b97596e..9bd48b06 100644
9552--- a/arch/x86/include/asm/bitops.h
9553+++ b/arch/x86/include/asm/bitops.h
9554@@ -38,7 +38,7 @@
9555 * a mask operation on a byte.
9556 */
9557 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
9558-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
9559+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
9560 #define CONST_MASK(nr) (1 << ((nr) & 7))
9561
9562 /**
9563diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
9564index 5e1a2ee..c9f9533 100644
9565--- a/arch/x86/include/asm/boot.h
9566+++ b/arch/x86/include/asm/boot.h
9567@@ -11,10 +11,15 @@
9568 #include <asm/pgtable_types.h>
9569
9570 /* Physical address where kernel should be loaded. */
9571-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9572+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9573 + (CONFIG_PHYSICAL_ALIGN - 1)) \
9574 & ~(CONFIG_PHYSICAL_ALIGN - 1))
9575
9576+#ifndef __ASSEMBLY__
9577+extern unsigned char __LOAD_PHYSICAL_ADDR[];
9578+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
9579+#endif
9580+
9581 /* Minimum kernel alignment, as a power of two */
9582 #ifdef CONFIG_X86_64
9583 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
9584diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
9585index 48f99f1..d78ebf9 100644
9586--- a/arch/x86/include/asm/cache.h
9587+++ b/arch/x86/include/asm/cache.h
9588@@ -5,12 +5,13 @@
9589
9590 /* L1 cache line size */
9591 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
9592-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9593+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9594
9595 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9596+#define __read_only __attribute__((__section__(".data..read_only")))
9597
9598 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
9599-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
9600+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
9601
9602 #ifdef CONFIG_X86_VSMP
9603 #ifdef CONFIG_SMP
9604diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
9605index 4e12668..501d239 100644
9606--- a/arch/x86/include/asm/cacheflush.h
9607+++ b/arch/x86/include/asm/cacheflush.h
9608@@ -26,7 +26,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
9609 unsigned long pg_flags = pg->flags & _PGMT_MASK;
9610
9611 if (pg_flags == _PGMT_DEFAULT)
9612- return -1;
9613+ return ~0UL;
9614 else if (pg_flags == _PGMT_WC)
9615 return _PAGE_CACHE_WC;
9616 else if (pg_flags == _PGMT_UC_MINUS)
9617diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
9618index 46fc474..b02b0f9 100644
9619--- a/arch/x86/include/asm/checksum_32.h
9620+++ b/arch/x86/include/asm/checksum_32.h
9621@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
9622 int len, __wsum sum,
9623 int *src_err_ptr, int *dst_err_ptr);
9624
9625+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
9626+ int len, __wsum sum,
9627+ int *src_err_ptr, int *dst_err_ptr);
9628+
9629+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
9630+ int len, __wsum sum,
9631+ int *src_err_ptr, int *dst_err_ptr);
9632+
9633 /*
9634 * Note: when you get a NULL pointer exception here this means someone
9635 * passed in an incorrect kernel address to one of these functions.
9636@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
9637 int *err_ptr)
9638 {
9639 might_sleep();
9640- return csum_partial_copy_generic((__force void *)src, dst,
9641+ return csum_partial_copy_generic_from_user((__force void *)src, dst,
9642 len, sum, err_ptr, NULL);
9643 }
9644
9645@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
9646 {
9647 might_sleep();
9648 if (access_ok(VERIFY_WRITE, dst, len))
9649- return csum_partial_copy_generic(src, (__force void *)dst,
9650+ return csum_partial_copy_generic_to_user(src, (__force void *)dst,
9651 len, sum, NULL, err_ptr);
9652
9653 if (len)
9654diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
9655index 99480e5..d81165b 100644
9656--- a/arch/x86/include/asm/cmpxchg.h
9657+++ b/arch/x86/include/asm/cmpxchg.h
9658@@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
9659 __compiletime_error("Bad argument size for cmpxchg");
9660 extern void __xadd_wrong_size(void)
9661 __compiletime_error("Bad argument size for xadd");
9662+extern void __xadd_check_overflow_wrong_size(void)
9663+ __compiletime_error("Bad argument size for xadd_check_overflow");
9664 extern void __add_wrong_size(void)
9665 __compiletime_error("Bad argument size for add");
9666+extern void __add_check_overflow_wrong_size(void)
9667+ __compiletime_error("Bad argument size for add_check_overflow");
9668
9669 /*
9670 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
9671@@ -67,6 +71,34 @@ extern void __add_wrong_size(void)
9672 __ret; \
9673 })
9674
9675+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
9676+ ({ \
9677+ __typeof__ (*(ptr)) __ret = (arg); \
9678+ switch (sizeof(*(ptr))) { \
9679+ case __X86_CASE_L: \
9680+ asm volatile (lock #op "l %0, %1\n" \
9681+ "jno 0f\n" \
9682+ "mov %0,%1\n" \
9683+ "int $4\n0:\n" \
9684+ _ASM_EXTABLE(0b, 0b) \
9685+ : "+r" (__ret), "+m" (*(ptr)) \
9686+ : : "memory", "cc"); \
9687+ break; \
9688+ case __X86_CASE_Q: \
9689+ asm volatile (lock #op "q %q0, %1\n" \
9690+ "jno 0f\n" \
9691+ "mov %0,%1\n" \
9692+ "int $4\n0:\n" \
9693+ _ASM_EXTABLE(0b, 0b) \
9694+ : "+r" (__ret), "+m" (*(ptr)) \
9695+ : : "memory", "cc"); \
9696+ break; \
9697+ default: \
9698+ __ ## op ## _check_overflow_wrong_size(); \
9699+ } \
9700+ __ret; \
9701+ })
9702+
9703 /*
9704 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
9705 * Since this is generally used to protect other memory information, we
9706@@ -167,6 +199,9 @@ extern void __add_wrong_size(void)
9707 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
9708 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
9709
9710+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
9711+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
9712+
9713 #define __add(ptr, inc, lock) \
9714 ({ \
9715 __typeof__ (*(ptr)) __ret = (inc); \
9716diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
9717index 8d67d42..183d0eb 100644
9718--- a/arch/x86/include/asm/cpufeature.h
9719+++ b/arch/x86/include/asm/cpufeature.h
9720@@ -367,7 +367,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
9721 ".section .discard,\"aw\",@progbits\n"
9722 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
9723 ".previous\n"
9724- ".section .altinstr_replacement,\"ax\"\n"
9725+ ".section .altinstr_replacement,\"a\"\n"
9726 "3: movb $1,%0\n"
9727 "4:\n"
9728 ".previous\n"
9729diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
9730index e95822d..a90010e 100644
9731--- a/arch/x86/include/asm/desc.h
9732+++ b/arch/x86/include/asm/desc.h
9733@@ -4,6 +4,7 @@
9734 #include <asm/desc_defs.h>
9735 #include <asm/ldt.h>
9736 #include <asm/mmu.h>
9737+#include <asm/pgtable.h>
9738
9739 #include <linux/smp.h>
9740
9741@@ -16,6 +17,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
9742
9743 desc->type = (info->read_exec_only ^ 1) << 1;
9744 desc->type |= info->contents << 2;
9745+ desc->type |= info->seg_not_present ^ 1;
9746
9747 desc->s = 1;
9748 desc->dpl = 0x3;
9749@@ -34,19 +36,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
9750 }
9751
9752 extern struct desc_ptr idt_descr;
9753-extern gate_desc idt_table[];
9754 extern struct desc_ptr nmi_idt_descr;
9755-extern gate_desc nmi_idt_table[];
9756-
9757-struct gdt_page {
9758- struct desc_struct gdt[GDT_ENTRIES];
9759-} __attribute__((aligned(PAGE_SIZE)));
9760-
9761-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
9762+extern gate_desc idt_table[256];
9763+extern gate_desc nmi_idt_table[256];
9764
9765+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
9766 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
9767 {
9768- return per_cpu(gdt_page, cpu).gdt;
9769+ return cpu_gdt_table[cpu];
9770 }
9771
9772 #ifdef CONFIG_X86_64
9773@@ -71,8 +68,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
9774 unsigned long base, unsigned dpl, unsigned flags,
9775 unsigned short seg)
9776 {
9777- gate->a = (seg << 16) | (base & 0xffff);
9778- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
9779+ gate->gate.offset_low = base;
9780+ gate->gate.seg = seg;
9781+ gate->gate.reserved = 0;
9782+ gate->gate.type = type;
9783+ gate->gate.s = 0;
9784+ gate->gate.dpl = dpl;
9785+ gate->gate.p = 1;
9786+ gate->gate.offset_high = base >> 16;
9787 }
9788
9789 #endif
9790@@ -117,12 +120,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
9791
9792 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
9793 {
9794+ pax_open_kernel();
9795 memcpy(&idt[entry], gate, sizeof(*gate));
9796+ pax_close_kernel();
9797 }
9798
9799 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
9800 {
9801+ pax_open_kernel();
9802 memcpy(&ldt[entry], desc, 8);
9803+ pax_close_kernel();
9804 }
9805
9806 static inline void
9807@@ -136,7 +143,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
9808 default: size = sizeof(*gdt); break;
9809 }
9810
9811+ pax_open_kernel();
9812 memcpy(&gdt[entry], desc, size);
9813+ pax_close_kernel();
9814 }
9815
9816 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
9817@@ -209,7 +218,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
9818
9819 static inline void native_load_tr_desc(void)
9820 {
9821+ pax_open_kernel();
9822 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
9823+ pax_close_kernel();
9824 }
9825
9826 static inline void native_load_gdt(const struct desc_ptr *dtr)
9827@@ -246,8 +257,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
9828 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
9829 unsigned int i;
9830
9831+ pax_open_kernel();
9832 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
9833 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
9834+ pax_close_kernel();
9835 }
9836
9837 #define _LDT_empty(info) \
9838@@ -310,7 +323,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
9839 }
9840
9841 #ifdef CONFIG_X86_64
9842-static inline void set_nmi_gate(int gate, void *addr)
9843+static inline void set_nmi_gate(int gate, const void *addr)
9844 {
9845 gate_desc s;
9846
9847@@ -319,7 +332,7 @@ static inline void set_nmi_gate(int gate, void *addr)
9848 }
9849 #endif
9850
9851-static inline void _set_gate(int gate, unsigned type, void *addr,
9852+static inline void _set_gate(int gate, unsigned type, const void *addr,
9853 unsigned dpl, unsigned ist, unsigned seg)
9854 {
9855 gate_desc s;
9856@@ -338,7 +351,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
9857 * Pentium F0 0F bugfix can have resulted in the mapped
9858 * IDT being write-protected.
9859 */
9860-static inline void set_intr_gate(unsigned int n, void *addr)
9861+static inline void set_intr_gate(unsigned int n, const void *addr)
9862 {
9863 BUG_ON((unsigned)n > 0xFF);
9864 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
9865@@ -368,19 +381,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
9866 /*
9867 * This routine sets up an interrupt gate at directory privilege level 3.
9868 */
9869-static inline void set_system_intr_gate(unsigned int n, void *addr)
9870+static inline void set_system_intr_gate(unsigned int n, const void *addr)
9871 {
9872 BUG_ON((unsigned)n > 0xFF);
9873 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
9874 }
9875
9876-static inline void set_system_trap_gate(unsigned int n, void *addr)
9877+static inline void set_system_trap_gate(unsigned int n, const void *addr)
9878 {
9879 BUG_ON((unsigned)n > 0xFF);
9880 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
9881 }
9882
9883-static inline void set_trap_gate(unsigned int n, void *addr)
9884+static inline void set_trap_gate(unsigned int n, const void *addr)
9885 {
9886 BUG_ON((unsigned)n > 0xFF);
9887 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
9888@@ -389,19 +402,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
9889 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
9890 {
9891 BUG_ON((unsigned)n > 0xFF);
9892- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
9893+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
9894 }
9895
9896-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
9897+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
9898 {
9899 BUG_ON((unsigned)n > 0xFF);
9900 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
9901 }
9902
9903-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
9904+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
9905 {
9906 BUG_ON((unsigned)n > 0xFF);
9907 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
9908 }
9909
9910+#ifdef CONFIG_X86_32
9911+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
9912+{
9913+ struct desc_struct d;
9914+
9915+ if (likely(limit))
9916+ limit = (limit - 1UL) >> PAGE_SHIFT;
9917+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
9918+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
9919+}
9920+#endif
9921+
9922 #endif /* _ASM_X86_DESC_H */
9923diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
9924index 278441f..b95a174 100644
9925--- a/arch/x86/include/asm/desc_defs.h
9926+++ b/arch/x86/include/asm/desc_defs.h
9927@@ -31,6 +31,12 @@ struct desc_struct {
9928 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
9929 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
9930 };
9931+ struct {
9932+ u16 offset_low;
9933+ u16 seg;
9934+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
9935+ unsigned offset_high: 16;
9936+ } gate;
9937 };
9938 } __attribute__((packed));
9939
9940diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
9941index 3778256..c5d4fce 100644
9942--- a/arch/x86/include/asm/e820.h
9943+++ b/arch/x86/include/asm/e820.h
9944@@ -69,7 +69,7 @@ struct e820map {
9945 #define ISA_START_ADDRESS 0xa0000
9946 #define ISA_END_ADDRESS 0x100000
9947
9948-#define BIOS_BEGIN 0x000a0000
9949+#define BIOS_BEGIN 0x000c0000
9950 #define BIOS_END 0x00100000
9951
9952 #define BIOS_ROM_BASE 0xffe00000
9953diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
9954index 5f962df..7289f09 100644
9955--- a/arch/x86/include/asm/elf.h
9956+++ b/arch/x86/include/asm/elf.h
9957@@ -238,7 +238,25 @@ extern int force_personality32;
9958 the loader. We need to make sure that it is out of the way of the program
9959 that it will "exec", and that there is sufficient room for the brk. */
9960
9961+#ifdef CONFIG_PAX_SEGMEXEC
9962+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
9963+#else
9964 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
9965+#endif
9966+
9967+#ifdef CONFIG_PAX_ASLR
9968+#ifdef CONFIG_X86_32
9969+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
9970+
9971+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9972+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9973+#else
9974+#define PAX_ELF_ET_DYN_BASE 0x400000UL
9975+
9976+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9977+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9978+#endif
9979+#endif
9980
9981 /* This yields a mask that user programs can use to figure out what
9982 instruction set this CPU supports. This could be done in user space,
9983@@ -291,9 +309,7 @@ do { \
9984
9985 #define ARCH_DLINFO \
9986 do { \
9987- if (vdso_enabled) \
9988- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
9989- (unsigned long)current->mm->context.vdso); \
9990+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
9991 } while (0)
9992
9993 #define AT_SYSINFO 32
9994@@ -304,7 +320,7 @@ do { \
9995
9996 #endif /* !CONFIG_X86_32 */
9997
9998-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
9999+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
10000
10001 #define VDSO_ENTRY \
10002 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
10003@@ -318,9 +334,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
10004 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
10005 #define compat_arch_setup_additional_pages syscall32_setup_pages
10006
10007-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
10008-#define arch_randomize_brk arch_randomize_brk
10009-
10010 /*
10011 * True on X86_32 or when emulating IA32 on X86_64
10012 */
10013diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
10014index cc70c1c..d96d011 100644
10015--- a/arch/x86/include/asm/emergency-restart.h
10016+++ b/arch/x86/include/asm/emergency-restart.h
10017@@ -15,6 +15,6 @@ enum reboot_type {
10018
10019 extern enum reboot_type reboot_type;
10020
10021-extern void machine_emergency_restart(void);
10022+extern void machine_emergency_restart(void) __noreturn;
10023
10024 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
10025diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
10026index dbe82a5..c6d8a00 100644
10027--- a/arch/x86/include/asm/floppy.h
10028+++ b/arch/x86/include/asm/floppy.h
10029@@ -157,6 +157,7 @@ static unsigned long dma_mem_alloc(unsigned long size)
10030 }
10031
10032
10033+static unsigned long vdma_mem_alloc(unsigned long size) __size_overflow(1);
10034 static unsigned long vdma_mem_alloc(unsigned long size)
10035 {
10036 return (unsigned long)vmalloc(size);
10037diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
10038index d09bb03..4ea4194 100644
10039--- a/arch/x86/include/asm/futex.h
10040+++ b/arch/x86/include/asm/futex.h
10041@@ -12,16 +12,18 @@
10042 #include <asm/system.h>
10043
10044 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
10045+ typecheck(u32 __user *, uaddr); \
10046 asm volatile("1:\t" insn "\n" \
10047 "2:\t.section .fixup,\"ax\"\n" \
10048 "3:\tmov\t%3, %1\n" \
10049 "\tjmp\t2b\n" \
10050 "\t.previous\n" \
10051 _ASM_EXTABLE(1b, 3b) \
10052- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
10053+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
10054 : "i" (-EFAULT), "0" (oparg), "1" (0))
10055
10056 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
10057+ typecheck(u32 __user *, uaddr); \
10058 asm volatile("1:\tmovl %2, %0\n" \
10059 "\tmovl\t%0, %3\n" \
10060 "\t" insn "\n" \
10061@@ -34,7 +36,7 @@
10062 _ASM_EXTABLE(1b, 4b) \
10063 _ASM_EXTABLE(2b, 4b) \
10064 : "=&a" (oldval), "=&r" (ret), \
10065- "+m" (*uaddr), "=&r" (tem) \
10066+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
10067 : "r" (oparg), "i" (-EFAULT), "1" (0))
10068
10069 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10070@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10071
10072 switch (op) {
10073 case FUTEX_OP_SET:
10074- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
10075+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
10076 break;
10077 case FUTEX_OP_ADD:
10078- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
10079+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
10080 uaddr, oparg);
10081 break;
10082 case FUTEX_OP_OR:
10083@@ -123,13 +125,13 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
10084 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
10085 return -EFAULT;
10086
10087- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
10088+ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
10089 "2:\t.section .fixup, \"ax\"\n"
10090 "3:\tmov %3, %0\n"
10091 "\tjmp 2b\n"
10092 "\t.previous\n"
10093 _ASM_EXTABLE(1b, 3b)
10094- : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
10095+ : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
10096 : "i" (-EFAULT), "r" (newval), "1" (oldval)
10097 : "memory"
10098 );
10099diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
10100index eb92a6e..b98b2f4 100644
10101--- a/arch/x86/include/asm/hw_irq.h
10102+++ b/arch/x86/include/asm/hw_irq.h
10103@@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
10104 extern void enable_IO_APIC(void);
10105
10106 /* Statistics */
10107-extern atomic_t irq_err_count;
10108-extern atomic_t irq_mis_count;
10109+extern atomic_unchecked_t irq_err_count;
10110+extern atomic_unchecked_t irq_mis_count;
10111
10112 /* EISA */
10113 extern void eisa_set_level_irq(unsigned int irq);
10114diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
10115index 2479049..3fb9795 100644
10116--- a/arch/x86/include/asm/i387.h
10117+++ b/arch/x86/include/asm/i387.h
10118@@ -93,6 +93,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10119 {
10120 int err;
10121
10122+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10123+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10124+ fx = (struct i387_fxsave_struct __user *)((void *)fx + PAX_USER_SHADOW_BASE);
10125+#endif
10126+
10127 /* See comment in fxsave() below. */
10128 #ifdef CONFIG_AS_FXSAVEQ
10129 asm volatile("1: fxrstorq %[fx]\n\t"
10130@@ -122,6 +127,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
10131 {
10132 int err;
10133
10134+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10135+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10136+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
10137+#endif
10138+
10139 /*
10140 * Clear the bytes not touched by the fxsave and reserved
10141 * for the SW usage.
10142@@ -278,7 +288,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
10143 "emms\n\t" /* clear stack tags */
10144 "fildl %P[addr]", /* set F?P to defined value */
10145 X86_FEATURE_FXSAVE_LEAK,
10146- [addr] "m" (tsk->thread.fpu.has_fpu));
10147+ [addr] "m" (init_tss[smp_processor_id()].x86_tss.sp0));
10148
10149 return fpu_restore_checking(&tsk->thread.fpu);
10150 }
10151@@ -445,7 +455,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
10152 static inline bool interrupted_user_mode(void)
10153 {
10154 struct pt_regs *regs = get_irq_regs();
10155- return regs && user_mode_vm(regs);
10156+ return regs && user_mode(regs);
10157 }
10158
10159 /*
10160diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
10161index d8e8eef..99f81ae 100644
10162--- a/arch/x86/include/asm/io.h
10163+++ b/arch/x86/include/asm/io.h
10164@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
10165
10166 #include <linux/vmalloc.h>
10167
10168+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10169+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10170+{
10171+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10172+}
10173+
10174+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10175+{
10176+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10177+}
10178+
10179 /*
10180 * Convert a virtual cached pointer to an uncached pointer
10181 */
10182diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
10183index bba3cf8..06bc8da 100644
10184--- a/arch/x86/include/asm/irqflags.h
10185+++ b/arch/x86/include/asm/irqflags.h
10186@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
10187 sti; \
10188 sysexit
10189
10190+#define GET_CR0_INTO_RDI mov %cr0, %rdi
10191+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
10192+#define GET_CR3_INTO_RDI mov %cr3, %rdi
10193+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
10194+
10195 #else
10196 #define INTERRUPT_RETURN iret
10197 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
10198diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
10199index 5478825..839e88c 100644
10200--- a/arch/x86/include/asm/kprobes.h
10201+++ b/arch/x86/include/asm/kprobes.h
10202@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
10203 #define RELATIVEJUMP_SIZE 5
10204 #define RELATIVECALL_OPCODE 0xe8
10205 #define RELATIVE_ADDR_SIZE 4
10206-#define MAX_STACK_SIZE 64
10207-#define MIN_STACK_SIZE(ADDR) \
10208- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
10209- THREAD_SIZE - (unsigned long)(ADDR))) \
10210- ? (MAX_STACK_SIZE) \
10211- : (((unsigned long)current_thread_info()) + \
10212- THREAD_SIZE - (unsigned long)(ADDR)))
10213+#define MAX_STACK_SIZE 64UL
10214+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
10215
10216 #define flush_insn_slot(p) do { } while (0)
10217
10218diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
10219index 52d6640..136b3bd 100644
10220--- a/arch/x86/include/asm/kvm_host.h
10221+++ b/arch/x86/include/asm/kvm_host.h
10222@@ -663,7 +663,7 @@ struct kvm_x86_ops {
10223 int (*check_intercept)(struct kvm_vcpu *vcpu,
10224 struct x86_instruction_info *info,
10225 enum x86_intercept_stage stage);
10226-};
10227+} __do_const;
10228
10229 struct kvm_arch_async_pf {
10230 u32 token;
10231@@ -694,7 +694,7 @@ void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages);
10232 int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3);
10233
10234 int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,
10235- const void *val, int bytes);
10236+ const void *val, int bytes) __size_overflow(2);
10237 u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);
10238
10239 extern bool tdp_enabled;
10240@@ -781,7 +781,7 @@ int fx_init(struct kvm_vcpu *vcpu);
10241
10242 void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu);
10243 void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
10244- const u8 *new, int bytes);
10245+ const u8 *new, int bytes) __size_overflow(2);
10246 int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn);
10247 int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva);
10248 void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
10249diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
10250index 9cdae5d..300d20f 100644
10251--- a/arch/x86/include/asm/local.h
10252+++ b/arch/x86/include/asm/local.h
10253@@ -18,26 +18,58 @@ typedef struct {
10254
10255 static inline void local_inc(local_t *l)
10256 {
10257- asm volatile(_ASM_INC "%0"
10258+ asm volatile(_ASM_INC "%0\n"
10259+
10260+#ifdef CONFIG_PAX_REFCOUNT
10261+ "jno 0f\n"
10262+ _ASM_DEC "%0\n"
10263+ "int $4\n0:\n"
10264+ _ASM_EXTABLE(0b, 0b)
10265+#endif
10266+
10267 : "+m" (l->a.counter));
10268 }
10269
10270 static inline void local_dec(local_t *l)
10271 {
10272- asm volatile(_ASM_DEC "%0"
10273+ asm volatile(_ASM_DEC "%0\n"
10274+
10275+#ifdef CONFIG_PAX_REFCOUNT
10276+ "jno 0f\n"
10277+ _ASM_INC "%0\n"
10278+ "int $4\n0:\n"
10279+ _ASM_EXTABLE(0b, 0b)
10280+#endif
10281+
10282 : "+m" (l->a.counter));
10283 }
10284
10285 static inline void local_add(long i, local_t *l)
10286 {
10287- asm volatile(_ASM_ADD "%1,%0"
10288+ asm volatile(_ASM_ADD "%1,%0\n"
10289+
10290+#ifdef CONFIG_PAX_REFCOUNT
10291+ "jno 0f\n"
10292+ _ASM_SUB "%1,%0\n"
10293+ "int $4\n0:\n"
10294+ _ASM_EXTABLE(0b, 0b)
10295+#endif
10296+
10297 : "+m" (l->a.counter)
10298 : "ir" (i));
10299 }
10300
10301 static inline void local_sub(long i, local_t *l)
10302 {
10303- asm volatile(_ASM_SUB "%1,%0"
10304+ asm volatile(_ASM_SUB "%1,%0\n"
10305+
10306+#ifdef CONFIG_PAX_REFCOUNT
10307+ "jno 0f\n"
10308+ _ASM_ADD "%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@@ -55,7 +87,16 @@ static inline int local_sub_and_test(long i, local_t *l)
10317 {
10318 unsigned char c;
10319
10320- asm volatile(_ASM_SUB "%2,%0; sete %1"
10321+ asm volatile(_ASM_SUB "%2,%0\n"
10322+
10323+#ifdef CONFIG_PAX_REFCOUNT
10324+ "jno 0f\n"
10325+ _ASM_ADD "%2,%0\n"
10326+ "int $4\n0:\n"
10327+ _ASM_EXTABLE(0b, 0b)
10328+#endif
10329+
10330+ "sete %1\n"
10331 : "+m" (l->a.counter), "=qm" (c)
10332 : "ir" (i) : "memory");
10333 return c;
10334@@ -73,7 +114,16 @@ static inline int local_dec_and_test(local_t *l)
10335 {
10336 unsigned char c;
10337
10338- asm volatile(_ASM_DEC "%0; sete %1"
10339+ asm volatile(_ASM_DEC "%0\n"
10340+
10341+#ifdef CONFIG_PAX_REFCOUNT
10342+ "jno 0f\n"
10343+ _ASM_INC "%0\n"
10344+ "int $4\n0:\n"
10345+ _ASM_EXTABLE(0b, 0b)
10346+#endif
10347+
10348+ "sete %1\n"
10349 : "+m" (l->a.counter), "=qm" (c)
10350 : : "memory");
10351 return c != 0;
10352@@ -91,7 +141,16 @@ static inline int local_inc_and_test(local_t *l)
10353 {
10354 unsigned char c;
10355
10356- asm volatile(_ASM_INC "%0; sete %1"
10357+ asm volatile(_ASM_INC "%0\n"
10358+
10359+#ifdef CONFIG_PAX_REFCOUNT
10360+ "jno 0f\n"
10361+ _ASM_DEC "%0\n"
10362+ "int $4\n0:\n"
10363+ _ASM_EXTABLE(0b, 0b)
10364+#endif
10365+
10366+ "sete %1\n"
10367 : "+m" (l->a.counter), "=qm" (c)
10368 : : "memory");
10369 return c != 0;
10370@@ -110,7 +169,16 @@ static inline int local_add_negative(long i, local_t *l)
10371 {
10372 unsigned char c;
10373
10374- asm volatile(_ASM_ADD "%2,%0; sets %1"
10375+ asm volatile(_ASM_ADD "%2,%0\n"
10376+
10377+#ifdef CONFIG_PAX_REFCOUNT
10378+ "jno 0f\n"
10379+ _ASM_SUB "%2,%0\n"
10380+ "int $4\n0:\n"
10381+ _ASM_EXTABLE(0b, 0b)
10382+#endif
10383+
10384+ "sets %1\n"
10385 : "+m" (l->a.counter), "=qm" (c)
10386 : "ir" (i) : "memory");
10387 return c;
10388@@ -133,7 +201,15 @@ static inline long local_add_return(long i, local_t *l)
10389 #endif
10390 /* Modern 486+ processor */
10391 __i = i;
10392- asm volatile(_ASM_XADD "%0, %1;"
10393+ asm volatile(_ASM_XADD "%0, %1\n"
10394+
10395+#ifdef CONFIG_PAX_REFCOUNT
10396+ "jno 0f\n"
10397+ _ASM_MOV "%0,%1\n"
10398+ "int $4\n0:\n"
10399+ _ASM_EXTABLE(0b, 0b)
10400+#endif
10401+
10402 : "+r" (i), "+m" (l->a.counter)
10403 : : "memory");
10404 return i + __i;
10405diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
10406index 593e51d..fa69c9a 100644
10407--- a/arch/x86/include/asm/mman.h
10408+++ b/arch/x86/include/asm/mman.h
10409@@ -5,4 +5,14 @@
10410
10411 #include <asm-generic/mman.h>
10412
10413+#ifdef __KERNEL__
10414+#ifndef __ASSEMBLY__
10415+#ifdef CONFIG_X86_32
10416+#define arch_mmap_check i386_mmap_check
10417+int i386_mmap_check(unsigned long addr, unsigned long len,
10418+ unsigned long flags);
10419+#endif
10420+#endif
10421+#endif
10422+
10423 #endif /* _ASM_X86_MMAN_H */
10424diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
10425index 5f55e69..e20bfb1 100644
10426--- a/arch/x86/include/asm/mmu.h
10427+++ b/arch/x86/include/asm/mmu.h
10428@@ -9,7 +9,7 @@
10429 * we put the segment information here.
10430 */
10431 typedef struct {
10432- void *ldt;
10433+ struct desc_struct *ldt;
10434 int size;
10435
10436 #ifdef CONFIG_X86_64
10437@@ -18,7 +18,19 @@ typedef struct {
10438 #endif
10439
10440 struct mutex lock;
10441- void *vdso;
10442+ unsigned long vdso;
10443+
10444+#ifdef CONFIG_X86_32
10445+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
10446+ unsigned long user_cs_base;
10447+ unsigned long user_cs_limit;
10448+
10449+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10450+ cpumask_t cpu_user_cs_mask;
10451+#endif
10452+
10453+#endif
10454+#endif
10455 } mm_context_t;
10456
10457 #ifdef CONFIG_SMP
10458diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
10459index 6902152..399f3a2 100644
10460--- a/arch/x86/include/asm/mmu_context.h
10461+++ b/arch/x86/include/asm/mmu_context.h
10462@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
10463
10464 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
10465 {
10466+
10467+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10468+ unsigned int i;
10469+ pgd_t *pgd;
10470+
10471+ pax_open_kernel();
10472+ pgd = get_cpu_pgd(smp_processor_id());
10473+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
10474+ set_pgd_batched(pgd+i, native_make_pgd(0));
10475+ pax_close_kernel();
10476+#endif
10477+
10478 #ifdef CONFIG_SMP
10479 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
10480 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
10481@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10482 struct task_struct *tsk)
10483 {
10484 unsigned cpu = smp_processor_id();
10485+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10486+ int tlbstate = TLBSTATE_OK;
10487+#endif
10488
10489 if (likely(prev != next)) {
10490 #ifdef CONFIG_SMP
10491+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10492+ tlbstate = percpu_read(cpu_tlbstate.state);
10493+#endif
10494 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10495 percpu_write(cpu_tlbstate.active_mm, next);
10496 #endif
10497 cpumask_set_cpu(cpu, mm_cpumask(next));
10498
10499 /* Re-load page tables */
10500+#ifdef CONFIG_PAX_PER_CPU_PGD
10501+ pax_open_kernel();
10502+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10503+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10504+ pax_close_kernel();
10505+ load_cr3(get_cpu_pgd(cpu));
10506+#else
10507 load_cr3(next->pgd);
10508+#endif
10509
10510 /* stop flush ipis for the previous mm */
10511 cpumask_clear_cpu(cpu, mm_cpumask(prev));
10512@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10513 */
10514 if (unlikely(prev->context.ldt != next->context.ldt))
10515 load_LDT_nolock(&next->context);
10516- }
10517+
10518+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10519+ if (!(__supported_pte_mask & _PAGE_NX)) {
10520+ smp_mb__before_clear_bit();
10521+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
10522+ smp_mb__after_clear_bit();
10523+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10524+ }
10525+#endif
10526+
10527+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10528+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
10529+ prev->context.user_cs_limit != next->context.user_cs_limit))
10530+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10531 #ifdef CONFIG_SMP
10532+ else if (unlikely(tlbstate != TLBSTATE_OK))
10533+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10534+#endif
10535+#endif
10536+
10537+ }
10538 else {
10539+
10540+#ifdef CONFIG_PAX_PER_CPU_PGD
10541+ pax_open_kernel();
10542+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10543+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10544+ pax_close_kernel();
10545+ load_cr3(get_cpu_pgd(cpu));
10546+#endif
10547+
10548+#ifdef CONFIG_SMP
10549 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10550 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
10551
10552@@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10553 * tlb flush IPI delivery. We must reload CR3
10554 * to make sure to use no freed page tables.
10555 */
10556+
10557+#ifndef CONFIG_PAX_PER_CPU_PGD
10558 load_cr3(next->pgd);
10559+#endif
10560+
10561 load_LDT_nolock(&next->context);
10562+
10563+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
10564+ if (!(__supported_pte_mask & _PAGE_NX))
10565+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10566+#endif
10567+
10568+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10569+#ifdef CONFIG_PAX_PAGEEXEC
10570+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
10571+#endif
10572+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10573+#endif
10574+
10575 }
10576+#endif
10577 }
10578-#endif
10579 }
10580
10581 #define activate_mm(prev, next) \
10582diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
10583index 9eae775..c914fea 100644
10584--- a/arch/x86/include/asm/module.h
10585+++ b/arch/x86/include/asm/module.h
10586@@ -5,6 +5,7 @@
10587
10588 #ifdef CONFIG_X86_64
10589 /* X86_64 does not define MODULE_PROC_FAMILY */
10590+#define MODULE_PROC_FAMILY ""
10591 #elif defined CONFIG_M386
10592 #define MODULE_PROC_FAMILY "386 "
10593 #elif defined CONFIG_M486
10594@@ -59,8 +60,20 @@
10595 #error unknown processor family
10596 #endif
10597
10598-#ifdef CONFIG_X86_32
10599-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
10600+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
10601+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
10602+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
10603+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
10604+#else
10605+#define MODULE_PAX_KERNEXEC ""
10606 #endif
10607
10608+#ifdef CONFIG_PAX_MEMORY_UDEREF
10609+#define MODULE_PAX_UDEREF "UDEREF "
10610+#else
10611+#define MODULE_PAX_UDEREF ""
10612+#endif
10613+
10614+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
10615+
10616 #endif /* _ASM_X86_MODULE_H */
10617diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
10618index 7639dbf..e08a58c 100644
10619--- a/arch/x86/include/asm/page_64_types.h
10620+++ b/arch/x86/include/asm/page_64_types.h
10621@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
10622
10623 /* duplicated to the one in bootmem.h */
10624 extern unsigned long max_pfn;
10625-extern unsigned long phys_base;
10626+extern const unsigned long phys_base;
10627
10628 extern unsigned long __phys_addr(unsigned long);
10629 #define __phys_reloc_hide(x) (x)
10630diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
10631index a7d2db9..edb023e 100644
10632--- a/arch/x86/include/asm/paravirt.h
10633+++ b/arch/x86/include/asm/paravirt.h
10634@@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
10635 val);
10636 }
10637
10638+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
10639+{
10640+ pgdval_t val = native_pgd_val(pgd);
10641+
10642+ if (sizeof(pgdval_t) > sizeof(long))
10643+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
10644+ val, (u64)val >> 32);
10645+ else
10646+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
10647+ val);
10648+}
10649+
10650 static inline void pgd_clear(pgd_t *pgdp)
10651 {
10652 set_pgd(pgdp, __pgd(0));
10653@@ -748,6 +760,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
10654 pv_mmu_ops.set_fixmap(idx, phys, flags);
10655 }
10656
10657+#ifdef CONFIG_PAX_KERNEXEC
10658+static inline unsigned long pax_open_kernel(void)
10659+{
10660+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
10661+}
10662+
10663+static inline unsigned long pax_close_kernel(void)
10664+{
10665+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
10666+}
10667+#else
10668+static inline unsigned long pax_open_kernel(void) { return 0; }
10669+static inline unsigned long pax_close_kernel(void) { return 0; }
10670+#endif
10671+
10672 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
10673
10674 static inline int arch_spin_is_locked(struct arch_spinlock *lock)
10675@@ -964,7 +991,7 @@ extern void default_banner(void);
10676
10677 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
10678 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
10679-#define PARA_INDIRECT(addr) *%cs:addr
10680+#define PARA_INDIRECT(addr) *%ss:addr
10681 #endif
10682
10683 #define INTERRUPT_RETURN \
10684@@ -1041,6 +1068,21 @@ extern void default_banner(void);
10685 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
10686 CLBR_NONE, \
10687 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
10688+
10689+#define GET_CR0_INTO_RDI \
10690+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
10691+ mov %rax,%rdi
10692+
10693+#define SET_RDI_INTO_CR0 \
10694+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10695+
10696+#define GET_CR3_INTO_RDI \
10697+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
10698+ mov %rax,%rdi
10699+
10700+#define SET_RDI_INTO_CR3 \
10701+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
10702+
10703 #endif /* CONFIG_X86_32 */
10704
10705 #endif /* __ASSEMBLY__ */
10706diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
10707index 8e8b9a4..f07d725 100644
10708--- a/arch/x86/include/asm/paravirt_types.h
10709+++ b/arch/x86/include/asm/paravirt_types.h
10710@@ -84,20 +84,20 @@ struct pv_init_ops {
10711 */
10712 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
10713 unsigned long addr, unsigned len);
10714-};
10715+} __no_const;
10716
10717
10718 struct pv_lazy_ops {
10719 /* Set deferred update mode, used for batching operations. */
10720 void (*enter)(void);
10721 void (*leave)(void);
10722-};
10723+} __no_const;
10724
10725 struct pv_time_ops {
10726 unsigned long long (*sched_clock)(void);
10727 unsigned long long (*steal_clock)(int cpu);
10728 unsigned long (*get_tsc_khz)(void);
10729-};
10730+} __no_const;
10731
10732 struct pv_cpu_ops {
10733 /* hooks for various privileged instructions */
10734@@ -193,7 +193,7 @@ struct pv_cpu_ops {
10735
10736 void (*start_context_switch)(struct task_struct *prev);
10737 void (*end_context_switch)(struct task_struct *next);
10738-};
10739+} __no_const;
10740
10741 struct pv_irq_ops {
10742 /*
10743@@ -224,7 +224,7 @@ struct pv_apic_ops {
10744 unsigned long start_eip,
10745 unsigned long start_esp);
10746 #endif
10747-};
10748+} __no_const;
10749
10750 struct pv_mmu_ops {
10751 unsigned long (*read_cr2)(void);
10752@@ -313,6 +313,7 @@ struct pv_mmu_ops {
10753 struct paravirt_callee_save make_pud;
10754
10755 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
10756+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
10757 #endif /* PAGETABLE_LEVELS == 4 */
10758 #endif /* PAGETABLE_LEVELS >= 3 */
10759
10760@@ -324,6 +325,12 @@ struct pv_mmu_ops {
10761 an mfn. We can tell which is which from the index. */
10762 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
10763 phys_addr_t phys, pgprot_t flags);
10764+
10765+#ifdef CONFIG_PAX_KERNEXEC
10766+ unsigned long (*pax_open_kernel)(void);
10767+ unsigned long (*pax_close_kernel)(void);
10768+#endif
10769+
10770 };
10771
10772 struct arch_spinlock;
10773@@ -334,7 +341,7 @@ struct pv_lock_ops {
10774 void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
10775 int (*spin_trylock)(struct arch_spinlock *lock);
10776 void (*spin_unlock)(struct arch_spinlock *lock);
10777-};
10778+} __no_const;
10779
10780 /* This contains all the paravirt structures: we get a convenient
10781 * number for each function using the offset which we use to indicate
10782diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
10783index b4389a4..b7ff22c 100644
10784--- a/arch/x86/include/asm/pgalloc.h
10785+++ b/arch/x86/include/asm/pgalloc.h
10786@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
10787 pmd_t *pmd, pte_t *pte)
10788 {
10789 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10790+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
10791+}
10792+
10793+static inline void pmd_populate_user(struct mm_struct *mm,
10794+ pmd_t *pmd, pte_t *pte)
10795+{
10796+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10797 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
10798 }
10799
10800diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
10801index 98391db..8f6984e 100644
10802--- a/arch/x86/include/asm/pgtable-2level.h
10803+++ b/arch/x86/include/asm/pgtable-2level.h
10804@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
10805
10806 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10807 {
10808+ pax_open_kernel();
10809 *pmdp = pmd;
10810+ pax_close_kernel();
10811 }
10812
10813 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10814diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
10815index effff47..f9e4035 100644
10816--- a/arch/x86/include/asm/pgtable-3level.h
10817+++ b/arch/x86/include/asm/pgtable-3level.h
10818@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10819
10820 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10821 {
10822+ pax_open_kernel();
10823 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
10824+ pax_close_kernel();
10825 }
10826
10827 static inline void native_set_pud(pud_t *pudp, pud_t pud)
10828 {
10829+ pax_open_kernel();
10830 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
10831+ pax_close_kernel();
10832 }
10833
10834 /*
10835diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
10836index 49afb3f..ed14d07 100644
10837--- a/arch/x86/include/asm/pgtable.h
10838+++ b/arch/x86/include/asm/pgtable.h
10839@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
10840
10841 #ifndef __PAGETABLE_PUD_FOLDED
10842 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
10843+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
10844 #define pgd_clear(pgd) native_pgd_clear(pgd)
10845 #endif
10846
10847@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
10848
10849 #define arch_end_context_switch(prev) do {} while(0)
10850
10851+#define pax_open_kernel() native_pax_open_kernel()
10852+#define pax_close_kernel() native_pax_close_kernel()
10853 #endif /* CONFIG_PARAVIRT */
10854
10855+#define __HAVE_ARCH_PAX_OPEN_KERNEL
10856+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
10857+
10858+#ifdef CONFIG_PAX_KERNEXEC
10859+static inline unsigned long native_pax_open_kernel(void)
10860+{
10861+ unsigned long cr0;
10862+
10863+ preempt_disable();
10864+ barrier();
10865+ cr0 = read_cr0() ^ X86_CR0_WP;
10866+ BUG_ON(unlikely(cr0 & X86_CR0_WP));
10867+ write_cr0(cr0);
10868+ return cr0 ^ X86_CR0_WP;
10869+}
10870+
10871+static inline unsigned long native_pax_close_kernel(void)
10872+{
10873+ unsigned long cr0;
10874+
10875+ cr0 = read_cr0() ^ X86_CR0_WP;
10876+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
10877+ write_cr0(cr0);
10878+ barrier();
10879+ preempt_enable_no_resched();
10880+ return cr0 ^ X86_CR0_WP;
10881+}
10882+#else
10883+static inline unsigned long native_pax_open_kernel(void) { return 0; }
10884+static inline unsigned long native_pax_close_kernel(void) { return 0; }
10885+#endif
10886+
10887 /*
10888 * The following only work if pte_present() is true.
10889 * Undefined behaviour if not..
10890 */
10891+static inline int pte_user(pte_t pte)
10892+{
10893+ return pte_val(pte) & _PAGE_USER;
10894+}
10895+
10896 static inline int pte_dirty(pte_t pte)
10897 {
10898 return pte_flags(pte) & _PAGE_DIRTY;
10899@@ -196,9 +236,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
10900 return pte_clear_flags(pte, _PAGE_RW);
10901 }
10902
10903+static inline pte_t pte_mkread(pte_t pte)
10904+{
10905+ return __pte(pte_val(pte) | _PAGE_USER);
10906+}
10907+
10908 static inline pte_t pte_mkexec(pte_t pte)
10909 {
10910- return pte_clear_flags(pte, _PAGE_NX);
10911+#ifdef CONFIG_X86_PAE
10912+ if (__supported_pte_mask & _PAGE_NX)
10913+ return pte_clear_flags(pte, _PAGE_NX);
10914+ else
10915+#endif
10916+ return pte_set_flags(pte, _PAGE_USER);
10917+}
10918+
10919+static inline pte_t pte_exprotect(pte_t pte)
10920+{
10921+#ifdef CONFIG_X86_PAE
10922+ if (__supported_pte_mask & _PAGE_NX)
10923+ return pte_set_flags(pte, _PAGE_NX);
10924+ else
10925+#endif
10926+ return pte_clear_flags(pte, _PAGE_USER);
10927 }
10928
10929 static inline pte_t pte_mkdirty(pte_t pte)
10930@@ -390,6 +450,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
10931 #endif
10932
10933 #ifndef __ASSEMBLY__
10934+
10935+#ifdef CONFIG_PAX_PER_CPU_PGD
10936+extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
10937+static inline pgd_t *get_cpu_pgd(unsigned int cpu)
10938+{
10939+ return cpu_pgd[cpu];
10940+}
10941+#endif
10942+
10943 #include <linux/mm_types.h>
10944
10945 static inline int pte_none(pte_t pte)
10946@@ -560,7 +629,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
10947
10948 static inline int pgd_bad(pgd_t pgd)
10949 {
10950- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
10951+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
10952 }
10953
10954 static inline int pgd_none(pgd_t pgd)
10955@@ -583,7 +652,12 @@ static inline int pgd_none(pgd_t pgd)
10956 * pgd_offset() returns a (pgd_t *)
10957 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
10958 */
10959-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
10960+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
10961+
10962+#ifdef CONFIG_PAX_PER_CPU_PGD
10963+#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
10964+#endif
10965+
10966 /*
10967 * a shortcut which implies the use of the kernel's pgd, instead
10968 * of a process's
10969@@ -594,6 +668,20 @@ static inline int pgd_none(pgd_t pgd)
10970 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
10971 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
10972
10973+#ifdef CONFIG_X86_32
10974+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
10975+#else
10976+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
10977+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
10978+
10979+#ifdef CONFIG_PAX_MEMORY_UDEREF
10980+#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
10981+#else
10982+#define PAX_USER_SHADOW_BASE (_AC(0,UL))
10983+#endif
10984+
10985+#endif
10986+
10987 #ifndef __ASSEMBLY__
10988
10989 extern int direct_gbpages;
10990@@ -758,11 +846,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
10991 * dst and src can be on the same page, but the range must not overlap,
10992 * and must not cross a page boundary.
10993 */
10994-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
10995+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
10996 {
10997- memcpy(dst, src, count * sizeof(pgd_t));
10998+ pax_open_kernel();
10999+ while (count--)
11000+ *dst++ = *src++;
11001+ pax_close_kernel();
11002 }
11003
11004+#ifdef CONFIG_PAX_PER_CPU_PGD
11005+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11006+#endif
11007+
11008+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11009+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11010+#else
11011+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
11012+#endif
11013
11014 #include <asm-generic/pgtable.h>
11015 #endif /* __ASSEMBLY__ */
11016diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
11017index 0c92113..34a77c6 100644
11018--- a/arch/x86/include/asm/pgtable_32.h
11019+++ b/arch/x86/include/asm/pgtable_32.h
11020@@ -25,9 +25,6 @@
11021 struct mm_struct;
11022 struct vm_area_struct;
11023
11024-extern pgd_t swapper_pg_dir[1024];
11025-extern pgd_t initial_page_table[1024];
11026-
11027 static inline void pgtable_cache_init(void) { }
11028 static inline void check_pgt_cache(void) { }
11029 void paging_init(void);
11030@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11031 # include <asm/pgtable-2level.h>
11032 #endif
11033
11034+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
11035+extern pgd_t initial_page_table[PTRS_PER_PGD];
11036+#ifdef CONFIG_X86_PAE
11037+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
11038+#endif
11039+
11040 #if defined(CONFIG_HIGHPTE)
11041 #define pte_offset_map(dir, address) \
11042 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
11043@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11044 /* Clear a kernel PTE and flush it from the TLB */
11045 #define kpte_clear_flush(ptep, vaddr) \
11046 do { \
11047+ pax_open_kernel(); \
11048 pte_clear(&init_mm, (vaddr), (ptep)); \
11049+ pax_close_kernel(); \
11050 __flush_tlb_one((vaddr)); \
11051 } while (0)
11052
11053@@ -74,6 +79,9 @@ do { \
11054
11055 #endif /* !__ASSEMBLY__ */
11056
11057+#define HAVE_ARCH_UNMAPPED_AREA
11058+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
11059+
11060 /*
11061 * kern_addr_valid() is (1) for FLATMEM and (0) for
11062 * SPARSEMEM and DISCONTIGMEM
11063diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
11064index ed5903b..c7fe163 100644
11065--- a/arch/x86/include/asm/pgtable_32_types.h
11066+++ b/arch/x86/include/asm/pgtable_32_types.h
11067@@ -8,7 +8,7 @@
11068 */
11069 #ifdef CONFIG_X86_PAE
11070 # include <asm/pgtable-3level_types.h>
11071-# define PMD_SIZE (1UL << PMD_SHIFT)
11072+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
11073 # define PMD_MASK (~(PMD_SIZE - 1))
11074 #else
11075 # include <asm/pgtable-2level_types.h>
11076@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
11077 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
11078 #endif
11079
11080+#ifdef CONFIG_PAX_KERNEXEC
11081+#ifndef __ASSEMBLY__
11082+extern unsigned char MODULES_EXEC_VADDR[];
11083+extern unsigned char MODULES_EXEC_END[];
11084+#endif
11085+#include <asm/boot.h>
11086+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
11087+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
11088+#else
11089+#define ktla_ktva(addr) (addr)
11090+#define ktva_ktla(addr) (addr)
11091+#endif
11092+
11093 #define MODULES_VADDR VMALLOC_START
11094 #define MODULES_END VMALLOC_END
11095 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
11096diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
11097index 975f709..107976d 100644
11098--- a/arch/x86/include/asm/pgtable_64.h
11099+++ b/arch/x86/include/asm/pgtable_64.h
11100@@ -16,10 +16,14 @@
11101
11102 extern pud_t level3_kernel_pgt[512];
11103 extern pud_t level3_ident_pgt[512];
11104+extern pud_t level3_vmalloc_start_pgt[512];
11105+extern pud_t level3_vmalloc_end_pgt[512];
11106+extern pud_t level3_vmemmap_pgt[512];
11107+extern pud_t level2_vmemmap_pgt[512];
11108 extern pmd_t level2_kernel_pgt[512];
11109 extern pmd_t level2_fixmap_pgt[512];
11110-extern pmd_t level2_ident_pgt[512];
11111-extern pgd_t init_level4_pgt[];
11112+extern pmd_t level2_ident_pgt[512*2];
11113+extern pgd_t init_level4_pgt[512];
11114
11115 #define swapper_pg_dir init_level4_pgt
11116
11117@@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11118
11119 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11120 {
11121+ pax_open_kernel();
11122 *pmdp = pmd;
11123+ pax_close_kernel();
11124 }
11125
11126 static inline void native_pmd_clear(pmd_t *pmd)
11127@@ -107,6 +113,13 @@ static inline void native_pud_clear(pud_t *pud)
11128
11129 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
11130 {
11131+ pax_open_kernel();
11132+ *pgdp = pgd;
11133+ pax_close_kernel();
11134+}
11135+
11136+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11137+{
11138 *pgdp = pgd;
11139 }
11140
11141diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
11142index 766ea16..5b96cb3 100644
11143--- a/arch/x86/include/asm/pgtable_64_types.h
11144+++ b/arch/x86/include/asm/pgtable_64_types.h
11145@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
11146 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
11147 #define MODULES_END _AC(0xffffffffff000000, UL)
11148 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
11149+#define MODULES_EXEC_VADDR MODULES_VADDR
11150+#define MODULES_EXEC_END MODULES_END
11151+
11152+#define ktla_ktva(addr) (addr)
11153+#define ktva_ktla(addr) (addr)
11154
11155 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
11156diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
11157index 013286a..8b42f4f 100644
11158--- a/arch/x86/include/asm/pgtable_types.h
11159+++ b/arch/x86/include/asm/pgtable_types.h
11160@@ -16,13 +16,12 @@
11161 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
11162 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
11163 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
11164-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
11165+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
11166 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
11167 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
11168 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
11169-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
11170-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
11171-#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
11172+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
11173+#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
11174 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
11175
11176 /* If _PAGE_BIT_PRESENT is clear, we use these: */
11177@@ -40,7 +39,6 @@
11178 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
11179 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
11180 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
11181-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
11182 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
11183 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
11184 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
11185@@ -57,8 +55,10 @@
11186
11187 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
11188 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
11189-#else
11190+#elif defined(CONFIG_KMEMCHECK)
11191 #define _PAGE_NX (_AT(pteval_t, 0))
11192+#else
11193+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
11194 #endif
11195
11196 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
11197@@ -96,6 +96,9 @@
11198 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
11199 _PAGE_ACCESSED)
11200
11201+#define PAGE_READONLY_NOEXEC PAGE_READONLY
11202+#define PAGE_SHARED_NOEXEC PAGE_SHARED
11203+
11204 #define __PAGE_KERNEL_EXEC \
11205 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
11206 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
11207@@ -106,7 +109,7 @@
11208 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
11209 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
11210 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
11211-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
11212+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
11213 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
11214 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
11215 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
11216@@ -168,8 +171,8 @@
11217 * bits are combined, this will alow user to access the high address mapped
11218 * VDSO in the presence of CONFIG_COMPAT_VDSO
11219 */
11220-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
11221-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
11222+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11223+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11224 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
11225 #endif
11226
11227@@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
11228 {
11229 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
11230 }
11231+#endif
11232
11233+#if PAGETABLE_LEVELS == 3
11234+#include <asm-generic/pgtable-nopud.h>
11235+#endif
11236+
11237+#if PAGETABLE_LEVELS == 2
11238+#include <asm-generic/pgtable-nopmd.h>
11239+#endif
11240+
11241+#ifndef __ASSEMBLY__
11242 #if PAGETABLE_LEVELS > 3
11243 typedef struct { pudval_t pud; } pud_t;
11244
11245@@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pud_t pud)
11246 return pud.pud;
11247 }
11248 #else
11249-#include <asm-generic/pgtable-nopud.h>
11250-
11251 static inline pudval_t native_pud_val(pud_t pud)
11252 {
11253 return native_pgd_val(pud.pgd);
11254@@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
11255 return pmd.pmd;
11256 }
11257 #else
11258-#include <asm-generic/pgtable-nopmd.h>
11259-
11260 static inline pmdval_t native_pmd_val(pmd_t pmd)
11261 {
11262 return native_pgd_val(pmd.pud.pgd);
11263@@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
11264
11265 extern pteval_t __supported_pte_mask;
11266 extern void set_nx(void);
11267-extern int nx_enabled;
11268
11269 #define pgprot_writecombine pgprot_writecombine
11270 extern pgprot_t pgprot_writecombine(pgprot_t prot);
11271diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
11272index 58545c9..fe6fc38e 100644
11273--- a/arch/x86/include/asm/processor.h
11274+++ b/arch/x86/include/asm/processor.h
11275@@ -266,7 +266,7 @@ struct tss_struct {
11276
11277 } ____cacheline_aligned;
11278
11279-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
11280+extern struct tss_struct init_tss[NR_CPUS];
11281
11282 /*
11283 * Save the original ist values for checking stack pointers during debugging
11284@@ -860,11 +860,18 @@ static inline void spin_lock_prefetch(const void *x)
11285 */
11286 #define TASK_SIZE PAGE_OFFSET
11287 #define TASK_SIZE_MAX TASK_SIZE
11288+
11289+#ifdef CONFIG_PAX_SEGMEXEC
11290+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
11291+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
11292+#else
11293 #define STACK_TOP TASK_SIZE
11294-#define STACK_TOP_MAX STACK_TOP
11295+#endif
11296+
11297+#define STACK_TOP_MAX TASK_SIZE
11298
11299 #define INIT_THREAD { \
11300- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11301+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11302 .vm86_info = NULL, \
11303 .sysenter_cs = __KERNEL_CS, \
11304 .io_bitmap_ptr = NULL, \
11305@@ -878,7 +885,7 @@ static inline void spin_lock_prefetch(const void *x)
11306 */
11307 #define INIT_TSS { \
11308 .x86_tss = { \
11309- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11310+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11311 .ss0 = __KERNEL_DS, \
11312 .ss1 = __KERNEL_CS, \
11313 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
11314@@ -889,11 +896,7 @@ static inline void spin_lock_prefetch(const void *x)
11315 extern unsigned long thread_saved_pc(struct task_struct *tsk);
11316
11317 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
11318-#define KSTK_TOP(info) \
11319-({ \
11320- unsigned long *__ptr = (unsigned long *)(info); \
11321- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
11322-})
11323+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
11324
11325 /*
11326 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
11327@@ -908,7 +911,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11328 #define task_pt_regs(task) \
11329 ({ \
11330 struct pt_regs *__regs__; \
11331- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
11332+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
11333 __regs__ - 1; \
11334 })
11335
11336@@ -918,13 +921,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11337 /*
11338 * User space process size. 47bits minus one guard page.
11339 */
11340-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
11341+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
11342
11343 /* This decides where the kernel will search for a free chunk of vm
11344 * space during mmap's.
11345 */
11346 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
11347- 0xc0000000 : 0xFFFFe000)
11348+ 0xc0000000 : 0xFFFFf000)
11349
11350 #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
11351 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
11352@@ -935,11 +938,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11353 #define STACK_TOP_MAX TASK_SIZE_MAX
11354
11355 #define INIT_THREAD { \
11356- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11357+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11358 }
11359
11360 #define INIT_TSS { \
11361- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11362+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11363 }
11364
11365 /*
11366@@ -961,6 +964,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
11367 */
11368 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
11369
11370+#ifdef CONFIG_PAX_SEGMEXEC
11371+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
11372+#endif
11373+
11374 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
11375
11376 /* Get/set a process' ability to use the timestamp counter instruction */
11377diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
11378index 3566454..4bdfb8c 100644
11379--- a/arch/x86/include/asm/ptrace.h
11380+++ b/arch/x86/include/asm/ptrace.h
11381@@ -156,28 +156,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
11382 }
11383
11384 /*
11385- * user_mode_vm(regs) determines whether a register set came from user mode.
11386+ * user_mode(regs) determines whether a register set came from user mode.
11387 * This is true if V8086 mode was enabled OR if the register set was from
11388 * protected mode with RPL-3 CS value. This tricky test checks that with
11389 * one comparison. Many places in the kernel can bypass this full check
11390- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
11391+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
11392+ * be used.
11393 */
11394-static inline int user_mode(struct pt_regs *regs)
11395+static inline int user_mode_novm(struct pt_regs *regs)
11396 {
11397 #ifdef CONFIG_X86_32
11398 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
11399 #else
11400- return !!(regs->cs & 3);
11401+ return !!(regs->cs & SEGMENT_RPL_MASK);
11402 #endif
11403 }
11404
11405-static inline int user_mode_vm(struct pt_regs *regs)
11406+static inline int user_mode(struct pt_regs *regs)
11407 {
11408 #ifdef CONFIG_X86_32
11409 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
11410 USER_RPL;
11411 #else
11412- return user_mode(regs);
11413+ return user_mode_novm(regs);
11414 #endif
11415 }
11416
11417@@ -193,15 +194,16 @@ static inline int v8086_mode(struct pt_regs *regs)
11418 #ifdef CONFIG_X86_64
11419 static inline bool user_64bit_mode(struct pt_regs *regs)
11420 {
11421+ unsigned long cs = regs->cs & 0xffff;
11422 #ifndef CONFIG_PARAVIRT
11423 /*
11424 * On non-paravirt systems, this is the only long mode CPL 3
11425 * selector. We do not allow long mode selectors in the LDT.
11426 */
11427- return regs->cs == __USER_CS;
11428+ return cs == __USER_CS;
11429 #else
11430 /* Headers are too twisted for this to go in paravirt.h. */
11431- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
11432+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
11433 #endif
11434 }
11435 #endif
11436diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
11437index 92f29706..a79cbbb 100644
11438--- a/arch/x86/include/asm/reboot.h
11439+++ b/arch/x86/include/asm/reboot.h
11440@@ -6,19 +6,19 @@
11441 struct pt_regs;
11442
11443 struct machine_ops {
11444- void (*restart)(char *cmd);
11445- void (*halt)(void);
11446- void (*power_off)(void);
11447+ void (* __noreturn restart)(char *cmd);
11448+ void (* __noreturn halt)(void);
11449+ void (* __noreturn power_off)(void);
11450 void (*shutdown)(void);
11451 void (*crash_shutdown)(struct pt_regs *);
11452- void (*emergency_restart)(void);
11453-};
11454+ void (* __noreturn emergency_restart)(void);
11455+} __no_const;
11456
11457 extern struct machine_ops machine_ops;
11458
11459 void native_machine_crash_shutdown(struct pt_regs *regs);
11460 void native_machine_shutdown(void);
11461-void machine_real_restart(unsigned int type);
11462+void machine_real_restart(unsigned int type) __noreturn;
11463 /* These must match dispatch_table in reboot_32.S */
11464 #define MRR_BIOS 0
11465 #define MRR_APM 1
11466diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
11467index 2dbe4a7..ce1db00 100644
11468--- a/arch/x86/include/asm/rwsem.h
11469+++ b/arch/x86/include/asm/rwsem.h
11470@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
11471 {
11472 asm volatile("# beginning down_read\n\t"
11473 LOCK_PREFIX _ASM_INC "(%1)\n\t"
11474+
11475+#ifdef CONFIG_PAX_REFCOUNT
11476+ "jno 0f\n"
11477+ LOCK_PREFIX _ASM_DEC "(%1)\n"
11478+ "int $4\n0:\n"
11479+ _ASM_EXTABLE(0b, 0b)
11480+#endif
11481+
11482 /* adds 0x00000001 */
11483 " jns 1f\n"
11484 " call call_rwsem_down_read_failed\n"
11485@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
11486 "1:\n\t"
11487 " mov %1,%2\n\t"
11488 " add %3,%2\n\t"
11489+
11490+#ifdef CONFIG_PAX_REFCOUNT
11491+ "jno 0f\n"
11492+ "sub %3,%2\n"
11493+ "int $4\n0:\n"
11494+ _ASM_EXTABLE(0b, 0b)
11495+#endif
11496+
11497 " jle 2f\n\t"
11498 LOCK_PREFIX " cmpxchg %2,%0\n\t"
11499 " jnz 1b\n\t"
11500@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
11501 long tmp;
11502 asm volatile("# beginning down_write\n\t"
11503 LOCK_PREFIX " xadd %1,(%2)\n\t"
11504+
11505+#ifdef CONFIG_PAX_REFCOUNT
11506+ "jno 0f\n"
11507+ "mov %1,(%2)\n"
11508+ "int $4\n0:\n"
11509+ _ASM_EXTABLE(0b, 0b)
11510+#endif
11511+
11512 /* adds 0xffff0001, returns the old value */
11513 " test %1,%1\n\t"
11514 /* was the count 0 before? */
11515@@ -141,6 +165,14 @@ static inline void __up_read(struct rw_semaphore *sem)
11516 long tmp;
11517 asm volatile("# beginning __up_read\n\t"
11518 LOCK_PREFIX " xadd %1,(%2)\n\t"
11519+
11520+#ifdef CONFIG_PAX_REFCOUNT
11521+ "jno 0f\n"
11522+ "mov %1,(%2)\n"
11523+ "int $4\n0:\n"
11524+ _ASM_EXTABLE(0b, 0b)
11525+#endif
11526+
11527 /* subtracts 1, returns the old value */
11528 " jns 1f\n\t"
11529 " call call_rwsem_wake\n" /* expects old value in %edx */
11530@@ -159,6 +191,14 @@ static inline void __up_write(struct rw_semaphore *sem)
11531 long tmp;
11532 asm volatile("# beginning __up_write\n\t"
11533 LOCK_PREFIX " xadd %1,(%2)\n\t"
11534+
11535+#ifdef CONFIG_PAX_REFCOUNT
11536+ "jno 0f\n"
11537+ "mov %1,(%2)\n"
11538+ "int $4\n0:\n"
11539+ _ASM_EXTABLE(0b, 0b)
11540+#endif
11541+
11542 /* subtracts 0xffff0001, returns the old value */
11543 " jns 1f\n\t"
11544 " call call_rwsem_wake\n" /* expects old value in %edx */
11545@@ -176,6 +216,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11546 {
11547 asm volatile("# beginning __downgrade_write\n\t"
11548 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
11549+
11550+#ifdef CONFIG_PAX_REFCOUNT
11551+ "jno 0f\n"
11552+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
11553+ "int $4\n0:\n"
11554+ _ASM_EXTABLE(0b, 0b)
11555+#endif
11556+
11557 /*
11558 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
11559 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
11560@@ -194,7 +242,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11561 */
11562 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
11563 {
11564- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
11565+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
11566+
11567+#ifdef CONFIG_PAX_REFCOUNT
11568+ "jno 0f\n"
11569+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
11570+ "int $4\n0:\n"
11571+ _ASM_EXTABLE(0b, 0b)
11572+#endif
11573+
11574 : "+m" (sem->count)
11575 : "er" (delta));
11576 }
11577@@ -204,7 +260,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
11578 */
11579 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
11580 {
11581- return delta + xadd(&sem->count, delta);
11582+ return delta + xadd_check_overflow(&sem->count, delta);
11583 }
11584
11585 #endif /* __KERNEL__ */
11586diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
11587index 5e64171..f58957e 100644
11588--- a/arch/x86/include/asm/segment.h
11589+++ b/arch/x86/include/asm/segment.h
11590@@ -64,10 +64,15 @@
11591 * 26 - ESPFIX small SS
11592 * 27 - per-cpu [ offset to per-cpu data area ]
11593 * 28 - stack_canary-20 [ for stack protector ]
11594- * 29 - unused
11595- * 30 - unused
11596+ * 29 - PCI BIOS CS
11597+ * 30 - PCI BIOS DS
11598 * 31 - TSS for double fault handler
11599 */
11600+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
11601+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
11602+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
11603+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
11604+
11605 #define GDT_ENTRY_TLS_MIN 6
11606 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
11607
11608@@ -79,6 +84,8 @@
11609
11610 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
11611
11612+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
11613+
11614 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
11615
11616 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
11617@@ -104,6 +111,12 @@
11618 #define __KERNEL_STACK_CANARY 0
11619 #endif
11620
11621+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
11622+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
11623+
11624+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
11625+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
11626+
11627 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
11628
11629 /*
11630@@ -141,7 +154,7 @@
11631 */
11632
11633 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
11634-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
11635+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
11636
11637
11638 #else
11639@@ -165,6 +178,8 @@
11640 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
11641 #define __USER32_DS __USER_DS
11642
11643+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
11644+
11645 #define GDT_ENTRY_TSS 8 /* needs two entries */
11646 #define GDT_ENTRY_LDT 10 /* needs two entries */
11647 #define GDT_ENTRY_TLS_MIN 12
11648@@ -185,6 +200,7 @@
11649 #endif
11650
11651 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
11652+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
11653 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
11654 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
11655 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
11656diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
11657index 0434c40..1714bf0 100644
11658--- a/arch/x86/include/asm/smp.h
11659+++ b/arch/x86/include/asm/smp.h
11660@@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
11661 /* cpus sharing the last level cache: */
11662 DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
11663 DECLARE_PER_CPU(u16, cpu_llc_id);
11664-DECLARE_PER_CPU(int, cpu_number);
11665+DECLARE_PER_CPU(unsigned int, cpu_number);
11666
11667 static inline struct cpumask *cpu_sibling_mask(int cpu)
11668 {
11669@@ -77,7 +77,7 @@ struct smp_ops {
11670
11671 void (*send_call_func_ipi)(const struct cpumask *mask);
11672 void (*send_call_func_single_ipi)(int cpu);
11673-};
11674+} __no_const;
11675
11676 /* Globals due to paravirt */
11677 extern void set_cpu_sibling_map(int cpu);
11678@@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitdata;
11679 extern int safe_smp_processor_id(void);
11680
11681 #elif defined(CONFIG_X86_64_SMP)
11682-#define raw_smp_processor_id() (percpu_read(cpu_number))
11683-
11684-#define stack_smp_processor_id() \
11685-({ \
11686- struct thread_info *ti; \
11687- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
11688- ti->cpu; \
11689-})
11690+#define raw_smp_processor_id() (percpu_read(cpu_number))
11691+#define stack_smp_processor_id() raw_smp_processor_id()
11692 #define safe_smp_processor_id() smp_processor_id()
11693
11694 #endif
11695diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
11696index a82c2bf..2198f61 100644
11697--- a/arch/x86/include/asm/spinlock.h
11698+++ b/arch/x86/include/asm/spinlock.h
11699@@ -175,6 +175,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
11700 static inline void arch_read_lock(arch_rwlock_t *rw)
11701 {
11702 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
11703+
11704+#ifdef CONFIG_PAX_REFCOUNT
11705+ "jno 0f\n"
11706+ LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
11707+ "int $4\n0:\n"
11708+ _ASM_EXTABLE(0b, 0b)
11709+#endif
11710+
11711 "jns 1f\n"
11712 "call __read_lock_failed\n\t"
11713 "1:\n"
11714@@ -184,6 +192,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
11715 static inline void arch_write_lock(arch_rwlock_t *rw)
11716 {
11717 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
11718+
11719+#ifdef CONFIG_PAX_REFCOUNT
11720+ "jno 0f\n"
11721+ LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
11722+ "int $4\n0:\n"
11723+ _ASM_EXTABLE(0b, 0b)
11724+#endif
11725+
11726 "jz 1f\n"
11727 "call __write_lock_failed\n\t"
11728 "1:\n"
11729@@ -213,13 +229,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
11730
11731 static inline void arch_read_unlock(arch_rwlock_t *rw)
11732 {
11733- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
11734+ asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
11735+
11736+#ifdef CONFIG_PAX_REFCOUNT
11737+ "jno 0f\n"
11738+ LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
11739+ "int $4\n0:\n"
11740+ _ASM_EXTABLE(0b, 0b)
11741+#endif
11742+
11743 :"+m" (rw->lock) : : "memory");
11744 }
11745
11746 static inline void arch_write_unlock(arch_rwlock_t *rw)
11747 {
11748- asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
11749+ asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
11750+
11751+#ifdef CONFIG_PAX_REFCOUNT
11752+ "jno 0f\n"
11753+ LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
11754+ "int $4\n0:\n"
11755+ _ASM_EXTABLE(0b, 0b)
11756+#endif
11757+
11758 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
11759 }
11760
11761diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
11762index 1575177..cb23f52 100644
11763--- a/arch/x86/include/asm/stackprotector.h
11764+++ b/arch/x86/include/asm/stackprotector.h
11765@@ -48,7 +48,7 @@
11766 * head_32 for boot CPU and setup_per_cpu_areas() for others.
11767 */
11768 #define GDT_STACK_CANARY_INIT \
11769- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
11770+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
11771
11772 /*
11773 * Initialize the stackprotector canary value.
11774@@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu)
11775
11776 static inline void load_stack_canary_segment(void)
11777 {
11778-#ifdef CONFIG_X86_32
11779+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
11780 asm volatile ("mov %0, %%gs" : : "r" (0));
11781 #endif
11782 }
11783diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
11784index 70bbe39..4ae2bd4 100644
11785--- a/arch/x86/include/asm/stacktrace.h
11786+++ b/arch/x86/include/asm/stacktrace.h
11787@@ -11,28 +11,20 @@
11788
11789 extern int kstack_depth_to_print;
11790
11791-struct thread_info;
11792+struct task_struct;
11793 struct stacktrace_ops;
11794
11795-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
11796- unsigned long *stack,
11797- unsigned long bp,
11798- const struct stacktrace_ops *ops,
11799- void *data,
11800- unsigned long *end,
11801- int *graph);
11802+typedef unsigned long walk_stack_t(struct task_struct *task,
11803+ void *stack_start,
11804+ unsigned long *stack,
11805+ unsigned long bp,
11806+ const struct stacktrace_ops *ops,
11807+ void *data,
11808+ unsigned long *end,
11809+ int *graph);
11810
11811-extern unsigned long
11812-print_context_stack(struct thread_info *tinfo,
11813- unsigned long *stack, unsigned long bp,
11814- const struct stacktrace_ops *ops, void *data,
11815- unsigned long *end, int *graph);
11816-
11817-extern unsigned long
11818-print_context_stack_bp(struct thread_info *tinfo,
11819- unsigned long *stack, unsigned long bp,
11820- const struct stacktrace_ops *ops, void *data,
11821- unsigned long *end, int *graph);
11822+extern walk_stack_t print_context_stack;
11823+extern walk_stack_t print_context_stack_bp;
11824
11825 /* Generic stack tracer with callbacks */
11826
11827@@ -40,7 +32,7 @@ struct stacktrace_ops {
11828 void (*address)(void *data, unsigned long address, int reliable);
11829 /* On negative return stop dumping */
11830 int (*stack)(void *data, char *name);
11831- walk_stack_t walk_stack;
11832+ walk_stack_t *walk_stack;
11833 };
11834
11835 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
11836diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
11837index cb23852..2dde194 100644
11838--- a/arch/x86/include/asm/sys_ia32.h
11839+++ b/arch/x86/include/asm/sys_ia32.h
11840@@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int, compat_sigset_t __user *,
11841 compat_sigset_t __user *, unsigned int);
11842 asmlinkage long sys32_alarm(unsigned int);
11843
11844-asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
11845+asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
11846 asmlinkage long sys32_sysfs(int, u32, u32);
11847
11848 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
11849diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
11850index f1d8b44..a4de8b7 100644
11851--- a/arch/x86/include/asm/syscalls.h
11852+++ b/arch/x86/include/asm/syscalls.h
11853@@ -30,7 +30,7 @@ long sys_clone(unsigned long, unsigned long, void __user *,
11854 void __user *, struct pt_regs *);
11855
11856 /* kernel/ldt.c */
11857-asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);
11858+asmlinkage int sys_modify_ldt(int, void __user *, unsigned long) __size_overflow(3);
11859
11860 /* kernel/signal.c */
11861 long sys_rt_sigreturn(struct pt_regs *);
11862diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
11863index 2d2f01c..f985723 100644
11864--- a/arch/x86/include/asm/system.h
11865+++ b/arch/x86/include/asm/system.h
11866@@ -129,7 +129,7 @@ do { \
11867 "call __switch_to\n\t" \
11868 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
11869 __switch_canary \
11870- "movq %P[thread_info](%%rsi),%%r8\n\t" \
11871+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
11872 "movq %%rax,%%rdi\n\t" \
11873 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
11874 "jnz ret_from_fork\n\t" \
11875@@ -140,7 +140,7 @@ do { \
11876 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
11877 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
11878 [_tif_fork] "i" (_TIF_FORK), \
11879- [thread_info] "i" (offsetof(struct task_struct, stack)), \
11880+ [thread_info] "m" (current_tinfo), \
11881 [current_task] "m" (current_task) \
11882 __switch_canary_iparam \
11883 : "memory", "cc" __EXTRA_CLOBBER)
11884@@ -200,7 +200,7 @@ static inline unsigned long get_limit(unsigned long segment)
11885 {
11886 unsigned long __limit;
11887 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
11888- return __limit + 1;
11889+ return __limit;
11890 }
11891
11892 static inline void native_clts(void)
11893@@ -397,13 +397,13 @@ void enable_hlt(void);
11894
11895 void cpu_idle_wait(void);
11896
11897-extern unsigned long arch_align_stack(unsigned long sp);
11898+#define arch_align_stack(x) ((x) & ~0xfUL)
11899 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
11900
11901 void default_idle(void);
11902 bool set_pm_idle_to_default(void);
11903
11904-void stop_this_cpu(void *dummy);
11905+void stop_this_cpu(void *dummy) __noreturn;
11906
11907 /*
11908 * Force strict CPU ordering.
11909diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
11910index cfd8144..1b1127d 100644
11911--- a/arch/x86/include/asm/thread_info.h
11912+++ b/arch/x86/include/asm/thread_info.h
11913@@ -10,6 +10,7 @@
11914 #include <linux/compiler.h>
11915 #include <asm/page.h>
11916 #include <asm/types.h>
11917+#include <asm/percpu.h>
11918
11919 /*
11920 * low level task data that entry.S needs immediate access to
11921@@ -24,7 +25,6 @@ struct exec_domain;
11922 #include <linux/atomic.h>
11923
11924 struct thread_info {
11925- struct task_struct *task; /* main task structure */
11926 struct exec_domain *exec_domain; /* execution domain */
11927 __u32 flags; /* low level flags */
11928 __u32 status; /* thread synchronous flags */
11929@@ -34,19 +34,13 @@ struct thread_info {
11930 mm_segment_t addr_limit;
11931 struct restart_block restart_block;
11932 void __user *sysenter_return;
11933-#ifdef CONFIG_X86_32
11934- unsigned long previous_esp; /* ESP of the previous stack in
11935- case of nested (IRQ) stacks
11936- */
11937- __u8 supervisor_stack[0];
11938-#endif
11939+ unsigned long lowest_stack;
11940 unsigned int sig_on_uaccess_error:1;
11941 unsigned int uaccess_err:1; /* uaccess failed */
11942 };
11943
11944-#define INIT_THREAD_INFO(tsk) \
11945+#define INIT_THREAD_INFO \
11946 { \
11947- .task = &tsk, \
11948 .exec_domain = &default_exec_domain, \
11949 .flags = 0, \
11950 .cpu = 0, \
11951@@ -57,7 +51,7 @@ struct thread_info {
11952 }, \
11953 }
11954
11955-#define init_thread_info (init_thread_union.thread_info)
11956+#define init_thread_info (init_thread_union.stack)
11957 #define init_stack (init_thread_union.stack)
11958
11959 #else /* !__ASSEMBLY__ */
11960@@ -169,45 +163,40 @@ struct thread_info {
11961 ret; \
11962 })
11963
11964-#ifdef CONFIG_X86_32
11965-
11966-#define STACK_WARN (THREAD_SIZE/8)
11967-/*
11968- * macros/functions for gaining access to the thread information structure
11969- *
11970- * preempt_count needs to be 1 initially, until the scheduler is functional.
11971- */
11972-#ifndef __ASSEMBLY__
11973-
11974-
11975-/* how to get the current stack pointer from C */
11976-register unsigned long current_stack_pointer asm("esp") __used;
11977-
11978-/* how to get the thread information struct from C */
11979-static inline struct thread_info *current_thread_info(void)
11980-{
11981- return (struct thread_info *)
11982- (current_stack_pointer & ~(THREAD_SIZE - 1));
11983-}
11984-
11985-#else /* !__ASSEMBLY__ */
11986-
11987+#ifdef __ASSEMBLY__
11988 /* how to get the thread information struct from ASM */
11989 #define GET_THREAD_INFO(reg) \
11990- movl $-THREAD_SIZE, reg; \
11991- andl %esp, reg
11992+ mov PER_CPU_VAR(current_tinfo), reg
11993
11994 /* use this one if reg already contains %esp */
11995-#define GET_THREAD_INFO_WITH_ESP(reg) \
11996- andl $-THREAD_SIZE, reg
11997+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
11998+#else
11999+/* how to get the thread information struct from C */
12000+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
12001+
12002+static __always_inline struct thread_info *current_thread_info(void)
12003+{
12004+ return percpu_read_stable(current_tinfo);
12005+}
12006+#endif
12007+
12008+#ifdef CONFIG_X86_32
12009+
12010+#define STACK_WARN (THREAD_SIZE/8)
12011+/*
12012+ * macros/functions for gaining access to the thread information structure
12013+ *
12014+ * preempt_count needs to be 1 initially, until the scheduler is functional.
12015+ */
12016+#ifndef __ASSEMBLY__
12017+
12018+/* how to get the current stack pointer from C */
12019+register unsigned long current_stack_pointer asm("esp") __used;
12020
12021 #endif
12022
12023 #else /* X86_32 */
12024
12025-#include <asm/percpu.h>
12026-#define KERNEL_STACK_OFFSET (5*8)
12027-
12028 /*
12029 * macros/functions for gaining access to the thread information structure
12030 * preempt_count needs to be 1 initially, until the scheduler is functional.
12031@@ -215,27 +204,8 @@ static inline struct thread_info *current_thread_info(void)
12032 #ifndef __ASSEMBLY__
12033 DECLARE_PER_CPU(unsigned long, kernel_stack);
12034
12035-static inline struct thread_info *current_thread_info(void)
12036-{
12037- struct thread_info *ti;
12038- ti = (void *)(percpu_read_stable(kernel_stack) +
12039- KERNEL_STACK_OFFSET - THREAD_SIZE);
12040- return ti;
12041-}
12042-
12043-#else /* !__ASSEMBLY__ */
12044-
12045-/* how to get the thread information struct from ASM */
12046-#define GET_THREAD_INFO(reg) \
12047- movq PER_CPU_VAR(kernel_stack),reg ; \
12048- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
12049-
12050-/*
12051- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
12052- * a certain register (to be used in assembler memory operands).
12053- */
12054-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
12055-
12056+/* how to get the current stack pointer from C */
12057+register unsigned long current_stack_pointer asm("rsp") __used;
12058 #endif
12059
12060 #endif /* !X86_32 */
12061@@ -269,5 +239,16 @@ extern void arch_task_cache_init(void);
12062 extern void free_thread_info(struct thread_info *ti);
12063 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
12064 #define arch_task_cache_init arch_task_cache_init
12065+
12066+#define __HAVE_THREAD_FUNCTIONS
12067+#define task_thread_info(task) (&(task)->tinfo)
12068+#define task_stack_page(task) ((task)->stack)
12069+#define setup_thread_stack(p, org) do {} while (0)
12070+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
12071+
12072+#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
12073+extern struct task_struct *alloc_task_struct_node(int node);
12074+extern void free_task_struct(struct task_struct *);
12075+
12076 #endif
12077 #endif /* _ASM_X86_THREAD_INFO_H */
12078diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
12079index 8be5f54..7ae826d 100644
12080--- a/arch/x86/include/asm/uaccess.h
12081+++ b/arch/x86/include/asm/uaccess.h
12082@@ -7,12 +7,15 @@
12083 #include <linux/compiler.h>
12084 #include <linux/thread_info.h>
12085 #include <linux/string.h>
12086+#include <linux/sched.h>
12087 #include <asm/asm.h>
12088 #include <asm/page.h>
12089
12090 #define VERIFY_READ 0
12091 #define VERIFY_WRITE 1
12092
12093+extern void check_object_size(const void *ptr, unsigned long n, bool to);
12094+
12095 /*
12096 * The fs value determines whether argument validity checking should be
12097 * performed or not. If get_fs() == USER_DS, checking is performed, with
12098@@ -28,7 +31,12 @@
12099
12100 #define get_ds() (KERNEL_DS)
12101 #define get_fs() (current_thread_info()->addr_limit)
12102+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12103+void __set_fs(mm_segment_t x);
12104+void set_fs(mm_segment_t x);
12105+#else
12106 #define set_fs(x) (current_thread_info()->addr_limit = (x))
12107+#endif
12108
12109 #define segment_eq(a, b) ((a).seg == (b).seg)
12110
12111@@ -76,7 +84,33 @@
12112 * checks that the pointer is in the user space range - after calling
12113 * this function, memory access functions may still return -EFAULT.
12114 */
12115-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12116+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12117+#define access_ok(type, addr, size) \
12118+({ \
12119+ long __size = size; \
12120+ unsigned long __addr = (unsigned long)addr; \
12121+ unsigned long __addr_ao = __addr & PAGE_MASK; \
12122+ unsigned long __end_ao = __addr + __size - 1; \
12123+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
12124+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
12125+ while(__addr_ao <= __end_ao) { \
12126+ char __c_ao; \
12127+ __addr_ao += PAGE_SIZE; \
12128+ if (__size > PAGE_SIZE) \
12129+ cond_resched(); \
12130+ if (__get_user(__c_ao, (char __user *)__addr)) \
12131+ break; \
12132+ if (type != VERIFY_WRITE) { \
12133+ __addr = __addr_ao; \
12134+ continue; \
12135+ } \
12136+ if (__put_user(__c_ao, (char __user *)__addr)) \
12137+ break; \
12138+ __addr = __addr_ao; \
12139+ } \
12140+ } \
12141+ __ret_ao; \
12142+})
12143
12144 /*
12145 * The exception table consists of pairs of addresses: the first is the
12146@@ -182,12 +216,20 @@ extern int __get_user_bad(void);
12147 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
12148 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
12149
12150-
12151+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12152+#define __copyuser_seg "gs;"
12153+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
12154+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
12155+#else
12156+#define __copyuser_seg
12157+#define __COPYUSER_SET_ES
12158+#define __COPYUSER_RESTORE_ES
12159+#endif
12160
12161 #ifdef CONFIG_X86_32
12162 #define __put_user_asm_u64(x, addr, err, errret) \
12163- asm volatile("1: movl %%eax,0(%2)\n" \
12164- "2: movl %%edx,4(%2)\n" \
12165+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
12166+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
12167 "3:\n" \
12168 ".section .fixup,\"ax\"\n" \
12169 "4: movl %3,%0\n" \
12170@@ -199,8 +241,8 @@ extern int __get_user_bad(void);
12171 : "A" (x), "r" (addr), "i" (errret), "0" (err))
12172
12173 #define __put_user_asm_ex_u64(x, addr) \
12174- asm volatile("1: movl %%eax,0(%1)\n" \
12175- "2: movl %%edx,4(%1)\n" \
12176+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
12177+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
12178 "3:\n" \
12179 _ASM_EXTABLE(1b, 2b - 1b) \
12180 _ASM_EXTABLE(2b, 3b - 2b) \
12181@@ -252,7 +294,7 @@ extern void __put_user_8(void);
12182 __typeof__(*(ptr)) __pu_val; \
12183 __chk_user_ptr(ptr); \
12184 might_fault(); \
12185- __pu_val = x; \
12186+ __pu_val = (x); \
12187 switch (sizeof(*(ptr))) { \
12188 case 1: \
12189 __put_user_x(1, __pu_val, ptr, __ret_pu); \
12190@@ -373,7 +415,7 @@ do { \
12191 } while (0)
12192
12193 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12194- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
12195+ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
12196 "2:\n" \
12197 ".section .fixup,\"ax\"\n" \
12198 "3: mov %3,%0\n" \
12199@@ -381,7 +423,7 @@ do { \
12200 " jmp 2b\n" \
12201 ".previous\n" \
12202 _ASM_EXTABLE(1b, 3b) \
12203- : "=r" (err), ltype(x) \
12204+ : "=r" (err), ltype (x) \
12205 : "m" (__m(addr)), "i" (errret), "0" (err))
12206
12207 #define __get_user_size_ex(x, ptr, size) \
12208@@ -406,7 +448,7 @@ do { \
12209 } while (0)
12210
12211 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
12212- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
12213+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
12214 "2:\n" \
12215 _ASM_EXTABLE(1b, 2b - 1b) \
12216 : ltype(x) : "m" (__m(addr)))
12217@@ -423,13 +465,24 @@ do { \
12218 int __gu_err; \
12219 unsigned long __gu_val; \
12220 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
12221- (x) = (__force __typeof__(*(ptr)))__gu_val; \
12222+ (x) = (__typeof__(*(ptr)))__gu_val; \
12223 __gu_err; \
12224 })
12225
12226 /* FIXME: this hack is definitely wrong -AK */
12227 struct __large_struct { unsigned long buf[100]; };
12228-#define __m(x) (*(struct __large_struct __user *)(x))
12229+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12230+#define ____m(x) \
12231+({ \
12232+ unsigned long ____x = (unsigned long)(x); \
12233+ if (____x < PAX_USER_SHADOW_BASE) \
12234+ ____x += PAX_USER_SHADOW_BASE; \
12235+ (void __user *)____x; \
12236+})
12237+#else
12238+#define ____m(x) (x)
12239+#endif
12240+#define __m(x) (*(struct __large_struct __user *)____m(x))
12241
12242 /*
12243 * Tell gcc we read from memory instead of writing: this is because
12244@@ -437,7 +490,7 @@ struct __large_struct { unsigned long buf[100]; };
12245 * aliasing issues.
12246 */
12247 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12248- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
12249+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
12250 "2:\n" \
12251 ".section .fixup,\"ax\"\n" \
12252 "3: mov %3,%0\n" \
12253@@ -445,10 +498,10 @@ struct __large_struct { unsigned long buf[100]; };
12254 ".previous\n" \
12255 _ASM_EXTABLE(1b, 3b) \
12256 : "=r"(err) \
12257- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
12258+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
12259
12260 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
12261- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
12262+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
12263 "2:\n" \
12264 _ASM_EXTABLE(1b, 2b - 1b) \
12265 : : ltype(x), "m" (__m(addr)))
12266@@ -487,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
12267 * On error, the variable @x is set to zero.
12268 */
12269
12270+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12271+#define __get_user(x, ptr) get_user((x), (ptr))
12272+#else
12273 #define __get_user(x, ptr) \
12274 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
12275+#endif
12276
12277 /**
12278 * __put_user: - Write a simple value into user space, with less checking.
12279@@ -510,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
12280 * Returns zero on success, or -EFAULT on error.
12281 */
12282
12283+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12284+#define __put_user(x, ptr) put_user((x), (ptr))
12285+#else
12286 #define __put_user(x, ptr) \
12287 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
12288+#endif
12289
12290 #define __get_user_unaligned __get_user
12291 #define __put_user_unaligned __put_user
12292@@ -529,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
12293 #define get_user_ex(x, ptr) do { \
12294 unsigned long __gue_val; \
12295 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
12296- (x) = (__force __typeof__(*(ptr)))__gue_val; \
12297+ (x) = (__typeof__(*(ptr)))__gue_val; \
12298 } while (0)
12299
12300 #ifdef CONFIG_X86_WP_WORKS_OK
12301diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
12302index 566e803..7183d0b 100644
12303--- a/arch/x86/include/asm/uaccess_32.h
12304+++ b/arch/x86/include/asm/uaccess_32.h
12305@@ -11,15 +11,15 @@
12306 #include <asm/page.h>
12307
12308 unsigned long __must_check __copy_to_user_ll
12309- (void __user *to, const void *from, unsigned long n);
12310+ (void __user *to, const void *from, unsigned long n) __size_overflow(3);
12311 unsigned long __must_check __copy_from_user_ll
12312- (void *to, const void __user *from, unsigned long n);
12313+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12314 unsigned long __must_check __copy_from_user_ll_nozero
12315- (void *to, const void __user *from, unsigned long n);
12316+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12317 unsigned long __must_check __copy_from_user_ll_nocache
12318- (void *to, const void __user *from, unsigned long n);
12319+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12320 unsigned long __must_check __copy_from_user_ll_nocache_nozero
12321- (void *to, const void __user *from, unsigned long n);
12322+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12323
12324 /**
12325 * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
12326@@ -41,8 +41,13 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
12327 */
12328
12329 static __always_inline unsigned long __must_check
12330+__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12331+static __always_inline unsigned long __must_check
12332 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12333 {
12334+ if ((long)n < 0)
12335+ return n;
12336+
12337 if (__builtin_constant_p(n)) {
12338 unsigned long ret;
12339
12340@@ -61,6 +66,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12341 return ret;
12342 }
12343 }
12344+ if (!__builtin_constant_p(n))
12345+ check_object_size(from, n, true);
12346 return __copy_to_user_ll(to, from, n);
12347 }
12348
12349@@ -79,15 +86,23 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12350 * On success, this will be zero.
12351 */
12352 static __always_inline unsigned long __must_check
12353+__copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12354+static __always_inline unsigned long __must_check
12355 __copy_to_user(void __user *to, const void *from, unsigned long n)
12356 {
12357 might_fault();
12358+
12359 return __copy_to_user_inatomic(to, from, n);
12360 }
12361
12362 static __always_inline unsigned long
12363+__copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12364+static __always_inline unsigned long
12365 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12366 {
12367+ if ((long)n < 0)
12368+ return n;
12369+
12370 /* Avoid zeroing the tail if the copy fails..
12371 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
12372 * but as the zeroing behaviour is only significant when n is not
12373@@ -134,9 +149,15 @@ __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12374 * for explanation of why this is needed.
12375 */
12376 static __always_inline unsigned long
12377+__copy_from_user(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12378+static __always_inline unsigned long
12379 __copy_from_user(void *to, const void __user *from, unsigned long n)
12380 {
12381 might_fault();
12382+
12383+ if ((long)n < 0)
12384+ return n;
12385+
12386 if (__builtin_constant_p(n)) {
12387 unsigned long ret;
12388
12389@@ -152,13 +173,21 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
12390 return ret;
12391 }
12392 }
12393+ if (!__builtin_constant_p(n))
12394+ check_object_size(to, n, false);
12395 return __copy_from_user_ll(to, from, n);
12396 }
12397
12398 static __always_inline unsigned long __copy_from_user_nocache(void *to,
12399+ const void __user *from, unsigned long n) __size_overflow(3);
12400+static __always_inline unsigned long __copy_from_user_nocache(void *to,
12401 const void __user *from, unsigned long n)
12402 {
12403 might_fault();
12404+
12405+ if ((long)n < 0)
12406+ return n;
12407+
12408 if (__builtin_constant_p(n)) {
12409 unsigned long ret;
12410
12411@@ -179,17 +208,24 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
12412
12413 static __always_inline unsigned long
12414 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
12415+ unsigned long n) __size_overflow(3);
12416+static __always_inline unsigned long
12417+__copy_from_user_inatomic_nocache(void *to, const void __user *from,
12418 unsigned long n)
12419 {
12420- return __copy_from_user_ll_nocache_nozero(to, from, n);
12421+ if ((long)n < 0)
12422+ return n;
12423+
12424+ return __copy_from_user_ll_nocache_nozero(to, from, n);
12425 }
12426
12427-unsigned long __must_check copy_to_user(void __user *to,
12428- const void *from, unsigned long n);
12429-unsigned long __must_check _copy_from_user(void *to,
12430- const void __user *from,
12431- unsigned long n);
12432-
12433+extern void copy_to_user_overflow(void)
12434+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
12435+ __compiletime_error("copy_to_user() buffer size is not provably correct")
12436+#else
12437+ __compiletime_warning("copy_to_user() buffer size is not provably correct")
12438+#endif
12439+;
12440
12441 extern void copy_from_user_overflow(void)
12442 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
12443@@ -199,17 +235,65 @@ extern void copy_from_user_overflow(void)
12444 #endif
12445 ;
12446
12447-static inline unsigned long __must_check copy_from_user(void *to,
12448- const void __user *from,
12449- unsigned long n)
12450+/**
12451+ * copy_to_user: - Copy a block of data into user space.
12452+ * @to: Destination address, in user space.
12453+ * @from: Source address, in kernel space.
12454+ * @n: Number of bytes to copy.
12455+ *
12456+ * Context: User context only. This function may sleep.
12457+ *
12458+ * Copy data from kernel space to user space.
12459+ *
12460+ * Returns number of bytes that could not be copied.
12461+ * On success, this will be zero.
12462+ */
12463+static inline unsigned long __must_check
12464+copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12465+static inline unsigned long __must_check
12466+copy_to_user(void __user *to, const void *from, unsigned long n)
12467+{
12468+ int sz = __compiletime_object_size(from);
12469+
12470+ if (unlikely(sz != -1 && sz < n))
12471+ copy_to_user_overflow();
12472+ else if (access_ok(VERIFY_WRITE, to, n))
12473+ n = __copy_to_user(to, from, n);
12474+ return n;
12475+}
12476+
12477+/**
12478+ * copy_from_user: - Copy a block of data from user space.
12479+ * @to: Destination address, in kernel space.
12480+ * @from: Source address, in user space.
12481+ * @n: Number of bytes to copy.
12482+ *
12483+ * Context: User context only. This function may sleep.
12484+ *
12485+ * Copy data from user space to kernel space.
12486+ *
12487+ * Returns number of bytes that could not be copied.
12488+ * On success, this will be zero.
12489+ *
12490+ * If some data could not be copied, this function will pad the copied
12491+ * data to the requested size using zero bytes.
12492+ */
12493+static inline unsigned long __must_check
12494+copy_from_user(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12495+static inline unsigned long __must_check
12496+copy_from_user(void *to, const void __user *from, unsigned long n)
12497 {
12498 int sz = __compiletime_object_size(to);
12499
12500- if (likely(sz == -1 || sz >= n))
12501- n = _copy_from_user(to, from, n);
12502- else
12503+ if (unlikely(sz != -1 && sz < n))
12504 copy_from_user_overflow();
12505-
12506+ else if (access_ok(VERIFY_READ, from, n))
12507+ n = __copy_from_user(to, from, n);
12508+ else if ((long)n > 0) {
12509+ if (!__builtin_constant_p(n))
12510+ check_object_size(to, n, false);
12511+ memset(to, 0, n);
12512+ }
12513 return n;
12514 }
12515
12516@@ -235,7 +319,7 @@ long __must_check __strncpy_from_user(char *dst,
12517 #define strlen_user(str) strnlen_user(str, LONG_MAX)
12518
12519 long strnlen_user(const char __user *str, long n);
12520-unsigned long __must_check clear_user(void __user *mem, unsigned long len);
12521-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
12522+unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12523+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12524
12525 #endif /* _ASM_X86_UACCESS_32_H */
12526diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
12527index 1c66d30..e294b5f 100644
12528--- a/arch/x86/include/asm/uaccess_64.h
12529+++ b/arch/x86/include/asm/uaccess_64.h
12530@@ -10,6 +10,9 @@
12531 #include <asm/alternative.h>
12532 #include <asm/cpufeature.h>
12533 #include <asm/page.h>
12534+#include <asm/pgtable.h>
12535+
12536+#define set_fs(x) (current_thread_info()->addr_limit = (x))
12537
12538 /*
12539 * Copy To/From Userspace
12540@@ -17,12 +20,14 @@
12541
12542 /* Handles exceptions in both to and from, but doesn't do access_ok */
12543 __must_check unsigned long
12544-copy_user_generic_string(void *to, const void *from, unsigned len);
12545+copy_user_generic_string(void *to, const void *from, unsigned long len) __size_overflow(3);
12546 __must_check unsigned long
12547-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
12548+copy_user_generic_unrolled(void *to, const void *from, unsigned long len) __size_overflow(3);
12549
12550 static __always_inline __must_check unsigned long
12551-copy_user_generic(void *to, const void *from, unsigned len)
12552+copy_user_generic(void *to, const void *from, unsigned long len) __size_overflow(3);
12553+static __always_inline __must_check unsigned long
12554+copy_user_generic(void *to, const void *from, unsigned long len)
12555 {
12556 unsigned ret;
12557
12558@@ -32,142 +37,237 @@ copy_user_generic(void *to, const void *from, unsigned len)
12559 ASM_OUTPUT2("=a" (ret), "=D" (to), "=S" (from),
12560 "=d" (len)),
12561 "1" (to), "2" (from), "3" (len)
12562- : "memory", "rcx", "r8", "r9", "r10", "r11");
12563+ : "memory", "rcx", "r8", "r9", "r11");
12564 return ret;
12565 }
12566
12567+static __always_inline __must_check unsigned long
12568+__copy_to_user(void __user *to, const void *from, unsigned long len) __size_overflow(3);
12569+static __always_inline __must_check unsigned long
12570+__copy_from_user(void *to, const void __user *from, unsigned long len) __size_overflow(3);
12571 __must_check unsigned long
12572-_copy_to_user(void __user *to, const void *from, unsigned len);
12573-__must_check unsigned long
12574-_copy_from_user(void *to, const void __user *from, unsigned len);
12575-__must_check unsigned long
12576-copy_in_user(void __user *to, const void __user *from, unsigned len);
12577+copy_in_user(void __user *to, const void __user *from, unsigned long len) __size_overflow(3);
12578
12579 static inline unsigned long __must_check copy_from_user(void *to,
12580 const void __user *from,
12581+ unsigned long n) __size_overflow(3);
12582+static inline unsigned long __must_check copy_from_user(void *to,
12583+ const void __user *from,
12584 unsigned long n)
12585 {
12586- int sz = __compiletime_object_size(to);
12587-
12588 might_fault();
12589- if (likely(sz == -1 || sz >= n))
12590- n = _copy_from_user(to, from, n);
12591-#ifdef CONFIG_DEBUG_VM
12592- else
12593- WARN(1, "Buffer overflow detected!\n");
12594-#endif
12595+
12596+ if (access_ok(VERIFY_READ, from, n))
12597+ n = __copy_from_user(to, from, n);
12598+ else if (n < INT_MAX) {
12599+ if (!__builtin_constant_p(n))
12600+ check_object_size(to, n, false);
12601+ memset(to, 0, n);
12602+ }
12603 return n;
12604 }
12605
12606 static __always_inline __must_check
12607-int copy_to_user(void __user *dst, const void *src, unsigned size)
12608+int copy_to_user(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12609+static __always_inline __must_check
12610+int copy_to_user(void __user *dst, const void *src, unsigned long size)
12611 {
12612 might_fault();
12613
12614- return _copy_to_user(dst, src, size);
12615+ if (access_ok(VERIFY_WRITE, dst, size))
12616+ size = __copy_to_user(dst, src, size);
12617+ return size;
12618 }
12619
12620 static __always_inline __must_check
12621-int __copy_from_user(void *dst, const void __user *src, unsigned size)
12622+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12623+static __always_inline __must_check
12624+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
12625 {
12626- int ret = 0;
12627+ int sz = __compiletime_object_size(dst);
12628+ unsigned ret = 0;
12629
12630 might_fault();
12631- if (!__builtin_constant_p(size))
12632- return copy_user_generic(dst, (__force void *)src, size);
12633+
12634+ if (size > INT_MAX)
12635+ return size;
12636+
12637+#ifdef CONFIG_PAX_MEMORY_UDEREF
12638+ if (!__access_ok(VERIFY_READ, src, size))
12639+ return size;
12640+#endif
12641+
12642+ if (unlikely(sz != -1 && sz < size)) {
12643+#ifdef CONFIG_DEBUG_VM
12644+ WARN(1, "Buffer overflow detected!\n");
12645+#endif
12646+ return size;
12647+ }
12648+
12649+ if (!__builtin_constant_p(size)) {
12650+ check_object_size(dst, size, false);
12651+
12652+#ifdef CONFIG_PAX_MEMORY_UDEREF
12653+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12654+ src += PAX_USER_SHADOW_BASE;
12655+#endif
12656+
12657+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12658+ }
12659 switch (size) {
12660- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
12661+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
12662 ret, "b", "b", "=q", 1);
12663 return ret;
12664- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
12665+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
12666 ret, "w", "w", "=r", 2);
12667 return ret;
12668- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
12669+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
12670 ret, "l", "k", "=r", 4);
12671 return ret;
12672- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
12673+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12674 ret, "q", "", "=r", 8);
12675 return ret;
12676 case 10:
12677- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12678+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12679 ret, "q", "", "=r", 10);
12680 if (unlikely(ret))
12681 return ret;
12682 __get_user_asm(*(u16 *)(8 + (char *)dst),
12683- (u16 __user *)(8 + (char __user *)src),
12684+ (const u16 __user *)(8 + (const char __user *)src),
12685 ret, "w", "w", "=r", 2);
12686 return ret;
12687 case 16:
12688- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12689+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12690 ret, "q", "", "=r", 16);
12691 if (unlikely(ret))
12692 return ret;
12693 __get_user_asm(*(u64 *)(8 + (char *)dst),
12694- (u64 __user *)(8 + (char __user *)src),
12695+ (const u64 __user *)(8 + (const char __user *)src),
12696 ret, "q", "", "=r", 8);
12697 return ret;
12698 default:
12699- return copy_user_generic(dst, (__force void *)src, size);
12700+
12701+#ifdef CONFIG_PAX_MEMORY_UDEREF
12702+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12703+ src += PAX_USER_SHADOW_BASE;
12704+#endif
12705+
12706+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12707 }
12708 }
12709
12710 static __always_inline __must_check
12711-int __copy_to_user(void __user *dst, const void *src, unsigned size)
12712+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12713+static __always_inline __must_check
12714+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
12715 {
12716- int ret = 0;
12717+ int sz = __compiletime_object_size(src);
12718+ unsigned ret = 0;
12719
12720 might_fault();
12721- if (!__builtin_constant_p(size))
12722- return copy_user_generic((__force void *)dst, src, size);
12723+
12724+ if (size > INT_MAX)
12725+ return size;
12726+
12727+#ifdef CONFIG_PAX_MEMORY_UDEREF
12728+ if (!__access_ok(VERIFY_WRITE, dst, size))
12729+ return size;
12730+#endif
12731+
12732+ if (unlikely(sz != -1 && sz < size)) {
12733+#ifdef CONFIG_DEBUG_VM
12734+ WARN(1, "Buffer overflow detected!\n");
12735+#endif
12736+ return size;
12737+ }
12738+
12739+ if (!__builtin_constant_p(size)) {
12740+ check_object_size(src, size, true);
12741+
12742+#ifdef CONFIG_PAX_MEMORY_UDEREF
12743+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12744+ dst += PAX_USER_SHADOW_BASE;
12745+#endif
12746+
12747+ return copy_user_generic((__force_kernel void *)dst, src, size);
12748+ }
12749 switch (size) {
12750- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
12751+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
12752 ret, "b", "b", "iq", 1);
12753 return ret;
12754- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
12755+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
12756 ret, "w", "w", "ir", 2);
12757 return ret;
12758- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
12759+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
12760 ret, "l", "k", "ir", 4);
12761 return ret;
12762- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
12763+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12764 ret, "q", "", "er", 8);
12765 return ret;
12766 case 10:
12767- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12768+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12769 ret, "q", "", "er", 10);
12770 if (unlikely(ret))
12771 return ret;
12772 asm("":::"memory");
12773- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
12774+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
12775 ret, "w", "w", "ir", 2);
12776 return ret;
12777 case 16:
12778- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12779+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12780 ret, "q", "", "er", 16);
12781 if (unlikely(ret))
12782 return ret;
12783 asm("":::"memory");
12784- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
12785+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
12786 ret, "q", "", "er", 8);
12787 return ret;
12788 default:
12789- return copy_user_generic((__force void *)dst, src, size);
12790+
12791+#ifdef CONFIG_PAX_MEMORY_UDEREF
12792+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12793+ dst += PAX_USER_SHADOW_BASE;
12794+#endif
12795+
12796+ return copy_user_generic((__force_kernel void *)dst, src, size);
12797 }
12798 }
12799
12800 static __always_inline __must_check
12801-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12802+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size) __size_overflow(3);
12803+static __always_inline __must_check
12804+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
12805 {
12806- int ret = 0;
12807+ unsigned ret = 0;
12808
12809 might_fault();
12810- if (!__builtin_constant_p(size))
12811- return copy_user_generic((__force void *)dst,
12812- (__force void *)src, size);
12813+
12814+ if (size > INT_MAX)
12815+ return size;
12816+
12817+#ifdef CONFIG_PAX_MEMORY_UDEREF
12818+ if (!__access_ok(VERIFY_READ, src, size))
12819+ return size;
12820+ if (!__access_ok(VERIFY_WRITE, dst, size))
12821+ return size;
12822+#endif
12823+
12824+ if (!__builtin_constant_p(size)) {
12825+
12826+#ifdef CONFIG_PAX_MEMORY_UDEREF
12827+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12828+ src += PAX_USER_SHADOW_BASE;
12829+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12830+ dst += PAX_USER_SHADOW_BASE;
12831+#endif
12832+
12833+ return copy_user_generic((__force_kernel void *)dst,
12834+ (__force_kernel const void *)src, size);
12835+ }
12836 switch (size) {
12837 case 1: {
12838 u8 tmp;
12839- __get_user_asm(tmp, (u8 __user *)src,
12840+ __get_user_asm(tmp, (const u8 __user *)src,
12841 ret, "b", "b", "=q", 1);
12842 if (likely(!ret))
12843 __put_user_asm(tmp, (u8 __user *)dst,
12844@@ -176,7 +276,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12845 }
12846 case 2: {
12847 u16 tmp;
12848- __get_user_asm(tmp, (u16 __user *)src,
12849+ __get_user_asm(tmp, (const u16 __user *)src,
12850 ret, "w", "w", "=r", 2);
12851 if (likely(!ret))
12852 __put_user_asm(tmp, (u16 __user *)dst,
12853@@ -186,7 +286,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12854
12855 case 4: {
12856 u32 tmp;
12857- __get_user_asm(tmp, (u32 __user *)src,
12858+ __get_user_asm(tmp, (const u32 __user *)src,
12859 ret, "l", "k", "=r", 4);
12860 if (likely(!ret))
12861 __put_user_asm(tmp, (u32 __user *)dst,
12862@@ -195,7 +295,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12863 }
12864 case 8: {
12865 u64 tmp;
12866- __get_user_asm(tmp, (u64 __user *)src,
12867+ __get_user_asm(tmp, (const u64 __user *)src,
12868 ret, "q", "", "=r", 8);
12869 if (likely(!ret))
12870 __put_user_asm(tmp, (u64 __user *)dst,
12871@@ -203,8 +303,16 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12872 return ret;
12873 }
12874 default:
12875- return copy_user_generic((__force void *)dst,
12876- (__force void *)src, size);
12877+
12878+#ifdef CONFIG_PAX_MEMORY_UDEREF
12879+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12880+ src += PAX_USER_SHADOW_BASE;
12881+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12882+ dst += PAX_USER_SHADOW_BASE;
12883+#endif
12884+
12885+ return copy_user_generic((__force_kernel void *)dst,
12886+ (__force_kernel const void *)src, size);
12887 }
12888 }
12889
12890@@ -215,39 +323,83 @@ __strncpy_from_user(char *dst, const char __user *src, long count);
12891 __must_check long strnlen_user(const char __user *str, long n);
12892 __must_check long __strnlen_user(const char __user *str, long n);
12893 __must_check long strlen_user(const char __user *str);
12894-__must_check unsigned long clear_user(void __user *mem, unsigned long len);
12895-__must_check unsigned long __clear_user(void __user *mem, unsigned long len);
12896+__must_check unsigned long clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12897+__must_check unsigned long __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12898
12899 static __must_check __always_inline int
12900-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
12901+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12902+static __must_check __always_inline int
12903+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
12904 {
12905- return copy_user_generic(dst, (__force const void *)src, size);
12906+ if (size > INT_MAX)
12907+ return size;
12908+
12909+#ifdef CONFIG_PAX_MEMORY_UDEREF
12910+ if (!__access_ok(VERIFY_READ, src, size))
12911+ return size;
12912+
12913+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12914+ src += PAX_USER_SHADOW_BASE;
12915+#endif
12916+
12917+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12918 }
12919
12920-static __must_check __always_inline int
12921-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
12922+static __must_check __always_inline unsigned long
12923+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12924+static __must_check __always_inline unsigned long
12925+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
12926 {
12927- return copy_user_generic((__force void *)dst, src, size);
12928+ if (size > INT_MAX)
12929+ return size;
12930+
12931+#ifdef CONFIG_PAX_MEMORY_UDEREF
12932+ if (!__access_ok(VERIFY_WRITE, dst, size))
12933+ return size;
12934+
12935+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12936+ dst += PAX_USER_SHADOW_BASE;
12937+#endif
12938+
12939+ return copy_user_generic((__force_kernel void *)dst, src, size);
12940 }
12941
12942-extern long __copy_user_nocache(void *dst, const void __user *src,
12943- unsigned size, int zerorest);
12944+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
12945+ unsigned long size, int zerorest) __size_overflow(3);
12946
12947-static inline int
12948-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
12949+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12950+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
12951 {
12952 might_sleep();
12953+
12954+ if (size > INT_MAX)
12955+ return size;
12956+
12957+#ifdef CONFIG_PAX_MEMORY_UDEREF
12958+ if (!__access_ok(VERIFY_READ, src, size))
12959+ return size;
12960+#endif
12961+
12962 return __copy_user_nocache(dst, src, size, 1);
12963 }
12964
12965-static inline int
12966-__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12967- unsigned size)
12968+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12969+ unsigned long size) __size_overflow(3);
12970+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12971+ unsigned long size)
12972 {
12973+ if (size > INT_MAX)
12974+ return size;
12975+
12976+#ifdef CONFIG_PAX_MEMORY_UDEREF
12977+ if (!__access_ok(VERIFY_READ, src, size))
12978+ return size;
12979+#endif
12980+
12981 return __copy_user_nocache(dst, src, size, 0);
12982 }
12983
12984-unsigned long
12985-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
12986+extern unsigned long
12987+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
12988
12989 #endif /* _ASM_X86_UACCESS_64_H */
12990diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
12991index bb05228..d763d5b 100644
12992--- a/arch/x86/include/asm/vdso.h
12993+++ b/arch/x86/include/asm/vdso.h
12994@@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
12995 #define VDSO32_SYMBOL(base, name) \
12996 ({ \
12997 extern const char VDSO32_##name[]; \
12998- (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
12999+ (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13000 })
13001 #endif
13002
13003diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
13004index 517d476..a1cb4d9 100644
13005--- a/arch/x86/include/asm/x86_init.h
13006+++ b/arch/x86/include/asm/x86_init.h
13007@@ -29,7 +29,7 @@ struct x86_init_mpparse {
13008 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
13009 void (*find_smp_config)(void);
13010 void (*get_smp_config)(unsigned int early);
13011-};
13012+} __no_const;
13013
13014 /**
13015 * struct x86_init_resources - platform specific resource related ops
13016@@ -43,7 +43,7 @@ struct x86_init_resources {
13017 void (*probe_roms)(void);
13018 void (*reserve_resources)(void);
13019 char *(*memory_setup)(void);
13020-};
13021+} __no_const;
13022
13023 /**
13024 * struct x86_init_irqs - platform specific interrupt setup
13025@@ -56,7 +56,7 @@ struct x86_init_irqs {
13026 void (*pre_vector_init)(void);
13027 void (*intr_init)(void);
13028 void (*trap_init)(void);
13029-};
13030+} __no_const;
13031
13032 /**
13033 * struct x86_init_oem - oem platform specific customizing functions
13034@@ -66,7 +66,7 @@ struct x86_init_irqs {
13035 struct x86_init_oem {
13036 void (*arch_setup)(void);
13037 void (*banner)(void);
13038-};
13039+} __no_const;
13040
13041 /**
13042 * struct x86_init_mapping - platform specific initial kernel pagetable setup
13043@@ -77,7 +77,7 @@ struct x86_init_oem {
13044 */
13045 struct x86_init_mapping {
13046 void (*pagetable_reserve)(u64 start, u64 end);
13047-};
13048+} __no_const;
13049
13050 /**
13051 * struct x86_init_paging - platform specific paging functions
13052@@ -87,7 +87,7 @@ struct x86_init_mapping {
13053 struct x86_init_paging {
13054 void (*pagetable_setup_start)(pgd_t *base);
13055 void (*pagetable_setup_done)(pgd_t *base);
13056-};
13057+} __no_const;
13058
13059 /**
13060 * struct x86_init_timers - platform specific timer setup
13061@@ -102,7 +102,7 @@ struct x86_init_timers {
13062 void (*tsc_pre_init)(void);
13063 void (*timer_init)(void);
13064 void (*wallclock_init)(void);
13065-};
13066+} __no_const;
13067
13068 /**
13069 * struct x86_init_iommu - platform specific iommu setup
13070@@ -110,7 +110,7 @@ struct x86_init_timers {
13071 */
13072 struct x86_init_iommu {
13073 int (*iommu_init)(void);
13074-};
13075+} __no_const;
13076
13077 /**
13078 * struct x86_init_pci - platform specific pci init functions
13079@@ -124,7 +124,7 @@ struct x86_init_pci {
13080 int (*init)(void);
13081 void (*init_irq)(void);
13082 void (*fixup_irqs)(void);
13083-};
13084+} __no_const;
13085
13086 /**
13087 * struct x86_init_ops - functions for platform specific setup
13088@@ -140,7 +140,7 @@ struct x86_init_ops {
13089 struct x86_init_timers timers;
13090 struct x86_init_iommu iommu;
13091 struct x86_init_pci pci;
13092-};
13093+} __no_const;
13094
13095 /**
13096 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
13097@@ -149,7 +149,7 @@ struct x86_init_ops {
13098 struct x86_cpuinit_ops {
13099 void (*setup_percpu_clockev)(void);
13100 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
13101-};
13102+} __no_const;
13103
13104 /**
13105 * struct x86_platform_ops - platform specific runtime functions
13106@@ -171,7 +171,7 @@ struct x86_platform_ops {
13107 void (*nmi_init)(void);
13108 unsigned char (*get_nmi_reason)(void);
13109 int (*i8042_detect)(void);
13110-};
13111+} __no_const;
13112
13113 struct pci_dev;
13114
13115@@ -180,7 +180,7 @@ struct x86_msi_ops {
13116 void (*teardown_msi_irq)(unsigned int irq);
13117 void (*teardown_msi_irqs)(struct pci_dev *dev);
13118 void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
13119-};
13120+} __no_const;
13121
13122 extern struct x86_init_ops x86_init;
13123 extern struct x86_cpuinit_ops x86_cpuinit;
13124diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
13125index c6ce245..ffbdab7 100644
13126--- a/arch/x86/include/asm/xsave.h
13127+++ b/arch/x86/include/asm/xsave.h
13128@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13129 {
13130 int err;
13131
13132+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13133+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
13134+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
13135+#endif
13136+
13137 /*
13138 * Clear the xsave header first, so that reserved fields are
13139 * initialized to zero.
13140@@ -96,10 +101,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13141 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
13142 {
13143 int err;
13144- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
13145+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
13146 u32 lmask = mask;
13147 u32 hmask = mask >> 32;
13148
13149+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13150+ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
13151+ xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
13152+#endif
13153+
13154 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
13155 "2:\n"
13156 ".section .fixup,\"ax\"\n"
13157diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
13158index 6a564ac..9b1340c 100644
13159--- a/arch/x86/kernel/acpi/realmode/Makefile
13160+++ b/arch/x86/kernel/acpi/realmode/Makefile
13161@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D_WAKEUP -D__KERNEL__ \
13162 $(call cc-option, -fno-stack-protector) \
13163 $(call cc-option, -mpreferred-stack-boundary=2)
13164 KBUILD_CFLAGS += $(call cc-option, -m32)
13165+ifdef CONSTIFY_PLUGIN
13166+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
13167+endif
13168 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
13169 GCOV_PROFILE := n
13170
13171diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S
13172index b4fd836..4358fe3 100644
13173--- a/arch/x86/kernel/acpi/realmode/wakeup.S
13174+++ b/arch/x86/kernel/acpi/realmode/wakeup.S
13175@@ -108,6 +108,9 @@ wakeup_code:
13176 /* Do any other stuff... */
13177
13178 #ifndef CONFIG_64BIT
13179+ /* Recheck NX bit overrides (64bit path does this in trampoline */
13180+ call verify_cpu
13181+
13182 /* This could also be done in C code... */
13183 movl pmode_cr3, %eax
13184 movl %eax, %cr3
13185@@ -131,6 +134,7 @@ wakeup_code:
13186 movl pmode_cr0, %eax
13187 movl %eax, %cr0
13188 jmp pmode_return
13189+# include "../../verify_cpu.S"
13190 #else
13191 pushw $0
13192 pushw trampoline_segment
13193diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
13194index 103b6ab..2004d0a 100644
13195--- a/arch/x86/kernel/acpi/sleep.c
13196+++ b/arch/x86/kernel/acpi/sleep.c
13197@@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
13198 header->trampoline_segment = trampoline_address() >> 4;
13199 #ifdef CONFIG_SMP
13200 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
13201+
13202+ pax_open_kernel();
13203 early_gdt_descr.address =
13204 (unsigned long)get_cpu_gdt_table(smp_processor_id());
13205+ pax_close_kernel();
13206+
13207 initial_gs = per_cpu_offset(smp_processor_id());
13208 #endif
13209 initial_code = (unsigned long)wakeup_long64;
13210diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
13211index 13ab720..95d5442 100644
13212--- a/arch/x86/kernel/acpi/wakeup_32.S
13213+++ b/arch/x86/kernel/acpi/wakeup_32.S
13214@@ -30,13 +30,11 @@ wakeup_pmode_return:
13215 # and restore the stack ... but you need gdt for this to work
13216 movl saved_context_esp, %esp
13217
13218- movl %cs:saved_magic, %eax
13219- cmpl $0x12345678, %eax
13220+ cmpl $0x12345678, saved_magic
13221 jne bogus_magic
13222
13223 # jump to place where we left off
13224- movl saved_eip, %eax
13225- jmp *%eax
13226+ jmp *(saved_eip)
13227
13228 bogus_magic:
13229 jmp bogus_magic
13230diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
13231index 1f84794..e23f862 100644
13232--- a/arch/x86/kernel/alternative.c
13233+++ b/arch/x86/kernel/alternative.c
13234@@ -276,6 +276,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
13235 */
13236 for (a = start; a < end; a++) {
13237 instr = (u8 *)&a->instr_offset + a->instr_offset;
13238+
13239+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13240+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13241+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
13242+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13243+#endif
13244+
13245 replacement = (u8 *)&a->repl_offset + a->repl_offset;
13246 BUG_ON(a->replacementlen > a->instrlen);
13247 BUG_ON(a->instrlen > sizeof(insnbuf));
13248@@ -307,10 +314,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
13249 for (poff = start; poff < end; poff++) {
13250 u8 *ptr = (u8 *)poff + *poff;
13251
13252+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13253+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13254+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13255+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13256+#endif
13257+
13258 if (!*poff || ptr < text || ptr >= text_end)
13259 continue;
13260 /* turn DS segment override prefix into lock prefix */
13261- if (*ptr == 0x3e)
13262+ if (*ktla_ktva(ptr) == 0x3e)
13263 text_poke(ptr, ((unsigned char []){0xf0}), 1);
13264 };
13265 mutex_unlock(&text_mutex);
13266@@ -328,10 +341,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
13267 for (poff = start; poff < end; poff++) {
13268 u8 *ptr = (u8 *)poff + *poff;
13269
13270+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13271+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13272+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13273+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13274+#endif
13275+
13276 if (!*poff || ptr < text || ptr >= text_end)
13277 continue;
13278 /* turn lock prefix into DS segment override prefix */
13279- if (*ptr == 0xf0)
13280+ if (*ktla_ktva(ptr) == 0xf0)
13281 text_poke(ptr, ((unsigned char []){0x3E}), 1);
13282 };
13283 mutex_unlock(&text_mutex);
13284@@ -500,7 +519,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
13285
13286 BUG_ON(p->len > MAX_PATCH_LEN);
13287 /* prep the buffer with the original instructions */
13288- memcpy(insnbuf, p->instr, p->len);
13289+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
13290 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
13291 (unsigned long)p->instr, p->len);
13292
13293@@ -568,7 +587,7 @@ void __init alternative_instructions(void)
13294 if (smp_alt_once)
13295 free_init_pages("SMP alternatives",
13296 (unsigned long)__smp_locks,
13297- (unsigned long)__smp_locks_end);
13298+ PAGE_ALIGN((unsigned long)__smp_locks_end));
13299
13300 restart_nmi();
13301 }
13302@@ -585,13 +604,17 @@ void __init alternative_instructions(void)
13303 * instructions. And on the local CPU you need to be protected again NMI or MCE
13304 * handlers seeing an inconsistent instruction while you patch.
13305 */
13306-void *__init_or_module text_poke_early(void *addr, const void *opcode,
13307+void *__kprobes text_poke_early(void *addr, const void *opcode,
13308 size_t len)
13309 {
13310 unsigned long flags;
13311 local_irq_save(flags);
13312- memcpy(addr, opcode, len);
13313+
13314+ pax_open_kernel();
13315+ memcpy(ktla_ktva(addr), opcode, len);
13316 sync_core();
13317+ pax_close_kernel();
13318+
13319 local_irq_restore(flags);
13320 /* Could also do a CLFLUSH here to speed up CPU recovery; but
13321 that causes hangs on some VIA CPUs. */
13322@@ -613,36 +636,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
13323 */
13324 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
13325 {
13326- unsigned long flags;
13327- char *vaddr;
13328+ unsigned char *vaddr = ktla_ktva(addr);
13329 struct page *pages[2];
13330- int i;
13331+ size_t i;
13332
13333 if (!core_kernel_text((unsigned long)addr)) {
13334- pages[0] = vmalloc_to_page(addr);
13335- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
13336+ pages[0] = vmalloc_to_page(vaddr);
13337+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
13338 } else {
13339- pages[0] = virt_to_page(addr);
13340+ pages[0] = virt_to_page(vaddr);
13341 WARN_ON(!PageReserved(pages[0]));
13342- pages[1] = virt_to_page(addr + PAGE_SIZE);
13343+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
13344 }
13345 BUG_ON(!pages[0]);
13346- local_irq_save(flags);
13347- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
13348- if (pages[1])
13349- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
13350- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
13351- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
13352- clear_fixmap(FIX_TEXT_POKE0);
13353- if (pages[1])
13354- clear_fixmap(FIX_TEXT_POKE1);
13355- local_flush_tlb();
13356- sync_core();
13357- /* Could also do a CLFLUSH here to speed up CPU recovery; but
13358- that causes hangs on some VIA CPUs. */
13359+ text_poke_early(addr, opcode, len);
13360 for (i = 0; i < len; i++)
13361- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
13362- local_irq_restore(flags);
13363+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
13364 return addr;
13365 }
13366
13367diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
13368index 2eec05b..fef012b 100644
13369--- a/arch/x86/kernel/apic/apic.c
13370+++ b/arch/x86/kernel/apic/apic.c
13371@@ -184,7 +184,7 @@ int first_system_vector = 0xfe;
13372 /*
13373 * Debug level, exported for io_apic.c
13374 */
13375-unsigned int apic_verbosity;
13376+int apic_verbosity;
13377
13378 int pic_mode;
13379
13380@@ -1908,7 +1908,7 @@ void smp_error_interrupt(struct pt_regs *regs)
13381 apic_write(APIC_ESR, 0);
13382 v1 = apic_read(APIC_ESR);
13383 ack_APIC_irq();
13384- atomic_inc(&irq_err_count);
13385+ atomic_inc_unchecked(&irq_err_count);
13386
13387 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
13388 smp_processor_id(), v0 , v1);
13389diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
13390index fb07275..e06bb59 100644
13391--- a/arch/x86/kernel/apic/io_apic.c
13392+++ b/arch/x86/kernel/apic/io_apic.c
13393@@ -1096,7 +1096,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
13394 }
13395 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
13396
13397-void lock_vector_lock(void)
13398+void lock_vector_lock(void) __acquires(vector_lock)
13399 {
13400 /* Used to the online set of cpus does not change
13401 * during assign_irq_vector.
13402@@ -1104,7 +1104,7 @@ void lock_vector_lock(void)
13403 raw_spin_lock(&vector_lock);
13404 }
13405
13406-void unlock_vector_lock(void)
13407+void unlock_vector_lock(void) __releases(vector_lock)
13408 {
13409 raw_spin_unlock(&vector_lock);
13410 }
13411@@ -2510,7 +2510,7 @@ static void ack_apic_edge(struct irq_data *data)
13412 ack_APIC_irq();
13413 }
13414
13415-atomic_t irq_mis_count;
13416+atomic_unchecked_t irq_mis_count;
13417
13418 static void ack_apic_level(struct irq_data *data)
13419 {
13420@@ -2576,7 +2576,7 @@ static void ack_apic_level(struct irq_data *data)
13421 * at the cpu.
13422 */
13423 if (!(v & (1 << (i & 0x1f)))) {
13424- atomic_inc(&irq_mis_count);
13425+ atomic_inc_unchecked(&irq_mis_count);
13426
13427 eoi_ioapic_irq(irq, cfg);
13428 }
13429diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
13430index f76623c..aab694f 100644
13431--- a/arch/x86/kernel/apm_32.c
13432+++ b/arch/x86/kernel/apm_32.c
13433@@ -411,7 +411,7 @@ static DEFINE_MUTEX(apm_mutex);
13434 * This is for buggy BIOS's that refer to (real mode) segment 0x40
13435 * even though they are called in protected mode.
13436 */
13437-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
13438+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
13439 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
13440
13441 static const char driver_version[] = "1.16ac"; /* no spaces */
13442@@ -589,7 +589,10 @@ static long __apm_bios_call(void *_call)
13443 BUG_ON(cpu != 0);
13444 gdt = get_cpu_gdt_table(cpu);
13445 save_desc_40 = gdt[0x40 / 8];
13446+
13447+ pax_open_kernel();
13448 gdt[0x40 / 8] = bad_bios_desc;
13449+ pax_close_kernel();
13450
13451 apm_irq_save(flags);
13452 APM_DO_SAVE_SEGS;
13453@@ -598,7 +601,11 @@ static long __apm_bios_call(void *_call)
13454 &call->esi);
13455 APM_DO_RESTORE_SEGS;
13456 apm_irq_restore(flags);
13457+
13458+ pax_open_kernel();
13459 gdt[0x40 / 8] = save_desc_40;
13460+ pax_close_kernel();
13461+
13462 put_cpu();
13463
13464 return call->eax & 0xff;
13465@@ -665,7 +672,10 @@ static long __apm_bios_call_simple(void *_call)
13466 BUG_ON(cpu != 0);
13467 gdt = get_cpu_gdt_table(cpu);
13468 save_desc_40 = gdt[0x40 / 8];
13469+
13470+ pax_open_kernel();
13471 gdt[0x40 / 8] = bad_bios_desc;
13472+ pax_close_kernel();
13473
13474 apm_irq_save(flags);
13475 APM_DO_SAVE_SEGS;
13476@@ -673,7 +683,11 @@ static long __apm_bios_call_simple(void *_call)
13477 &call->eax);
13478 APM_DO_RESTORE_SEGS;
13479 apm_irq_restore(flags);
13480+
13481+ pax_open_kernel();
13482 gdt[0x40 / 8] = save_desc_40;
13483+ pax_close_kernel();
13484+
13485 put_cpu();
13486 return error;
13487 }
13488@@ -2347,12 +2361,15 @@ static int __init apm_init(void)
13489 * code to that CPU.
13490 */
13491 gdt = get_cpu_gdt_table(0);
13492+
13493+ pax_open_kernel();
13494 set_desc_base(&gdt[APM_CS >> 3],
13495 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
13496 set_desc_base(&gdt[APM_CS_16 >> 3],
13497 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
13498 set_desc_base(&gdt[APM_DS >> 3],
13499 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
13500+ pax_close_kernel();
13501
13502 proc_create("apm", 0, NULL, &apm_file_ops);
13503
13504diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
13505index 68de2dc..1f3c720 100644
13506--- a/arch/x86/kernel/asm-offsets.c
13507+++ b/arch/x86/kernel/asm-offsets.c
13508@@ -33,6 +33,8 @@ void common(void) {
13509 OFFSET(TI_status, thread_info, status);
13510 OFFSET(TI_addr_limit, thread_info, addr_limit);
13511 OFFSET(TI_preempt_count, thread_info, preempt_count);
13512+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
13513+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
13514
13515 BLANK();
13516 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
13517@@ -53,8 +55,26 @@ void common(void) {
13518 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
13519 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
13520 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
13521+
13522+#ifdef CONFIG_PAX_KERNEXEC
13523+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
13524 #endif
13525
13526+#ifdef CONFIG_PAX_MEMORY_UDEREF
13527+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
13528+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
13529+#ifdef CONFIG_X86_64
13530+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
13531+#endif
13532+#endif
13533+
13534+#endif
13535+
13536+ BLANK();
13537+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
13538+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
13539+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
13540+
13541 #ifdef CONFIG_XEN
13542 BLANK();
13543 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
13544diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
13545index 834e897..dacddc8 100644
13546--- a/arch/x86/kernel/asm-offsets_64.c
13547+++ b/arch/x86/kernel/asm-offsets_64.c
13548@@ -70,6 +70,7 @@ int main(void)
13549 BLANK();
13550 #undef ENTRY
13551
13552+ DEFINE(TSS_size, sizeof(struct tss_struct));
13553 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
13554 BLANK();
13555
13556diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
13557index 25f24dc..4094a7f 100644
13558--- a/arch/x86/kernel/cpu/Makefile
13559+++ b/arch/x86/kernel/cpu/Makefile
13560@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
13561 CFLAGS_REMOVE_perf_event.o = -pg
13562 endif
13563
13564-# Make sure load_percpu_segment has no stackprotector
13565-nostackp := $(call cc-option, -fno-stack-protector)
13566-CFLAGS_common.o := $(nostackp)
13567-
13568 obj-y := intel_cacheinfo.o scattered.o topology.o
13569 obj-y += proc.o capflags.o powerflags.o common.o
13570 obj-y += vmware.o hypervisor.o sched.o mshyperv.o
13571diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
13572index f4773f4..b3fb13c 100644
13573--- a/arch/x86/kernel/cpu/amd.c
13574+++ b/arch/x86/kernel/cpu/amd.c
13575@@ -669,7 +669,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
13576 unsigned int size)
13577 {
13578 /* AMD errata T13 (order #21922) */
13579- if ((c->x86 == 6)) {
13580+ if (c->x86 == 6) {
13581 /* Duron Rev A0 */
13582 if (c->x86_model == 3 && c->x86_mask == 0)
13583 size = 64;
13584diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
13585index c0f7d68..aa418f9 100644
13586--- a/arch/x86/kernel/cpu/common.c
13587+++ b/arch/x86/kernel/cpu/common.c
13588@@ -84,60 +84,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
13589
13590 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
13591
13592-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
13593-#ifdef CONFIG_X86_64
13594- /*
13595- * We need valid kernel segments for data and code in long mode too
13596- * IRET will check the segment types kkeil 2000/10/28
13597- * Also sysret mandates a special GDT layout
13598- *
13599- * TLS descriptors are currently at a different place compared to i386.
13600- * Hopefully nobody expects them at a fixed place (Wine?)
13601- */
13602- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
13603- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
13604- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
13605- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
13606- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
13607- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
13608-#else
13609- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
13610- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13611- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
13612- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
13613- /*
13614- * Segments used for calling PnP BIOS have byte granularity.
13615- * They code segments and data segments have fixed 64k limits,
13616- * the transfer segment sizes are set at run time.
13617- */
13618- /* 32-bit code */
13619- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13620- /* 16-bit code */
13621- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13622- /* 16-bit data */
13623- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
13624- /* 16-bit data */
13625- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
13626- /* 16-bit data */
13627- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
13628- /*
13629- * The APM segments have byte granularity and their bases
13630- * are set at run time. All have 64k limits.
13631- */
13632- /* 32-bit code */
13633- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13634- /* 16-bit code */
13635- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13636- /* data */
13637- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
13638-
13639- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13640- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13641- GDT_STACK_CANARY_INIT
13642-#endif
13643-} };
13644-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
13645-
13646 static int __init x86_xsave_setup(char *s)
13647 {
13648 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
13649@@ -372,7 +318,7 @@ void switch_to_new_gdt(int cpu)
13650 {
13651 struct desc_ptr gdt_descr;
13652
13653- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
13654+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
13655 gdt_descr.size = GDT_SIZE - 1;
13656 load_gdt(&gdt_descr);
13657 /* Reload the per-cpu base */
13658@@ -839,6 +785,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
13659 /* Filter out anything that depends on CPUID levels we don't have */
13660 filter_cpuid_features(c, true);
13661
13662+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
13663+ setup_clear_cpu_cap(X86_FEATURE_SEP);
13664+#endif
13665+
13666 /* If the model name is still unset, do table lookup. */
13667 if (!c->x86_model_id[0]) {
13668 const char *p;
13669@@ -1019,10 +969,12 @@ static __init int setup_disablecpuid(char *arg)
13670 }
13671 __setup("clearcpuid=", setup_disablecpuid);
13672
13673+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
13674+EXPORT_PER_CPU_SYMBOL(current_tinfo);
13675+
13676 #ifdef CONFIG_X86_64
13677 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
13678-struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1,
13679- (unsigned long) nmi_idt_table };
13680+struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) nmi_idt_table };
13681
13682 DEFINE_PER_CPU_FIRST(union irq_stack_union,
13683 irq_stack_union) __aligned(PAGE_SIZE);
13684@@ -1036,7 +988,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
13685 EXPORT_PER_CPU_SYMBOL(current_task);
13686
13687 DEFINE_PER_CPU(unsigned long, kernel_stack) =
13688- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
13689+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
13690 EXPORT_PER_CPU_SYMBOL(kernel_stack);
13691
13692 DEFINE_PER_CPU(char *, irq_stack_ptr) =
13693@@ -1126,7 +1078,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
13694 {
13695 memset(regs, 0, sizeof(struct pt_regs));
13696 regs->fs = __KERNEL_PERCPU;
13697- regs->gs = __KERNEL_STACK_CANARY;
13698+ savesegment(gs, regs->gs);
13699
13700 return regs;
13701 }
13702@@ -1190,7 +1142,7 @@ void __cpuinit cpu_init(void)
13703 int i;
13704
13705 cpu = stack_smp_processor_id();
13706- t = &per_cpu(init_tss, cpu);
13707+ t = init_tss + cpu;
13708 oist = &per_cpu(orig_ist, cpu);
13709
13710 #ifdef CONFIG_NUMA
13711@@ -1216,7 +1168,7 @@ void __cpuinit cpu_init(void)
13712 switch_to_new_gdt(cpu);
13713 loadsegment(fs, 0);
13714
13715- load_idt((const struct desc_ptr *)&idt_descr);
13716+ load_idt(&idt_descr);
13717
13718 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
13719 syscall_init();
13720@@ -1225,7 +1177,6 @@ void __cpuinit cpu_init(void)
13721 wrmsrl(MSR_KERNEL_GS_BASE, 0);
13722 barrier();
13723
13724- x86_configure_nx();
13725 if (cpu != 0)
13726 enable_x2apic();
13727
13728@@ -1281,7 +1232,7 @@ void __cpuinit cpu_init(void)
13729 {
13730 int cpu = smp_processor_id();
13731 struct task_struct *curr = current;
13732- struct tss_struct *t = &per_cpu(init_tss, cpu);
13733+ struct tss_struct *t = init_tss + cpu;
13734 struct thread_struct *thread = &curr->thread;
13735
13736 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
13737diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
13738index 3e6ff6c..54b4992 100644
13739--- a/arch/x86/kernel/cpu/intel.c
13740+++ b/arch/x86/kernel/cpu/intel.c
13741@@ -174,7 +174,7 @@ static void __cpuinit trap_init_f00f_bug(void)
13742 * Update the IDT descriptor and reload the IDT so that
13743 * it uses the read-only mapped virtual address.
13744 */
13745- idt_descr.address = fix_to_virt(FIX_F00F_IDT);
13746+ idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
13747 load_idt(&idt_descr);
13748 }
13749 #endif
13750diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13751index fc4beb3..f20a5a7 100644
13752--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
13753+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13754@@ -199,6 +199,8 @@ static void raise_mce(struct mce *m)
13755
13756 /* Error injection interface */
13757 static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13758+ size_t usize, loff_t *off) __size_overflow(3);
13759+static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13760 size_t usize, loff_t *off)
13761 {
13762 struct mce m;
13763diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
13764index 5a11ae2..a1a1c8a 100644
13765--- a/arch/x86/kernel/cpu/mcheck/mce.c
13766+++ b/arch/x86/kernel/cpu/mcheck/mce.c
13767@@ -42,6 +42,7 @@
13768 #include <asm/processor.h>
13769 #include <asm/mce.h>
13770 #include <asm/msr.h>
13771+#include <asm/local.h>
13772
13773 #include "mce-internal.h"
13774
13775@@ -250,7 +251,7 @@ static void print_mce(struct mce *m)
13776 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
13777 m->cs, m->ip);
13778
13779- if (m->cs == __KERNEL_CS)
13780+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
13781 print_symbol("{%s}", m->ip);
13782 pr_cont("\n");
13783 }
13784@@ -283,10 +284,10 @@ static void print_mce(struct mce *m)
13785
13786 #define PANIC_TIMEOUT 5 /* 5 seconds */
13787
13788-static atomic_t mce_paniced;
13789+static atomic_unchecked_t mce_paniced;
13790
13791 static int fake_panic;
13792-static atomic_t mce_fake_paniced;
13793+static atomic_unchecked_t mce_fake_paniced;
13794
13795 /* Panic in progress. Enable interrupts and wait for final IPI */
13796 static void wait_for_panic(void)
13797@@ -310,7 +311,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13798 /*
13799 * Make sure only one CPU runs in machine check panic
13800 */
13801- if (atomic_inc_return(&mce_paniced) > 1)
13802+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
13803 wait_for_panic();
13804 barrier();
13805
13806@@ -318,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13807 console_verbose();
13808 } else {
13809 /* Don't log too much for fake panic */
13810- if (atomic_inc_return(&mce_fake_paniced) > 1)
13811+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
13812 return;
13813 }
13814 /* First print corrected ones that are still unlogged */
13815@@ -658,7 +659,7 @@ static int mce_timed_out(u64 *t)
13816 * might have been modified by someone else.
13817 */
13818 rmb();
13819- if (atomic_read(&mce_paniced))
13820+ if (atomic_read_unchecked(&mce_paniced))
13821 wait_for_panic();
13822 if (!monarch_timeout)
13823 goto out;
13824@@ -1446,7 +1447,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
13825 }
13826
13827 /* Call the installed machine check handler for this CPU setup. */
13828-void (*machine_check_vector)(struct pt_regs *, long error_code) =
13829+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
13830 unexpected_machine_check;
13831
13832 /*
13833@@ -1469,7 +1470,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
13834 return;
13835 }
13836
13837+ pax_open_kernel();
13838 machine_check_vector = do_machine_check;
13839+ pax_close_kernel();
13840
13841 __mcheck_cpu_init_generic();
13842 __mcheck_cpu_init_vendor(c);
13843@@ -1483,7 +1486,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
13844 */
13845
13846 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
13847-static int mce_chrdev_open_count; /* #times opened */
13848+static local_t mce_chrdev_open_count; /* #times opened */
13849 static int mce_chrdev_open_exclu; /* already open exclusive? */
13850
13851 static int mce_chrdev_open(struct inode *inode, struct file *file)
13852@@ -1491,7 +1494,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
13853 spin_lock(&mce_chrdev_state_lock);
13854
13855 if (mce_chrdev_open_exclu ||
13856- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
13857+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
13858 spin_unlock(&mce_chrdev_state_lock);
13859
13860 return -EBUSY;
13861@@ -1499,7 +1502,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
13862
13863 if (file->f_flags & O_EXCL)
13864 mce_chrdev_open_exclu = 1;
13865- mce_chrdev_open_count++;
13866+ local_inc(&mce_chrdev_open_count);
13867
13868 spin_unlock(&mce_chrdev_state_lock);
13869
13870@@ -1510,7 +1513,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
13871 {
13872 spin_lock(&mce_chrdev_state_lock);
13873
13874- mce_chrdev_open_count--;
13875+ local_dec(&mce_chrdev_open_count);
13876 mce_chrdev_open_exclu = 0;
13877
13878 spin_unlock(&mce_chrdev_state_lock);
13879@@ -2229,7 +2232,7 @@ struct dentry *mce_get_debugfs_dir(void)
13880 static void mce_reset(void)
13881 {
13882 cpu_missing = 0;
13883- atomic_set(&mce_fake_paniced, 0);
13884+ atomic_set_unchecked(&mce_fake_paniced, 0);
13885 atomic_set(&mce_executing, 0);
13886 atomic_set(&mce_callin, 0);
13887 atomic_set(&global_nwo, 0);
13888diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
13889index 5c0e653..0882b0a 100644
13890--- a/arch/x86/kernel/cpu/mcheck/p5.c
13891+++ b/arch/x86/kernel/cpu/mcheck/p5.c
13892@@ -12,6 +12,7 @@
13893 #include <asm/system.h>
13894 #include <asm/mce.h>
13895 #include <asm/msr.h>
13896+#include <asm/pgtable.h>
13897
13898 /* By default disabled */
13899 int mce_p5_enabled __read_mostly;
13900@@ -50,7 +51,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
13901 if (!cpu_has(c, X86_FEATURE_MCE))
13902 return;
13903
13904+ pax_open_kernel();
13905 machine_check_vector = pentium_machine_check;
13906+ pax_close_kernel();
13907 /* Make sure the vector pointer is visible before we enable MCEs: */
13908 wmb();
13909
13910diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
13911index 54060f5..c1a7577 100644
13912--- a/arch/x86/kernel/cpu/mcheck/winchip.c
13913+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
13914@@ -11,6 +11,7 @@
13915 #include <asm/system.h>
13916 #include <asm/mce.h>
13917 #include <asm/msr.h>
13918+#include <asm/pgtable.h>
13919
13920 /* Machine check handler for WinChip C6: */
13921 static void winchip_machine_check(struct pt_regs *regs, long error_code)
13922@@ -24,7 +25,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
13923 {
13924 u32 lo, hi;
13925
13926+ pax_open_kernel();
13927 machine_check_vector = winchip_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/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
13933index 7928963..1b16001 100644
13934--- a/arch/x86/kernel/cpu/mtrr/if.c
13935+++ b/arch/x86/kernel/cpu/mtrr/if.c
13936@@ -91,6 +91,8 @@ mtrr_file_del(unsigned long base, unsigned long size,
13937 * "base=%Lx size=%Lx type=%s" or "disable=%d"
13938 */
13939 static ssize_t
13940+mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos) __size_overflow(3);
13941+static ssize_t
13942 mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos)
13943 {
13944 int i, err;
13945diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
13946index 6b96110..0da73eb 100644
13947--- a/arch/x86/kernel/cpu/mtrr/main.c
13948+++ b/arch/x86/kernel/cpu/mtrr/main.c
13949@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
13950 u64 size_or_mask, size_and_mask;
13951 static bool mtrr_aps_delayed_init;
13952
13953-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
13954+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
13955
13956 const struct mtrr_ops *mtrr_if;
13957
13958diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
13959index df5e41f..816c719 100644
13960--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
13961+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
13962@@ -25,7 +25,7 @@ struct mtrr_ops {
13963 int (*validate_add_page)(unsigned long base, unsigned long size,
13964 unsigned int type);
13965 int (*have_wrcomb)(void);
13966-};
13967+} __do_const;
13968
13969 extern int generic_get_free_region(unsigned long base, unsigned long size,
13970 int replace_reg);
13971diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
13972index 5adce10..99284ec 100644
13973--- a/arch/x86/kernel/cpu/perf_event.c
13974+++ b/arch/x86/kernel/cpu/perf_event.c
13975@@ -1665,7 +1665,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
13976 break;
13977
13978 perf_callchain_store(entry, frame.return_address);
13979- fp = frame.next_frame;
13980+ fp = (const void __force_user *)frame.next_frame;
13981 }
13982 }
13983
13984diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
13985index 13ad899..f642b9a 100644
13986--- a/arch/x86/kernel/crash.c
13987+++ b/arch/x86/kernel/crash.c
13988@@ -36,10 +36,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
13989 {
13990 #ifdef CONFIG_X86_32
13991 struct pt_regs fixed_regs;
13992-#endif
13993
13994-#ifdef CONFIG_X86_32
13995- if (!user_mode_vm(regs)) {
13996+ if (!user_mode(regs)) {
13997 crash_fixup_ss_esp(&fixed_regs, regs);
13998 regs = &fixed_regs;
13999 }
14000diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
14001index 37250fe..bf2ec74 100644
14002--- a/arch/x86/kernel/doublefault_32.c
14003+++ b/arch/x86/kernel/doublefault_32.c
14004@@ -11,7 +11,7 @@
14005
14006 #define DOUBLEFAULT_STACKSIZE (1024)
14007 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
14008-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
14009+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
14010
14011 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
14012
14013@@ -21,7 +21,7 @@ static void doublefault_fn(void)
14014 unsigned long gdt, tss;
14015
14016 store_gdt(&gdt_desc);
14017- gdt = gdt_desc.address;
14018+ gdt = (unsigned long)gdt_desc.address;
14019
14020 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
14021
14022@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
14023 /* 0x2 bit is always set */
14024 .flags = X86_EFLAGS_SF | 0x2,
14025 .sp = STACK_START,
14026- .es = __USER_DS,
14027+ .es = __KERNEL_DS,
14028 .cs = __KERNEL_CS,
14029 .ss = __KERNEL_DS,
14030- .ds = __USER_DS,
14031+ .ds = __KERNEL_DS,
14032 .fs = __KERNEL_PERCPU,
14033
14034 .__cr3 = __pa_nodebug(swapper_pg_dir),
14035diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
14036index 4025fe4..d8451c6 100644
14037--- a/arch/x86/kernel/dumpstack.c
14038+++ b/arch/x86/kernel/dumpstack.c
14039@@ -2,6 +2,9 @@
14040 * Copyright (C) 1991, 1992 Linus Torvalds
14041 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
14042 */
14043+#ifdef CONFIG_GRKERNSEC_HIDESYM
14044+#define __INCLUDED_BY_HIDESYM 1
14045+#endif
14046 #include <linux/kallsyms.h>
14047 #include <linux/kprobes.h>
14048 #include <linux/uaccess.h>
14049@@ -35,9 +38,8 @@ void printk_address(unsigned long address, int reliable)
14050 static void
14051 print_ftrace_graph_addr(unsigned long addr, void *data,
14052 const struct stacktrace_ops *ops,
14053- struct thread_info *tinfo, int *graph)
14054+ struct task_struct *task, int *graph)
14055 {
14056- struct task_struct *task = tinfo->task;
14057 unsigned long ret_addr;
14058 int index = task->curr_ret_stack;
14059
14060@@ -58,7 +60,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14061 static inline void
14062 print_ftrace_graph_addr(unsigned long addr, void *data,
14063 const struct stacktrace_ops *ops,
14064- struct thread_info *tinfo, int *graph)
14065+ struct task_struct *task, int *graph)
14066 { }
14067 #endif
14068
14069@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14070 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
14071 */
14072
14073-static inline int valid_stack_ptr(struct thread_info *tinfo,
14074- void *p, unsigned int size, void *end)
14075+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
14076 {
14077- void *t = tinfo;
14078 if (end) {
14079 if (p < end && p >= (end-THREAD_SIZE))
14080 return 1;
14081@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
14082 }
14083
14084 unsigned long
14085-print_context_stack(struct thread_info *tinfo,
14086+print_context_stack(struct task_struct *task, void *stack_start,
14087 unsigned long *stack, unsigned long bp,
14088 const struct stacktrace_ops *ops, void *data,
14089 unsigned long *end, int *graph)
14090 {
14091 struct stack_frame *frame = (struct stack_frame *)bp;
14092
14093- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
14094+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
14095 unsigned long addr;
14096
14097 addr = *stack;
14098@@ -102,7 +102,7 @@ print_context_stack(struct thread_info *tinfo,
14099 } else {
14100 ops->address(data, addr, 0);
14101 }
14102- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14103+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14104 }
14105 stack++;
14106 }
14107@@ -111,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
14108 EXPORT_SYMBOL_GPL(print_context_stack);
14109
14110 unsigned long
14111-print_context_stack_bp(struct thread_info *tinfo,
14112+print_context_stack_bp(struct task_struct *task, void *stack_start,
14113 unsigned long *stack, unsigned long bp,
14114 const struct stacktrace_ops *ops, void *data,
14115 unsigned long *end, int *graph)
14116@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14117 struct stack_frame *frame = (struct stack_frame *)bp;
14118 unsigned long *ret_addr = &frame->return_address;
14119
14120- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
14121+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
14122 unsigned long addr = *ret_addr;
14123
14124 if (!__kernel_text_address(addr))
14125@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14126 ops->address(data, addr, 1);
14127 frame = frame->next_frame;
14128 ret_addr = &frame->return_address;
14129- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14130+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14131 }
14132
14133 return (unsigned long)frame;
14134@@ -186,7 +186,7 @@ void dump_stack(void)
14135
14136 bp = stack_frame(current, NULL);
14137 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
14138- current->pid, current->comm, print_tainted(),
14139+ task_pid_nr(current), current->comm, print_tainted(),
14140 init_utsname()->release,
14141 (int)strcspn(init_utsname()->version, " "),
14142 init_utsname()->version);
14143@@ -222,6 +222,8 @@ unsigned __kprobes long oops_begin(void)
14144 }
14145 EXPORT_SYMBOL_GPL(oops_begin);
14146
14147+extern void gr_handle_kernel_exploit(void);
14148+
14149 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14150 {
14151 if (regs && kexec_should_crash(current))
14152@@ -243,7 +245,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14153 panic("Fatal exception in interrupt");
14154 if (panic_on_oops)
14155 panic("Fatal exception");
14156- do_exit(signr);
14157+
14158+ gr_handle_kernel_exploit();
14159+
14160+ do_group_exit(signr);
14161 }
14162
14163 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14164@@ -270,7 +275,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14165
14166 show_registers(regs);
14167 #ifdef CONFIG_X86_32
14168- if (user_mode_vm(regs)) {
14169+ if (user_mode(regs)) {
14170 sp = regs->sp;
14171 ss = regs->ss & 0xffff;
14172 } else {
14173@@ -298,7 +303,7 @@ void die(const char *str, struct pt_regs *regs, long err)
14174 unsigned long flags = oops_begin();
14175 int sig = SIGSEGV;
14176
14177- if (!user_mode_vm(regs))
14178+ if (!user_mode(regs))
14179 report_bug(regs->ip, regs);
14180
14181 if (__die(str, regs, err))
14182diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
14183index c99f9ed..2a15d80 100644
14184--- a/arch/x86/kernel/dumpstack_32.c
14185+++ b/arch/x86/kernel/dumpstack_32.c
14186@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14187 bp = stack_frame(task, regs);
14188
14189 for (;;) {
14190- struct thread_info *context;
14191+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14192
14193- context = (struct thread_info *)
14194- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
14195- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
14196+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14197
14198- stack = (unsigned long *)context->previous_esp;
14199- if (!stack)
14200+ if (stack_start == task_stack_page(task))
14201 break;
14202+ stack = *(unsigned long **)stack_start;
14203 if (ops->stack(data, "IRQ") < 0)
14204 break;
14205 touch_nmi_watchdog();
14206@@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs)
14207 * When in-kernel, we also print out the stack and code at the
14208 * time of the fault..
14209 */
14210- if (!user_mode_vm(regs)) {
14211+ if (!user_mode(regs)) {
14212 unsigned int code_prologue = code_bytes * 43 / 64;
14213 unsigned int code_len = code_bytes;
14214 unsigned char c;
14215 u8 *ip;
14216+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
14217
14218 printk(KERN_EMERG "Stack:\n");
14219 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
14220
14221 printk(KERN_EMERG "Code: ");
14222
14223- ip = (u8 *)regs->ip - code_prologue;
14224+ ip = (u8 *)regs->ip - code_prologue + cs_base;
14225 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
14226 /* try starting at IP */
14227- ip = (u8 *)regs->ip;
14228+ ip = (u8 *)regs->ip + cs_base;
14229 code_len = code_len - code_prologue + 1;
14230 }
14231 for (i = 0; i < code_len; i++, ip++) {
14232@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs)
14233 printk(KERN_CONT " Bad EIP value.");
14234 break;
14235 }
14236- if (ip == (u8 *)regs->ip)
14237+ if (ip == (u8 *)regs->ip + cs_base)
14238 printk(KERN_CONT "<%02x> ", c);
14239 else
14240 printk(KERN_CONT "%02x ", c);
14241@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip)
14242 {
14243 unsigned short ud2;
14244
14245+ ip = ktla_ktva(ip);
14246 if (ip < PAGE_OFFSET)
14247 return 0;
14248 if (probe_kernel_address((unsigned short *)ip, ud2))
14249@@ -139,3 +139,15 @@ int is_valid_bugaddr(unsigned long ip)
14250
14251 return ud2 == 0x0b0f;
14252 }
14253+
14254+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14255+void pax_check_alloca(unsigned long size)
14256+{
14257+ unsigned long sp = (unsigned long)&sp, stack_left;
14258+
14259+ /* all kernel stacks are of the same size */
14260+ stack_left = sp & (THREAD_SIZE - 1);
14261+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14262+}
14263+EXPORT_SYMBOL(pax_check_alloca);
14264+#endif
14265diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
14266index 17107bd..b2deecf 100644
14267--- a/arch/x86/kernel/dumpstack_64.c
14268+++ b/arch/x86/kernel/dumpstack_64.c
14269@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14270 unsigned long *irq_stack_end =
14271 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
14272 unsigned used = 0;
14273- struct thread_info *tinfo;
14274 int graph = 0;
14275 unsigned long dummy;
14276+ void *stack_start;
14277
14278 if (!task)
14279 task = current;
14280@@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14281 * current stack address. If the stacks consist of nested
14282 * exceptions
14283 */
14284- tinfo = task_thread_info(task);
14285 for (;;) {
14286 char *id;
14287 unsigned long *estack_end;
14288+
14289 estack_end = in_exception_stack(cpu, (unsigned long)stack,
14290 &used, &id);
14291
14292@@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14293 if (ops->stack(data, id) < 0)
14294 break;
14295
14296- bp = ops->walk_stack(tinfo, stack, bp, ops,
14297+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
14298 data, estack_end, &graph);
14299 ops->stack(data, "<EOE>");
14300 /*
14301@@ -172,7 +172,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14302 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
14303 if (ops->stack(data, "IRQ") < 0)
14304 break;
14305- bp = ops->walk_stack(tinfo, stack, bp,
14306+ bp = ops->walk_stack(task, irq_stack, stack, bp,
14307 ops, data, irq_stack_end, &graph);
14308 /*
14309 * We link to the next stack (which would be
14310@@ -191,7 +191,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14311 /*
14312 * This handles the process stack:
14313 */
14314- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
14315+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14316+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14317 put_cpu();
14318 }
14319 EXPORT_SYMBOL(dump_trace);
14320@@ -305,3 +306,50 @@ int is_valid_bugaddr(unsigned long ip)
14321
14322 return ud2 == 0x0b0f;
14323 }
14324+
14325+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14326+void pax_check_alloca(unsigned long size)
14327+{
14328+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
14329+ unsigned cpu, used;
14330+ char *id;
14331+
14332+ /* check the process stack first */
14333+ stack_start = (unsigned long)task_stack_page(current);
14334+ stack_end = stack_start + THREAD_SIZE;
14335+ if (likely(stack_start <= sp && sp < stack_end)) {
14336+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
14337+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14338+ return;
14339+ }
14340+
14341+ cpu = get_cpu();
14342+
14343+ /* check the irq stacks */
14344+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
14345+ stack_start = stack_end - IRQ_STACK_SIZE;
14346+ if (stack_start <= sp && sp < stack_end) {
14347+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
14348+ put_cpu();
14349+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14350+ return;
14351+ }
14352+
14353+ /* check the exception stacks */
14354+ used = 0;
14355+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
14356+ stack_start = stack_end - EXCEPTION_STKSZ;
14357+ if (stack_end && stack_start <= sp && sp < stack_end) {
14358+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
14359+ put_cpu();
14360+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14361+ return;
14362+ }
14363+
14364+ put_cpu();
14365+
14366+ /* unknown stack */
14367+ BUG();
14368+}
14369+EXPORT_SYMBOL(pax_check_alloca);
14370+#endif
14371diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
14372index 9b9f18b..9fcaa04 100644
14373--- a/arch/x86/kernel/early_printk.c
14374+++ b/arch/x86/kernel/early_printk.c
14375@@ -7,6 +7,7 @@
14376 #include <linux/pci_regs.h>
14377 #include <linux/pci_ids.h>
14378 #include <linux/errno.h>
14379+#include <linux/sched.h>
14380 #include <asm/io.h>
14381 #include <asm/processor.h>
14382 #include <asm/fcntl.h>
14383diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
14384index 7b784f4..76aaad7 100644
14385--- a/arch/x86/kernel/entry_32.S
14386+++ b/arch/x86/kernel/entry_32.S
14387@@ -179,13 +179,146 @@
14388 /*CFI_REL_OFFSET gs, PT_GS*/
14389 .endm
14390 .macro SET_KERNEL_GS reg
14391+
14392+#ifdef CONFIG_CC_STACKPROTECTOR
14393 movl $(__KERNEL_STACK_CANARY), \reg
14394+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
14395+ movl $(__USER_DS), \reg
14396+#else
14397+ xorl \reg, \reg
14398+#endif
14399+
14400 movl \reg, %gs
14401 .endm
14402
14403 #endif /* CONFIG_X86_32_LAZY_GS */
14404
14405-.macro SAVE_ALL
14406+.macro pax_enter_kernel
14407+#ifdef CONFIG_PAX_KERNEXEC
14408+ call pax_enter_kernel
14409+#endif
14410+.endm
14411+
14412+.macro pax_exit_kernel
14413+#ifdef CONFIG_PAX_KERNEXEC
14414+ call pax_exit_kernel
14415+#endif
14416+.endm
14417+
14418+#ifdef CONFIG_PAX_KERNEXEC
14419+ENTRY(pax_enter_kernel)
14420+#ifdef CONFIG_PARAVIRT
14421+ pushl %eax
14422+ pushl %ecx
14423+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
14424+ mov %eax, %esi
14425+#else
14426+ mov %cr0, %esi
14427+#endif
14428+ bts $16, %esi
14429+ jnc 1f
14430+ mov %cs, %esi
14431+ cmp $__KERNEL_CS, %esi
14432+ jz 3f
14433+ ljmp $__KERNEL_CS, $3f
14434+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
14435+2:
14436+#ifdef CONFIG_PARAVIRT
14437+ mov %esi, %eax
14438+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
14439+#else
14440+ mov %esi, %cr0
14441+#endif
14442+3:
14443+#ifdef CONFIG_PARAVIRT
14444+ popl %ecx
14445+ popl %eax
14446+#endif
14447+ ret
14448+ENDPROC(pax_enter_kernel)
14449+
14450+ENTRY(pax_exit_kernel)
14451+#ifdef CONFIG_PARAVIRT
14452+ pushl %eax
14453+ pushl %ecx
14454+#endif
14455+ mov %cs, %esi
14456+ cmp $__KERNEXEC_KERNEL_CS, %esi
14457+ jnz 2f
14458+#ifdef CONFIG_PARAVIRT
14459+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
14460+ mov %eax, %esi
14461+#else
14462+ mov %cr0, %esi
14463+#endif
14464+ btr $16, %esi
14465+ ljmp $__KERNEL_CS, $1f
14466+1:
14467+#ifdef CONFIG_PARAVIRT
14468+ mov %esi, %eax
14469+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
14470+#else
14471+ mov %esi, %cr0
14472+#endif
14473+2:
14474+#ifdef CONFIG_PARAVIRT
14475+ popl %ecx
14476+ popl %eax
14477+#endif
14478+ ret
14479+ENDPROC(pax_exit_kernel)
14480+#endif
14481+
14482+.macro pax_erase_kstack
14483+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14484+ call pax_erase_kstack
14485+#endif
14486+.endm
14487+
14488+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14489+/*
14490+ * ebp: thread_info
14491+ * ecx, edx: can be clobbered
14492+ */
14493+ENTRY(pax_erase_kstack)
14494+ pushl %edi
14495+ pushl %eax
14496+
14497+ mov TI_lowest_stack(%ebp), %edi
14498+ mov $-0xBEEF, %eax
14499+ std
14500+
14501+1: mov %edi, %ecx
14502+ and $THREAD_SIZE_asm - 1, %ecx
14503+ shr $2, %ecx
14504+ repne scasl
14505+ jecxz 2f
14506+
14507+ cmp $2*16, %ecx
14508+ jc 2f
14509+
14510+ mov $2*16, %ecx
14511+ repe scasl
14512+ jecxz 2f
14513+ jne 1b
14514+
14515+2: cld
14516+ mov %esp, %ecx
14517+ sub %edi, %ecx
14518+ shr $2, %ecx
14519+ rep stosl
14520+
14521+ mov TI_task_thread_sp0(%ebp), %edi
14522+ sub $128, %edi
14523+ mov %edi, TI_lowest_stack(%ebp)
14524+
14525+ popl %eax
14526+ popl %edi
14527+ ret
14528+ENDPROC(pax_erase_kstack)
14529+#endif
14530+
14531+.macro __SAVE_ALL _DS
14532 cld
14533 PUSH_GS
14534 pushl_cfi %fs
14535@@ -208,7 +341,7 @@
14536 CFI_REL_OFFSET ecx, 0
14537 pushl_cfi %ebx
14538 CFI_REL_OFFSET ebx, 0
14539- movl $(__USER_DS), %edx
14540+ movl $\_DS, %edx
14541 movl %edx, %ds
14542 movl %edx, %es
14543 movl $(__KERNEL_PERCPU), %edx
14544@@ -216,6 +349,15 @@
14545 SET_KERNEL_GS %edx
14546 .endm
14547
14548+.macro SAVE_ALL
14549+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
14550+ __SAVE_ALL __KERNEL_DS
14551+ pax_enter_kernel
14552+#else
14553+ __SAVE_ALL __USER_DS
14554+#endif
14555+.endm
14556+
14557 .macro RESTORE_INT_REGS
14558 popl_cfi %ebx
14559 CFI_RESTORE ebx
14560@@ -301,7 +443,7 @@ ENTRY(ret_from_fork)
14561 popfl_cfi
14562 jmp syscall_exit
14563 CFI_ENDPROC
14564-END(ret_from_fork)
14565+ENDPROC(ret_from_fork)
14566
14567 /*
14568 * Interrupt exit functions should be protected against kprobes
14569@@ -335,7 +477,15 @@ resume_userspace_sig:
14570 andl $SEGMENT_RPL_MASK, %eax
14571 #endif
14572 cmpl $USER_RPL, %eax
14573+
14574+#ifdef CONFIG_PAX_KERNEXEC
14575+ jae resume_userspace
14576+
14577+ PAX_EXIT_KERNEL
14578+ jmp resume_kernel
14579+#else
14580 jb resume_kernel # not returning to v8086 or userspace
14581+#endif
14582
14583 ENTRY(resume_userspace)
14584 LOCKDEP_SYS_EXIT
14585@@ -347,8 +497,8 @@ ENTRY(resume_userspace)
14586 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
14587 # int/exception return?
14588 jne work_pending
14589- jmp restore_all
14590-END(ret_from_exception)
14591+ jmp restore_all_pax
14592+ENDPROC(ret_from_exception)
14593
14594 #ifdef CONFIG_PREEMPT
14595 ENTRY(resume_kernel)
14596@@ -363,7 +513,7 @@ need_resched:
14597 jz restore_all
14598 call preempt_schedule_irq
14599 jmp need_resched
14600-END(resume_kernel)
14601+ENDPROC(resume_kernel)
14602 #endif
14603 CFI_ENDPROC
14604 /*
14605@@ -397,23 +547,34 @@ sysenter_past_esp:
14606 /*CFI_REL_OFFSET cs, 0*/
14607 /*
14608 * Push current_thread_info()->sysenter_return to the stack.
14609- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
14610- * pushed above; +8 corresponds to copy_thread's esp0 setting.
14611 */
14612- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
14613+ pushl_cfi $0
14614 CFI_REL_OFFSET eip, 0
14615
14616 pushl_cfi %eax
14617 SAVE_ALL
14618+ GET_THREAD_INFO(%ebp)
14619+ movl TI_sysenter_return(%ebp),%ebp
14620+ movl %ebp,PT_EIP(%esp)
14621 ENABLE_INTERRUPTS(CLBR_NONE)
14622
14623 /*
14624 * Load the potential sixth argument from user stack.
14625 * Careful about security.
14626 */
14627+ movl PT_OLDESP(%esp),%ebp
14628+
14629+#ifdef CONFIG_PAX_MEMORY_UDEREF
14630+ mov PT_OLDSS(%esp),%ds
14631+1: movl %ds:(%ebp),%ebp
14632+ push %ss
14633+ pop %ds
14634+#else
14635 cmpl $__PAGE_OFFSET-3,%ebp
14636 jae syscall_fault
14637 1: movl (%ebp),%ebp
14638+#endif
14639+
14640 movl %ebp,PT_EBP(%esp)
14641 .section __ex_table,"a"
14642 .align 4
14643@@ -436,12 +597,24 @@ sysenter_do_call:
14644 testl $_TIF_ALLWORK_MASK, %ecx
14645 jne sysexit_audit
14646 sysenter_exit:
14647+
14648+#ifdef CONFIG_PAX_RANDKSTACK
14649+ pushl_cfi %eax
14650+ movl %esp, %eax
14651+ call pax_randomize_kstack
14652+ popl_cfi %eax
14653+#endif
14654+
14655+ pax_erase_kstack
14656+
14657 /* if something modifies registers it must also disable sysexit */
14658 movl PT_EIP(%esp), %edx
14659 movl PT_OLDESP(%esp), %ecx
14660 xorl %ebp,%ebp
14661 TRACE_IRQS_ON
14662 1: mov PT_FS(%esp), %fs
14663+2: mov PT_DS(%esp), %ds
14664+3: mov PT_ES(%esp), %es
14665 PTGS_TO_GS
14666 ENABLE_INTERRUPTS_SYSEXIT
14667
14668@@ -458,6 +631,9 @@ sysenter_audit:
14669 movl %eax,%edx /* 2nd arg: syscall number */
14670 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
14671 call __audit_syscall_entry
14672+
14673+ pax_erase_kstack
14674+
14675 pushl_cfi %ebx
14676 movl PT_EAX(%esp),%eax /* reload syscall number */
14677 jmp sysenter_do_call
14678@@ -483,11 +659,17 @@ sysexit_audit:
14679
14680 CFI_ENDPROC
14681 .pushsection .fixup,"ax"
14682-2: movl $0,PT_FS(%esp)
14683+4: movl $0,PT_FS(%esp)
14684+ jmp 1b
14685+5: movl $0,PT_DS(%esp)
14686+ jmp 1b
14687+6: movl $0,PT_ES(%esp)
14688 jmp 1b
14689 .section __ex_table,"a"
14690 .align 4
14691- .long 1b,2b
14692+ .long 1b,4b
14693+ .long 2b,5b
14694+ .long 3b,6b
14695 .popsection
14696 PTGS_TO_GS_EX
14697 ENDPROC(ia32_sysenter_target)
14698@@ -520,6 +702,15 @@ syscall_exit:
14699 testl $_TIF_ALLWORK_MASK, %ecx # current->work
14700 jne syscall_exit_work
14701
14702+restore_all_pax:
14703+
14704+#ifdef CONFIG_PAX_RANDKSTACK
14705+ movl %esp, %eax
14706+ call pax_randomize_kstack
14707+#endif
14708+
14709+ pax_erase_kstack
14710+
14711 restore_all:
14712 TRACE_IRQS_IRET
14713 restore_all_notrace:
14714@@ -579,14 +770,34 @@ ldt_ss:
14715 * compensating for the offset by changing to the ESPFIX segment with
14716 * a base address that matches for the difference.
14717 */
14718-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
14719+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
14720 mov %esp, %edx /* load kernel esp */
14721 mov PT_OLDESP(%esp), %eax /* load userspace esp */
14722 mov %dx, %ax /* eax: new kernel esp */
14723 sub %eax, %edx /* offset (low word is 0) */
14724+#ifdef CONFIG_SMP
14725+ movl PER_CPU_VAR(cpu_number), %ebx
14726+ shll $PAGE_SHIFT_asm, %ebx
14727+ addl $cpu_gdt_table, %ebx
14728+#else
14729+ movl $cpu_gdt_table, %ebx
14730+#endif
14731 shr $16, %edx
14732- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
14733- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
14734+
14735+#ifdef CONFIG_PAX_KERNEXEC
14736+ mov %cr0, %esi
14737+ btr $16, %esi
14738+ mov %esi, %cr0
14739+#endif
14740+
14741+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
14742+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
14743+
14744+#ifdef CONFIG_PAX_KERNEXEC
14745+ bts $16, %esi
14746+ mov %esi, %cr0
14747+#endif
14748+
14749 pushl_cfi $__ESPFIX_SS
14750 pushl_cfi %eax /* new kernel esp */
14751 /* Disable interrupts, but do not irqtrace this section: we
14752@@ -615,38 +826,30 @@ work_resched:
14753 movl TI_flags(%ebp), %ecx
14754 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
14755 # than syscall tracing?
14756- jz restore_all
14757+ jz restore_all_pax
14758 testb $_TIF_NEED_RESCHED, %cl
14759 jnz work_resched
14760
14761 work_notifysig: # deal with pending signals and
14762 # notify-resume requests
14763+ movl %esp, %eax
14764 #ifdef CONFIG_VM86
14765 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
14766- movl %esp, %eax
14767- jne work_notifysig_v86 # returning to kernel-space or
14768+ jz 1f # returning to kernel-space or
14769 # vm86-space
14770- TRACE_IRQS_ON
14771- ENABLE_INTERRUPTS(CLBR_NONE)
14772- xorl %edx, %edx
14773- call do_notify_resume
14774- jmp resume_userspace_sig
14775
14776- ALIGN
14777-work_notifysig_v86:
14778 pushl_cfi %ecx # save ti_flags for do_notify_resume
14779 call save_v86_state # %eax contains pt_regs pointer
14780 popl_cfi %ecx
14781 movl %eax, %esp
14782-#else
14783- movl %esp, %eax
14784+1:
14785 #endif
14786 TRACE_IRQS_ON
14787 ENABLE_INTERRUPTS(CLBR_NONE)
14788 xorl %edx, %edx
14789 call do_notify_resume
14790 jmp resume_userspace_sig
14791-END(work_pending)
14792+ENDPROC(work_pending)
14793
14794 # perform syscall exit tracing
14795 ALIGN
14796@@ -654,11 +857,14 @@ syscall_trace_entry:
14797 movl $-ENOSYS,PT_EAX(%esp)
14798 movl %esp, %eax
14799 call syscall_trace_enter
14800+
14801+ pax_erase_kstack
14802+
14803 /* What it returned is what we'll actually use. */
14804 cmpl $(NR_syscalls), %eax
14805 jnae syscall_call
14806 jmp syscall_exit
14807-END(syscall_trace_entry)
14808+ENDPROC(syscall_trace_entry)
14809
14810 # perform syscall exit tracing
14811 ALIGN
14812@@ -671,20 +877,24 @@ syscall_exit_work:
14813 movl %esp, %eax
14814 call syscall_trace_leave
14815 jmp resume_userspace
14816-END(syscall_exit_work)
14817+ENDPROC(syscall_exit_work)
14818 CFI_ENDPROC
14819
14820 RING0_INT_FRAME # can't unwind into user space anyway
14821 syscall_fault:
14822+#ifdef CONFIG_PAX_MEMORY_UDEREF
14823+ push %ss
14824+ pop %ds
14825+#endif
14826 GET_THREAD_INFO(%ebp)
14827 movl $-EFAULT,PT_EAX(%esp)
14828 jmp resume_userspace
14829-END(syscall_fault)
14830+ENDPROC(syscall_fault)
14831
14832 syscall_badsys:
14833 movl $-ENOSYS,PT_EAX(%esp)
14834 jmp resume_userspace
14835-END(syscall_badsys)
14836+ENDPROC(syscall_badsys)
14837 CFI_ENDPROC
14838 /*
14839 * End of kprobes section
14840@@ -756,6 +966,36 @@ ENTRY(ptregs_clone)
14841 CFI_ENDPROC
14842 ENDPROC(ptregs_clone)
14843
14844+ ALIGN;
14845+ENTRY(kernel_execve)
14846+ CFI_STARTPROC
14847+ pushl_cfi %ebp
14848+ sub $PT_OLDSS+4,%esp
14849+ pushl_cfi %edi
14850+ pushl_cfi %ecx
14851+ pushl_cfi %eax
14852+ lea 3*4(%esp),%edi
14853+ mov $PT_OLDSS/4+1,%ecx
14854+ xorl %eax,%eax
14855+ rep stosl
14856+ popl_cfi %eax
14857+ popl_cfi %ecx
14858+ popl_cfi %edi
14859+ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
14860+ pushl_cfi %esp
14861+ call sys_execve
14862+ add $4,%esp
14863+ CFI_ADJUST_CFA_OFFSET -4
14864+ GET_THREAD_INFO(%ebp)
14865+ test %eax,%eax
14866+ jz syscall_exit
14867+ add $PT_OLDSS+4,%esp
14868+ CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4
14869+ popl_cfi %ebp
14870+ ret
14871+ CFI_ENDPROC
14872+ENDPROC(kernel_execve)
14873+
14874 .macro FIXUP_ESPFIX_STACK
14875 /*
14876 * Switch back for ESPFIX stack to the normal zerobased stack
14877@@ -765,8 +1005,15 @@ ENDPROC(ptregs_clone)
14878 * normal stack and adjusts ESP with the matching offset.
14879 */
14880 /* fixup the stack */
14881- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
14882- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
14883+#ifdef CONFIG_SMP
14884+ movl PER_CPU_VAR(cpu_number), %ebx
14885+ shll $PAGE_SHIFT_asm, %ebx
14886+ addl $cpu_gdt_table, %ebx
14887+#else
14888+ movl $cpu_gdt_table, %ebx
14889+#endif
14890+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
14891+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
14892 shl $16, %eax
14893 addl %esp, %eax /* the adjusted stack pointer */
14894 pushl_cfi $__KERNEL_DS
14895@@ -819,7 +1066,7 @@ vector=vector+1
14896 .endr
14897 2: jmp common_interrupt
14898 .endr
14899-END(irq_entries_start)
14900+ENDPROC(irq_entries_start)
14901
14902 .previous
14903 END(interrupt)
14904@@ -867,7 +1114,7 @@ ENTRY(coprocessor_error)
14905 pushl_cfi $do_coprocessor_error
14906 jmp error_code
14907 CFI_ENDPROC
14908-END(coprocessor_error)
14909+ENDPROC(coprocessor_error)
14910
14911 ENTRY(simd_coprocessor_error)
14912 RING0_INT_FRAME
14913@@ -888,7 +1135,7 @@ ENTRY(simd_coprocessor_error)
14914 #endif
14915 jmp error_code
14916 CFI_ENDPROC
14917-END(simd_coprocessor_error)
14918+ENDPROC(simd_coprocessor_error)
14919
14920 ENTRY(device_not_available)
14921 RING0_INT_FRAME
14922@@ -896,7 +1143,7 @@ ENTRY(device_not_available)
14923 pushl_cfi $do_device_not_available
14924 jmp error_code
14925 CFI_ENDPROC
14926-END(device_not_available)
14927+ENDPROC(device_not_available)
14928
14929 #ifdef CONFIG_PARAVIRT
14930 ENTRY(native_iret)
14931@@ -905,12 +1152,12 @@ ENTRY(native_iret)
14932 .align 4
14933 .long native_iret, iret_exc
14934 .previous
14935-END(native_iret)
14936+ENDPROC(native_iret)
14937
14938 ENTRY(native_irq_enable_sysexit)
14939 sti
14940 sysexit
14941-END(native_irq_enable_sysexit)
14942+ENDPROC(native_irq_enable_sysexit)
14943 #endif
14944
14945 ENTRY(overflow)
14946@@ -919,7 +1166,7 @@ ENTRY(overflow)
14947 pushl_cfi $do_overflow
14948 jmp error_code
14949 CFI_ENDPROC
14950-END(overflow)
14951+ENDPROC(overflow)
14952
14953 ENTRY(bounds)
14954 RING0_INT_FRAME
14955@@ -927,7 +1174,7 @@ ENTRY(bounds)
14956 pushl_cfi $do_bounds
14957 jmp error_code
14958 CFI_ENDPROC
14959-END(bounds)
14960+ENDPROC(bounds)
14961
14962 ENTRY(invalid_op)
14963 RING0_INT_FRAME
14964@@ -935,7 +1182,7 @@ ENTRY(invalid_op)
14965 pushl_cfi $do_invalid_op
14966 jmp error_code
14967 CFI_ENDPROC
14968-END(invalid_op)
14969+ENDPROC(invalid_op)
14970
14971 ENTRY(coprocessor_segment_overrun)
14972 RING0_INT_FRAME
14973@@ -943,35 +1190,35 @@ ENTRY(coprocessor_segment_overrun)
14974 pushl_cfi $do_coprocessor_segment_overrun
14975 jmp error_code
14976 CFI_ENDPROC
14977-END(coprocessor_segment_overrun)
14978+ENDPROC(coprocessor_segment_overrun)
14979
14980 ENTRY(invalid_TSS)
14981 RING0_EC_FRAME
14982 pushl_cfi $do_invalid_TSS
14983 jmp error_code
14984 CFI_ENDPROC
14985-END(invalid_TSS)
14986+ENDPROC(invalid_TSS)
14987
14988 ENTRY(segment_not_present)
14989 RING0_EC_FRAME
14990 pushl_cfi $do_segment_not_present
14991 jmp error_code
14992 CFI_ENDPROC
14993-END(segment_not_present)
14994+ENDPROC(segment_not_present)
14995
14996 ENTRY(stack_segment)
14997 RING0_EC_FRAME
14998 pushl_cfi $do_stack_segment
14999 jmp error_code
15000 CFI_ENDPROC
15001-END(stack_segment)
15002+ENDPROC(stack_segment)
15003
15004 ENTRY(alignment_check)
15005 RING0_EC_FRAME
15006 pushl_cfi $do_alignment_check
15007 jmp error_code
15008 CFI_ENDPROC
15009-END(alignment_check)
15010+ENDPROC(alignment_check)
15011
15012 ENTRY(divide_error)
15013 RING0_INT_FRAME
15014@@ -979,7 +1226,7 @@ ENTRY(divide_error)
15015 pushl_cfi $do_divide_error
15016 jmp error_code
15017 CFI_ENDPROC
15018-END(divide_error)
15019+ENDPROC(divide_error)
15020
15021 #ifdef CONFIG_X86_MCE
15022 ENTRY(machine_check)
15023@@ -988,7 +1235,7 @@ ENTRY(machine_check)
15024 pushl_cfi machine_check_vector
15025 jmp error_code
15026 CFI_ENDPROC
15027-END(machine_check)
15028+ENDPROC(machine_check)
15029 #endif
15030
15031 ENTRY(spurious_interrupt_bug)
15032@@ -997,7 +1244,7 @@ ENTRY(spurious_interrupt_bug)
15033 pushl_cfi $do_spurious_interrupt_bug
15034 jmp error_code
15035 CFI_ENDPROC
15036-END(spurious_interrupt_bug)
15037+ENDPROC(spurious_interrupt_bug)
15038 /*
15039 * End of kprobes section
15040 */
15041@@ -1112,7 +1359,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
15042
15043 ENTRY(mcount)
15044 ret
15045-END(mcount)
15046+ENDPROC(mcount)
15047
15048 ENTRY(ftrace_caller)
15049 cmpl $0, function_trace_stop
15050@@ -1141,7 +1388,7 @@ ftrace_graph_call:
15051 .globl ftrace_stub
15052 ftrace_stub:
15053 ret
15054-END(ftrace_caller)
15055+ENDPROC(ftrace_caller)
15056
15057 #else /* ! CONFIG_DYNAMIC_FTRACE */
15058
15059@@ -1177,7 +1424,7 @@ trace:
15060 popl %ecx
15061 popl %eax
15062 jmp ftrace_stub
15063-END(mcount)
15064+ENDPROC(mcount)
15065 #endif /* CONFIG_DYNAMIC_FTRACE */
15066 #endif /* CONFIG_FUNCTION_TRACER */
15067
15068@@ -1198,7 +1445,7 @@ ENTRY(ftrace_graph_caller)
15069 popl %ecx
15070 popl %eax
15071 ret
15072-END(ftrace_graph_caller)
15073+ENDPROC(ftrace_graph_caller)
15074
15075 .globl return_to_handler
15076 return_to_handler:
15077@@ -1253,15 +1500,18 @@ error_code:
15078 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
15079 REG_TO_PTGS %ecx
15080 SET_KERNEL_GS %ecx
15081- movl $(__USER_DS), %ecx
15082+ movl $(__KERNEL_DS), %ecx
15083 movl %ecx, %ds
15084 movl %ecx, %es
15085+
15086+ pax_enter_kernel
15087+
15088 TRACE_IRQS_OFF
15089 movl %esp,%eax # pt_regs pointer
15090 call *%edi
15091 jmp ret_from_exception
15092 CFI_ENDPROC
15093-END(page_fault)
15094+ENDPROC(page_fault)
15095
15096 /*
15097 * Debug traps and NMI can happen at the one SYSENTER instruction
15098@@ -1303,7 +1553,7 @@ debug_stack_correct:
15099 call do_debug
15100 jmp ret_from_exception
15101 CFI_ENDPROC
15102-END(debug)
15103+ENDPROC(debug)
15104
15105 /*
15106 * NMI is doubly nasty. It can happen _while_ we're handling
15107@@ -1340,6 +1590,9 @@ nmi_stack_correct:
15108 xorl %edx,%edx # zero error code
15109 movl %esp,%eax # pt_regs pointer
15110 call do_nmi
15111+
15112+ pax_exit_kernel
15113+
15114 jmp restore_all_notrace
15115 CFI_ENDPROC
15116
15117@@ -1376,12 +1629,15 @@ nmi_espfix_stack:
15118 FIXUP_ESPFIX_STACK # %eax == %esp
15119 xorl %edx,%edx # zero error code
15120 call do_nmi
15121+
15122+ pax_exit_kernel
15123+
15124 RESTORE_REGS
15125 lss 12+4(%esp), %esp # back to espfix stack
15126 CFI_ADJUST_CFA_OFFSET -24
15127 jmp irq_return
15128 CFI_ENDPROC
15129-END(nmi)
15130+ENDPROC(nmi)
15131
15132 ENTRY(int3)
15133 RING0_INT_FRAME
15134@@ -1393,14 +1649,14 @@ ENTRY(int3)
15135 call do_int3
15136 jmp ret_from_exception
15137 CFI_ENDPROC
15138-END(int3)
15139+ENDPROC(int3)
15140
15141 ENTRY(general_protection)
15142 RING0_EC_FRAME
15143 pushl_cfi $do_general_protection
15144 jmp error_code
15145 CFI_ENDPROC
15146-END(general_protection)
15147+ENDPROC(general_protection)
15148
15149 #ifdef CONFIG_KVM_GUEST
15150 ENTRY(async_page_fault)
15151@@ -1408,7 +1664,7 @@ ENTRY(async_page_fault)
15152 pushl_cfi $do_async_page_fault
15153 jmp error_code
15154 CFI_ENDPROC
15155-END(async_page_fault)
15156+ENDPROC(async_page_fault)
15157 #endif
15158
15159 /*
15160diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
15161index 1333d98..b340ca2 100644
15162--- a/arch/x86/kernel/entry_64.S
15163+++ b/arch/x86/kernel/entry_64.S
15164@@ -56,6 +56,8 @@
15165 #include <asm/ftrace.h>
15166 #include <asm/percpu.h>
15167 #include <linux/err.h>
15168+#include <asm/pgtable.h>
15169+#include <asm/alternative-asm.h>
15170
15171 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
15172 #include <linux/elf-em.h>
15173@@ -69,8 +71,9 @@
15174 #ifdef CONFIG_FUNCTION_TRACER
15175 #ifdef CONFIG_DYNAMIC_FTRACE
15176 ENTRY(mcount)
15177+ pax_force_retaddr
15178 retq
15179-END(mcount)
15180+ENDPROC(mcount)
15181
15182 ENTRY(ftrace_caller)
15183 cmpl $0, function_trace_stop
15184@@ -93,8 +96,9 @@ GLOBAL(ftrace_graph_call)
15185 #endif
15186
15187 GLOBAL(ftrace_stub)
15188+ pax_force_retaddr
15189 retq
15190-END(ftrace_caller)
15191+ENDPROC(ftrace_caller)
15192
15193 #else /* ! CONFIG_DYNAMIC_FTRACE */
15194 ENTRY(mcount)
15195@@ -113,6 +117,7 @@ ENTRY(mcount)
15196 #endif
15197
15198 GLOBAL(ftrace_stub)
15199+ pax_force_retaddr
15200 retq
15201
15202 trace:
15203@@ -122,12 +127,13 @@ trace:
15204 movq 8(%rbp), %rsi
15205 subq $MCOUNT_INSN_SIZE, %rdi
15206
15207+ pax_force_fptr ftrace_trace_function
15208 call *ftrace_trace_function
15209
15210 MCOUNT_RESTORE_FRAME
15211
15212 jmp ftrace_stub
15213-END(mcount)
15214+ENDPROC(mcount)
15215 #endif /* CONFIG_DYNAMIC_FTRACE */
15216 #endif /* CONFIG_FUNCTION_TRACER */
15217
15218@@ -147,8 +153,9 @@ ENTRY(ftrace_graph_caller)
15219
15220 MCOUNT_RESTORE_FRAME
15221
15222+ pax_force_retaddr
15223 retq
15224-END(ftrace_graph_caller)
15225+ENDPROC(ftrace_graph_caller)
15226
15227 GLOBAL(return_to_handler)
15228 subq $24, %rsp
15229@@ -164,6 +171,7 @@ GLOBAL(return_to_handler)
15230 movq 8(%rsp), %rdx
15231 movq (%rsp), %rax
15232 addq $24, %rsp
15233+ pax_force_fptr %rdi
15234 jmp *%rdi
15235 #endif
15236
15237@@ -179,6 +187,282 @@ ENTRY(native_usergs_sysret64)
15238 ENDPROC(native_usergs_sysret64)
15239 #endif /* CONFIG_PARAVIRT */
15240
15241+ .macro ljmpq sel, off
15242+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
15243+ .byte 0x48; ljmp *1234f(%rip)
15244+ .pushsection .rodata
15245+ .align 16
15246+ 1234: .quad \off; .word \sel
15247+ .popsection
15248+#else
15249+ pushq $\sel
15250+ pushq $\off
15251+ lretq
15252+#endif
15253+ .endm
15254+
15255+ .macro pax_enter_kernel
15256+ pax_set_fptr_mask
15257+#ifdef CONFIG_PAX_KERNEXEC
15258+ call pax_enter_kernel
15259+#endif
15260+ .endm
15261+
15262+ .macro pax_exit_kernel
15263+#ifdef CONFIG_PAX_KERNEXEC
15264+ call pax_exit_kernel
15265+#endif
15266+ .endm
15267+
15268+#ifdef CONFIG_PAX_KERNEXEC
15269+ENTRY(pax_enter_kernel)
15270+ pushq %rdi
15271+
15272+#ifdef CONFIG_PARAVIRT
15273+ PV_SAVE_REGS(CLBR_RDI)
15274+#endif
15275+
15276+ GET_CR0_INTO_RDI
15277+ bts $16,%rdi
15278+ jnc 3f
15279+ mov %cs,%edi
15280+ cmp $__KERNEL_CS,%edi
15281+ jnz 2f
15282+1:
15283+
15284+#ifdef CONFIG_PARAVIRT
15285+ PV_RESTORE_REGS(CLBR_RDI)
15286+#endif
15287+
15288+ popq %rdi
15289+ pax_force_retaddr
15290+ retq
15291+
15292+2: ljmpq __KERNEL_CS,1f
15293+3: ljmpq __KERNEXEC_KERNEL_CS,4f
15294+4: SET_RDI_INTO_CR0
15295+ jmp 1b
15296+ENDPROC(pax_enter_kernel)
15297+
15298+ENTRY(pax_exit_kernel)
15299+ pushq %rdi
15300+
15301+#ifdef CONFIG_PARAVIRT
15302+ PV_SAVE_REGS(CLBR_RDI)
15303+#endif
15304+
15305+ mov %cs,%rdi
15306+ cmp $__KERNEXEC_KERNEL_CS,%edi
15307+ jz 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: GET_CR0_INTO_RDI
15319+ btr $16,%rdi
15320+ ljmpq __KERNEL_CS,3f
15321+3: SET_RDI_INTO_CR0
15322+ jmp 1b
15323+#ifdef CONFIG_PARAVIRT
15324+ PV_RESTORE_REGS(CLBR_RDI);
15325+#endif
15326+
15327+ popq %rdi
15328+ pax_force_retaddr
15329+ retq
15330+ENDPROC(pax_exit_kernel)
15331+#endif
15332+
15333+ .macro pax_enter_kernel_user
15334+ pax_set_fptr_mask
15335+#ifdef CONFIG_PAX_MEMORY_UDEREF
15336+ call pax_enter_kernel_user
15337+#endif
15338+ .endm
15339+
15340+ .macro pax_exit_kernel_user
15341+#ifdef CONFIG_PAX_MEMORY_UDEREF
15342+ call pax_exit_kernel_user
15343+#endif
15344+#ifdef CONFIG_PAX_RANDKSTACK
15345+ pushq %rax
15346+ call pax_randomize_kstack
15347+ popq %rax
15348+#endif
15349+ .endm
15350+
15351+#ifdef CONFIG_PAX_MEMORY_UDEREF
15352+ENTRY(pax_enter_kernel_user)
15353+ pushq %rdi
15354+ pushq %rbx
15355+
15356+#ifdef CONFIG_PARAVIRT
15357+ PV_SAVE_REGS(CLBR_RDI)
15358+#endif
15359+
15360+ GET_CR3_INTO_RDI
15361+ mov %rdi,%rbx
15362+ add $__START_KERNEL_map,%rbx
15363+ sub phys_base(%rip),%rbx
15364+
15365+#ifdef CONFIG_PARAVIRT
15366+ pushq %rdi
15367+ cmpl $0, pv_info+PARAVIRT_enabled
15368+ jz 1f
15369+ i = 0
15370+ .rept USER_PGD_PTRS
15371+ mov i*8(%rbx),%rsi
15372+ mov $0,%sil
15373+ lea i*8(%rbx),%rdi
15374+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15375+ i = i + 1
15376+ .endr
15377+ jmp 2f
15378+1:
15379+#endif
15380+
15381+ i = 0
15382+ .rept USER_PGD_PTRS
15383+ movb $0,i*8(%rbx)
15384+ i = i + 1
15385+ .endr
15386+
15387+#ifdef CONFIG_PARAVIRT
15388+2: popq %rdi
15389+#endif
15390+ SET_RDI_INTO_CR3
15391+
15392+#ifdef CONFIG_PAX_KERNEXEC
15393+ GET_CR0_INTO_RDI
15394+ bts $16,%rdi
15395+ SET_RDI_INTO_CR0
15396+#endif
15397+
15398+#ifdef CONFIG_PARAVIRT
15399+ PV_RESTORE_REGS(CLBR_RDI)
15400+#endif
15401+
15402+ popq %rbx
15403+ popq %rdi
15404+ pax_force_retaddr
15405+ retq
15406+ENDPROC(pax_enter_kernel_user)
15407+
15408+ENTRY(pax_exit_kernel_user)
15409+ push %rdi
15410+
15411+#ifdef CONFIG_PARAVIRT
15412+ pushq %rbx
15413+ PV_SAVE_REGS(CLBR_RDI)
15414+#endif
15415+
15416+#ifdef CONFIG_PAX_KERNEXEC
15417+ GET_CR0_INTO_RDI
15418+ btr $16,%rdi
15419+ SET_RDI_INTO_CR0
15420+#endif
15421+
15422+ GET_CR3_INTO_RDI
15423+ add $__START_KERNEL_map,%rdi
15424+ sub phys_base(%rip),%rdi
15425+
15426+#ifdef CONFIG_PARAVIRT
15427+ cmpl $0, pv_info+PARAVIRT_enabled
15428+ jz 1f
15429+ mov %rdi,%rbx
15430+ i = 0
15431+ .rept USER_PGD_PTRS
15432+ mov i*8(%rbx),%rsi
15433+ mov $0x67,%sil
15434+ lea i*8(%rbx),%rdi
15435+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15436+ i = i + 1
15437+ .endr
15438+ jmp 2f
15439+1:
15440+#endif
15441+
15442+ i = 0
15443+ .rept USER_PGD_PTRS
15444+ movb $0x67,i*8(%rdi)
15445+ i = i + 1
15446+ .endr
15447+
15448+#ifdef CONFIG_PARAVIRT
15449+2: PV_RESTORE_REGS(CLBR_RDI)
15450+ popq %rbx
15451+#endif
15452+
15453+ popq %rdi
15454+ pax_force_retaddr
15455+ retq
15456+ENDPROC(pax_exit_kernel_user)
15457+#endif
15458+
15459+.macro pax_erase_kstack
15460+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15461+ call pax_erase_kstack
15462+#endif
15463+.endm
15464+
15465+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15466+/*
15467+ * r11: thread_info
15468+ * rcx, rdx: can be clobbered
15469+ */
15470+ENTRY(pax_erase_kstack)
15471+ pushq %rdi
15472+ pushq %rax
15473+ pushq %r11
15474+
15475+ GET_THREAD_INFO(%r11)
15476+ mov TI_lowest_stack(%r11), %rdi
15477+ mov $-0xBEEF, %rax
15478+ std
15479+
15480+1: mov %edi, %ecx
15481+ and $THREAD_SIZE_asm - 1, %ecx
15482+ shr $3, %ecx
15483+ repne scasq
15484+ jecxz 2f
15485+
15486+ cmp $2*8, %ecx
15487+ jc 2f
15488+
15489+ mov $2*8, %ecx
15490+ repe scasq
15491+ jecxz 2f
15492+ jne 1b
15493+
15494+2: cld
15495+ mov %esp, %ecx
15496+ sub %edi, %ecx
15497+
15498+ cmp $THREAD_SIZE_asm, %rcx
15499+ jb 3f
15500+ ud2
15501+3:
15502+
15503+ shr $3, %ecx
15504+ rep stosq
15505+
15506+ mov TI_task_thread_sp0(%r11), %rdi
15507+ sub $256, %rdi
15508+ mov %rdi, TI_lowest_stack(%r11)
15509+
15510+ popq %r11
15511+ popq %rax
15512+ popq %rdi
15513+ pax_force_retaddr
15514+ ret
15515+ENDPROC(pax_erase_kstack)
15516+#endif
15517
15518 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
15519 #ifdef CONFIG_TRACE_IRQFLAGS
15520@@ -232,8 +516,8 @@ ENDPROC(native_usergs_sysret64)
15521 .endm
15522
15523 .macro UNFAKE_STACK_FRAME
15524- addq $8*6, %rsp
15525- CFI_ADJUST_CFA_OFFSET -(6*8)
15526+ addq $8*6 + ARG_SKIP, %rsp
15527+ CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
15528 .endm
15529
15530 /*
15531@@ -320,7 +604,7 @@ ENDPROC(native_usergs_sysret64)
15532 movq %rsp, %rsi
15533
15534 leaq -RBP(%rsp),%rdi /* arg1 for handler */
15535- testl $3, CS(%rdi)
15536+ testb $3, CS(%rdi)
15537 je 1f
15538 SWAPGS
15539 /*
15540@@ -356,9 +640,10 @@ ENTRY(save_rest)
15541 movq_cfi r15, R15+16
15542 movq %r11, 8(%rsp) /* return address */
15543 FIXUP_TOP_OF_STACK %r11, 16
15544+ pax_force_retaddr
15545 ret
15546 CFI_ENDPROC
15547-END(save_rest)
15548+ENDPROC(save_rest)
15549
15550 /* save complete stack frame */
15551 .pushsection .kprobes.text, "ax"
15552@@ -387,9 +672,10 @@ ENTRY(save_paranoid)
15553 js 1f /* negative -> in kernel */
15554 SWAPGS
15555 xorl %ebx,%ebx
15556-1: ret
15557+1: pax_force_retaddr_bts
15558+ ret
15559 CFI_ENDPROC
15560-END(save_paranoid)
15561+ENDPROC(save_paranoid)
15562 .popsection
15563
15564 /*
15565@@ -411,7 +697,7 @@ ENTRY(ret_from_fork)
15566
15567 RESTORE_REST
15568
15569- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
15570+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
15571 jz retint_restore_args
15572
15573 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
15574@@ -421,7 +707,7 @@ ENTRY(ret_from_fork)
15575 jmp ret_from_sys_call # go to the SYSRET fastpath
15576
15577 CFI_ENDPROC
15578-END(ret_from_fork)
15579+ENDPROC(ret_from_fork)
15580
15581 /*
15582 * System call entry. Up to 6 arguments in registers are supported.
15583@@ -457,7 +743,7 @@ END(ret_from_fork)
15584 ENTRY(system_call)
15585 CFI_STARTPROC simple
15586 CFI_SIGNAL_FRAME
15587- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
15588+ CFI_DEF_CFA rsp,0
15589 CFI_REGISTER rip,rcx
15590 /*CFI_REGISTER rflags,r11*/
15591 SWAPGS_UNSAFE_STACK
15592@@ -470,21 +756,23 @@ GLOBAL(system_call_after_swapgs)
15593
15594 movq %rsp,PER_CPU_VAR(old_rsp)
15595 movq PER_CPU_VAR(kernel_stack),%rsp
15596+ SAVE_ARGS 8*6,0
15597+ pax_enter_kernel_user
15598 /*
15599 * No need to follow this irqs off/on section - it's straight
15600 * and short:
15601 */
15602 ENABLE_INTERRUPTS(CLBR_NONE)
15603- SAVE_ARGS 8,0
15604 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
15605 movq %rcx,RIP-ARGOFFSET(%rsp)
15606 CFI_REL_OFFSET rip,RIP-ARGOFFSET
15607- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15608+ GET_THREAD_INFO(%rcx)
15609+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
15610 jnz tracesys
15611 system_call_fastpath:
15612 cmpq $__NR_syscall_max,%rax
15613 ja badsys
15614- movq %r10,%rcx
15615+ movq R10-ARGOFFSET(%rsp),%rcx
15616 call *sys_call_table(,%rax,8) # XXX: rip relative
15617 movq %rax,RAX-ARGOFFSET(%rsp)
15618 /*
15619@@ -498,10 +786,13 @@ sysret_check:
15620 LOCKDEP_SYS_EXIT
15621 DISABLE_INTERRUPTS(CLBR_NONE)
15622 TRACE_IRQS_OFF
15623- movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
15624+ GET_THREAD_INFO(%rcx)
15625+ movl TI_flags(%rcx),%edx
15626 andl %edi,%edx
15627 jnz sysret_careful
15628 CFI_REMEMBER_STATE
15629+ pax_exit_kernel_user
15630+ pax_erase_kstack
15631 /*
15632 * sysretq will re-enable interrupts:
15633 */
15634@@ -553,14 +844,18 @@ badsys:
15635 * jump back to the normal fast path.
15636 */
15637 auditsys:
15638- movq %r10,%r9 /* 6th arg: 4th syscall arg */
15639+ movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
15640 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
15641 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
15642 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
15643 movq %rax,%rsi /* 2nd arg: syscall number */
15644 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
15645 call __audit_syscall_entry
15646+
15647+ pax_erase_kstack
15648+
15649 LOAD_ARGS 0 /* reload call-clobbered registers */
15650+ pax_set_fptr_mask
15651 jmp system_call_fastpath
15652
15653 /*
15654@@ -581,7 +876,7 @@ sysret_audit:
15655 /* Do syscall tracing */
15656 tracesys:
15657 #ifdef CONFIG_AUDITSYSCALL
15658- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15659+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
15660 jz auditsys
15661 #endif
15662 SAVE_REST
15663@@ -589,16 +884,20 @@ tracesys:
15664 FIXUP_TOP_OF_STACK %rdi
15665 movq %rsp,%rdi
15666 call syscall_trace_enter
15667+
15668+ pax_erase_kstack
15669+
15670 /*
15671 * Reload arg registers from stack in case ptrace changed them.
15672 * We don't reload %rax because syscall_trace_enter() returned
15673 * the value it wants us to use in the table lookup.
15674 */
15675 LOAD_ARGS ARGOFFSET, 1
15676+ pax_set_fptr_mask
15677 RESTORE_REST
15678 cmpq $__NR_syscall_max,%rax
15679 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
15680- movq %r10,%rcx /* fixup for C */
15681+ movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
15682 call *sys_call_table(,%rax,8)
15683 movq %rax,RAX-ARGOFFSET(%rsp)
15684 /* Use IRET because user could have changed frame */
15685@@ -619,6 +918,7 @@ GLOBAL(int_with_check)
15686 andl %edi,%edx
15687 jnz int_careful
15688 andl $~TS_COMPAT,TI_status(%rcx)
15689+ pax_erase_kstack
15690 jmp retint_swapgs
15691
15692 /* Either reschedule or signal or syscall exit tracking needed. */
15693@@ -665,7 +965,7 @@ int_restore_rest:
15694 TRACE_IRQS_OFF
15695 jmp int_with_check
15696 CFI_ENDPROC
15697-END(system_call)
15698+ENDPROC(system_call)
15699
15700 /*
15701 * Certain special system calls that need to save a complete full stack frame.
15702@@ -681,7 +981,7 @@ ENTRY(\label)
15703 call \func
15704 jmp ptregscall_common
15705 CFI_ENDPROC
15706-END(\label)
15707+ENDPROC(\label)
15708 .endm
15709
15710 PTREGSCALL stub_clone, sys_clone, %r8
15711@@ -699,9 +999,10 @@ ENTRY(ptregscall_common)
15712 movq_cfi_restore R12+8, r12
15713 movq_cfi_restore RBP+8, rbp
15714 movq_cfi_restore RBX+8, rbx
15715+ pax_force_retaddr
15716 ret $REST_SKIP /* pop extended registers */
15717 CFI_ENDPROC
15718-END(ptregscall_common)
15719+ENDPROC(ptregscall_common)
15720
15721 ENTRY(stub_execve)
15722 CFI_STARTPROC
15723@@ -716,7 +1017,7 @@ ENTRY(stub_execve)
15724 RESTORE_REST
15725 jmp int_ret_from_sys_call
15726 CFI_ENDPROC
15727-END(stub_execve)
15728+ENDPROC(stub_execve)
15729
15730 /*
15731 * sigreturn is special because it needs to restore all registers on return.
15732@@ -734,7 +1035,7 @@ ENTRY(stub_rt_sigreturn)
15733 RESTORE_REST
15734 jmp int_ret_from_sys_call
15735 CFI_ENDPROC
15736-END(stub_rt_sigreturn)
15737+ENDPROC(stub_rt_sigreturn)
15738
15739 /*
15740 * Build the entry stubs and pointer table with some assembler magic.
15741@@ -769,7 +1070,7 @@ vector=vector+1
15742 2: jmp common_interrupt
15743 .endr
15744 CFI_ENDPROC
15745-END(irq_entries_start)
15746+ENDPROC(irq_entries_start)
15747
15748 .previous
15749 END(interrupt)
15750@@ -789,6 +1090,16 @@ END(interrupt)
15751 subq $ORIG_RAX-RBP, %rsp
15752 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
15753 SAVE_ARGS_IRQ
15754+#ifdef CONFIG_PAX_MEMORY_UDEREF
15755+ testb $3, CS(%rdi)
15756+ jnz 1f
15757+ pax_enter_kernel
15758+ jmp 2f
15759+1: pax_enter_kernel_user
15760+2:
15761+#else
15762+ pax_enter_kernel
15763+#endif
15764 call \func
15765 .endm
15766
15767@@ -820,7 +1131,7 @@ ret_from_intr:
15768
15769 exit_intr:
15770 GET_THREAD_INFO(%rcx)
15771- testl $3,CS-ARGOFFSET(%rsp)
15772+ testb $3,CS-ARGOFFSET(%rsp)
15773 je retint_kernel
15774
15775 /* Interrupt came from user space */
15776@@ -842,12 +1153,15 @@ retint_swapgs: /* return to user-space */
15777 * The iretq could re-enable interrupts:
15778 */
15779 DISABLE_INTERRUPTS(CLBR_ANY)
15780+ pax_exit_kernel_user
15781 TRACE_IRQS_IRETQ
15782 SWAPGS
15783 jmp restore_args
15784
15785 retint_restore_args: /* return to kernel space */
15786 DISABLE_INTERRUPTS(CLBR_ANY)
15787+ pax_exit_kernel
15788+ pax_force_retaddr RIP-ARGOFFSET
15789 /*
15790 * The iretq could re-enable interrupts:
15791 */
15792@@ -936,7 +1250,7 @@ ENTRY(retint_kernel)
15793 #endif
15794
15795 CFI_ENDPROC
15796-END(common_interrupt)
15797+ENDPROC(common_interrupt)
15798 /*
15799 * End of kprobes section
15800 */
15801@@ -953,7 +1267,7 @@ ENTRY(\sym)
15802 interrupt \do_sym
15803 jmp ret_from_intr
15804 CFI_ENDPROC
15805-END(\sym)
15806+ENDPROC(\sym)
15807 .endm
15808
15809 #ifdef CONFIG_SMP
15810@@ -1026,12 +1340,22 @@ ENTRY(\sym)
15811 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15812 call error_entry
15813 DEFAULT_FRAME 0
15814+#ifdef CONFIG_PAX_MEMORY_UDEREF
15815+ testb $3, CS(%rsp)
15816+ jnz 1f
15817+ pax_enter_kernel
15818+ jmp 2f
15819+1: pax_enter_kernel_user
15820+2:
15821+#else
15822+ pax_enter_kernel
15823+#endif
15824 movq %rsp,%rdi /* pt_regs pointer */
15825 xorl %esi,%esi /* no error code */
15826 call \do_sym
15827 jmp error_exit /* %ebx: no swapgs flag */
15828 CFI_ENDPROC
15829-END(\sym)
15830+ENDPROC(\sym)
15831 .endm
15832
15833 .macro paranoidzeroentry sym do_sym
15834@@ -1043,15 +1367,25 @@ ENTRY(\sym)
15835 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15836 call save_paranoid
15837 TRACE_IRQS_OFF
15838+#ifdef CONFIG_PAX_MEMORY_UDEREF
15839+ testb $3, CS(%rsp)
15840+ jnz 1f
15841+ pax_enter_kernel
15842+ jmp 2f
15843+1: pax_enter_kernel_user
15844+2:
15845+#else
15846+ pax_enter_kernel
15847+#endif
15848 movq %rsp,%rdi /* pt_regs pointer */
15849 xorl %esi,%esi /* no error code */
15850 call \do_sym
15851 jmp paranoid_exit /* %ebx: no swapgs flag */
15852 CFI_ENDPROC
15853-END(\sym)
15854+ENDPROC(\sym)
15855 .endm
15856
15857-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
15858+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
15859 .macro paranoidzeroentry_ist sym do_sym ist
15860 ENTRY(\sym)
15861 INTR_FRAME
15862@@ -1061,14 +1395,30 @@ ENTRY(\sym)
15863 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15864 call save_paranoid
15865 TRACE_IRQS_OFF
15866+#ifdef CONFIG_PAX_MEMORY_UDEREF
15867+ testb $3, CS(%rsp)
15868+ jnz 1f
15869+ pax_enter_kernel
15870+ jmp 2f
15871+1: pax_enter_kernel_user
15872+2:
15873+#else
15874+ pax_enter_kernel
15875+#endif
15876 movq %rsp,%rdi /* pt_regs pointer */
15877 xorl %esi,%esi /* no error code */
15878+#ifdef CONFIG_SMP
15879+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
15880+ lea init_tss(%r12), %r12
15881+#else
15882+ lea init_tss(%rip), %r12
15883+#endif
15884 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
15885 call \do_sym
15886 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
15887 jmp paranoid_exit /* %ebx: no swapgs flag */
15888 CFI_ENDPROC
15889-END(\sym)
15890+ENDPROC(\sym)
15891 .endm
15892
15893 .macro errorentry sym do_sym
15894@@ -1079,13 +1429,23 @@ ENTRY(\sym)
15895 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15896 call error_entry
15897 DEFAULT_FRAME 0
15898+#ifdef CONFIG_PAX_MEMORY_UDEREF
15899+ testb $3, CS(%rsp)
15900+ jnz 1f
15901+ pax_enter_kernel
15902+ jmp 2f
15903+1: pax_enter_kernel_user
15904+2:
15905+#else
15906+ pax_enter_kernel
15907+#endif
15908 movq %rsp,%rdi /* pt_regs pointer */
15909 movq ORIG_RAX(%rsp),%rsi /* get error code */
15910 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
15911 call \do_sym
15912 jmp error_exit /* %ebx: no swapgs flag */
15913 CFI_ENDPROC
15914-END(\sym)
15915+ENDPROC(\sym)
15916 .endm
15917
15918 /* error code is on the stack already */
15919@@ -1098,13 +1458,23 @@ ENTRY(\sym)
15920 call save_paranoid
15921 DEFAULT_FRAME 0
15922 TRACE_IRQS_OFF
15923+#ifdef CONFIG_PAX_MEMORY_UDEREF
15924+ testb $3, CS(%rsp)
15925+ jnz 1f
15926+ pax_enter_kernel
15927+ jmp 2f
15928+1: pax_enter_kernel_user
15929+2:
15930+#else
15931+ pax_enter_kernel
15932+#endif
15933 movq %rsp,%rdi /* pt_regs pointer */
15934 movq ORIG_RAX(%rsp),%rsi /* get error code */
15935 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
15936 call \do_sym
15937 jmp paranoid_exit /* %ebx: no swapgs flag */
15938 CFI_ENDPROC
15939-END(\sym)
15940+ENDPROC(\sym)
15941 .endm
15942
15943 zeroentry divide_error do_divide_error
15944@@ -1134,9 +1504,10 @@ gs_change:
15945 2: mfence /* workaround */
15946 SWAPGS
15947 popfq_cfi
15948+ pax_force_retaddr
15949 ret
15950 CFI_ENDPROC
15951-END(native_load_gs_index)
15952+ENDPROC(native_load_gs_index)
15953
15954 .section __ex_table,"a"
15955 .align 8
15956@@ -1158,13 +1529,14 @@ ENTRY(kernel_thread_helper)
15957 * Here we are in the child and the registers are set as they were
15958 * at kernel_thread() invocation in the parent.
15959 */
15960+ pax_force_fptr %rsi
15961 call *%rsi
15962 # exit
15963 mov %eax, %edi
15964 call do_exit
15965 ud2 # padding for call trace
15966 CFI_ENDPROC
15967-END(kernel_thread_helper)
15968+ENDPROC(kernel_thread_helper)
15969
15970 /*
15971 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
15972@@ -1191,11 +1563,11 @@ ENTRY(kernel_execve)
15973 RESTORE_REST
15974 testq %rax,%rax
15975 je int_ret_from_sys_call
15976- RESTORE_ARGS
15977 UNFAKE_STACK_FRAME
15978+ pax_force_retaddr
15979 ret
15980 CFI_ENDPROC
15981-END(kernel_execve)
15982+ENDPROC(kernel_execve)
15983
15984 /* Call softirq on interrupt stack. Interrupts are off. */
15985 ENTRY(call_softirq)
15986@@ -1213,9 +1585,10 @@ ENTRY(call_softirq)
15987 CFI_DEF_CFA_REGISTER rsp
15988 CFI_ADJUST_CFA_OFFSET -8
15989 decl PER_CPU_VAR(irq_count)
15990+ pax_force_retaddr
15991 ret
15992 CFI_ENDPROC
15993-END(call_softirq)
15994+ENDPROC(call_softirq)
15995
15996 #ifdef CONFIG_XEN
15997 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
15998@@ -1253,7 +1626,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
15999 decl PER_CPU_VAR(irq_count)
16000 jmp error_exit
16001 CFI_ENDPROC
16002-END(xen_do_hypervisor_callback)
16003+ENDPROC(xen_do_hypervisor_callback)
16004
16005 /*
16006 * Hypervisor uses this for application faults while it executes.
16007@@ -1312,7 +1685,7 @@ ENTRY(xen_failsafe_callback)
16008 SAVE_ALL
16009 jmp error_exit
16010 CFI_ENDPROC
16011-END(xen_failsafe_callback)
16012+ENDPROC(xen_failsafe_callback)
16013
16014 apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
16015 xen_hvm_callback_vector xen_evtchn_do_upcall
16016@@ -1361,16 +1734,31 @@ ENTRY(paranoid_exit)
16017 TRACE_IRQS_OFF
16018 testl %ebx,%ebx /* swapgs needed? */
16019 jnz paranoid_restore
16020- testl $3,CS(%rsp)
16021+ testb $3,CS(%rsp)
16022 jnz paranoid_userspace
16023+#ifdef CONFIG_PAX_MEMORY_UDEREF
16024+ pax_exit_kernel
16025+ TRACE_IRQS_IRETQ 0
16026+ SWAPGS_UNSAFE_STACK
16027+ RESTORE_ALL 8
16028+ pax_force_retaddr_bts
16029+ jmp irq_return
16030+#endif
16031 paranoid_swapgs:
16032+#ifdef CONFIG_PAX_MEMORY_UDEREF
16033+ pax_exit_kernel_user
16034+#else
16035+ pax_exit_kernel
16036+#endif
16037 TRACE_IRQS_IRETQ 0
16038 SWAPGS_UNSAFE_STACK
16039 RESTORE_ALL 8
16040 jmp irq_return
16041 paranoid_restore:
16042+ pax_exit_kernel
16043 TRACE_IRQS_IRETQ 0
16044 RESTORE_ALL 8
16045+ pax_force_retaddr_bts
16046 jmp irq_return
16047 paranoid_userspace:
16048 GET_THREAD_INFO(%rcx)
16049@@ -1399,7 +1787,7 @@ paranoid_schedule:
16050 TRACE_IRQS_OFF
16051 jmp paranoid_userspace
16052 CFI_ENDPROC
16053-END(paranoid_exit)
16054+ENDPROC(paranoid_exit)
16055
16056 /*
16057 * Exception entry point. This expects an error code/orig_rax on the stack.
16058@@ -1426,12 +1814,13 @@ ENTRY(error_entry)
16059 movq_cfi r14, R14+8
16060 movq_cfi r15, R15+8
16061 xorl %ebx,%ebx
16062- testl $3,CS+8(%rsp)
16063+ testb $3,CS+8(%rsp)
16064 je error_kernelspace
16065 error_swapgs:
16066 SWAPGS
16067 error_sti:
16068 TRACE_IRQS_OFF
16069+ pax_force_retaddr_bts
16070 ret
16071
16072 /*
16073@@ -1458,7 +1847,7 @@ bstep_iret:
16074 movq %rcx,RIP+8(%rsp)
16075 jmp error_swapgs
16076 CFI_ENDPROC
16077-END(error_entry)
16078+ENDPROC(error_entry)
16079
16080
16081 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
16082@@ -1478,7 +1867,7 @@ ENTRY(error_exit)
16083 jnz retint_careful
16084 jmp retint_swapgs
16085 CFI_ENDPROC
16086-END(error_exit)
16087+ENDPROC(error_exit)
16088
16089 /*
16090 * Test if a given stack is an NMI stack or not.
16091@@ -1535,9 +1924,11 @@ ENTRY(nmi)
16092 * If %cs was not the kernel segment, then the NMI triggered in user
16093 * space, which means it is definitely not nested.
16094 */
16095+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
16096+ je 1f
16097 cmpl $__KERNEL_CS, 16(%rsp)
16098 jne first_nmi
16099-
16100+1:
16101 /*
16102 * Check the special variable on the stack to see if NMIs are
16103 * executing.
16104@@ -1659,6 +2050,16 @@ restart_nmi:
16105 */
16106 call save_paranoid
16107 DEFAULT_FRAME 0
16108+#ifdef CONFIG_PAX_MEMORY_UDEREF
16109+ testb $3, CS(%rsp)
16110+ jnz 1f
16111+ pax_enter_kernel
16112+ jmp 2f
16113+1: pax_enter_kernel_user
16114+2:
16115+#else
16116+ pax_enter_kernel
16117+#endif
16118 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
16119 movq %rsp,%rdi
16120 movq $-1,%rsi
16121@@ -1666,14 +2067,25 @@ restart_nmi:
16122 testl %ebx,%ebx /* swapgs needed? */
16123 jnz nmi_restore
16124 nmi_swapgs:
16125+#ifdef CONFIG_PAX_MEMORY_UDEREF
16126+ pax_exit_kernel_user
16127+#else
16128+ pax_exit_kernel
16129+#endif
16130 SWAPGS_UNSAFE_STACK
16131+ RESTORE_ALL 8
16132+ /* Clear the NMI executing stack variable */
16133+ movq $0, 10*8(%rsp)
16134+ jmp irq_return
16135 nmi_restore:
16136+ pax_exit_kernel
16137 RESTORE_ALL 8
16138+ pax_force_retaddr_bts
16139 /* Clear the NMI executing stack variable */
16140 movq $0, 10*8(%rsp)
16141 jmp irq_return
16142 CFI_ENDPROC
16143-END(nmi)
16144+ENDPROC(nmi)
16145
16146 /*
16147 * If an NMI hit an iret because of an exception or breakpoint,
16148@@ -1700,7 +2112,7 @@ ENTRY(ignore_sysret)
16149 mov $-ENOSYS,%eax
16150 sysret
16151 CFI_ENDPROC
16152-END(ignore_sysret)
16153+ENDPROC(ignore_sysret)
16154
16155 /*
16156 * End of kprobes section
16157diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
16158index c9a281f..ce2f317 100644
16159--- a/arch/x86/kernel/ftrace.c
16160+++ b/arch/x86/kernel/ftrace.c
16161@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the IP to write to */
16162 static const void *mod_code_newcode; /* holds the text to write to the IP */
16163
16164 static unsigned nmi_wait_count;
16165-static atomic_t nmi_update_count = ATOMIC_INIT(0);
16166+static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
16167
16168 int ftrace_arch_read_dyn_info(char *buf, int size)
16169 {
16170@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
16171
16172 r = snprintf(buf, size, "%u %u",
16173 nmi_wait_count,
16174- atomic_read(&nmi_update_count));
16175+ atomic_read_unchecked(&nmi_update_count));
16176 return r;
16177 }
16178
16179@@ -177,8 +177,10 @@ void ftrace_nmi_enter(void)
16180
16181 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
16182 smp_rmb();
16183+ pax_open_kernel();
16184 ftrace_mod_code();
16185- atomic_inc(&nmi_update_count);
16186+ pax_close_kernel();
16187+ atomic_inc_unchecked(&nmi_update_count);
16188 }
16189 /* Must have previous changes seen before executions */
16190 smp_mb();
16191@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
16192 {
16193 unsigned char replaced[MCOUNT_INSN_SIZE];
16194
16195+ ip = ktla_ktva(ip);
16196+
16197 /*
16198 * Note: Due to modules and __init, code can
16199 * disappear and change, we need to protect against faulting
16200@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
16201 unsigned char old[MCOUNT_INSN_SIZE], *new;
16202 int ret;
16203
16204- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
16205+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
16206 new = ftrace_call_replace(ip, (unsigned long)func);
16207 ret = ftrace_modify_code(ip, old, new);
16208
16209@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long ip,
16210 {
16211 unsigned char code[MCOUNT_INSN_SIZE];
16212
16213+ ip = ktla_ktva(ip);
16214+
16215 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
16216 return -EFAULT;
16217
16218diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
16219index 51ff186..9e77418 100644
16220--- a/arch/x86/kernel/head32.c
16221+++ b/arch/x86/kernel/head32.c
16222@@ -19,6 +19,7 @@
16223 #include <asm/io_apic.h>
16224 #include <asm/bios_ebda.h>
16225 #include <asm/tlbflush.h>
16226+#include <asm/boot.h>
16227
16228 static void __init i386_default_early_setup(void)
16229 {
16230@@ -31,8 +32,7 @@ static void __init i386_default_early_setup(void)
16231
16232 void __init i386_start_kernel(void)
16233 {
16234- memblock_reserve(__pa_symbol(&_text),
16235- __pa_symbol(&__bss_stop) - __pa_symbol(&_text));
16236+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop) - LOAD_PHYSICAL_ADDR);
16237
16238 #ifdef CONFIG_BLK_DEV_INITRD
16239 /* Reserve INITRD */
16240diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
16241index ce0be7c..c41476e 100644
16242--- a/arch/x86/kernel/head_32.S
16243+++ b/arch/x86/kernel/head_32.S
16244@@ -25,6 +25,12 @@
16245 /* Physical address */
16246 #define pa(X) ((X) - __PAGE_OFFSET)
16247
16248+#ifdef CONFIG_PAX_KERNEXEC
16249+#define ta(X) (X)
16250+#else
16251+#define ta(X) ((X) - __PAGE_OFFSET)
16252+#endif
16253+
16254 /*
16255 * References to members of the new_cpu_data structure.
16256 */
16257@@ -54,11 +60,7 @@
16258 * and small than max_low_pfn, otherwise will waste some page table entries
16259 */
16260
16261-#if PTRS_PER_PMD > 1
16262-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
16263-#else
16264-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
16265-#endif
16266+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
16267
16268 /* Number of possible pages in the lowmem region */
16269 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
16270@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
16271 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16272
16273 /*
16274+ * Real beginning of normal "text" segment
16275+ */
16276+ENTRY(stext)
16277+ENTRY(_stext)
16278+
16279+/*
16280 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
16281 * %esi points to the real-mode code as a 32-bit pointer.
16282 * CS and DS must be 4 GB flat segments, but we don't depend on
16283@@ -84,6 +92,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16284 * can.
16285 */
16286 __HEAD
16287+
16288+#ifdef CONFIG_PAX_KERNEXEC
16289+ jmp startup_32
16290+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
16291+.fill PAGE_SIZE-5,1,0xcc
16292+#endif
16293+
16294 ENTRY(startup_32)
16295 movl pa(stack_start),%ecx
16296
16297@@ -105,6 +120,57 @@ ENTRY(startup_32)
16298 2:
16299 leal -__PAGE_OFFSET(%ecx),%esp
16300
16301+#ifdef CONFIG_SMP
16302+ movl $pa(cpu_gdt_table),%edi
16303+ movl $__per_cpu_load,%eax
16304+ movw %ax,__KERNEL_PERCPU + 2(%edi)
16305+ rorl $16,%eax
16306+ movb %al,__KERNEL_PERCPU + 4(%edi)
16307+ movb %ah,__KERNEL_PERCPU + 7(%edi)
16308+ movl $__per_cpu_end - 1,%eax
16309+ subl $__per_cpu_start,%eax
16310+ movw %ax,__KERNEL_PERCPU + 0(%edi)
16311+#endif
16312+
16313+#ifdef CONFIG_PAX_MEMORY_UDEREF
16314+ movl $NR_CPUS,%ecx
16315+ movl $pa(cpu_gdt_table),%edi
16316+1:
16317+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
16318+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
16319+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
16320+ addl $PAGE_SIZE_asm,%edi
16321+ loop 1b
16322+#endif
16323+
16324+#ifdef CONFIG_PAX_KERNEXEC
16325+ movl $pa(boot_gdt),%edi
16326+ movl $__LOAD_PHYSICAL_ADDR,%eax
16327+ movw %ax,__BOOT_CS + 2(%edi)
16328+ rorl $16,%eax
16329+ movb %al,__BOOT_CS + 4(%edi)
16330+ movb %ah,__BOOT_CS + 7(%edi)
16331+ rorl $16,%eax
16332+
16333+ ljmp $(__BOOT_CS),$1f
16334+1:
16335+
16336+ movl $NR_CPUS,%ecx
16337+ movl $pa(cpu_gdt_table),%edi
16338+ addl $__PAGE_OFFSET,%eax
16339+1:
16340+ movw %ax,__KERNEL_CS + 2(%edi)
16341+ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
16342+ rorl $16,%eax
16343+ movb %al,__KERNEL_CS + 4(%edi)
16344+ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
16345+ movb %ah,__KERNEL_CS + 7(%edi)
16346+ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
16347+ rorl $16,%eax
16348+ addl $PAGE_SIZE_asm,%edi
16349+ loop 1b
16350+#endif
16351+
16352 /*
16353 * Clear BSS first so that there are no surprises...
16354 */
16355@@ -195,8 +261,11 @@ ENTRY(startup_32)
16356 movl %eax, pa(max_pfn_mapped)
16357
16358 /* Do early initialization of the fixmap area */
16359- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16360- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
16361+#ifdef CONFIG_COMPAT_VDSO
16362+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
16363+#else
16364+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
16365+#endif
16366 #else /* Not PAE */
16367
16368 page_pde_offset = (__PAGE_OFFSET >> 20);
16369@@ -226,8 +295,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
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_page_table+0xffc)
16375+#ifdef CONFIG_COMPAT_VDSO
16376+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
16377+#else
16378+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
16379+#endif
16380 #endif
16381
16382 #ifdef CONFIG_PARAVIRT
16383@@ -241,9 +313,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16384 cmpl $num_subarch_entries, %eax
16385 jae bad_subarch
16386
16387- movl pa(subarch_entries)(,%eax,4), %eax
16388- subl $__PAGE_OFFSET, %eax
16389- jmp *%eax
16390+ jmp *pa(subarch_entries)(,%eax,4)
16391
16392 bad_subarch:
16393 WEAK(lguest_entry)
16394@@ -255,10 +325,10 @@ WEAK(xen_entry)
16395 __INITDATA
16396
16397 subarch_entries:
16398- .long default_entry /* normal x86/PC */
16399- .long lguest_entry /* lguest hypervisor */
16400- .long xen_entry /* Xen hypervisor */
16401- .long default_entry /* Moorestown MID */
16402+ .long ta(default_entry) /* normal x86/PC */
16403+ .long ta(lguest_entry) /* lguest hypervisor */
16404+ .long ta(xen_entry) /* Xen hypervisor */
16405+ .long ta(default_entry) /* Moorestown MID */
16406 num_subarch_entries = (. - subarch_entries) / 4
16407 .previous
16408 #else
16409@@ -312,6 +382,7 @@ default_entry:
16410 orl %edx,%eax
16411 movl %eax,%cr4
16412
16413+#ifdef CONFIG_X86_PAE
16414 testb $X86_CR4_PAE, %al # check if PAE is enabled
16415 jz 6f
16416
16417@@ -340,6 +411,9 @@ default_entry:
16418 /* Make changes effective */
16419 wrmsr
16420
16421+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
16422+#endif
16423+
16424 6:
16425
16426 /*
16427@@ -443,7 +517,7 @@ is386: movl $2,%ecx # set MP
16428 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
16429 movl %eax,%ss # after changing gdt.
16430
16431- movl $(__USER_DS),%eax # DS/ES contains default USER segment
16432+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
16433 movl %eax,%ds
16434 movl %eax,%es
16435
16436@@ -457,15 +531,22 @@ is386: movl $2,%ecx # set MP
16437 */
16438 cmpb $0,ready
16439 jne 1f
16440- movl $gdt_page,%eax
16441+ movl $cpu_gdt_table,%eax
16442 movl $stack_canary,%ecx
16443+#ifdef CONFIG_SMP
16444+ addl $__per_cpu_load,%ecx
16445+#endif
16446 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
16447 shrl $16, %ecx
16448 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
16449 movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
16450 1:
16451-#endif
16452 movl $(__KERNEL_STACK_CANARY),%eax
16453+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
16454+ movl $(__USER_DS),%eax
16455+#else
16456+ xorl %eax,%eax
16457+#endif
16458 movl %eax,%gs
16459
16460 xorl %eax,%eax # Clear LDT
16461@@ -558,22 +639,22 @@ early_page_fault:
16462 jmp early_fault
16463
16464 early_fault:
16465- cld
16466 #ifdef CONFIG_PRINTK
16467+ cmpl $1,%ss:early_recursion_flag
16468+ je hlt_loop
16469+ incl %ss:early_recursion_flag
16470+ cld
16471 pusha
16472 movl $(__KERNEL_DS),%eax
16473 movl %eax,%ds
16474 movl %eax,%es
16475- cmpl $2,early_recursion_flag
16476- je hlt_loop
16477- incl early_recursion_flag
16478 movl %cr2,%eax
16479 pushl %eax
16480 pushl %edx /* trapno */
16481 pushl $fault_msg
16482 call printk
16483+; call dump_stack
16484 #endif
16485- call dump_stack
16486 hlt_loop:
16487 hlt
16488 jmp hlt_loop
16489@@ -581,8 +662,11 @@ hlt_loop:
16490 /* This is the default interrupt "handler" :-) */
16491 ALIGN
16492 ignore_int:
16493- cld
16494 #ifdef CONFIG_PRINTK
16495+ cmpl $2,%ss:early_recursion_flag
16496+ je hlt_loop
16497+ incl %ss:early_recursion_flag
16498+ cld
16499 pushl %eax
16500 pushl %ecx
16501 pushl %edx
16502@@ -591,9 +675,6 @@ ignore_int:
16503 movl $(__KERNEL_DS),%eax
16504 movl %eax,%ds
16505 movl %eax,%es
16506- cmpl $2,early_recursion_flag
16507- je hlt_loop
16508- incl early_recursion_flag
16509 pushl 16(%esp)
16510 pushl 24(%esp)
16511 pushl 32(%esp)
16512@@ -622,29 +703,43 @@ ENTRY(initial_code)
16513 /*
16514 * BSS section
16515 */
16516-__PAGE_ALIGNED_BSS
16517- .align PAGE_SIZE
16518 #ifdef CONFIG_X86_PAE
16519+.section .initial_pg_pmd,"a",@progbits
16520 initial_pg_pmd:
16521 .fill 1024*KPMDS,4,0
16522 #else
16523+.section .initial_page_table,"a",@progbits
16524 ENTRY(initial_page_table)
16525 .fill 1024,4,0
16526 #endif
16527+.section .initial_pg_fixmap,"a",@progbits
16528 initial_pg_fixmap:
16529 .fill 1024,4,0
16530+.section .empty_zero_page,"a",@progbits
16531 ENTRY(empty_zero_page)
16532 .fill 4096,1,0
16533+.section .swapper_pg_dir,"a",@progbits
16534 ENTRY(swapper_pg_dir)
16535+#ifdef CONFIG_X86_PAE
16536+ .fill 4,8,0
16537+#else
16538 .fill 1024,4,0
16539+#endif
16540+
16541+/*
16542+ * The IDT has to be page-aligned to simplify the Pentium
16543+ * F0 0F bug workaround.. We have a special link segment
16544+ * for this.
16545+ */
16546+.section .idt,"a",@progbits
16547+ENTRY(idt_table)
16548+ .fill 256,8,0
16549
16550 /*
16551 * This starts the data section.
16552 */
16553 #ifdef CONFIG_X86_PAE
16554-__PAGE_ALIGNED_DATA
16555- /* Page-aligned for the benefit of paravirt? */
16556- .align PAGE_SIZE
16557+.section .initial_page_table,"a",@progbits
16558 ENTRY(initial_page_table)
16559 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
16560 # if KPMDS == 3
16561@@ -663,18 +758,27 @@ ENTRY(initial_page_table)
16562 # error "Kernel PMDs should be 1, 2 or 3"
16563 # endif
16564 .align PAGE_SIZE /* needs to be page-sized too */
16565+
16566+#ifdef CONFIG_PAX_PER_CPU_PGD
16567+ENTRY(cpu_pgd)
16568+ .rept NR_CPUS
16569+ .fill 4,8,0
16570+ .endr
16571+#endif
16572+
16573 #endif
16574
16575 .data
16576 .balign 4
16577 ENTRY(stack_start)
16578- .long init_thread_union+THREAD_SIZE
16579+ .long init_thread_union+THREAD_SIZE-8
16580
16581+ready: .byte 0
16582+
16583+.section .rodata,"a",@progbits
16584 early_recursion_flag:
16585 .long 0
16586
16587-ready: .byte 0
16588-
16589 int_msg:
16590 .asciz "Unknown interrupt or fault at: %p %p %p\n"
16591
16592@@ -707,7 +811,7 @@ fault_msg:
16593 .word 0 # 32 bit align gdt_desc.address
16594 boot_gdt_descr:
16595 .word __BOOT_DS+7
16596- .long boot_gdt - __PAGE_OFFSET
16597+ .long pa(boot_gdt)
16598
16599 .word 0 # 32-bit align idt_desc.address
16600 idt_descr:
16601@@ -718,7 +822,7 @@ idt_descr:
16602 .word 0 # 32 bit align gdt_desc.address
16603 ENTRY(early_gdt_descr)
16604 .word GDT_ENTRIES*8-1
16605- .long gdt_page /* Overwritten for secondary CPUs */
16606+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
16607
16608 /*
16609 * The boot_gdt must mirror the equivalent in setup.S and is
16610@@ -727,5 +831,65 @@ ENTRY(early_gdt_descr)
16611 .align L1_CACHE_BYTES
16612 ENTRY(boot_gdt)
16613 .fill GDT_ENTRY_BOOT_CS,8,0
16614- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
16615- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
16616+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
16617+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
16618+
16619+ .align PAGE_SIZE_asm
16620+ENTRY(cpu_gdt_table)
16621+ .rept NR_CPUS
16622+ .quad 0x0000000000000000 /* NULL descriptor */
16623+ .quad 0x0000000000000000 /* 0x0b reserved */
16624+ .quad 0x0000000000000000 /* 0x13 reserved */
16625+ .quad 0x0000000000000000 /* 0x1b reserved */
16626+
16627+#ifdef CONFIG_PAX_KERNEXEC
16628+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
16629+#else
16630+ .quad 0x0000000000000000 /* 0x20 unused */
16631+#endif
16632+
16633+ .quad 0x0000000000000000 /* 0x28 unused */
16634+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
16635+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
16636+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
16637+ .quad 0x0000000000000000 /* 0x4b reserved */
16638+ .quad 0x0000000000000000 /* 0x53 reserved */
16639+ .quad 0x0000000000000000 /* 0x5b reserved */
16640+
16641+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
16642+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
16643+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
16644+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
16645+
16646+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
16647+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
16648+
16649+ /*
16650+ * Segments used for calling PnP BIOS have byte granularity.
16651+ * The code segments and data segments have fixed 64k limits,
16652+ * the transfer segment sizes are set at run time.
16653+ */
16654+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
16655+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
16656+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
16657+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
16658+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
16659+
16660+ /*
16661+ * The APM segments have byte granularity and their bases
16662+ * are set at run time. All have 64k limits.
16663+ */
16664+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
16665+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
16666+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
16667+
16668+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
16669+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
16670+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
16671+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
16672+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
16673+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
16674+
16675+ /* Be sure this is zeroed to avoid false validations in Xen */
16676+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
16677+ .endr
16678diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
16679index 40f4eb3..6d24d9d 100644
16680--- a/arch/x86/kernel/head_64.S
16681+++ b/arch/x86/kernel/head_64.S
16682@@ -19,6 +19,8 @@
16683 #include <asm/cache.h>
16684 #include <asm/processor-flags.h>
16685 #include <asm/percpu.h>
16686+#include <asm/cpufeature.h>
16687+#include <asm/alternative-asm.h>
16688
16689 #ifdef CONFIG_PARAVIRT
16690 #include <asm/asm-offsets.h>
16691@@ -38,6 +40,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
16692 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
16693 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
16694 L3_START_KERNEL = pud_index(__START_KERNEL_map)
16695+L4_VMALLOC_START = pgd_index(VMALLOC_START)
16696+L3_VMALLOC_START = pud_index(VMALLOC_START)
16697+L4_VMALLOC_END = pgd_index(VMALLOC_END)
16698+L3_VMALLOC_END = pud_index(VMALLOC_END)
16699+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
16700+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
16701
16702 .text
16703 __HEAD
16704@@ -85,35 +93,23 @@ startup_64:
16705 */
16706 addq %rbp, init_level4_pgt + 0(%rip)
16707 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
16708+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
16709+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
16710+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
16711 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
16712
16713 addq %rbp, level3_ident_pgt + 0(%rip)
16714+#ifndef CONFIG_XEN
16715+ addq %rbp, level3_ident_pgt + 8(%rip)
16716+#endif
16717
16718- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
16719- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
16720+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
16721+
16722+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
16723+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
16724
16725 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
16726-
16727- /* Add an Identity mapping if I am above 1G */
16728- leaq _text(%rip), %rdi
16729- andq $PMD_PAGE_MASK, %rdi
16730-
16731- movq %rdi, %rax
16732- shrq $PUD_SHIFT, %rax
16733- andq $(PTRS_PER_PUD - 1), %rax
16734- jz ident_complete
16735-
16736- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
16737- leaq level3_ident_pgt(%rip), %rbx
16738- movq %rdx, 0(%rbx, %rax, 8)
16739-
16740- movq %rdi, %rax
16741- shrq $PMD_SHIFT, %rax
16742- andq $(PTRS_PER_PMD - 1), %rax
16743- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
16744- leaq level2_spare_pgt(%rip), %rbx
16745- movq %rdx, 0(%rbx, %rax, 8)
16746-ident_complete:
16747+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
16748
16749 /*
16750 * Fixup the kernel text+data virtual addresses. Note that
16751@@ -160,8 +156,8 @@ ENTRY(secondary_startup_64)
16752 * after the boot processor executes this code.
16753 */
16754
16755- /* Enable PAE mode and PGE */
16756- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
16757+ /* Enable PAE mode and PSE/PGE */
16758+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
16759 movq %rax, %cr4
16760
16761 /* Setup early boot stage 4 level pagetables. */
16762@@ -183,9 +179,17 @@ ENTRY(secondary_startup_64)
16763 movl $MSR_EFER, %ecx
16764 rdmsr
16765 btsl $_EFER_SCE, %eax /* Enable System Call */
16766- btl $20,%edi /* No Execute supported? */
16767+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
16768 jnc 1f
16769 btsl $_EFER_NX, %eax
16770+ leaq init_level4_pgt(%rip), %rdi
16771+#ifndef CONFIG_EFI
16772+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
16773+#endif
16774+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
16775+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
16776+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
16777+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
16778 1: wrmsr /* Make changes effective */
16779
16780 /* Setup cr0 */
16781@@ -247,6 +251,7 @@ ENTRY(secondary_startup_64)
16782 * jump. In addition we need to ensure %cs is set so we make this
16783 * a far return.
16784 */
16785+ pax_set_fptr_mask
16786 movq initial_code(%rip),%rax
16787 pushq $0 # fake return address to stop unwinder
16788 pushq $__KERNEL_CS # set correct cs
16789@@ -269,7 +274,7 @@ ENTRY(secondary_startup_64)
16790 bad_address:
16791 jmp bad_address
16792
16793- .section ".init.text","ax"
16794+ __INIT
16795 #ifdef CONFIG_EARLY_PRINTK
16796 .globl early_idt_handlers
16797 early_idt_handlers:
16798@@ -314,18 +319,23 @@ ENTRY(early_idt_handler)
16799 #endif /* EARLY_PRINTK */
16800 1: hlt
16801 jmp 1b
16802+ .previous
16803
16804 #ifdef CONFIG_EARLY_PRINTK
16805+ __INITDATA
16806 early_recursion_flag:
16807 .long 0
16808+ .previous
16809
16810+ .section .rodata,"a",@progbits
16811 early_idt_msg:
16812 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
16813 early_idt_ripmsg:
16814 .asciz "RIP %s\n"
16815+ .previous
16816 #endif /* CONFIG_EARLY_PRINTK */
16817- .previous
16818
16819+ .section .rodata,"a",@progbits
16820 #define NEXT_PAGE(name) \
16821 .balign PAGE_SIZE; \
16822 ENTRY(name)
16823@@ -338,7 +348,6 @@ ENTRY(name)
16824 i = i + 1 ; \
16825 .endr
16826
16827- .data
16828 /*
16829 * This default setting generates an ident mapping at address 0x100000
16830 * and a mapping for the kernel that precisely maps virtual address
16831@@ -349,13 +358,41 @@ NEXT_PAGE(init_level4_pgt)
16832 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16833 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
16834 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16835+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
16836+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
16837+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
16838+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
16839+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
16840+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
16841 .org init_level4_pgt + L4_START_KERNEL*8, 0
16842 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
16843 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
16844
16845+#ifdef CONFIG_PAX_PER_CPU_PGD
16846+NEXT_PAGE(cpu_pgd)
16847+ .rept NR_CPUS
16848+ .fill 512,8,0
16849+ .endr
16850+#endif
16851+
16852 NEXT_PAGE(level3_ident_pgt)
16853 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16854+#ifdef CONFIG_XEN
16855 .fill 511,8,0
16856+#else
16857+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
16858+ .fill 510,8,0
16859+#endif
16860+
16861+NEXT_PAGE(level3_vmalloc_start_pgt)
16862+ .fill 512,8,0
16863+
16864+NEXT_PAGE(level3_vmalloc_end_pgt)
16865+ .fill 512,8,0
16866+
16867+NEXT_PAGE(level3_vmemmap_pgt)
16868+ .fill L3_VMEMMAP_START,8,0
16869+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
16870
16871 NEXT_PAGE(level3_kernel_pgt)
16872 .fill L3_START_KERNEL,8,0
16873@@ -363,20 +400,23 @@ NEXT_PAGE(level3_kernel_pgt)
16874 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
16875 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
16876
16877+NEXT_PAGE(level2_vmemmap_pgt)
16878+ .fill 512,8,0
16879+
16880 NEXT_PAGE(level2_fixmap_pgt)
16881- .fill 506,8,0
16882- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
16883- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
16884- .fill 5,8,0
16885+ .fill 507,8,0
16886+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
16887+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
16888+ .fill 4,8,0
16889
16890-NEXT_PAGE(level1_fixmap_pgt)
16891+NEXT_PAGE(level1_vsyscall_pgt)
16892 .fill 512,8,0
16893
16894-NEXT_PAGE(level2_ident_pgt)
16895- /* Since I easily can, map the first 1G.
16896+ /* Since I easily can, map the first 2G.
16897 * Don't set NX because code runs from these pages.
16898 */
16899- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
16900+NEXT_PAGE(level2_ident_pgt)
16901+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
16902
16903 NEXT_PAGE(level2_kernel_pgt)
16904 /*
16905@@ -389,37 +429,59 @@ NEXT_PAGE(level2_kernel_pgt)
16906 * If you want to increase this then increase MODULES_VADDR
16907 * too.)
16908 */
16909- PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
16910- KERNEL_IMAGE_SIZE/PMD_SIZE)
16911-
16912-NEXT_PAGE(level2_spare_pgt)
16913- .fill 512, 8, 0
16914+ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
16915
16916 #undef PMDS
16917 #undef NEXT_PAGE
16918
16919- .data
16920+ .align PAGE_SIZE
16921+ENTRY(cpu_gdt_table)
16922+ .rept NR_CPUS
16923+ .quad 0x0000000000000000 /* NULL descriptor */
16924+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
16925+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
16926+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
16927+ .quad 0x00cffb000000ffff /* __USER32_CS */
16928+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
16929+ .quad 0x00affb000000ffff /* __USER_CS */
16930+
16931+#ifdef CONFIG_PAX_KERNEXEC
16932+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
16933+#else
16934+ .quad 0x0 /* unused */
16935+#endif
16936+
16937+ .quad 0,0 /* TSS */
16938+ .quad 0,0 /* LDT */
16939+ .quad 0,0,0 /* three TLS descriptors */
16940+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
16941+ /* asm/segment.h:GDT_ENTRIES must match this */
16942+
16943+ /* zero the remaining page */
16944+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
16945+ .endr
16946+
16947 .align 16
16948 .globl early_gdt_descr
16949 early_gdt_descr:
16950 .word GDT_ENTRIES*8-1
16951 early_gdt_descr_base:
16952- .quad INIT_PER_CPU_VAR(gdt_page)
16953+ .quad cpu_gdt_table
16954
16955 ENTRY(phys_base)
16956 /* This must match the first entry in level2_kernel_pgt */
16957 .quad 0x0000000000000000
16958
16959 #include "../../x86/xen/xen-head.S"
16960-
16961- .section .bss, "aw", @nobits
16962+
16963+ .section .rodata,"a",@progbits
16964 .align L1_CACHE_BYTES
16965 ENTRY(idt_table)
16966- .skip IDT_ENTRIES * 16
16967+ .fill 512,8,0
16968
16969 .align L1_CACHE_BYTES
16970 ENTRY(nmi_idt_table)
16971- .skip IDT_ENTRIES * 16
16972+ .fill 512,8,0
16973
16974 __PAGE_ALIGNED_BSS
16975 .align PAGE_SIZE
16976diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
16977index 9c3bd4a..e1d9b35 100644
16978--- a/arch/x86/kernel/i386_ksyms_32.c
16979+++ b/arch/x86/kernel/i386_ksyms_32.c
16980@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
16981 EXPORT_SYMBOL(cmpxchg8b_emu);
16982 #endif
16983
16984+EXPORT_SYMBOL_GPL(cpu_gdt_table);
16985+
16986 /* Networking helper routines. */
16987 EXPORT_SYMBOL(csum_partial_copy_generic);
16988+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
16989+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
16990
16991 EXPORT_SYMBOL(__get_user_1);
16992 EXPORT_SYMBOL(__get_user_2);
16993@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
16994
16995 EXPORT_SYMBOL(csum_partial);
16996 EXPORT_SYMBOL(empty_zero_page);
16997+
16998+#ifdef CONFIG_PAX_KERNEXEC
16999+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
17000+#endif
17001diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
17002index 739d859..aab2a58 100644
17003--- a/arch/x86/kernel/i387.c
17004+++ b/arch/x86/kernel/i387.c
17005@@ -154,6 +154,7 @@ int init_fpu(struct task_struct *tsk)
17006 if (tsk_used_math(tsk)) {
17007 if (HAVE_HWFP && tsk == current)
17008 unlazy_fpu(tsk);
17009+ tsk->thread.fpu.last_cpu = ~0;
17010 return 0;
17011 }
17012
17013@@ -188,6 +189,9 @@ int xfpregs_active(struct task_struct *target, const struct user_regset *regset)
17014
17015 int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17016 unsigned int pos, unsigned int count,
17017+ void *kbuf, void __user *ubuf) __size_overflow(4);
17018+int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17019+ unsigned int pos, unsigned int count,
17020 void *kbuf, void __user *ubuf)
17021 {
17022 int ret;
17023@@ -207,6 +211,9 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17024
17025 int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17026 unsigned int pos, unsigned int count,
17027+ const void *kbuf, const void __user *ubuf) __size_overflow(4);
17028+int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17029+ unsigned int pos, unsigned int count,
17030 const void *kbuf, const void __user *ubuf)
17031 {
17032 int ret;
17033@@ -240,6 +247,9 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17034
17035 int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17036 unsigned int pos, unsigned int count,
17037+ void *kbuf, void __user *ubuf) __size_overflow(4);
17038+int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17039+ unsigned int pos, unsigned int count,
17040 void *kbuf, void __user *ubuf)
17041 {
17042 int ret;
17043@@ -269,6 +279,9 @@ int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17044
17045 int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
17046 unsigned int pos, unsigned int count,
17047+ const void *kbuf, const void __user *ubuf) __size_overflow(4);
17048+int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
17049+ unsigned int pos, unsigned int count,
17050 const void *kbuf, const void __user *ubuf)
17051 {
17052 int ret;
17053@@ -439,6 +452,9 @@ static void convert_to_fxsr(struct task_struct *tsk,
17054
17055 int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17056 unsigned int pos, unsigned int count,
17057+ void *kbuf, void __user *ubuf) __size_overflow(3,4);
17058+int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17059+ unsigned int pos, unsigned int count,
17060 void *kbuf, void __user *ubuf)
17061 {
17062 struct user_i387_ia32_struct env;
17063@@ -471,6 +487,9 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17064
17065 int fpregs_set(struct task_struct *target, const struct user_regset *regset,
17066 unsigned int pos, unsigned int count,
17067+ const void *kbuf, const void __user *ubuf) __size_overflow(3,4);
17068+int fpregs_set(struct task_struct *target, const struct user_regset *regset,
17069+ unsigned int pos, unsigned int count,
17070 const void *kbuf, const void __user *ubuf)
17071 {
17072 struct user_i387_ia32_struct env;
17073@@ -619,6 +638,8 @@ static inline int restore_i387_fsave(struct _fpstate_ia32 __user *buf)
17074 }
17075
17076 static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,
17077+ unsigned int size) __size_overflow(2);
17078+static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,
17079 unsigned int size)
17080 {
17081 struct task_struct *tsk = current;
17082diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
17083index 6104852..6114160 100644
17084--- a/arch/x86/kernel/i8259.c
17085+++ b/arch/x86/kernel/i8259.c
17086@@ -210,7 +210,7 @@ spurious_8259A_irq:
17087 "spurious 8259A interrupt: IRQ%d.\n", irq);
17088 spurious_irq_mask |= irqmask;
17089 }
17090- atomic_inc(&irq_err_count);
17091+ atomic_inc_unchecked(&irq_err_count);
17092 /*
17093 * Theoretically we do not have to handle this IRQ,
17094 * but in Linux this does not cause problems and is
17095diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
17096index 43e9ccf..44ccf6f 100644
17097--- a/arch/x86/kernel/init_task.c
17098+++ b/arch/x86/kernel/init_task.c
17099@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
17100 * way process stacks are handled. This is done by having a special
17101 * "init_task" linker map entry..
17102 */
17103-union thread_union init_thread_union __init_task_data =
17104- { INIT_THREAD_INFO(init_task) };
17105+union thread_union init_thread_union __init_task_data;
17106
17107 /*
17108 * Initial task structure.
17109@@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
17110 * section. Since TSS's are completely CPU-local, we want them
17111 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
17112 */
17113-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
17114-
17115+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
17116+EXPORT_SYMBOL(init_tss);
17117diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
17118index 8c96897..be66bfa 100644
17119--- a/arch/x86/kernel/ioport.c
17120+++ b/arch/x86/kernel/ioport.c
17121@@ -6,6 +6,7 @@
17122 #include <linux/sched.h>
17123 #include <linux/kernel.h>
17124 #include <linux/capability.h>
17125+#include <linux/security.h>
17126 #include <linux/errno.h>
17127 #include <linux/types.h>
17128 #include <linux/ioport.h>
17129@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17130
17131 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
17132 return -EINVAL;
17133+#ifdef CONFIG_GRKERNSEC_IO
17134+ if (turn_on && grsec_disable_privio) {
17135+ gr_handle_ioperm();
17136+ return -EPERM;
17137+ }
17138+#endif
17139 if (turn_on && !capable(CAP_SYS_RAWIO))
17140 return -EPERM;
17141
17142@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17143 * because the ->io_bitmap_max value must match the bitmap
17144 * contents:
17145 */
17146- tss = &per_cpu(init_tss, get_cpu());
17147+ tss = init_tss + get_cpu();
17148
17149 if (turn_on)
17150 bitmap_clear(t->io_bitmap_ptr, from, num);
17151@@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
17152 return -EINVAL;
17153 /* Trying to gain more privileges? */
17154 if (level > old) {
17155+#ifdef CONFIG_GRKERNSEC_IO
17156+ if (grsec_disable_privio) {
17157+ gr_handle_iopl();
17158+ return -EPERM;
17159+ }
17160+#endif
17161 if (!capable(CAP_SYS_RAWIO))
17162 return -EPERM;
17163 }
17164diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
17165index 7943e0c..dd32c5c 100644
17166--- a/arch/x86/kernel/irq.c
17167+++ b/arch/x86/kernel/irq.c
17168@@ -18,7 +18,7 @@
17169 #include <asm/mce.h>
17170 #include <asm/hw_irq.h>
17171
17172-atomic_t irq_err_count;
17173+atomic_unchecked_t irq_err_count;
17174
17175 /* Function pointer for generic interrupt vector handling */
17176 void (*x86_platform_ipi_callback)(void) = NULL;
17177@@ -121,9 +121,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
17178 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
17179 seq_printf(p, " Machine check polls\n");
17180 #endif
17181- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
17182+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
17183 #if defined(CONFIG_X86_IO_APIC)
17184- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
17185+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
17186 #endif
17187 return 0;
17188 }
17189@@ -164,10 +164,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
17190
17191 u64 arch_irq_stat(void)
17192 {
17193- u64 sum = atomic_read(&irq_err_count);
17194+ u64 sum = atomic_read_unchecked(&irq_err_count);
17195
17196 #ifdef CONFIG_X86_IO_APIC
17197- sum += atomic_read(&irq_mis_count);
17198+ sum += atomic_read_unchecked(&irq_mis_count);
17199 #endif
17200 return sum;
17201 }
17202diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
17203index 40fc861..9b8739b 100644
17204--- a/arch/x86/kernel/irq_32.c
17205+++ b/arch/x86/kernel/irq_32.c
17206@@ -39,7 +39,7 @@ static int check_stack_overflow(void)
17207 __asm__ __volatile__("andl %%esp,%0" :
17208 "=r" (sp) : "0" (THREAD_SIZE - 1));
17209
17210- return sp < (sizeof(struct thread_info) + STACK_WARN);
17211+ return sp < STACK_WARN;
17212 }
17213
17214 static void print_stack_overflow(void)
17215@@ -59,8 +59,8 @@ static inline void print_stack_overflow(void) { }
17216 * per-CPU IRQ handling contexts (thread information and stack)
17217 */
17218 union irq_ctx {
17219- struct thread_info tinfo;
17220- u32 stack[THREAD_SIZE/sizeof(u32)];
17221+ unsigned long previous_esp;
17222+ u32 stack[THREAD_SIZE/sizeof(u32)];
17223 } __attribute__((aligned(THREAD_SIZE)));
17224
17225 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
17226@@ -80,10 +80,9 @@ static void call_on_stack(void *func, void *stack)
17227 static inline int
17228 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17229 {
17230- union irq_ctx *curctx, *irqctx;
17231+ union irq_ctx *irqctx;
17232 u32 *isp, arg1, arg2;
17233
17234- curctx = (union irq_ctx *) current_thread_info();
17235 irqctx = __this_cpu_read(hardirq_ctx);
17236
17237 /*
17238@@ -92,21 +91,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17239 * handler) we can't do that and just have to keep using the
17240 * current stack (which is the irq stack already after all)
17241 */
17242- if (unlikely(curctx == irqctx))
17243+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
17244 return 0;
17245
17246 /* build the stack frame on the IRQ stack */
17247- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17248- irqctx->tinfo.task = curctx->tinfo.task;
17249- irqctx->tinfo.previous_esp = current_stack_pointer;
17250+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17251+ irqctx->previous_esp = current_stack_pointer;
17252
17253- /*
17254- * Copy the softirq bits in preempt_count so that the
17255- * softirq checks work in the hardirq context.
17256- */
17257- irqctx->tinfo.preempt_count =
17258- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
17259- (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
17260+#ifdef CONFIG_PAX_MEMORY_UDEREF
17261+ __set_fs(MAKE_MM_SEG(0));
17262+#endif
17263
17264 if (unlikely(overflow))
17265 call_on_stack(print_stack_overflow, isp);
17266@@ -118,6 +112,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17267 : "0" (irq), "1" (desc), "2" (isp),
17268 "D" (desc->handle_irq)
17269 : "memory", "cc", "ecx");
17270+
17271+#ifdef CONFIG_PAX_MEMORY_UDEREF
17272+ __set_fs(current_thread_info()->addr_limit);
17273+#endif
17274+
17275 return 1;
17276 }
17277
17278@@ -126,29 +125,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17279 */
17280 void __cpuinit irq_ctx_init(int cpu)
17281 {
17282- union irq_ctx *irqctx;
17283-
17284 if (per_cpu(hardirq_ctx, cpu))
17285 return;
17286
17287- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17288- THREAD_FLAGS,
17289- THREAD_ORDER));
17290- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17291- irqctx->tinfo.cpu = cpu;
17292- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
17293- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17294-
17295- per_cpu(hardirq_ctx, cpu) = irqctx;
17296-
17297- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17298- THREAD_FLAGS,
17299- THREAD_ORDER));
17300- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17301- irqctx->tinfo.cpu = cpu;
17302- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17303-
17304- per_cpu(softirq_ctx, cpu) = irqctx;
17305+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
17306+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
17307
17308 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17309 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17310@@ -157,7 +138,6 @@ void __cpuinit irq_ctx_init(int cpu)
17311 asmlinkage void do_softirq(void)
17312 {
17313 unsigned long flags;
17314- struct thread_info *curctx;
17315 union irq_ctx *irqctx;
17316 u32 *isp;
17317
17318@@ -167,15 +147,22 @@ asmlinkage void do_softirq(void)
17319 local_irq_save(flags);
17320
17321 if (local_softirq_pending()) {
17322- curctx = current_thread_info();
17323 irqctx = __this_cpu_read(softirq_ctx);
17324- irqctx->tinfo.task = curctx->task;
17325- irqctx->tinfo.previous_esp = current_stack_pointer;
17326+ irqctx->previous_esp = current_stack_pointer;
17327
17328 /* build the stack frame on the softirq stack */
17329- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17330+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17331+
17332+#ifdef CONFIG_PAX_MEMORY_UDEREF
17333+ __set_fs(MAKE_MM_SEG(0));
17334+#endif
17335
17336 call_on_stack(__do_softirq, isp);
17337+
17338+#ifdef CONFIG_PAX_MEMORY_UDEREF
17339+ __set_fs(current_thread_info()->addr_limit);
17340+#endif
17341+
17342 /*
17343 * Shouldn't happen, we returned above if in_interrupt():
17344 */
17345diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
17346index d04d3ec..ea4b374 100644
17347--- a/arch/x86/kernel/irq_64.c
17348+++ b/arch/x86/kernel/irq_64.c
17349@@ -44,7 +44,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
17350 u64 estack_top, estack_bottom;
17351 u64 curbase = (u64)task_stack_page(current);
17352
17353- if (user_mode_vm(regs))
17354+ if (user_mode(regs))
17355 return;
17356
17357 if (regs->sp >= curbase + sizeof(struct thread_info) +
17358diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c
17359index 90fcf62..e682cdd 100644
17360--- a/arch/x86/kernel/kdebugfs.c
17361+++ b/arch/x86/kernel/kdebugfs.c
17362@@ -28,6 +28,8 @@ struct setup_data_node {
17363 };
17364
17365 static ssize_t setup_data_read(struct file *file, char __user *user_buf,
17366+ size_t count, loff_t *ppos) __size_overflow(3);
17367+static ssize_t setup_data_read(struct file *file, char __user *user_buf,
17368 size_t count, loff_t *ppos)
17369 {
17370 struct setup_data_node *node = file->private_data;
17371diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
17372index 2f45c4c..d95504f 100644
17373--- a/arch/x86/kernel/kgdb.c
17374+++ b/arch/x86/kernel/kgdb.c
17375@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
17376 #ifdef CONFIG_X86_32
17377 switch (regno) {
17378 case GDB_SS:
17379- if (!user_mode_vm(regs))
17380+ if (!user_mode(regs))
17381 *(unsigned long *)mem = __KERNEL_DS;
17382 break;
17383 case GDB_SP:
17384- if (!user_mode_vm(regs))
17385+ if (!user_mode(regs))
17386 *(unsigned long *)mem = kernel_stack_pointer(regs);
17387 break;
17388 case GDB_GS:
17389@@ -475,12 +475,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
17390 case 'k':
17391 /* clear the trace bit */
17392 linux_regs->flags &= ~X86_EFLAGS_TF;
17393- atomic_set(&kgdb_cpu_doing_single_step, -1);
17394+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
17395
17396 /* set the trace bit if we're stepping */
17397 if (remcomInBuffer[0] == 's') {
17398 linux_regs->flags |= X86_EFLAGS_TF;
17399- atomic_set(&kgdb_cpu_doing_single_step,
17400+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
17401 raw_smp_processor_id());
17402 }
17403
17404@@ -545,7 +545,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
17405
17406 switch (cmd) {
17407 case DIE_DEBUG:
17408- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
17409+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
17410 if (user_mode(regs))
17411 return single_step_cont(regs, args);
17412 break;
17413diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
17414index 7da647d..56fe348 100644
17415--- a/arch/x86/kernel/kprobes.c
17416+++ b/arch/x86/kernel/kprobes.c
17417@@ -118,8 +118,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
17418 } __attribute__((packed)) *insn;
17419
17420 insn = (struct __arch_relative_insn *)from;
17421+
17422+ pax_open_kernel();
17423 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
17424 insn->op = op;
17425+ pax_close_kernel();
17426 }
17427
17428 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
17429@@ -156,7 +159,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
17430 kprobe_opcode_t opcode;
17431 kprobe_opcode_t *orig_opcodes = opcodes;
17432
17433- if (search_exception_tables((unsigned long)opcodes))
17434+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
17435 return 0; /* Page fault may occur on this address. */
17436
17437 retry:
17438@@ -317,7 +320,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
17439 }
17440 }
17441 insn_get_length(&insn);
17442+ pax_open_kernel();
17443 memcpy(dest, insn.kaddr, insn.length);
17444+ pax_close_kernel();
17445
17446 #ifdef CONFIG_X86_64
17447 if (insn_rip_relative(&insn)) {
17448@@ -341,7 +346,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
17449 (u8 *) dest;
17450 BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
17451 disp = (u8 *) dest + insn_offset_displacement(&insn);
17452+ pax_open_kernel();
17453 *(s32 *) disp = (s32) newdisp;
17454+ pax_close_kernel();
17455 }
17456 #endif
17457 return insn.length;
17458@@ -355,12 +362,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
17459 */
17460 __copy_instruction(p->ainsn.insn, p->addr, 0);
17461
17462- if (can_boost(p->addr))
17463+ if (can_boost(ktla_ktva(p->addr)))
17464 p->ainsn.boostable = 0;
17465 else
17466 p->ainsn.boostable = -1;
17467
17468- p->opcode = *p->addr;
17469+ p->opcode = *(ktla_ktva(p->addr));
17470 }
17471
17472 int __kprobes arch_prepare_kprobe(struct kprobe *p)
17473@@ -477,7 +484,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17474 * nor set current_kprobe, because it doesn't use single
17475 * stepping.
17476 */
17477- regs->ip = (unsigned long)p->ainsn.insn;
17478+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17479 preempt_enable_no_resched();
17480 return;
17481 }
17482@@ -496,7 +503,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17483 if (p->opcode == BREAKPOINT_INSTRUCTION)
17484 regs->ip = (unsigned long)p->addr;
17485 else
17486- regs->ip = (unsigned long)p->ainsn.insn;
17487+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17488 }
17489
17490 /*
17491@@ -575,7 +582,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
17492 setup_singlestep(p, regs, kcb, 0);
17493 return 1;
17494 }
17495- } else if (*addr != BREAKPOINT_INSTRUCTION) {
17496+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
17497 /*
17498 * The breakpoint instruction was removed right
17499 * after we hit it. Another cpu has removed
17500@@ -683,6 +690,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
17501 " movq %rax, 152(%rsp)\n"
17502 RESTORE_REGS_STRING
17503 " popfq\n"
17504+#ifdef KERNEXEC_PLUGIN
17505+ " btsq $63,(%rsp)\n"
17506+#endif
17507 #else
17508 " pushf\n"
17509 SAVE_REGS_STRING
17510@@ -820,7 +830,7 @@ static void __kprobes resume_execution(struct kprobe *p,
17511 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
17512 {
17513 unsigned long *tos = stack_addr(regs);
17514- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
17515+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
17516 unsigned long orig_ip = (unsigned long)p->addr;
17517 kprobe_opcode_t *insn = p->ainsn.insn;
17518
17519@@ -1002,7 +1012,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
17520 struct die_args *args = data;
17521 int ret = NOTIFY_DONE;
17522
17523- if (args->regs && user_mode_vm(args->regs))
17524+ if (args->regs && user_mode(args->regs))
17525 return ret;
17526
17527 switch (val) {
17528@@ -1384,7 +1394,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17529 * Verify if the address gap is in 2GB range, because this uses
17530 * a relative jump.
17531 */
17532- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
17533+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
17534 if (abs(rel) > 0x7fffffff)
17535 return -ERANGE;
17536
17537@@ -1405,11 +1415,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17538 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
17539
17540 /* Set probe function call */
17541- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
17542+ synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
17543
17544 /* Set returning jmp instruction at the tail of out-of-line buffer */
17545 synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
17546- (u8 *)op->kp.addr + op->optinsn.size);
17547+ (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
17548
17549 flush_icache_range((unsigned long) buf,
17550 (unsigned long) buf + TMPL_END_IDX +
17551@@ -1431,7 +1441,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
17552 ((long)op->kp.addr + RELATIVEJUMP_SIZE));
17553
17554 /* Backup instructions which will be replaced by jump address */
17555- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
17556+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
17557 RELATIVE_ADDR_SIZE);
17558
17559 insn_buf[0] = RELATIVEJUMP_OPCODE;
17560diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
17561index ea69726..a305f16 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@@ -175,6 +194,7 @@ error_return:
17623 return err;
17624 }
17625
17626+static int read_default_ldt(void __user *ptr, unsigned long bytecount) __size_overflow(2);
17627 static int read_default_ldt(void __user *ptr, unsigned long bytecount)
17628 {
17629 /* CHECKME: Can we use _one_ random number ? */
17630@@ -230,6 +250,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
17631 }
17632 }
17633
17634+#ifdef CONFIG_PAX_SEGMEXEC
17635+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
17636+ error = -EINVAL;
17637+ goto out_unlock;
17638+ }
17639+#endif
17640+
17641 fill_ldt(&ldt, &ldt_info);
17642 if (oldmode)
17643 ldt.avl = 0;
17644diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
17645index a3fa43b..8966f4c 100644
17646--- a/arch/x86/kernel/machine_kexec_32.c
17647+++ b/arch/x86/kernel/machine_kexec_32.c
17648@@ -27,7 +27,7 @@
17649 #include <asm/cacheflush.h>
17650 #include <asm/debugreg.h>
17651
17652-static void set_idt(void *newidt, __u16 limit)
17653+static void set_idt(struct desc_struct *newidt, __u16 limit)
17654 {
17655 struct desc_ptr curidt;
17656
17657@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit)
17658 }
17659
17660
17661-static void set_gdt(void *newgdt, __u16 limit)
17662+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
17663 {
17664 struct desc_ptr curgdt;
17665
17666@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
17667 }
17668
17669 control_page = page_address(image->control_code_page);
17670- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
17671+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
17672
17673 relocate_kernel_ptr = control_page;
17674 page_list[PA_CONTROL_PAGE] = __pa(control_page);
17675diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
17676index 3ca42d0..79d24cd 100644
17677--- a/arch/x86/kernel/microcode_intel.c
17678+++ b/arch/x86/kernel/microcode_intel.c
17679@@ -434,15 +434,16 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
17680 return ret;
17681 }
17682
17683+static int get_ucode_user(void *to, const void *from, size_t n) __size_overflow(3);
17684 static int get_ucode_user(void *to, const void *from, size_t n)
17685 {
17686- return copy_from_user(to, from, n);
17687+ return copy_from_user(to, (const void __force_user *)from, n);
17688 }
17689
17690 static enum ucode_state
17691 request_microcode_user(int cpu, const void __user *buf, size_t size)
17692 {
17693- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
17694+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
17695 }
17696
17697 static void microcode_fini_cpu(int cpu)
17698diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
17699index 925179f..1f0d561 100644
17700--- a/arch/x86/kernel/module.c
17701+++ b/arch/x86/kernel/module.c
17702@@ -36,15 +36,61 @@
17703 #define DEBUGP(fmt...)
17704 #endif
17705
17706-void *module_alloc(unsigned long size)
17707+static inline void *__module_alloc(unsigned long size, pgprot_t prot) __size_overflow(1);
17708+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
17709 {
17710- if (PAGE_ALIGN(size) > MODULES_LEN)
17711+ if (size == 0 || PAGE_ALIGN(size) > MODULES_LEN)
17712 return NULL;
17713 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
17714- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
17715+ GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
17716 -1, __builtin_return_address(0));
17717 }
17718
17719+void *module_alloc(unsigned long size)
17720+{
17721+
17722+#ifdef CONFIG_PAX_KERNEXEC
17723+ return __module_alloc(size, PAGE_KERNEL);
17724+#else
17725+ return __module_alloc(size, PAGE_KERNEL_EXEC);
17726+#endif
17727+
17728+}
17729+
17730+#ifdef CONFIG_PAX_KERNEXEC
17731+#ifdef CONFIG_X86_32
17732+void *module_alloc_exec(unsigned long size)
17733+{
17734+ struct vm_struct *area;
17735+
17736+ if (size == 0)
17737+ return NULL;
17738+
17739+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
17740+ return area ? area->addr : NULL;
17741+}
17742+EXPORT_SYMBOL(module_alloc_exec);
17743+
17744+void module_free_exec(struct module *mod, void *module_region)
17745+{
17746+ vunmap(module_region);
17747+}
17748+EXPORT_SYMBOL(module_free_exec);
17749+#else
17750+void module_free_exec(struct module *mod, void *module_region)
17751+{
17752+ module_free(mod, module_region);
17753+}
17754+EXPORT_SYMBOL(module_free_exec);
17755+
17756+void *module_alloc_exec(unsigned long size)
17757+{
17758+ return __module_alloc(size, PAGE_KERNEL_RX);
17759+}
17760+EXPORT_SYMBOL(module_alloc_exec);
17761+#endif
17762+#endif
17763+
17764 #ifdef CONFIG_X86_32
17765 int apply_relocate(Elf32_Shdr *sechdrs,
17766 const char *strtab,
17767@@ -55,14 +101,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
17768 unsigned int i;
17769 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
17770 Elf32_Sym *sym;
17771- uint32_t *location;
17772+ uint32_t *plocation, location;
17773
17774 DEBUGP("Applying relocate section %u to %u\n", relsec,
17775 sechdrs[relsec].sh_info);
17776 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
17777 /* This is where to make the change */
17778- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
17779- + rel[i].r_offset;
17780+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
17781+ location = (uint32_t)plocation;
17782+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
17783+ plocation = ktla_ktva((void *)plocation);
17784 /* This is the symbol it is referring to. Note that all
17785 undefined symbols have been resolved. */
17786 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
17787@@ -71,11 +119,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
17788 switch (ELF32_R_TYPE(rel[i].r_info)) {
17789 case R_386_32:
17790 /* We add the value into the location given */
17791- *location += sym->st_value;
17792+ pax_open_kernel();
17793+ *plocation += sym->st_value;
17794+ pax_close_kernel();
17795 break;
17796 case R_386_PC32:
17797 /* Add the value, subtract its postition */
17798- *location += sym->st_value - (uint32_t)location;
17799+ pax_open_kernel();
17800+ *plocation += sym->st_value - location;
17801+ pax_close_kernel();
17802 break;
17803 default:
17804 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
17805@@ -120,21 +172,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
17806 case R_X86_64_NONE:
17807 break;
17808 case R_X86_64_64:
17809+ pax_open_kernel();
17810 *(u64 *)loc = val;
17811+ pax_close_kernel();
17812 break;
17813 case R_X86_64_32:
17814+ pax_open_kernel();
17815 *(u32 *)loc = val;
17816+ pax_close_kernel();
17817 if (val != *(u32 *)loc)
17818 goto overflow;
17819 break;
17820 case R_X86_64_32S:
17821+ pax_open_kernel();
17822 *(s32 *)loc = val;
17823+ pax_close_kernel();
17824 if ((s64)val != *(s32 *)loc)
17825 goto overflow;
17826 break;
17827 case R_X86_64_PC32:
17828 val -= (u64)loc;
17829+ pax_open_kernel();
17830 *(u32 *)loc = val;
17831+ pax_close_kernel();
17832+
17833 #if 0
17834 if ((s64)val != *(s32 *)loc)
17835 goto overflow;
17836diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
17837index 47acaf3..ec48ab6 100644
17838--- a/arch/x86/kernel/nmi.c
17839+++ b/arch/x86/kernel/nmi.c
17840@@ -505,6 +505,17 @@ static inline void nmi_nesting_postprocess(void)
17841 dotraplinkage notrace __kprobes void
17842 do_nmi(struct pt_regs *regs, long error_code)
17843 {
17844+
17845+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17846+ if (!user_mode(regs)) {
17847+ unsigned long cs = regs->cs & 0xFFFF;
17848+ unsigned long ip = ktva_ktla(regs->ip);
17849+
17850+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
17851+ regs->ip = ip;
17852+ }
17853+#endif
17854+
17855 nmi_nesting_preprocess(regs);
17856
17857 nmi_enter();
17858diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
17859index 676b8c7..870ba04 100644
17860--- a/arch/x86/kernel/paravirt-spinlocks.c
17861+++ b/arch/x86/kernel/paravirt-spinlocks.c
17862@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
17863 arch_spin_lock(lock);
17864 }
17865
17866-struct pv_lock_ops pv_lock_ops = {
17867+struct pv_lock_ops pv_lock_ops __read_only = {
17868 #ifdef CONFIG_SMP
17869 .spin_is_locked = __ticket_spin_is_locked,
17870 .spin_is_contended = __ticket_spin_is_contended,
17871diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
17872index d90272e..6bb013b 100644
17873--- a/arch/x86/kernel/paravirt.c
17874+++ b/arch/x86/kernel/paravirt.c
17875@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
17876 {
17877 return x;
17878 }
17879+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
17880+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
17881+#endif
17882
17883 void __init default_banner(void)
17884 {
17885@@ -145,15 +148,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
17886 if (opfunc == NULL)
17887 /* If there's no function, patch it with a ud2a (BUG) */
17888 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
17889- else if (opfunc == _paravirt_nop)
17890+ else if (opfunc == (void *)_paravirt_nop)
17891 /* If the operation is a nop, then nop the callsite */
17892 ret = paravirt_patch_nop();
17893
17894 /* identity functions just return their single argument */
17895- else if (opfunc == _paravirt_ident_32)
17896+ else if (opfunc == (void *)_paravirt_ident_32)
17897 ret = paravirt_patch_ident_32(insnbuf, len);
17898- else if (opfunc == _paravirt_ident_64)
17899+ else if (opfunc == (void *)_paravirt_ident_64)
17900 ret = paravirt_patch_ident_64(insnbuf, len);
17901+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
17902+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
17903+ ret = paravirt_patch_ident_64(insnbuf, len);
17904+#endif
17905
17906 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
17907 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
17908@@ -178,7 +185,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
17909 if (insn_len > len || start == NULL)
17910 insn_len = len;
17911 else
17912- memcpy(insnbuf, start, insn_len);
17913+ memcpy(insnbuf, ktla_ktva(start), insn_len);
17914
17915 return insn_len;
17916 }
17917@@ -302,7 +309,7 @@ void arch_flush_lazy_mmu_mode(void)
17918 preempt_enable();
17919 }
17920
17921-struct pv_info pv_info = {
17922+struct pv_info pv_info __read_only = {
17923 .name = "bare hardware",
17924 .paravirt_enabled = 0,
17925 .kernel_rpl = 0,
17926@@ -313,16 +320,16 @@ struct pv_info pv_info = {
17927 #endif
17928 };
17929
17930-struct pv_init_ops pv_init_ops = {
17931+struct pv_init_ops pv_init_ops __read_only = {
17932 .patch = native_patch,
17933 };
17934
17935-struct pv_time_ops pv_time_ops = {
17936+struct pv_time_ops pv_time_ops __read_only = {
17937 .sched_clock = native_sched_clock,
17938 .steal_clock = native_steal_clock,
17939 };
17940
17941-struct pv_irq_ops pv_irq_ops = {
17942+struct pv_irq_ops pv_irq_ops __read_only = {
17943 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
17944 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
17945 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
17946@@ -334,7 +341,7 @@ struct pv_irq_ops pv_irq_ops = {
17947 #endif
17948 };
17949
17950-struct pv_cpu_ops pv_cpu_ops = {
17951+struct pv_cpu_ops pv_cpu_ops __read_only = {
17952 .cpuid = native_cpuid,
17953 .get_debugreg = native_get_debugreg,
17954 .set_debugreg = native_set_debugreg,
17955@@ -395,21 +402,26 @@ struct pv_cpu_ops pv_cpu_ops = {
17956 .end_context_switch = paravirt_nop,
17957 };
17958
17959-struct pv_apic_ops pv_apic_ops = {
17960+struct pv_apic_ops pv_apic_ops __read_only = {
17961 #ifdef CONFIG_X86_LOCAL_APIC
17962 .startup_ipi_hook = paravirt_nop,
17963 #endif
17964 };
17965
17966-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
17967+#ifdef CONFIG_X86_32
17968+#ifdef CONFIG_X86_PAE
17969+/* 64-bit pagetable entries */
17970+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
17971+#else
17972 /* 32-bit pagetable entries */
17973 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
17974+#endif
17975 #else
17976 /* 64-bit pagetable entries */
17977 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
17978 #endif
17979
17980-struct pv_mmu_ops pv_mmu_ops = {
17981+struct pv_mmu_ops pv_mmu_ops __read_only = {
17982
17983 .read_cr2 = native_read_cr2,
17984 .write_cr2 = native_write_cr2,
17985@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
17986 .make_pud = PTE_IDENT,
17987
17988 .set_pgd = native_set_pgd,
17989+ .set_pgd_batched = native_set_pgd_batched,
17990 #endif
17991 #endif /* PAGETABLE_LEVELS >= 3 */
17992
17993@@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = {
17994 },
17995
17996 .set_fixmap = native_set_fixmap,
17997+
17998+#ifdef CONFIG_PAX_KERNEXEC
17999+ .pax_open_kernel = native_pax_open_kernel,
18000+ .pax_close_kernel = native_pax_close_kernel,
18001+#endif
18002+
18003 };
18004
18005 EXPORT_SYMBOL_GPL(pv_time_ops);
18006diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
18007index 35ccf75..7a15747 100644
18008--- a/arch/x86/kernel/pci-iommu_table.c
18009+++ b/arch/x86/kernel/pci-iommu_table.c
18010@@ -2,7 +2,7 @@
18011 #include <asm/iommu_table.h>
18012 #include <linux/string.h>
18013 #include <linux/kallsyms.h>
18014-
18015+#include <linux/sched.h>
18016
18017 #define DEBUG 1
18018
18019diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
18020index 15763af..da59ada 100644
18021--- a/arch/x86/kernel/process.c
18022+++ b/arch/x86/kernel/process.c
18023@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_struct *tsk)
18024
18025 void free_thread_info(struct thread_info *ti)
18026 {
18027- free_thread_xstate(ti->task);
18028 free_pages((unsigned long)ti, THREAD_ORDER);
18029 }
18030
18031+static struct kmem_cache *task_struct_cachep;
18032+
18033 void arch_task_cache_init(void)
18034 {
18035- task_xstate_cachep =
18036- kmem_cache_create("task_xstate", xstate_size,
18037+ /* create a slab on which task_structs can be allocated */
18038+ task_struct_cachep =
18039+ kmem_cache_create("task_struct", sizeof(struct task_struct),
18040+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
18041+
18042+ task_xstate_cachep =
18043+ kmem_cache_create("task_xstate", xstate_size,
18044 __alignof__(union thread_xstate),
18045- SLAB_PANIC | SLAB_NOTRACK, NULL);
18046+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
18047+}
18048+
18049+struct task_struct *alloc_task_struct_node(int node)
18050+{
18051+ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
18052+}
18053+
18054+void free_task_struct(struct task_struct *task)
18055+{
18056+ free_thread_xstate(task);
18057+ kmem_cache_free(task_struct_cachep, task);
18058 }
18059
18060 /*
18061@@ -70,7 +87,7 @@ void exit_thread(void)
18062 unsigned long *bp = t->io_bitmap_ptr;
18063
18064 if (bp) {
18065- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
18066+ struct tss_struct *tss = init_tss + get_cpu();
18067
18068 t->io_bitmap_ptr = NULL;
18069 clear_thread_flag(TIF_IO_BITMAP);
18070@@ -106,7 +123,7 @@ void show_regs_common(void)
18071
18072 printk(KERN_CONT "\n");
18073 printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
18074- current->pid, current->comm, print_tainted(),
18075+ task_pid_nr(current), current->comm, print_tainted(),
18076 init_utsname()->release,
18077 (int)strcspn(init_utsname()->version, " "),
18078 init_utsname()->version);
18079@@ -120,6 +137,9 @@ void flush_thread(void)
18080 {
18081 struct task_struct *tsk = current;
18082
18083+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18084+ loadsegment(gs, 0);
18085+#endif
18086 flush_ptrace_hw_breakpoint(tsk);
18087 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
18088 /*
18089@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
18090 regs.di = (unsigned long) arg;
18091
18092 #ifdef CONFIG_X86_32
18093- regs.ds = __USER_DS;
18094- regs.es = __USER_DS;
18095+ regs.ds = __KERNEL_DS;
18096+ regs.es = __KERNEL_DS;
18097 regs.fs = __KERNEL_PERCPU;
18098- regs.gs = __KERNEL_STACK_CANARY;
18099+ savesegment(gs, regs.gs);
18100 #else
18101 regs.ss = __KERNEL_DS;
18102 #endif
18103@@ -411,7 +431,7 @@ bool set_pm_idle_to_default(void)
18104
18105 return ret;
18106 }
18107-void stop_this_cpu(void *dummy)
18108+__noreturn void stop_this_cpu(void *dummy)
18109 {
18110 local_irq_disable();
18111 /*
18112@@ -653,16 +673,37 @@ static int __init idle_setup(char *str)
18113 }
18114 early_param("idle", idle_setup);
18115
18116-unsigned long arch_align_stack(unsigned long sp)
18117+#ifdef CONFIG_PAX_RANDKSTACK
18118+void pax_randomize_kstack(struct pt_regs *regs)
18119 {
18120- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
18121- sp -= get_random_int() % 8192;
18122- return sp & ~0xf;
18123-}
18124+ struct thread_struct *thread = &current->thread;
18125+ unsigned long time;
18126
18127-unsigned long arch_randomize_brk(struct mm_struct *mm)
18128-{
18129- unsigned long range_end = mm->brk + 0x02000000;
18130- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
18131-}
18132+ if (!randomize_va_space)
18133+ return;
18134+
18135+ if (v8086_mode(regs))
18136+ return;
18137
18138+ rdtscl(time);
18139+
18140+ /* P4 seems to return a 0 LSB, ignore it */
18141+#ifdef CONFIG_MPENTIUM4
18142+ time &= 0x3EUL;
18143+ time <<= 2;
18144+#elif defined(CONFIG_X86_64)
18145+ time &= 0xFUL;
18146+ time <<= 4;
18147+#else
18148+ time &= 0x1FUL;
18149+ time <<= 3;
18150+#endif
18151+
18152+ thread->sp0 ^= time;
18153+ load_sp0(init_tss + smp_processor_id(), thread);
18154+
18155+#ifdef CONFIG_X86_64
18156+ percpu_write(kernel_stack, thread->sp0);
18157+#endif
18158+}
18159+#endif
18160diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
18161index c08d1ff..6ae1c81 100644
18162--- a/arch/x86/kernel/process_32.c
18163+++ b/arch/x86/kernel/process_32.c
18164@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
18165 unsigned long thread_saved_pc(struct task_struct *tsk)
18166 {
18167 return ((unsigned long *)tsk->thread.sp)[3];
18168+//XXX return tsk->thread.eip;
18169 }
18170
18171 #ifndef CONFIG_SMP
18172@@ -132,15 +133,14 @@ void __show_regs(struct pt_regs *regs, int all)
18173 unsigned long sp;
18174 unsigned short ss, gs;
18175
18176- if (user_mode_vm(regs)) {
18177+ if (user_mode(regs)) {
18178 sp = regs->sp;
18179 ss = regs->ss & 0xffff;
18180- gs = get_user_gs(regs);
18181 } else {
18182 sp = kernel_stack_pointer(regs);
18183 savesegment(ss, ss);
18184- savesegment(gs, gs);
18185 }
18186+ gs = get_user_gs(regs);
18187
18188 show_regs_common();
18189
18190@@ -202,13 +202,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18191 struct task_struct *tsk;
18192 int err;
18193
18194- childregs = task_pt_regs(p);
18195+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
18196 *childregs = *regs;
18197 childregs->ax = 0;
18198 childregs->sp = sp;
18199
18200 p->thread.sp = (unsigned long) childregs;
18201 p->thread.sp0 = (unsigned long) (childregs+1);
18202+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18203
18204 p->thread.ip = (unsigned long) ret_from_fork;
18205
18206@@ -299,7 +300,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18207 struct thread_struct *prev = &prev_p->thread,
18208 *next = &next_p->thread;
18209 int cpu = smp_processor_id();
18210- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18211+ struct tss_struct *tss = init_tss + cpu;
18212 fpu_switch_t fpu;
18213
18214 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
18215@@ -323,6 +324,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18216 */
18217 lazy_save_gs(prev->gs);
18218
18219+#ifdef CONFIG_PAX_MEMORY_UDEREF
18220+ __set_fs(task_thread_info(next_p)->addr_limit);
18221+#endif
18222+
18223 /*
18224 * Load the per-thread Thread-Local Storage descriptor.
18225 */
18226@@ -353,6 +358,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18227 */
18228 arch_end_context_switch(next_p);
18229
18230+ percpu_write(current_task, next_p);
18231+ percpu_write(current_tinfo, &next_p->tinfo);
18232+
18233 /*
18234 * Restore %gs if needed (which is common)
18235 */
18236@@ -361,8 +369,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18237
18238 switch_fpu_finish(next_p, fpu);
18239
18240- percpu_write(current_task, next_p);
18241-
18242 return prev_p;
18243 }
18244
18245@@ -392,4 +398,3 @@ unsigned long get_wchan(struct task_struct *p)
18246 } while (count++ < 16);
18247 return 0;
18248 }
18249-
18250diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
18251index cfa5c90..4facd28 100644
18252--- a/arch/x86/kernel/process_64.c
18253+++ b/arch/x86/kernel/process_64.c
18254@@ -89,7 +89,7 @@ static void __exit_idle(void)
18255 void exit_idle(void)
18256 {
18257 /* idle loop has pid 0 */
18258- if (current->pid)
18259+ if (task_pid_nr(current))
18260 return;
18261 __exit_idle();
18262 }
18263@@ -270,8 +270,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18264 struct pt_regs *childregs;
18265 struct task_struct *me = current;
18266
18267- childregs = ((struct pt_regs *)
18268- (THREAD_SIZE + task_stack_page(p))) - 1;
18269+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
18270 *childregs = *regs;
18271
18272 childregs->ax = 0;
18273@@ -283,6 +282,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18274 p->thread.sp = (unsigned long) childregs;
18275 p->thread.sp0 = (unsigned long) (childregs+1);
18276 p->thread.usersp = me->thread.usersp;
18277+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18278
18279 set_tsk_thread_flag(p, TIF_FORK);
18280
18281@@ -385,7 +385,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18282 struct thread_struct *prev = &prev_p->thread;
18283 struct thread_struct *next = &next_p->thread;
18284 int cpu = smp_processor_id();
18285- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18286+ struct tss_struct *tss = init_tss + cpu;
18287 unsigned fsindex, gsindex;
18288 fpu_switch_t fpu;
18289
18290@@ -467,10 +467,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18291 prev->usersp = percpu_read(old_rsp);
18292 percpu_write(old_rsp, next->usersp);
18293 percpu_write(current_task, next_p);
18294+ percpu_write(current_tinfo, &next_p->tinfo);
18295
18296- percpu_write(kernel_stack,
18297- (unsigned long)task_stack_page(next_p) +
18298- THREAD_SIZE - KERNEL_STACK_OFFSET);
18299+ percpu_write(kernel_stack, next->sp0);
18300
18301 /*
18302 * Now maybe reload the debug registers and handle I/O bitmaps
18303@@ -525,12 +524,11 @@ unsigned long get_wchan(struct task_struct *p)
18304 if (!p || p == current || p->state == TASK_RUNNING)
18305 return 0;
18306 stack = (unsigned long)task_stack_page(p);
18307- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
18308+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
18309 return 0;
18310 fp = *(u64 *)(p->thread.sp);
18311 do {
18312- if (fp < (unsigned long)stack ||
18313- fp >= (unsigned long)stack+THREAD_SIZE)
18314+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
18315 return 0;
18316 ip = *(u64 *)(fp+8);
18317 if (!in_sched_functions(ip))
18318diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
18319index 5026738..e1b5aa8 100644
18320--- a/arch/x86/kernel/ptrace.c
18321+++ b/arch/x86/kernel/ptrace.c
18322@@ -792,6 +792,10 @@ static int ioperm_active(struct task_struct *target,
18323 static int ioperm_get(struct task_struct *target,
18324 const struct user_regset *regset,
18325 unsigned int pos, unsigned int count,
18326+ void *kbuf, void __user *ubuf) __size_overflow(3,4);
18327+static int ioperm_get(struct task_struct *target,
18328+ const struct user_regset *regset,
18329+ unsigned int pos, unsigned int count,
18330 void *kbuf, void __user *ubuf)
18331 {
18332 if (!target->thread.io_bitmap_ptr)
18333@@ -823,7 +827,7 @@ long arch_ptrace(struct task_struct *child, long request,
18334 unsigned long addr, unsigned long data)
18335 {
18336 int ret;
18337- unsigned long __user *datap = (unsigned long __user *)data;
18338+ unsigned long __user *datap = (__force unsigned long __user *)data;
18339
18340 switch (request) {
18341 /* read the word at location addr in the USER area. */
18342@@ -908,14 +912,14 @@ long arch_ptrace(struct task_struct *child, long request,
18343 if ((int) addr < 0)
18344 return -EIO;
18345 ret = do_get_thread_area(child, addr,
18346- (struct user_desc __user *)data);
18347+ (__force struct user_desc __user *) data);
18348 break;
18349
18350 case PTRACE_SET_THREAD_AREA:
18351 if ((int) addr < 0)
18352 return -EIO;
18353 ret = do_set_thread_area(child, addr,
18354- (struct user_desc __user *)data, 0);
18355+ (__force struct user_desc __user *) data, 0);
18356 break;
18357 #endif
18358
18359@@ -1332,7 +1336,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
18360 memset(info, 0, sizeof(*info));
18361 info->si_signo = SIGTRAP;
18362 info->si_code = si_code;
18363- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
18364+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
18365 }
18366
18367 void user_single_step_siginfo(struct task_struct *tsk,
18368diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
18369index 42eb330..139955c 100644
18370--- a/arch/x86/kernel/pvclock.c
18371+++ b/arch/x86/kernel/pvclock.c
18372@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
18373 return pv_tsc_khz;
18374 }
18375
18376-static atomic64_t last_value = ATOMIC64_INIT(0);
18377+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
18378
18379 void pvclock_resume(void)
18380 {
18381- atomic64_set(&last_value, 0);
18382+ atomic64_set_unchecked(&last_value, 0);
18383 }
18384
18385 cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18386@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18387 * updating at the same time, and one of them could be slightly behind,
18388 * making the assumption that last_value always go forward fail to hold.
18389 */
18390- last = atomic64_read(&last_value);
18391+ last = atomic64_read_unchecked(&last_value);
18392 do {
18393 if (ret < last)
18394 return last;
18395- last = atomic64_cmpxchg(&last_value, last, ret);
18396+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
18397 } while (unlikely(last != ret));
18398
18399 return ret;
18400diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
18401index d840e69..98e9581 100644
18402--- a/arch/x86/kernel/reboot.c
18403+++ b/arch/x86/kernel/reboot.c
18404@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
18405 EXPORT_SYMBOL(pm_power_off);
18406
18407 static const struct desc_ptr no_idt = {};
18408-static int reboot_mode;
18409+static unsigned short reboot_mode;
18410 enum reboot_type reboot_type = BOOT_ACPI;
18411 int reboot_force;
18412
18413@@ -335,13 +335,17 @@ core_initcall(reboot_init);
18414 extern const unsigned char machine_real_restart_asm[];
18415 extern const u64 machine_real_restart_gdt[3];
18416
18417-void machine_real_restart(unsigned int type)
18418+__noreturn void machine_real_restart(unsigned int type)
18419 {
18420 void *restart_va;
18421 unsigned long restart_pa;
18422- void (*restart_lowmem)(unsigned int);
18423+ void (* __noreturn restart_lowmem)(unsigned int);
18424 u64 *lowmem_gdt;
18425
18426+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18427+ struct desc_struct *gdt;
18428+#endif
18429+
18430 local_irq_disable();
18431
18432 /* Write zero to CMOS register number 0x0f, which the BIOS POST
18433@@ -367,14 +371,14 @@ void machine_real_restart(unsigned int type)
18434 boot)". This seems like a fairly standard thing that gets set by
18435 REBOOT.COM programs, and the previous reset routine did this
18436 too. */
18437- *((unsigned short *)0x472) = reboot_mode;
18438+ *(unsigned short *)(__va(0x472)) = reboot_mode;
18439
18440 /* Patch the GDT in the low memory trampoline */
18441 lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt);
18442
18443 restart_va = TRAMPOLINE_SYM(machine_real_restart_asm);
18444 restart_pa = virt_to_phys(restart_va);
18445- restart_lowmem = (void (*)(unsigned int))restart_pa;
18446+ restart_lowmem = (void *)restart_pa;
18447
18448 /* GDT[0]: GDT self-pointer */
18449 lowmem_gdt[0] =
18450@@ -385,7 +389,33 @@ void machine_real_restart(unsigned int type)
18451 GDT_ENTRY(0x009b, restart_pa, 0xffff);
18452
18453 /* Jump to the identity-mapped low memory code */
18454+
18455+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18456+ gdt = get_cpu_gdt_table(smp_processor_id());
18457+ pax_open_kernel();
18458+#ifdef CONFIG_PAX_MEMORY_UDEREF
18459+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
18460+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
18461+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
18462+#endif
18463+#ifdef CONFIG_PAX_KERNEXEC
18464+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
18465+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
18466+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
18467+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
18468+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
18469+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
18470+#endif
18471+ pax_close_kernel();
18472+#endif
18473+
18474+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18475+ asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
18476+ unreachable();
18477+#else
18478 restart_lowmem(type);
18479+#endif
18480+
18481 }
18482 #ifdef CONFIG_APM_MODULE
18483 EXPORT_SYMBOL(machine_real_restart);
18484@@ -556,7 +586,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
18485 * try to force a triple fault and then cycle between hitting the keyboard
18486 * controller and doing that
18487 */
18488-static void native_machine_emergency_restart(void)
18489+__noreturn static void native_machine_emergency_restart(void)
18490 {
18491 int i;
18492 int attempt = 0;
18493@@ -680,13 +710,13 @@ void native_machine_shutdown(void)
18494 #endif
18495 }
18496
18497-static void __machine_emergency_restart(int emergency)
18498+static __noreturn void __machine_emergency_restart(int emergency)
18499 {
18500 reboot_emergency = emergency;
18501 machine_ops.emergency_restart();
18502 }
18503
18504-static void native_machine_restart(char *__unused)
18505+static __noreturn void native_machine_restart(char *__unused)
18506 {
18507 printk("machine restart\n");
18508
18509@@ -695,7 +725,7 @@ static void native_machine_restart(char *__unused)
18510 __machine_emergency_restart(0);
18511 }
18512
18513-static void native_machine_halt(void)
18514+static __noreturn void native_machine_halt(void)
18515 {
18516 /* stop other cpus and apics */
18517 machine_shutdown();
18518@@ -706,7 +736,7 @@ static void native_machine_halt(void)
18519 stop_this_cpu(NULL);
18520 }
18521
18522-static void native_machine_power_off(void)
18523+__noreturn static void native_machine_power_off(void)
18524 {
18525 if (pm_power_off) {
18526 if (!reboot_force)
18527@@ -715,6 +745,7 @@ static void native_machine_power_off(void)
18528 }
18529 /* a fallback in case there is no PM info available */
18530 tboot_shutdown(TB_SHUTDOWN_HALT);
18531+ unreachable();
18532 }
18533
18534 struct machine_ops machine_ops = {
18535diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
18536index 7a6f3b3..bed145d7 100644
18537--- a/arch/x86/kernel/relocate_kernel_64.S
18538+++ b/arch/x86/kernel/relocate_kernel_64.S
18539@@ -11,6 +11,7 @@
18540 #include <asm/kexec.h>
18541 #include <asm/processor-flags.h>
18542 #include <asm/pgtable_types.h>
18543+#include <asm/alternative-asm.h>
18544
18545 /*
18546 * Must be relocatable PIC code callable as a C function
18547@@ -160,13 +161,14 @@ identity_mapped:
18548 xorq %rbp, %rbp
18549 xorq %r8, %r8
18550 xorq %r9, %r9
18551- xorq %r10, %r9
18552+ xorq %r10, %r10
18553 xorq %r11, %r11
18554 xorq %r12, %r12
18555 xorq %r13, %r13
18556 xorq %r14, %r14
18557 xorq %r15, %r15
18558
18559+ pax_force_retaddr 0, 1
18560 ret
18561
18562 1:
18563diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
18564index d7d5099..28555d0 100644
18565--- a/arch/x86/kernel/setup.c
18566+++ b/arch/x86/kernel/setup.c
18567@@ -448,7 +448,7 @@ static void __init parse_setup_data(void)
18568
18569 switch (data->type) {
18570 case SETUP_E820_EXT:
18571- parse_e820_ext(data);
18572+ parse_e820_ext((struct setup_data __force_kernel *)data);
18573 break;
18574 case SETUP_DTB:
18575 add_dtb(pa_data);
18576@@ -649,7 +649,7 @@ static void __init trim_bios_range(void)
18577 * area (640->1Mb) as ram even though it is not.
18578 * take them out.
18579 */
18580- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
18581+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
18582 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
18583 }
18584
18585@@ -767,14 +767,14 @@ void __init setup_arch(char **cmdline_p)
18586
18587 if (!boot_params.hdr.root_flags)
18588 root_mountflags &= ~MS_RDONLY;
18589- init_mm.start_code = (unsigned long) _text;
18590- init_mm.end_code = (unsigned long) _etext;
18591+ init_mm.start_code = ktla_ktva((unsigned long) _text);
18592+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
18593 init_mm.end_data = (unsigned long) _edata;
18594 init_mm.brk = _brk_end;
18595
18596- code_resource.start = virt_to_phys(_text);
18597- code_resource.end = virt_to_phys(_etext)-1;
18598- data_resource.start = virt_to_phys(_etext);
18599+ code_resource.start = virt_to_phys(ktla_ktva(_text));
18600+ code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
18601+ data_resource.start = virt_to_phys(_sdata);
18602 data_resource.end = virt_to_phys(_edata)-1;
18603 bss_resource.start = virt_to_phys(&__bss_start);
18604 bss_resource.end = virt_to_phys(&__bss_stop)-1;
18605diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
18606index 71f4727..217419b 100644
18607--- a/arch/x86/kernel/setup_percpu.c
18608+++ b/arch/x86/kernel/setup_percpu.c
18609@@ -21,19 +21,17 @@
18610 #include <asm/cpu.h>
18611 #include <asm/stackprotector.h>
18612
18613-DEFINE_PER_CPU(int, cpu_number);
18614+#ifdef CONFIG_SMP
18615+DEFINE_PER_CPU(unsigned int, cpu_number);
18616 EXPORT_PER_CPU_SYMBOL(cpu_number);
18617+#endif
18618
18619-#ifdef CONFIG_X86_64
18620 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
18621-#else
18622-#define BOOT_PERCPU_OFFSET 0
18623-#endif
18624
18625 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
18626 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
18627
18628-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
18629+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
18630 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
18631 };
18632 EXPORT_SYMBOL(__per_cpu_offset);
18633@@ -96,6 +94,8 @@ static bool __init pcpu_need_numa(void)
18634 * Pointer to the allocated area on success, NULL on failure.
18635 */
18636 static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18637+ unsigned long align) __size_overflow(2);
18638+static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18639 unsigned long align)
18640 {
18641 const unsigned long goal = __pa(MAX_DMA_ADDRESS);
18642@@ -124,6 +124,8 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18643 /*
18644 * Helpers for first chunk memory allocation
18645 */
18646+static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align) __size_overflow(2);
18647+
18648 static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)
18649 {
18650 return pcpu_alloc_bootmem(cpu, size, align);
18651@@ -155,10 +157,10 @@ static inline void setup_percpu_segment(int cpu)
18652 {
18653 #ifdef CONFIG_X86_32
18654 struct desc_struct gdt;
18655+ unsigned long base = per_cpu_offset(cpu);
18656
18657- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
18658- 0x2 | DESCTYPE_S, 0x8);
18659- gdt.s = 1;
18660+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
18661+ 0x83 | DESCTYPE_S, 0xC);
18662 write_gdt_entry(get_cpu_gdt_table(cpu),
18663 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
18664 #endif
18665@@ -207,6 +209,11 @@ void __init setup_per_cpu_areas(void)
18666 /* alrighty, percpu areas up and running */
18667 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
18668 for_each_possible_cpu(cpu) {
18669+#ifdef CONFIG_CC_STACKPROTECTOR
18670+#ifdef CONFIG_X86_32
18671+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
18672+#endif
18673+#endif
18674 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
18675 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
18676 per_cpu(cpu_number, cpu) = cpu;
18677@@ -247,6 +254,12 @@ void __init setup_per_cpu_areas(void)
18678 */
18679 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
18680 #endif
18681+#ifdef CONFIG_CC_STACKPROTECTOR
18682+#ifdef CONFIG_X86_32
18683+ if (!cpu)
18684+ per_cpu(stack_canary.canary, cpu) = canary;
18685+#endif
18686+#endif
18687 /*
18688 * Up to this point, the boot CPU has been using .init.data
18689 * area. Reload any changed state for the boot CPU.
18690diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
18691index 46a01bd..2e88e6d 100644
18692--- a/arch/x86/kernel/signal.c
18693+++ b/arch/x86/kernel/signal.c
18694@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsigned long sp)
18695 * Align the stack pointer according to the i386 ABI,
18696 * i.e. so that on function entry ((sp + 4) & 15) == 0.
18697 */
18698- sp = ((sp + 4) & -16ul) - 4;
18699+ sp = ((sp - 12) & -16ul) - 4;
18700 #else /* !CONFIG_X86_32 */
18701 sp = round_down(sp, 16) - 8;
18702 #endif
18703@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
18704 * Return an always-bogus address instead so we will die with SIGSEGV.
18705 */
18706 if (onsigstack && !likely(on_sig_stack(sp)))
18707- return (void __user *)-1L;
18708+ return (__force void __user *)-1L;
18709
18710 /* save i387 state */
18711 if (used_math() && save_i387_xstate(*fpstate) < 0)
18712- return (void __user *)-1L;
18713+ return (__force void __user *)-1L;
18714
18715 return (void __user *)sp;
18716 }
18717@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
18718 }
18719
18720 if (current->mm->context.vdso)
18721- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
18722+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
18723 else
18724- restorer = &frame->retcode;
18725+ restorer = (void __user *)&frame->retcode;
18726 if (ka->sa.sa_flags & SA_RESTORER)
18727 restorer = ka->sa.sa_restorer;
18728
18729@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
18730 * reasons and because gdb uses it as a signature to notice
18731 * signal handler stack frames.
18732 */
18733- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
18734+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
18735
18736 if (err)
18737 return -EFAULT;
18738@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
18739 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
18740
18741 /* Set up to return from userspace. */
18742- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
18743+ if (current->mm->context.vdso)
18744+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
18745+ else
18746+ restorer = (void __user *)&frame->retcode;
18747 if (ka->sa.sa_flags & SA_RESTORER)
18748 restorer = ka->sa.sa_restorer;
18749 put_user_ex(restorer, &frame->pretcode);
18750@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
18751 * reasons and because gdb uses it as a signature to notice
18752 * signal handler stack frames.
18753 */
18754- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
18755+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
18756 } put_user_catch(err);
18757
18758 if (err)
18759@@ -765,7 +768,7 @@ static void do_signal(struct pt_regs *regs)
18760 * X86_32: vm86 regs switched out by assembly code before reaching
18761 * here, so testing against kernel CS suffices.
18762 */
18763- if (!user_mode(regs))
18764+ if (!user_mode_novm(regs))
18765 return;
18766
18767 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
18768diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
18769index 66d250c..f1b10bd 100644
18770--- a/arch/x86/kernel/smpboot.c
18771+++ b/arch/x86/kernel/smpboot.c
18772@@ -715,17 +715,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
18773 set_idle_for_cpu(cpu, c_idle.idle);
18774 do_rest:
18775 per_cpu(current_task, cpu) = c_idle.idle;
18776+ per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
18777 #ifdef CONFIG_X86_32
18778 /* Stack for startup_32 can be just as for start_secondary onwards */
18779 irq_ctx_init(cpu);
18780 #else
18781 clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
18782 initial_gs = per_cpu_offset(cpu);
18783- per_cpu(kernel_stack, cpu) =
18784- (unsigned long)task_stack_page(c_idle.idle) -
18785- KERNEL_STACK_OFFSET + THREAD_SIZE;
18786+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
18787 #endif
18788+
18789+ pax_open_kernel();
18790 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
18791+ pax_close_kernel();
18792+
18793 initial_code = (unsigned long)start_secondary;
18794 stack_start = c_idle.idle->thread.sp;
18795
18796@@ -868,6 +871,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
18797
18798 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
18799
18800+#ifdef CONFIG_PAX_PER_CPU_PGD
18801+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
18802+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
18803+ KERNEL_PGD_PTRS);
18804+#endif
18805+
18806 err = do_boot_cpu(apicid, cpu);
18807 if (err) {
18808 pr_debug("do_boot_cpu failed %d\n", err);
18809diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
18810index c346d11..d43b163 100644
18811--- a/arch/x86/kernel/step.c
18812+++ b/arch/x86/kernel/step.c
18813@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
18814 struct desc_struct *desc;
18815 unsigned long base;
18816
18817- seg &= ~7UL;
18818+ seg >>= 3;
18819
18820 mutex_lock(&child->mm->context.lock);
18821- if (unlikely((seg >> 3) >= child->mm->context.size))
18822+ if (unlikely(seg >= child->mm->context.size))
18823 addr = -1L; /* bogus selector, access would fault */
18824 else {
18825 desc = child->mm->context.ldt + seg;
18826@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
18827 addr += base;
18828 }
18829 mutex_unlock(&child->mm->context.lock);
18830- }
18831+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
18832+ addr = ktla_ktva(addr);
18833
18834 return addr;
18835 }
18836@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
18837 unsigned char opcode[15];
18838 unsigned long addr = convert_ip_to_linear(child, regs);
18839
18840+ if (addr == -EINVAL)
18841+ return 0;
18842+
18843 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
18844 for (i = 0; i < copied; i++) {
18845 switch (opcode[i]) {
18846diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
18847index 0b0cb5f..db6b9ed 100644
18848--- a/arch/x86/kernel/sys_i386_32.c
18849+++ b/arch/x86/kernel/sys_i386_32.c
18850@@ -24,17 +24,224 @@
18851
18852 #include <asm/syscalls.h>
18853
18854-/*
18855- * Do a system call from kernel instead of calling sys_execve so we
18856- * end up with proper pt_regs.
18857- */
18858-int kernel_execve(const char *filename,
18859- const char *const argv[],
18860- const char *const envp[])
18861+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
18862 {
18863- long __res;
18864- asm volatile ("int $0x80"
18865- : "=a" (__res)
18866- : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
18867- return __res;
18868+ unsigned long pax_task_size = TASK_SIZE;
18869+
18870+#ifdef CONFIG_PAX_SEGMEXEC
18871+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
18872+ pax_task_size = SEGMEXEC_TASK_SIZE;
18873+#endif
18874+
18875+ if (len > pax_task_size || addr > pax_task_size - len)
18876+ return -EINVAL;
18877+
18878+ return 0;
18879+}
18880+
18881+unsigned long
18882+arch_get_unmapped_area(struct file *filp, unsigned long addr,
18883+ unsigned long len, unsigned long pgoff, unsigned long flags)
18884+{
18885+ struct mm_struct *mm = current->mm;
18886+ struct vm_area_struct *vma;
18887+ unsigned long start_addr, pax_task_size = TASK_SIZE;
18888+
18889+#ifdef CONFIG_PAX_SEGMEXEC
18890+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
18891+ pax_task_size = SEGMEXEC_TASK_SIZE;
18892+#endif
18893+
18894+ pax_task_size -= PAGE_SIZE;
18895+
18896+ if (len > pax_task_size)
18897+ return -ENOMEM;
18898+
18899+ if (flags & MAP_FIXED)
18900+ return addr;
18901+
18902+#ifdef CONFIG_PAX_RANDMMAP
18903+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
18904+#endif
18905+
18906+ if (addr) {
18907+ addr = PAGE_ALIGN(addr);
18908+ if (pax_task_size - len >= addr) {
18909+ vma = find_vma(mm, addr);
18910+ if (check_heap_stack_gap(vma, addr, len))
18911+ return addr;
18912+ }
18913+ }
18914+ if (len > mm->cached_hole_size) {
18915+ start_addr = addr = mm->free_area_cache;
18916+ } else {
18917+ start_addr = addr = mm->mmap_base;
18918+ mm->cached_hole_size = 0;
18919+ }
18920+
18921+#ifdef CONFIG_PAX_PAGEEXEC
18922+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
18923+ start_addr = 0x00110000UL;
18924+
18925+#ifdef CONFIG_PAX_RANDMMAP
18926+ if (mm->pax_flags & MF_PAX_RANDMMAP)
18927+ start_addr += mm->delta_mmap & 0x03FFF000UL;
18928+#endif
18929+
18930+ if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
18931+ start_addr = addr = mm->mmap_base;
18932+ else
18933+ addr = start_addr;
18934+ }
18935+#endif
18936+
18937+full_search:
18938+ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
18939+ /* At this point: (!vma || addr < vma->vm_end). */
18940+ if (pax_task_size - len < addr) {
18941+ /*
18942+ * Start a new search - just in case we missed
18943+ * some holes.
18944+ */
18945+ if (start_addr != mm->mmap_base) {
18946+ start_addr = addr = mm->mmap_base;
18947+ mm->cached_hole_size = 0;
18948+ goto full_search;
18949+ }
18950+ return -ENOMEM;
18951+ }
18952+ if (check_heap_stack_gap(vma, addr, len))
18953+ break;
18954+ if (addr + mm->cached_hole_size < vma->vm_start)
18955+ mm->cached_hole_size = vma->vm_start - addr;
18956+ addr = vma->vm_end;
18957+ if (mm->start_brk <= addr && addr < mm->mmap_base) {
18958+ start_addr = addr = mm->mmap_base;
18959+ mm->cached_hole_size = 0;
18960+ goto full_search;
18961+ }
18962+ }
18963+
18964+ /*
18965+ * Remember the place where we stopped the search:
18966+ */
18967+ mm->free_area_cache = addr + len;
18968+ return addr;
18969+}
18970+
18971+unsigned long
18972+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
18973+ const unsigned long len, const unsigned long pgoff,
18974+ const unsigned long flags)
18975+{
18976+ struct vm_area_struct *vma;
18977+ struct mm_struct *mm = current->mm;
18978+ unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
18979+
18980+#ifdef CONFIG_PAX_SEGMEXEC
18981+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
18982+ pax_task_size = SEGMEXEC_TASK_SIZE;
18983+#endif
18984+
18985+ pax_task_size -= PAGE_SIZE;
18986+
18987+ /* requested length too big for entire address space */
18988+ if (len > pax_task_size)
18989+ return -ENOMEM;
18990+
18991+ if (flags & MAP_FIXED)
18992+ return addr;
18993+
18994+#ifdef CONFIG_PAX_PAGEEXEC
18995+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
18996+ goto bottomup;
18997+#endif
18998+
18999+#ifdef CONFIG_PAX_RANDMMAP
19000+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19001+#endif
19002+
19003+ /* requesting a specific address */
19004+ if (addr) {
19005+ addr = PAGE_ALIGN(addr);
19006+ if (pax_task_size - len >= addr) {
19007+ vma = find_vma(mm, addr);
19008+ if (check_heap_stack_gap(vma, addr, len))
19009+ return addr;
19010+ }
19011+ }
19012+
19013+ /* check if free_area_cache is useful for us */
19014+ if (len <= mm->cached_hole_size) {
19015+ mm->cached_hole_size = 0;
19016+ mm->free_area_cache = mm->mmap_base;
19017+ }
19018+
19019+ /* either no address requested or can't fit in requested address hole */
19020+ addr = mm->free_area_cache;
19021+
19022+ /* make sure it can fit in the remaining address space */
19023+ if (addr > len) {
19024+ vma = find_vma(mm, addr-len);
19025+ if (check_heap_stack_gap(vma, addr - len, len))
19026+ /* remember the address as a hint for next time */
19027+ return (mm->free_area_cache = addr-len);
19028+ }
19029+
19030+ if (mm->mmap_base < len)
19031+ goto bottomup;
19032+
19033+ addr = mm->mmap_base-len;
19034+
19035+ do {
19036+ /*
19037+ * Lookup failure means no vma is above this address,
19038+ * else if new region fits below vma->vm_start,
19039+ * return with success:
19040+ */
19041+ vma = find_vma(mm, addr);
19042+ if (check_heap_stack_gap(vma, addr, len))
19043+ /* remember the address as a hint for next time */
19044+ return (mm->free_area_cache = addr);
19045+
19046+ /* remember the largest hole we saw so far */
19047+ if (addr + mm->cached_hole_size < vma->vm_start)
19048+ mm->cached_hole_size = vma->vm_start - addr;
19049+
19050+ /* try just below the current vma->vm_start */
19051+ addr = skip_heap_stack_gap(vma, len);
19052+ } while (!IS_ERR_VALUE(addr));
19053+
19054+bottomup:
19055+ /*
19056+ * A failed mmap() very likely causes application failure,
19057+ * so fall back to the bottom-up function here. This scenario
19058+ * can happen with large stack limits and large mmap()
19059+ * allocations.
19060+ */
19061+
19062+#ifdef CONFIG_PAX_SEGMEXEC
19063+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
19064+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
19065+ else
19066+#endif
19067+
19068+ mm->mmap_base = TASK_UNMAPPED_BASE;
19069+
19070+#ifdef CONFIG_PAX_RANDMMAP
19071+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19072+ mm->mmap_base += mm->delta_mmap;
19073+#endif
19074+
19075+ mm->free_area_cache = mm->mmap_base;
19076+ mm->cached_hole_size = ~0UL;
19077+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19078+ /*
19079+ * Restore the topdown base:
19080+ */
19081+ mm->mmap_base = base;
19082+ mm->free_area_cache = base;
19083+ mm->cached_hole_size = ~0UL;
19084+
19085+ return addr;
19086 }
19087diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
19088index 0514890..3dbebce 100644
19089--- a/arch/x86/kernel/sys_x86_64.c
19090+++ b/arch/x86/kernel/sys_x86_64.c
19091@@ -95,8 +95,8 @@ out:
19092 return error;
19093 }
19094
19095-static void find_start_end(unsigned long flags, unsigned long *begin,
19096- unsigned long *end)
19097+static void find_start_end(struct mm_struct *mm, unsigned long flags,
19098+ unsigned long *begin, unsigned long *end)
19099 {
19100 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
19101 unsigned long new_begin;
19102@@ -115,7 +115,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
19103 *begin = new_begin;
19104 }
19105 } else {
19106- *begin = TASK_UNMAPPED_BASE;
19107+ *begin = mm->mmap_base;
19108 *end = TASK_SIZE;
19109 }
19110 }
19111@@ -132,16 +132,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
19112 if (flags & MAP_FIXED)
19113 return addr;
19114
19115- find_start_end(flags, &begin, &end);
19116+ find_start_end(mm, flags, &begin, &end);
19117
19118 if (len > end)
19119 return -ENOMEM;
19120
19121+#ifdef CONFIG_PAX_RANDMMAP
19122+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19123+#endif
19124+
19125 if (addr) {
19126 addr = PAGE_ALIGN(addr);
19127 vma = find_vma(mm, addr);
19128- if (end - len >= addr &&
19129- (!vma || addr + len <= vma->vm_start))
19130+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
19131 return addr;
19132 }
19133 if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
19134@@ -172,7 +175,7 @@ full_search:
19135 }
19136 return -ENOMEM;
19137 }
19138- if (!vma || addr + len <= vma->vm_start) {
19139+ if (check_heap_stack_gap(vma, addr, len)) {
19140 /*
19141 * Remember the place where we stopped the search:
19142 */
19143@@ -195,7 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19144 {
19145 struct vm_area_struct *vma;
19146 struct mm_struct *mm = current->mm;
19147- unsigned long addr = addr0;
19148+ unsigned long base = mm->mmap_base, addr = addr0;
19149
19150 /* requested length too big for entire address space */
19151 if (len > TASK_SIZE)
19152@@ -208,13 +211,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19153 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
19154 goto bottomup;
19155
19156+#ifdef CONFIG_PAX_RANDMMAP
19157+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19158+#endif
19159+
19160 /* requesting a specific address */
19161 if (addr) {
19162 addr = PAGE_ALIGN(addr);
19163- vma = find_vma(mm, addr);
19164- if (TASK_SIZE - len >= addr &&
19165- (!vma || addr + len <= vma->vm_start))
19166- return addr;
19167+ if (TASK_SIZE - len >= addr) {
19168+ vma = find_vma(mm, addr);
19169+ if (check_heap_stack_gap(vma, addr, len))
19170+ return addr;
19171+ }
19172 }
19173
19174 /* check if free_area_cache is useful for us */
19175@@ -232,7 +240,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19176 ALIGN_TOPDOWN);
19177
19178 vma = find_vma(mm, tmp_addr);
19179- if (!vma || tmp_addr + len <= vma->vm_start)
19180+ if (check_heap_stack_gap(vma, tmp_addr, len))
19181 /* remember the address as a hint for next time */
19182 return mm->free_area_cache = tmp_addr;
19183 }
19184@@ -251,7 +259,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19185 * return with success:
19186 */
19187 vma = find_vma(mm, addr);
19188- if (!vma || addr+len <= vma->vm_start)
19189+ if (check_heap_stack_gap(vma, addr, len))
19190 /* remember the address as a hint for next time */
19191 return mm->free_area_cache = addr;
19192
19193@@ -260,8 +268,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19194 mm->cached_hole_size = vma->vm_start - addr;
19195
19196 /* try just below the current vma->vm_start */
19197- addr = vma->vm_start-len;
19198- } while (len < vma->vm_start);
19199+ addr = skip_heap_stack_gap(vma, len);
19200+ } while (!IS_ERR_VALUE(addr));
19201
19202 bottomup:
19203 /*
19204@@ -270,13 +278,21 @@ bottomup:
19205 * can happen with large stack limits and large mmap()
19206 * allocations.
19207 */
19208+ mm->mmap_base = TASK_UNMAPPED_BASE;
19209+
19210+#ifdef CONFIG_PAX_RANDMMAP
19211+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19212+ mm->mmap_base += mm->delta_mmap;
19213+#endif
19214+
19215+ mm->free_area_cache = mm->mmap_base;
19216 mm->cached_hole_size = ~0UL;
19217- mm->free_area_cache = TASK_UNMAPPED_BASE;
19218 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19219 /*
19220 * Restore the topdown base:
19221 */
19222- mm->free_area_cache = mm->mmap_base;
19223+ mm->mmap_base = base;
19224+ mm->free_area_cache = base;
19225 mm->cached_hole_size = ~0UL;
19226
19227 return addr;
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 bcfec2d..8f88b4a 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 4bbe04d..41d0943 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@@ -421,7 +450,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@@ -436,7 +465,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@@ -466,7 +495,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;
19536diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
19537index b9242ba..50c5edd 100644
19538--- a/arch/x86/kernel/verify_cpu.S
19539+++ b/arch/x86/kernel/verify_cpu.S
19540@@ -20,6 +20,7 @@
19541 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
19542 * arch/x86/kernel/trampoline_64.S: secondary processor verification
19543 * arch/x86/kernel/head_32.S: processor startup
19544+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
19545 *
19546 * verify_cpu, returns the status of longmode and SSE in register %eax.
19547 * 0: Success 1: Failure
19548diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
19549index 328cb37..f37fee1 100644
19550--- a/arch/x86/kernel/vm86_32.c
19551+++ b/arch/x86/kernel/vm86_32.c
19552@@ -41,6 +41,7 @@
19553 #include <linux/ptrace.h>
19554 #include <linux/audit.h>
19555 #include <linux/stddef.h>
19556+#include <linux/grsecurity.h>
19557
19558 #include <asm/uaccess.h>
19559 #include <asm/io.h>
19560@@ -109,6 +110,9 @@ static int copy_vm86_regs_to_user(struct vm86_regs __user *user,
19561 /* convert vm86_regs to kernel_vm86_regs */
19562 static int copy_vm86_regs_from_user(struct kernel_vm86_regs *regs,
19563 const struct vm86_regs __user *user,
19564+ unsigned extra) __size_overflow(3);
19565+static int copy_vm86_regs_from_user(struct kernel_vm86_regs *regs,
19566+ const struct vm86_regs __user *user,
19567 unsigned extra)
19568 {
19569 int ret = 0;
19570@@ -148,7 +152,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
19571 do_exit(SIGSEGV);
19572 }
19573
19574- tss = &per_cpu(init_tss, get_cpu());
19575+ tss = init_tss + get_cpu();
19576 current->thread.sp0 = current->thread.saved_sp0;
19577 current->thread.sysenter_cs = __KERNEL_CS;
19578 load_sp0(tss, &current->thread);
19579@@ -210,6 +214,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
19580 struct task_struct *tsk;
19581 int tmp, ret = -EPERM;
19582
19583+#ifdef CONFIG_GRKERNSEC_VM86
19584+ if (!capable(CAP_SYS_RAWIO)) {
19585+ gr_handle_vm86();
19586+ goto out;
19587+ }
19588+#endif
19589+
19590 tsk = current;
19591 if (tsk->thread.saved_sp0)
19592 goto out;
19593@@ -240,6 +251,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
19594 int tmp, ret;
19595 struct vm86plus_struct __user *v86;
19596
19597+#ifdef CONFIG_GRKERNSEC_VM86
19598+ if (!capable(CAP_SYS_RAWIO)) {
19599+ gr_handle_vm86();
19600+ ret = -EPERM;
19601+ goto out;
19602+ }
19603+#endif
19604+
19605 tsk = current;
19606 switch (cmd) {
19607 case VM86_REQUEST_IRQ:
19608@@ -326,7 +345,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
19609 tsk->thread.saved_fs = info->regs32->fs;
19610 tsk->thread.saved_gs = get_user_gs(info->regs32);
19611
19612- tss = &per_cpu(init_tss, get_cpu());
19613+ tss = init_tss + get_cpu();
19614 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
19615 if (cpu_has_sep)
19616 tsk->thread.sysenter_cs = 0;
19617@@ -533,7 +552,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
19618 goto cannot_handle;
19619 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
19620 goto cannot_handle;
19621- intr_ptr = (unsigned long __user *) (i << 2);
19622+ intr_ptr = (__force unsigned long __user *) (i << 2);
19623 if (get_user(segoffs, intr_ptr))
19624 goto cannot_handle;
19625 if ((segoffs >> 16) == BIOSSEG)
19626diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
19627index 0f703f1..9e15f64 100644
19628--- a/arch/x86/kernel/vmlinux.lds.S
19629+++ b/arch/x86/kernel/vmlinux.lds.S
19630@@ -26,6 +26,13 @@
19631 #include <asm/page_types.h>
19632 #include <asm/cache.h>
19633 #include <asm/boot.h>
19634+#include <asm/segment.h>
19635+
19636+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19637+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
19638+#else
19639+#define __KERNEL_TEXT_OFFSET 0
19640+#endif
19641
19642 #undef i386 /* in case the preprocessor is a 32bit one */
19643
19644@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
19645
19646 PHDRS {
19647 text PT_LOAD FLAGS(5); /* R_E */
19648+#ifdef CONFIG_X86_32
19649+ module PT_LOAD FLAGS(5); /* R_E */
19650+#endif
19651+#ifdef CONFIG_XEN
19652+ rodata PT_LOAD FLAGS(5); /* R_E */
19653+#else
19654+ rodata PT_LOAD FLAGS(4); /* R__ */
19655+#endif
19656 data PT_LOAD FLAGS(6); /* RW_ */
19657-#ifdef CONFIG_X86_64
19658+ init.begin PT_LOAD FLAGS(6); /* RW_ */
19659 #ifdef CONFIG_SMP
19660 percpu PT_LOAD FLAGS(6); /* RW_ */
19661 #endif
19662+ text.init PT_LOAD FLAGS(5); /* R_E */
19663+ text.exit PT_LOAD FLAGS(5); /* R_E */
19664 init PT_LOAD FLAGS(7); /* RWE */
19665-#endif
19666 note PT_NOTE FLAGS(0); /* ___ */
19667 }
19668
19669 SECTIONS
19670 {
19671 #ifdef CONFIG_X86_32
19672- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
19673- phys_startup_32 = startup_32 - LOAD_OFFSET;
19674+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
19675 #else
19676- . = __START_KERNEL;
19677- phys_startup_64 = startup_64 - LOAD_OFFSET;
19678+ . = __START_KERNEL;
19679 #endif
19680
19681 /* Text and read-only data */
19682- .text : AT(ADDR(.text) - LOAD_OFFSET) {
19683- _text = .;
19684+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
19685 /* bootstrapping code */
19686+#ifdef CONFIG_X86_32
19687+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19688+#else
19689+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19690+#endif
19691+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19692+ _text = .;
19693 HEAD_TEXT
19694 #ifdef CONFIG_X86_32
19695 . = ALIGN(PAGE_SIZE);
19696@@ -108,13 +128,47 @@ SECTIONS
19697 IRQENTRY_TEXT
19698 *(.fixup)
19699 *(.gnu.warning)
19700- /* End of text section */
19701- _etext = .;
19702 } :text = 0x9090
19703
19704- NOTES :text :note
19705+ . += __KERNEL_TEXT_OFFSET;
19706
19707- EXCEPTION_TABLE(16) :text = 0x9090
19708+#ifdef CONFIG_X86_32
19709+ . = ALIGN(PAGE_SIZE);
19710+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
19711+
19712+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
19713+ MODULES_EXEC_VADDR = .;
19714+ BYTE(0)
19715+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
19716+ . = ALIGN(HPAGE_SIZE);
19717+ MODULES_EXEC_END = . - 1;
19718+#endif
19719+
19720+ } :module
19721+#endif
19722+
19723+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
19724+ /* End of text section */
19725+ _etext = . - __KERNEL_TEXT_OFFSET;
19726+ }
19727+
19728+#ifdef CONFIG_X86_32
19729+ . = ALIGN(PAGE_SIZE);
19730+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
19731+ *(.idt)
19732+ . = ALIGN(PAGE_SIZE);
19733+ *(.empty_zero_page)
19734+ *(.initial_pg_fixmap)
19735+ *(.initial_pg_pmd)
19736+ *(.initial_page_table)
19737+ *(.swapper_pg_dir)
19738+ } :rodata
19739+#endif
19740+
19741+ . = ALIGN(PAGE_SIZE);
19742+ NOTES :rodata :note
19743+
19744+ EXCEPTION_TABLE(16) :rodata
19745
19746 #if defined(CONFIG_DEBUG_RODATA)
19747 /* .text should occupy whole number of pages */
19748@@ -126,16 +180,20 @@ SECTIONS
19749
19750 /* Data */
19751 .data : AT(ADDR(.data) - LOAD_OFFSET) {
19752+
19753+#ifdef CONFIG_PAX_KERNEXEC
19754+ . = ALIGN(HPAGE_SIZE);
19755+#else
19756+ . = ALIGN(PAGE_SIZE);
19757+#endif
19758+
19759 /* Start of data section */
19760 _sdata = .;
19761
19762 /* init_task */
19763 INIT_TASK_DATA(THREAD_SIZE)
19764
19765-#ifdef CONFIG_X86_32
19766- /* 32 bit has nosave before _edata */
19767 NOSAVE_DATA
19768-#endif
19769
19770 PAGE_ALIGNED_DATA(PAGE_SIZE)
19771
19772@@ -176,12 +234,19 @@ SECTIONS
19773 #endif /* CONFIG_X86_64 */
19774
19775 /* Init code and data - will be freed after init */
19776- . = ALIGN(PAGE_SIZE);
19777 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
19778+ BYTE(0)
19779+
19780+#ifdef CONFIG_PAX_KERNEXEC
19781+ . = ALIGN(HPAGE_SIZE);
19782+#else
19783+ . = ALIGN(PAGE_SIZE);
19784+#endif
19785+
19786 __init_begin = .; /* paired with __init_end */
19787- }
19788+ } :init.begin
19789
19790-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
19791+#ifdef CONFIG_SMP
19792 /*
19793 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
19794 * output PHDR, so the next output section - .init.text - should
19795@@ -190,12 +255,27 @@ SECTIONS
19796 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
19797 #endif
19798
19799- INIT_TEXT_SECTION(PAGE_SIZE)
19800-#ifdef CONFIG_X86_64
19801- :init
19802-#endif
19803+ . = ALIGN(PAGE_SIZE);
19804+ init_begin = .;
19805+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
19806+ VMLINUX_SYMBOL(_sinittext) = .;
19807+ INIT_TEXT
19808+ VMLINUX_SYMBOL(_einittext) = .;
19809+ . = ALIGN(PAGE_SIZE);
19810+ } :text.init
19811
19812- INIT_DATA_SECTION(16)
19813+ /*
19814+ * .exit.text is discard at runtime, not link time, to deal with
19815+ * references from .altinstructions and .eh_frame
19816+ */
19817+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
19818+ EXIT_TEXT
19819+ . = ALIGN(16);
19820+ } :text.exit
19821+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
19822+
19823+ . = ALIGN(PAGE_SIZE);
19824+ INIT_DATA_SECTION(16) :init
19825
19826 /*
19827 * Code and data for a variety of lowlevel trampolines, to be
19828@@ -269,19 +349,12 @@ SECTIONS
19829 }
19830
19831 . = ALIGN(8);
19832- /*
19833- * .exit.text is discard at runtime, not link time, to deal with
19834- * references from .altinstructions and .eh_frame
19835- */
19836- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
19837- EXIT_TEXT
19838- }
19839
19840 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
19841 EXIT_DATA
19842 }
19843
19844-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
19845+#ifndef CONFIG_SMP
19846 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
19847 #endif
19848
19849@@ -300,16 +373,10 @@ SECTIONS
19850 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
19851 __smp_locks = .;
19852 *(.smp_locks)
19853- . = ALIGN(PAGE_SIZE);
19854 __smp_locks_end = .;
19855+ . = ALIGN(PAGE_SIZE);
19856 }
19857
19858-#ifdef CONFIG_X86_64
19859- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
19860- NOSAVE_DATA
19861- }
19862-#endif
19863-
19864 /* BSS */
19865 . = ALIGN(PAGE_SIZE);
19866 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
19867@@ -325,6 +392,7 @@ SECTIONS
19868 __brk_base = .;
19869 . += 64 * 1024; /* 64k alignment slop space */
19870 *(.brk_reservation) /* areas brk users have reserved */
19871+ . = ALIGN(HPAGE_SIZE);
19872 __brk_limit = .;
19873 }
19874
19875@@ -351,13 +419,12 @@ SECTIONS
19876 * for the boot processor.
19877 */
19878 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
19879-INIT_PER_CPU(gdt_page);
19880 INIT_PER_CPU(irq_stack_union);
19881
19882 /*
19883 * Build-time check on the image size:
19884 */
19885-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
19886+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
19887 "kernel image bigger than KERNEL_IMAGE_SIZE");
19888
19889 #ifdef CONFIG_SMP
19890diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
19891index b07ba93..a212969 100644
19892--- a/arch/x86/kernel/vsyscall_64.c
19893+++ b/arch/x86/kernel/vsyscall_64.c
19894@@ -57,15 +57,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
19895 .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
19896 };
19897
19898-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
19899+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
19900
19901 static int __init vsyscall_setup(char *str)
19902 {
19903 if (str) {
19904 if (!strcmp("emulate", str))
19905 vsyscall_mode = EMULATE;
19906- else if (!strcmp("native", str))
19907- vsyscall_mode = NATIVE;
19908 else if (!strcmp("none", str))
19909 vsyscall_mode = NONE;
19910 else
19911@@ -207,7 +205,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
19912
19913 tsk = current;
19914 if (seccomp_mode(&tsk->seccomp))
19915- do_exit(SIGKILL);
19916+ do_group_exit(SIGKILL);
19917
19918 /*
19919 * With a real vsyscall, page faults cause SIGSEGV. We want to
19920@@ -279,8 +277,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
19921 return true;
19922
19923 sigsegv:
19924- force_sig(SIGSEGV, current);
19925- return true;
19926+ do_group_exit(SIGKILL);
19927 }
19928
19929 /*
19930@@ -333,10 +330,7 @@ void __init map_vsyscall(void)
19931 extern char __vvar_page;
19932 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
19933
19934- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
19935- vsyscall_mode == NATIVE
19936- ? PAGE_KERNEL_VSYSCALL
19937- : PAGE_KERNEL_VVAR);
19938+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
19939 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
19940 (unsigned long)VSYSCALL_START);
19941
19942diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
19943index 9796c2f..f686fbf 100644
19944--- a/arch/x86/kernel/x8664_ksyms_64.c
19945+++ b/arch/x86/kernel/x8664_ksyms_64.c
19946@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
19947 EXPORT_SYMBOL(copy_user_generic_string);
19948 EXPORT_SYMBOL(copy_user_generic_unrolled);
19949 EXPORT_SYMBOL(__copy_user_nocache);
19950-EXPORT_SYMBOL(_copy_from_user);
19951-EXPORT_SYMBOL(_copy_to_user);
19952
19953 EXPORT_SYMBOL(copy_page);
19954 EXPORT_SYMBOL(clear_page);
19955diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
19956index 7110911..e8cdee5 100644
19957--- a/arch/x86/kernel/xsave.c
19958+++ b/arch/x86/kernel/xsave.c
19959@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
19960 fx_sw_user->xstate_size > fx_sw_user->extended_size)
19961 return -EINVAL;
19962
19963- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
19964+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
19965 fx_sw_user->extended_size -
19966 FP_XSTATE_MAGIC2_SIZE));
19967 if (err)
19968@@ -266,7 +266,7 @@ fx_only:
19969 * the other extended state.
19970 */
19971 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
19972- return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
19973+ return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
19974 }
19975
19976 /*
19977@@ -295,7 +295,7 @@ int restore_i387_xstate(void __user *buf)
19978 if (use_xsave())
19979 err = restore_user_xstate(buf);
19980 else
19981- err = fxrstor_checking((__force struct i387_fxsave_struct *)
19982+ err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
19983 buf);
19984 if (unlikely(err)) {
19985 /*
19986diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
19987index 89b02bf..0f6511d 100644
19988--- a/arch/x86/kvm/cpuid.c
19989+++ b/arch/x86/kvm/cpuid.c
19990@@ -124,15 +124,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
19991 struct kvm_cpuid2 *cpuid,
19992 struct kvm_cpuid_entry2 __user *entries)
19993 {
19994- int r;
19995+ int r, i;
19996
19997 r = -E2BIG;
19998 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
19999 goto out;
20000 r = -EFAULT;
20001- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
20002- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20003+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20004 goto out;
20005+ for (i = 0; i < cpuid->nent; ++i) {
20006+ struct kvm_cpuid_entry2 cpuid_entry;
20007+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
20008+ goto out;
20009+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
20010+ }
20011 vcpu->arch.cpuid_nent = cpuid->nent;
20012 kvm_apic_set_version(vcpu);
20013 kvm_x86_ops->cpuid_update(vcpu);
20014@@ -147,15 +152,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
20015 struct kvm_cpuid2 *cpuid,
20016 struct kvm_cpuid_entry2 __user *entries)
20017 {
20018- int r;
20019+ int r, i;
20020
20021 r = -E2BIG;
20022 if (cpuid->nent < vcpu->arch.cpuid_nent)
20023 goto out;
20024 r = -EFAULT;
20025- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
20026- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20027+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20028 goto out;
20029+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
20030+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
20031+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
20032+ goto out;
20033+ }
20034 return 0;
20035
20036 out:
20037diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
20038index 0982507..7f6d72f 100644
20039--- a/arch/x86/kvm/emulate.c
20040+++ b/arch/x86/kvm/emulate.c
20041@@ -250,6 +250,7 @@ struct gprefix {
20042
20043 #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
20044 do { \
20045+ unsigned long _tmp; \
20046 __asm__ __volatile__ ( \
20047 _PRE_EFLAGS("0", "4", "2") \
20048 _op _suffix " %"_x"3,%1; " \
20049@@ -264,8 +265,6 @@ struct gprefix {
20050 /* Raw emulation: instruction has two explicit operands. */
20051 #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
20052 do { \
20053- unsigned long _tmp; \
20054- \
20055 switch ((ctxt)->dst.bytes) { \
20056 case 2: \
20057 ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
20058@@ -281,7 +280,6 @@ struct gprefix {
20059
20060 #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
20061 do { \
20062- unsigned long _tmp; \
20063 switch ((ctxt)->dst.bytes) { \
20064 case 1: \
20065 ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
20066diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
20067index cfdc6e0..ab92e84 100644
20068--- a/arch/x86/kvm/lapic.c
20069+++ b/arch/x86/kvm/lapic.c
20070@@ -54,7 +54,7 @@
20071 #define APIC_BUS_CYCLE_NS 1
20072
20073 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
20074-#define apic_debug(fmt, arg...)
20075+#define apic_debug(fmt, arg...) do {} while (0)
20076
20077 #define APIC_LVT_NUM 6
20078 /* 14 is the version for Xeon and Pentium 8.4.8*/
20079diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
20080index 1561028..0ed7f14 100644
20081--- a/arch/x86/kvm/paging_tmpl.h
20082+++ b/arch/x86/kvm/paging_tmpl.h
20083@@ -197,7 +197,7 @@ retry_walk:
20084 if (unlikely(kvm_is_error_hva(host_addr)))
20085 goto error;
20086
20087- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
20088+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
20089 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
20090 goto error;
20091
20092diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
20093index e385214..f8df033 100644
20094--- a/arch/x86/kvm/svm.c
20095+++ b/arch/x86/kvm/svm.c
20096@@ -3420,7 +3420,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
20097 int cpu = raw_smp_processor_id();
20098
20099 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
20100+
20101+ pax_open_kernel();
20102 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
20103+ pax_close_kernel();
20104+
20105 load_TR_desc();
20106 }
20107
20108@@ -3798,6 +3802,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
20109 #endif
20110 #endif
20111
20112+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20113+ __set_fs(current_thread_info()->addr_limit);
20114+#endif
20115+
20116 reload_tss(vcpu);
20117
20118 local_irq_disable();
20119diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
20120index 3b4c8d8..f457b63 100644
20121--- a/arch/x86/kvm/vmx.c
20122+++ b/arch/x86/kvm/vmx.c
20123@@ -1306,7 +1306,11 @@ static void reload_tss(void)
20124 struct desc_struct *descs;
20125
20126 descs = (void *)gdt->address;
20127+
20128+ pax_open_kernel();
20129 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
20130+ pax_close_kernel();
20131+
20132 load_TR_desc();
20133 }
20134
20135@@ -2631,8 +2635,11 @@ static __init int hardware_setup(void)
20136 if (!cpu_has_vmx_flexpriority())
20137 flexpriority_enabled = 0;
20138
20139- if (!cpu_has_vmx_tpr_shadow())
20140- kvm_x86_ops->update_cr8_intercept = NULL;
20141+ if (!cpu_has_vmx_tpr_shadow()) {
20142+ pax_open_kernel();
20143+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
20144+ pax_close_kernel();
20145+ }
20146
20147 if (enable_ept && !cpu_has_vmx_ept_2m_page())
20148 kvm_disable_largepages();
20149@@ -3648,7 +3655,7 @@ static void vmx_set_constant_host_state(void)
20150 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
20151
20152 asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
20153- vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
20154+ vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
20155
20156 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
20157 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
20158@@ -6184,6 +6191,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20159 "jmp .Lkvm_vmx_return \n\t"
20160 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
20161 ".Lkvm_vmx_return: "
20162+
20163+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20164+ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
20165+ ".Lkvm_vmx_return2: "
20166+#endif
20167+
20168 /* Save guest registers, load host registers, keep flags */
20169 "mov %0, %c[wordsize](%%"R"sp) \n\t"
20170 "pop %0 \n\t"
20171@@ -6232,6 +6245,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20172 #endif
20173 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
20174 [wordsize]"i"(sizeof(ulong))
20175+
20176+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20177+ ,[cs]"i"(__KERNEL_CS)
20178+#endif
20179+
20180 : "cc", "memory"
20181 , R"ax", R"bx", R"di", R"si"
20182 #ifdef CONFIG_X86_64
20183@@ -6260,7 +6278,16 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20184 }
20185 }
20186
20187- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
20188+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
20189+
20190+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20191+ loadsegment(fs, __KERNEL_PERCPU);
20192+#endif
20193+
20194+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20195+ __set_fs(current_thread_info()->addr_limit);
20196+#endif
20197+
20198 vmx->loaded_vmcs->launched = 1;
20199
20200 vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
20201diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
20202index 9cbfc06..943ffa6 100644
20203--- a/arch/x86/kvm/x86.c
20204+++ b/arch/x86/kvm/x86.c
20205@@ -873,6 +873,7 @@ static int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data)
20206 return kvm_set_msr(vcpu, index, *data);
20207 }
20208
20209+static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) __size_overflow(2);
20210 static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
20211 {
20212 int version;
20213@@ -1307,12 +1308,13 @@ static int set_msr_mce(struct kvm_vcpu *vcpu, u32 msr, u64 data)
20214 return 0;
20215 }
20216
20217+static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data) __size_overflow(2);
20218 static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
20219 {
20220 struct kvm *kvm = vcpu->kvm;
20221 int lm = is_long_mode(vcpu);
20222- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20223- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20224+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20225+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20226 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
20227 : kvm->arch.xen_hvm_config.blob_size_32;
20228 u32 page_num = data & ~PAGE_MASK;
20229@@ -2145,6 +2147,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
20230 if (n < msr_list.nmsrs)
20231 goto out;
20232 r = -EFAULT;
20233+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
20234+ goto out;
20235 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
20236 num_msrs_to_save * sizeof(u32)))
20237 goto out;
20238@@ -2266,7 +2270,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
20239 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
20240 struct kvm_interrupt *irq)
20241 {
20242- if (irq->irq < 0 || irq->irq >= 256)
20243+ if (irq->irq >= 256)
20244 return -EINVAL;
20245 if (irqchip_in_kernel(vcpu->kvm))
20246 return -ENXIO;
20247@@ -3497,6 +3501,9 @@ gpa_t kvm_mmu_gva_to_gpa_system(struct kvm_vcpu *vcpu, gva_t gva,
20248
20249 static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
20250 struct kvm_vcpu *vcpu, u32 access,
20251+ struct x86_exception *exception) __size_overflow(1,3);
20252+static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
20253+ struct kvm_vcpu *vcpu, u32 access,
20254 struct x86_exception *exception)
20255 {
20256 void *data = val;
20257@@ -3528,6 +3535,9 @@ out:
20258 /* used for instruction fetching */
20259 static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
20260 gva_t addr, void *val, unsigned int bytes,
20261+ struct x86_exception *exception) __size_overflow(2,4);
20262+static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
20263+ gva_t addr, void *val, unsigned int bytes,
20264 struct x86_exception *exception)
20265 {
20266 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20267@@ -3552,6 +3562,9 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_virt);
20268
20269 static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20270 gva_t addr, void *val, unsigned int bytes,
20271+ struct x86_exception *exception) __size_overflow(2,4);
20272+static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20273+ gva_t addr, void *val, unsigned int bytes,
20274 struct x86_exception *exception)
20275 {
20276 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20277@@ -3665,12 +3678,16 @@ static int read_prepare(struct kvm_vcpu *vcpu, void *val, int bytes)
20278 }
20279
20280 static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20281+ void *val, int bytes) __size_overflow(2);
20282+static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20283 void *val, int bytes)
20284 {
20285 return !kvm_read_guest(vcpu->kvm, gpa, val, bytes);
20286 }
20287
20288 static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20289+ void *val, int bytes) __size_overflow(2);
20290+static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20291 void *val, int bytes)
20292 {
20293 return emulator_write_phys(vcpu, gpa, val, bytes);
20294@@ -3821,6 +3838,12 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
20295 const void *old,
20296 const void *new,
20297 unsigned int bytes,
20298+ struct x86_exception *exception) __size_overflow(5);
20299+static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
20300+ unsigned long addr,
20301+ const void *old,
20302+ const void *new,
20303+ unsigned int bytes,
20304 struct x86_exception *exception)
20305 {
20306 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20307@@ -4780,7 +4803,7 @@ static void kvm_set_mmio_spte_mask(void)
20308 kvm_mmu_set_mmio_spte_mask(mask);
20309 }
20310
20311-int kvm_arch_init(void *opaque)
20312+int kvm_arch_init(const void *opaque)
20313 {
20314 int r;
20315 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
20316diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
20317index cb80c29..aeee86c 100644
20318--- a/arch/x86/kvm/x86.h
20319+++ b/arch/x86/kvm/x86.h
20320@@ -116,11 +116,11 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data);
20321
20322 int kvm_read_guest_virt(struct x86_emulate_ctxt *ctxt,
20323 gva_t addr, void *val, unsigned int bytes,
20324- struct x86_exception *exception);
20325+ struct x86_exception *exception) __size_overflow(2,4);
20326
20327 int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20328 gva_t addr, void *val, unsigned int bytes,
20329- struct x86_exception *exception);
20330+ struct x86_exception *exception) __size_overflow(2,4);
20331
20332 extern u64 host_xcr0;
20333
20334diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
20335index 642d880..44e0f3f 100644
20336--- a/arch/x86/lguest/boot.c
20337+++ b/arch/x86/lguest/boot.c
20338@@ -1200,9 +1200,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
20339 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
20340 * Launcher to reboot us.
20341 */
20342-static void lguest_restart(char *reason)
20343+static __noreturn void lguest_restart(char *reason)
20344 {
20345 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
20346+ BUG();
20347 }
20348
20349 /*G:050
20350diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
20351index 042f682..c92afb6 100644
20352--- a/arch/x86/lib/atomic64_32.c
20353+++ b/arch/x86/lib/atomic64_32.c
20354@@ -8,18 +8,30 @@
20355
20356 long long atomic64_read_cx8(long long, const atomic64_t *v);
20357 EXPORT_SYMBOL(atomic64_read_cx8);
20358+long long atomic64_read_unchecked_cx8(long long, const atomic64_unchecked_t *v);
20359+EXPORT_SYMBOL(atomic64_read_unchecked_cx8);
20360 long long atomic64_set_cx8(long long, const atomic64_t *v);
20361 EXPORT_SYMBOL(atomic64_set_cx8);
20362+long long atomic64_set_unchecked_cx8(long long, const atomic64_unchecked_t *v);
20363+EXPORT_SYMBOL(atomic64_set_unchecked_cx8);
20364 long long atomic64_xchg_cx8(long long, unsigned high);
20365 EXPORT_SYMBOL(atomic64_xchg_cx8);
20366 long long atomic64_add_return_cx8(long long a, atomic64_t *v);
20367 EXPORT_SYMBOL(atomic64_add_return_cx8);
20368+long long atomic64_add_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20369+EXPORT_SYMBOL(atomic64_add_return_unchecked_cx8);
20370 long long atomic64_sub_return_cx8(long long a, atomic64_t *v);
20371 EXPORT_SYMBOL(atomic64_sub_return_cx8);
20372+long long atomic64_sub_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20373+EXPORT_SYMBOL(atomic64_sub_return_unchecked_cx8);
20374 long long atomic64_inc_return_cx8(long long a, atomic64_t *v);
20375 EXPORT_SYMBOL(atomic64_inc_return_cx8);
20376+long long atomic64_inc_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20377+EXPORT_SYMBOL(atomic64_inc_return_unchecked_cx8);
20378 long long atomic64_dec_return_cx8(long long a, atomic64_t *v);
20379 EXPORT_SYMBOL(atomic64_dec_return_cx8);
20380+long long atomic64_dec_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20381+EXPORT_SYMBOL(atomic64_dec_return_unchecked_cx8);
20382 long long atomic64_dec_if_positive_cx8(atomic64_t *v);
20383 EXPORT_SYMBOL(atomic64_dec_if_positive_cx8);
20384 int atomic64_inc_not_zero_cx8(atomic64_t *v);
20385@@ -30,26 +42,46 @@ EXPORT_SYMBOL(atomic64_add_unless_cx8);
20386 #ifndef CONFIG_X86_CMPXCHG64
20387 long long atomic64_read_386(long long, const atomic64_t *v);
20388 EXPORT_SYMBOL(atomic64_read_386);
20389+long long atomic64_read_unchecked_386(long long, const atomic64_unchecked_t *v);
20390+EXPORT_SYMBOL(atomic64_read_unchecked_386);
20391 long long atomic64_set_386(long long, const atomic64_t *v);
20392 EXPORT_SYMBOL(atomic64_set_386);
20393+long long atomic64_set_unchecked_386(long long, const atomic64_unchecked_t *v);
20394+EXPORT_SYMBOL(atomic64_set_unchecked_386);
20395 long long atomic64_xchg_386(long long, unsigned high);
20396 EXPORT_SYMBOL(atomic64_xchg_386);
20397 long long atomic64_add_return_386(long long a, atomic64_t *v);
20398 EXPORT_SYMBOL(atomic64_add_return_386);
20399+long long atomic64_add_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20400+EXPORT_SYMBOL(atomic64_add_return_unchecked_386);
20401 long long atomic64_sub_return_386(long long a, atomic64_t *v);
20402 EXPORT_SYMBOL(atomic64_sub_return_386);
20403+long long atomic64_sub_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20404+EXPORT_SYMBOL(atomic64_sub_return_unchecked_386);
20405 long long atomic64_inc_return_386(long long a, atomic64_t *v);
20406 EXPORT_SYMBOL(atomic64_inc_return_386);
20407+long long atomic64_inc_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20408+EXPORT_SYMBOL(atomic64_inc_return_unchecked_386);
20409 long long atomic64_dec_return_386(long long a, atomic64_t *v);
20410 EXPORT_SYMBOL(atomic64_dec_return_386);
20411+long long atomic64_dec_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20412+EXPORT_SYMBOL(atomic64_dec_return_unchecked_386);
20413 long long atomic64_add_386(long long a, atomic64_t *v);
20414 EXPORT_SYMBOL(atomic64_add_386);
20415+long long atomic64_add_unchecked_386(long long a, atomic64_unchecked_t *v);
20416+EXPORT_SYMBOL(atomic64_add_unchecked_386);
20417 long long atomic64_sub_386(long long a, atomic64_t *v);
20418 EXPORT_SYMBOL(atomic64_sub_386);
20419+long long atomic64_sub_unchecked_386(long long a, atomic64_unchecked_t *v);
20420+EXPORT_SYMBOL(atomic64_sub_unchecked_386);
20421 long long atomic64_inc_386(long long a, atomic64_t *v);
20422 EXPORT_SYMBOL(atomic64_inc_386);
20423+long long atomic64_inc_unchecked_386(long long a, atomic64_unchecked_t *v);
20424+EXPORT_SYMBOL(atomic64_inc_unchecked_386);
20425 long long atomic64_dec_386(long long a, atomic64_t *v);
20426 EXPORT_SYMBOL(atomic64_dec_386);
20427+long long atomic64_dec_unchecked_386(long long a, atomic64_unchecked_t *v);
20428+EXPORT_SYMBOL(atomic64_dec_unchecked_386);
20429 long long atomic64_dec_if_positive_386(atomic64_t *v);
20430 EXPORT_SYMBOL(atomic64_dec_if_positive_386);
20431 int atomic64_inc_not_zero_386(atomic64_t *v);
20432diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
20433index e8e7e0d..56fd1b0 100644
20434--- a/arch/x86/lib/atomic64_386_32.S
20435+++ b/arch/x86/lib/atomic64_386_32.S
20436@@ -48,6 +48,10 @@ BEGIN(read)
20437 movl (v), %eax
20438 movl 4(v), %edx
20439 RET_ENDP
20440+BEGIN(read_unchecked)
20441+ movl (v), %eax
20442+ movl 4(v), %edx
20443+RET_ENDP
20444 #undef v
20445
20446 #define v %esi
20447@@ -55,6 +59,10 @@ BEGIN(set)
20448 movl %ebx, (v)
20449 movl %ecx, 4(v)
20450 RET_ENDP
20451+BEGIN(set_unchecked)
20452+ movl %ebx, (v)
20453+ movl %ecx, 4(v)
20454+RET_ENDP
20455 #undef v
20456
20457 #define v %esi
20458@@ -70,6 +78,20 @@ RET_ENDP
20459 BEGIN(add)
20460 addl %eax, (v)
20461 adcl %edx, 4(v)
20462+
20463+#ifdef CONFIG_PAX_REFCOUNT
20464+ jno 0f
20465+ subl %eax, (v)
20466+ sbbl %edx, 4(v)
20467+ int $4
20468+0:
20469+ _ASM_EXTABLE(0b, 0b)
20470+#endif
20471+
20472+RET_ENDP
20473+BEGIN(add_unchecked)
20474+ addl %eax, (v)
20475+ adcl %edx, 4(v)
20476 RET_ENDP
20477 #undef v
20478
20479@@ -77,6 +99,24 @@ RET_ENDP
20480 BEGIN(add_return)
20481 addl (v), %eax
20482 adcl 4(v), %edx
20483+
20484+#ifdef CONFIG_PAX_REFCOUNT
20485+ into
20486+1234:
20487+ _ASM_EXTABLE(1234b, 2f)
20488+#endif
20489+
20490+ movl %eax, (v)
20491+ movl %edx, 4(v)
20492+
20493+#ifdef CONFIG_PAX_REFCOUNT
20494+2:
20495+#endif
20496+
20497+RET_ENDP
20498+BEGIN(add_return_unchecked)
20499+ addl (v), %eax
20500+ adcl 4(v), %edx
20501 movl %eax, (v)
20502 movl %edx, 4(v)
20503 RET_ENDP
20504@@ -86,6 +126,20 @@ RET_ENDP
20505 BEGIN(sub)
20506 subl %eax, (v)
20507 sbbl %edx, 4(v)
20508+
20509+#ifdef CONFIG_PAX_REFCOUNT
20510+ jno 0f
20511+ addl %eax, (v)
20512+ adcl %edx, 4(v)
20513+ int $4
20514+0:
20515+ _ASM_EXTABLE(0b, 0b)
20516+#endif
20517+
20518+RET_ENDP
20519+BEGIN(sub_unchecked)
20520+ subl %eax, (v)
20521+ sbbl %edx, 4(v)
20522 RET_ENDP
20523 #undef v
20524
20525@@ -96,6 +150,27 @@ BEGIN(sub_return)
20526 sbbl $0, %edx
20527 addl (v), %eax
20528 adcl 4(v), %edx
20529+
20530+#ifdef CONFIG_PAX_REFCOUNT
20531+ into
20532+1234:
20533+ _ASM_EXTABLE(1234b, 2f)
20534+#endif
20535+
20536+ movl %eax, (v)
20537+ movl %edx, 4(v)
20538+
20539+#ifdef CONFIG_PAX_REFCOUNT
20540+2:
20541+#endif
20542+
20543+RET_ENDP
20544+BEGIN(sub_return_unchecked)
20545+ negl %edx
20546+ negl %eax
20547+ sbbl $0, %edx
20548+ addl (v), %eax
20549+ adcl 4(v), %edx
20550 movl %eax, (v)
20551 movl %edx, 4(v)
20552 RET_ENDP
20553@@ -105,6 +180,20 @@ RET_ENDP
20554 BEGIN(inc)
20555 addl $1, (v)
20556 adcl $0, 4(v)
20557+
20558+#ifdef CONFIG_PAX_REFCOUNT
20559+ jno 0f
20560+ subl $1, (v)
20561+ sbbl $0, 4(v)
20562+ int $4
20563+0:
20564+ _ASM_EXTABLE(0b, 0b)
20565+#endif
20566+
20567+RET_ENDP
20568+BEGIN(inc_unchecked)
20569+ addl $1, (v)
20570+ adcl $0, 4(v)
20571 RET_ENDP
20572 #undef v
20573
20574@@ -114,6 +203,26 @@ BEGIN(inc_return)
20575 movl 4(v), %edx
20576 addl $1, %eax
20577 adcl $0, %edx
20578+
20579+#ifdef CONFIG_PAX_REFCOUNT
20580+ into
20581+1234:
20582+ _ASM_EXTABLE(1234b, 2f)
20583+#endif
20584+
20585+ movl %eax, (v)
20586+ movl %edx, 4(v)
20587+
20588+#ifdef CONFIG_PAX_REFCOUNT
20589+2:
20590+#endif
20591+
20592+RET_ENDP
20593+BEGIN(inc_return_unchecked)
20594+ movl (v), %eax
20595+ movl 4(v), %edx
20596+ addl $1, %eax
20597+ adcl $0, %edx
20598 movl %eax, (v)
20599 movl %edx, 4(v)
20600 RET_ENDP
20601@@ -123,6 +232,20 @@ RET_ENDP
20602 BEGIN(dec)
20603 subl $1, (v)
20604 sbbl $0, 4(v)
20605+
20606+#ifdef CONFIG_PAX_REFCOUNT
20607+ jno 0f
20608+ addl $1, (v)
20609+ adcl $0, 4(v)
20610+ int $4
20611+0:
20612+ _ASM_EXTABLE(0b, 0b)
20613+#endif
20614+
20615+RET_ENDP
20616+BEGIN(dec_unchecked)
20617+ subl $1, (v)
20618+ sbbl $0, 4(v)
20619 RET_ENDP
20620 #undef v
20621
20622@@ -132,6 +255,26 @@ BEGIN(dec_return)
20623 movl 4(v), %edx
20624 subl $1, %eax
20625 sbbl $0, %edx
20626+
20627+#ifdef CONFIG_PAX_REFCOUNT
20628+ into
20629+1234:
20630+ _ASM_EXTABLE(1234b, 2f)
20631+#endif
20632+
20633+ movl %eax, (v)
20634+ movl %edx, 4(v)
20635+
20636+#ifdef CONFIG_PAX_REFCOUNT
20637+2:
20638+#endif
20639+
20640+RET_ENDP
20641+BEGIN(dec_return_unchecked)
20642+ movl (v), %eax
20643+ movl 4(v), %edx
20644+ subl $1, %eax
20645+ sbbl $0, %edx
20646 movl %eax, (v)
20647 movl %edx, 4(v)
20648 RET_ENDP
20649@@ -143,6 +286,13 @@ BEGIN(add_unless)
20650 adcl %edx, %edi
20651 addl (v), %eax
20652 adcl 4(v), %edx
20653+
20654+#ifdef CONFIG_PAX_REFCOUNT
20655+ into
20656+1234:
20657+ _ASM_EXTABLE(1234b, 2f)
20658+#endif
20659+
20660 cmpl %eax, %esi
20661 je 3f
20662 1:
20663@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
20664 1:
20665 addl $1, %eax
20666 adcl $0, %edx
20667+
20668+#ifdef CONFIG_PAX_REFCOUNT
20669+ into
20670+1234:
20671+ _ASM_EXTABLE(1234b, 2f)
20672+#endif
20673+
20674 movl %eax, (v)
20675 movl %edx, 4(v)
20676 movl $1, %eax
20677@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
20678 movl 4(v), %edx
20679 subl $1, %eax
20680 sbbl $0, %edx
20681+
20682+#ifdef CONFIG_PAX_REFCOUNT
20683+ into
20684+1234:
20685+ _ASM_EXTABLE(1234b, 1f)
20686+#endif
20687+
20688 js 1f
20689 movl %eax, (v)
20690 movl %edx, 4(v)
20691diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
20692index 391a083..d658e9f 100644
20693--- a/arch/x86/lib/atomic64_cx8_32.S
20694+++ b/arch/x86/lib/atomic64_cx8_32.S
20695@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
20696 CFI_STARTPROC
20697
20698 read64 %ecx
20699+ pax_force_retaddr
20700 ret
20701 CFI_ENDPROC
20702 ENDPROC(atomic64_read_cx8)
20703
20704+ENTRY(atomic64_read_unchecked_cx8)
20705+ CFI_STARTPROC
20706+
20707+ read64 %ecx
20708+ pax_force_retaddr
20709+ ret
20710+ CFI_ENDPROC
20711+ENDPROC(atomic64_read_unchecked_cx8)
20712+
20713 ENTRY(atomic64_set_cx8)
20714 CFI_STARTPROC
20715
20716@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
20717 cmpxchg8b (%esi)
20718 jne 1b
20719
20720+ pax_force_retaddr
20721 ret
20722 CFI_ENDPROC
20723 ENDPROC(atomic64_set_cx8)
20724
20725+ENTRY(atomic64_set_unchecked_cx8)
20726+ CFI_STARTPROC
20727+
20728+1:
20729+/* we don't need LOCK_PREFIX since aligned 64-bit writes
20730+ * are atomic on 586 and newer */
20731+ cmpxchg8b (%esi)
20732+ jne 1b
20733+
20734+ pax_force_retaddr
20735+ ret
20736+ CFI_ENDPROC
20737+ENDPROC(atomic64_set_unchecked_cx8)
20738+
20739 ENTRY(atomic64_xchg_cx8)
20740 CFI_STARTPROC
20741
20742@@ -62,12 +87,13 @@ ENTRY(atomic64_xchg_cx8)
20743 cmpxchg8b (%esi)
20744 jne 1b
20745
20746+ pax_force_retaddr
20747 ret
20748 CFI_ENDPROC
20749 ENDPROC(atomic64_xchg_cx8)
20750
20751-.macro addsub_return func ins insc
20752-ENTRY(atomic64_\func\()_return_cx8)
20753+.macro addsub_return func ins insc unchecked=""
20754+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20755 CFI_STARTPROC
20756 SAVE ebp
20757 SAVE ebx
20758@@ -84,27 +110,44 @@ ENTRY(atomic64_\func\()_return_cx8)
20759 movl %edx, %ecx
20760 \ins\()l %esi, %ebx
20761 \insc\()l %edi, %ecx
20762+
20763+.ifb \unchecked
20764+#ifdef CONFIG_PAX_REFCOUNT
20765+ into
20766+2:
20767+ _ASM_EXTABLE(2b, 3f)
20768+#endif
20769+.endif
20770+
20771 LOCK_PREFIX
20772 cmpxchg8b (%ebp)
20773 jne 1b
20774-
20775-10:
20776 movl %ebx, %eax
20777 movl %ecx, %edx
20778+
20779+.ifb \unchecked
20780+#ifdef CONFIG_PAX_REFCOUNT
20781+3:
20782+#endif
20783+.endif
20784+
20785 RESTORE edi
20786 RESTORE esi
20787 RESTORE ebx
20788 RESTORE ebp
20789+ pax_force_retaddr
20790 ret
20791 CFI_ENDPROC
20792-ENDPROC(atomic64_\func\()_return_cx8)
20793+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
20794 .endm
20795
20796 addsub_return add add adc
20797 addsub_return sub sub sbb
20798+addsub_return add add adc _unchecked
20799+addsub_return sub sub sbb _unchecked
20800
20801-.macro incdec_return func ins insc
20802-ENTRY(atomic64_\func\()_return_cx8)
20803+.macro incdec_return func ins insc unchecked
20804+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20805 CFI_STARTPROC
20806 SAVE ebx
20807
20808@@ -114,21 +157,39 @@ ENTRY(atomic64_\func\()_return_cx8)
20809 movl %edx, %ecx
20810 \ins\()l $1, %ebx
20811 \insc\()l $0, %ecx
20812+
20813+.ifb \unchecked
20814+#ifdef CONFIG_PAX_REFCOUNT
20815+ into
20816+2:
20817+ _ASM_EXTABLE(2b, 3f)
20818+#endif
20819+.endif
20820+
20821 LOCK_PREFIX
20822 cmpxchg8b (%esi)
20823 jne 1b
20824
20825-10:
20826 movl %ebx, %eax
20827 movl %ecx, %edx
20828+
20829+.ifb \unchecked
20830+#ifdef CONFIG_PAX_REFCOUNT
20831+3:
20832+#endif
20833+.endif
20834+
20835 RESTORE ebx
20836+ pax_force_retaddr
20837 ret
20838 CFI_ENDPROC
20839-ENDPROC(atomic64_\func\()_return_cx8)
20840+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
20841 .endm
20842
20843 incdec_return inc add adc
20844 incdec_return dec sub sbb
20845+incdec_return inc add adc _unchecked
20846+incdec_return dec sub sbb _unchecked
20847
20848 ENTRY(atomic64_dec_if_positive_cx8)
20849 CFI_STARTPROC
20850@@ -140,6 +201,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
20851 movl %edx, %ecx
20852 subl $1, %ebx
20853 sbb $0, %ecx
20854+
20855+#ifdef CONFIG_PAX_REFCOUNT
20856+ into
20857+1234:
20858+ _ASM_EXTABLE(1234b, 2f)
20859+#endif
20860+
20861 js 2f
20862 LOCK_PREFIX
20863 cmpxchg8b (%esi)
20864@@ -149,6 +217,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
20865 movl %ebx, %eax
20866 movl %ecx, %edx
20867 RESTORE ebx
20868+ pax_force_retaddr
20869 ret
20870 CFI_ENDPROC
20871 ENDPROC(atomic64_dec_if_positive_cx8)
20872@@ -174,6 +243,13 @@ ENTRY(atomic64_add_unless_cx8)
20873 movl %edx, %ecx
20874 addl %esi, %ebx
20875 adcl %edi, %ecx
20876+
20877+#ifdef CONFIG_PAX_REFCOUNT
20878+ into
20879+1234:
20880+ _ASM_EXTABLE(1234b, 3f)
20881+#endif
20882+
20883 LOCK_PREFIX
20884 cmpxchg8b (%ebp)
20885 jne 1b
20886@@ -184,6 +260,7 @@ ENTRY(atomic64_add_unless_cx8)
20887 CFI_ADJUST_CFA_OFFSET -8
20888 RESTORE ebx
20889 RESTORE ebp
20890+ pax_force_retaddr
20891 ret
20892 4:
20893 cmpl %edx, 4(%esp)
20894@@ -206,6 +283,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
20895 movl %edx, %ecx
20896 addl $1, %ebx
20897 adcl $0, %ecx
20898+
20899+#ifdef CONFIG_PAX_REFCOUNT
20900+ into
20901+1234:
20902+ _ASM_EXTABLE(1234b, 3f)
20903+#endif
20904+
20905 LOCK_PREFIX
20906 cmpxchg8b (%esi)
20907 jne 1b
20908@@ -213,6 +297,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
20909 movl $1, %eax
20910 3:
20911 RESTORE ebx
20912+ pax_force_retaddr
20913 ret
20914 4:
20915 testl %edx, %edx
20916diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
20917index 78d16a5..fbcf666 100644
20918--- a/arch/x86/lib/checksum_32.S
20919+++ b/arch/x86/lib/checksum_32.S
20920@@ -28,7 +28,8 @@
20921 #include <linux/linkage.h>
20922 #include <asm/dwarf2.h>
20923 #include <asm/errno.h>
20924-
20925+#include <asm/segment.h>
20926+
20927 /*
20928 * computes a partial checksum, e.g. for TCP/UDP fragments
20929 */
20930@@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
20931
20932 #define ARGBASE 16
20933 #define FP 12
20934-
20935-ENTRY(csum_partial_copy_generic)
20936+
20937+ENTRY(csum_partial_copy_generic_to_user)
20938 CFI_STARTPROC
20939+
20940+#ifdef CONFIG_PAX_MEMORY_UDEREF
20941+ pushl_cfi %gs
20942+ popl_cfi %es
20943+ jmp csum_partial_copy_generic
20944+#endif
20945+
20946+ENTRY(csum_partial_copy_generic_from_user)
20947+
20948+#ifdef CONFIG_PAX_MEMORY_UDEREF
20949+ pushl_cfi %gs
20950+ popl_cfi %ds
20951+#endif
20952+
20953+ENTRY(csum_partial_copy_generic)
20954 subl $4,%esp
20955 CFI_ADJUST_CFA_OFFSET 4
20956 pushl_cfi %edi
20957@@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic)
20958 jmp 4f
20959 SRC(1: movw (%esi), %bx )
20960 addl $2, %esi
20961-DST( movw %bx, (%edi) )
20962+DST( movw %bx, %es:(%edi) )
20963 addl $2, %edi
20964 addw %bx, %ax
20965 adcl $0, %eax
20966@@ -332,30 +348,30 @@ DST( movw %bx, (%edi) )
20967 SRC(1: movl (%esi), %ebx )
20968 SRC( movl 4(%esi), %edx )
20969 adcl %ebx, %eax
20970-DST( movl %ebx, (%edi) )
20971+DST( movl %ebx, %es:(%edi) )
20972 adcl %edx, %eax
20973-DST( movl %edx, 4(%edi) )
20974+DST( movl %edx, %es:4(%edi) )
20975
20976 SRC( movl 8(%esi), %ebx )
20977 SRC( movl 12(%esi), %edx )
20978 adcl %ebx, %eax
20979-DST( movl %ebx, 8(%edi) )
20980+DST( movl %ebx, %es:8(%edi) )
20981 adcl %edx, %eax
20982-DST( movl %edx, 12(%edi) )
20983+DST( movl %edx, %es:12(%edi) )
20984
20985 SRC( movl 16(%esi), %ebx )
20986 SRC( movl 20(%esi), %edx )
20987 adcl %ebx, %eax
20988-DST( movl %ebx, 16(%edi) )
20989+DST( movl %ebx, %es:16(%edi) )
20990 adcl %edx, %eax
20991-DST( movl %edx, 20(%edi) )
20992+DST( movl %edx, %es:20(%edi) )
20993
20994 SRC( movl 24(%esi), %ebx )
20995 SRC( movl 28(%esi), %edx )
20996 adcl %ebx, %eax
20997-DST( movl %ebx, 24(%edi) )
20998+DST( movl %ebx, %es:24(%edi) )
20999 adcl %edx, %eax
21000-DST( movl %edx, 28(%edi) )
21001+DST( movl %edx, %es:28(%edi) )
21002
21003 lea 32(%esi), %esi
21004 lea 32(%edi), %edi
21005@@ -369,7 +385,7 @@ DST( movl %edx, 28(%edi) )
21006 shrl $2, %edx # This clears CF
21007 SRC(3: movl (%esi), %ebx )
21008 adcl %ebx, %eax
21009-DST( movl %ebx, (%edi) )
21010+DST( movl %ebx, %es:(%edi) )
21011 lea 4(%esi), %esi
21012 lea 4(%edi), %edi
21013 dec %edx
21014@@ -381,12 +397,12 @@ DST( movl %ebx, (%edi) )
21015 jb 5f
21016 SRC( movw (%esi), %cx )
21017 leal 2(%esi), %esi
21018-DST( movw %cx, (%edi) )
21019+DST( movw %cx, %es:(%edi) )
21020 leal 2(%edi), %edi
21021 je 6f
21022 shll $16,%ecx
21023 SRC(5: movb (%esi), %cl )
21024-DST( movb %cl, (%edi) )
21025+DST( movb %cl, %es:(%edi) )
21026 6: addl %ecx, %eax
21027 adcl $0, %eax
21028 7:
21029@@ -397,7 +413,7 @@ DST( movb %cl, (%edi) )
21030
21031 6001:
21032 movl ARGBASE+20(%esp), %ebx # src_err_ptr
21033- movl $-EFAULT, (%ebx)
21034+ movl $-EFAULT, %ss:(%ebx)
21035
21036 # zero the complete destination - computing the rest
21037 # is too much work
21038@@ -410,11 +426,15 @@ DST( movb %cl, (%edi) )
21039
21040 6002:
21041 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21042- movl $-EFAULT,(%ebx)
21043+ movl $-EFAULT,%ss:(%ebx)
21044 jmp 5000b
21045
21046 .previous
21047
21048+ pushl_cfi %ss
21049+ popl_cfi %ds
21050+ pushl_cfi %ss
21051+ popl_cfi %es
21052 popl_cfi %ebx
21053 CFI_RESTORE ebx
21054 popl_cfi %esi
21055@@ -424,26 +444,43 @@ DST( movb %cl, (%edi) )
21056 popl_cfi %ecx # equivalent to addl $4,%esp
21057 ret
21058 CFI_ENDPROC
21059-ENDPROC(csum_partial_copy_generic)
21060+ENDPROC(csum_partial_copy_generic_to_user)
21061
21062 #else
21063
21064 /* Version for PentiumII/PPro */
21065
21066 #define ROUND1(x) \
21067+ nop; nop; nop; \
21068 SRC(movl x(%esi), %ebx ) ; \
21069 addl %ebx, %eax ; \
21070- DST(movl %ebx, x(%edi) ) ;
21071+ DST(movl %ebx, %es:x(%edi)) ;
21072
21073 #define ROUND(x) \
21074+ nop; nop; nop; \
21075 SRC(movl x(%esi), %ebx ) ; \
21076 adcl %ebx, %eax ; \
21077- DST(movl %ebx, x(%edi) ) ;
21078+ DST(movl %ebx, %es:x(%edi)) ;
21079
21080 #define ARGBASE 12
21081-
21082-ENTRY(csum_partial_copy_generic)
21083+
21084+ENTRY(csum_partial_copy_generic_to_user)
21085 CFI_STARTPROC
21086+
21087+#ifdef CONFIG_PAX_MEMORY_UDEREF
21088+ pushl_cfi %gs
21089+ popl_cfi %es
21090+ jmp csum_partial_copy_generic
21091+#endif
21092+
21093+ENTRY(csum_partial_copy_generic_from_user)
21094+
21095+#ifdef CONFIG_PAX_MEMORY_UDEREF
21096+ pushl_cfi %gs
21097+ popl_cfi %ds
21098+#endif
21099+
21100+ENTRY(csum_partial_copy_generic)
21101 pushl_cfi %ebx
21102 CFI_REL_OFFSET ebx, 0
21103 pushl_cfi %edi
21104@@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic)
21105 subl %ebx, %edi
21106 lea -1(%esi),%edx
21107 andl $-32,%edx
21108- lea 3f(%ebx,%ebx), %ebx
21109+ lea 3f(%ebx,%ebx,2), %ebx
21110 testl %esi, %esi
21111 jmp *%ebx
21112 1: addl $64,%esi
21113@@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic)
21114 jb 5f
21115 SRC( movw (%esi), %dx )
21116 leal 2(%esi), %esi
21117-DST( movw %dx, (%edi) )
21118+DST( movw %dx, %es:(%edi) )
21119 leal 2(%edi), %edi
21120 je 6f
21121 shll $16,%edx
21122 5:
21123 SRC( movb (%esi), %dl )
21124-DST( movb %dl, (%edi) )
21125+DST( movb %dl, %es:(%edi) )
21126 6: addl %edx, %eax
21127 adcl $0, %eax
21128 7:
21129 .section .fixup, "ax"
21130 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
21131- movl $-EFAULT, (%ebx)
21132+ movl $-EFAULT, %ss:(%ebx)
21133 # zero the complete destination (computing the rest is too much work)
21134 movl ARGBASE+8(%esp),%edi # dst
21135 movl ARGBASE+12(%esp),%ecx # len
21136@@ -505,10 +542,17 @@ DST( movb %dl, (%edi) )
21137 rep; stosb
21138 jmp 7b
21139 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21140- movl $-EFAULT, (%ebx)
21141+ movl $-EFAULT, %ss:(%ebx)
21142 jmp 7b
21143 .previous
21144
21145+#ifdef CONFIG_PAX_MEMORY_UDEREF
21146+ pushl_cfi %ss
21147+ popl_cfi %ds
21148+ pushl_cfi %ss
21149+ popl_cfi %es
21150+#endif
21151+
21152 popl_cfi %esi
21153 CFI_RESTORE esi
21154 popl_cfi %edi
21155@@ -517,7 +561,7 @@ DST( movb %dl, (%edi) )
21156 CFI_RESTORE ebx
21157 ret
21158 CFI_ENDPROC
21159-ENDPROC(csum_partial_copy_generic)
21160+ENDPROC(csum_partial_copy_generic_to_user)
21161
21162 #undef ROUND
21163 #undef ROUND1
21164diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
21165index f2145cf..cea889d 100644
21166--- a/arch/x86/lib/clear_page_64.S
21167+++ b/arch/x86/lib/clear_page_64.S
21168@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
21169 movl $4096/8,%ecx
21170 xorl %eax,%eax
21171 rep stosq
21172+ pax_force_retaddr
21173 ret
21174 CFI_ENDPROC
21175 ENDPROC(clear_page_c)
21176@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
21177 movl $4096,%ecx
21178 xorl %eax,%eax
21179 rep stosb
21180+ pax_force_retaddr
21181 ret
21182 CFI_ENDPROC
21183 ENDPROC(clear_page_c_e)
21184@@ -43,6 +45,7 @@ ENTRY(clear_page)
21185 leaq 64(%rdi),%rdi
21186 jnz .Lloop
21187 nop
21188+ pax_force_retaddr
21189 ret
21190 CFI_ENDPROC
21191 .Lclear_page_end:
21192@@ -58,7 +61,7 @@ ENDPROC(clear_page)
21193
21194 #include <asm/cpufeature.h>
21195
21196- .section .altinstr_replacement,"ax"
21197+ .section .altinstr_replacement,"a"
21198 1: .byte 0xeb /* jmp <disp8> */
21199 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
21200 2: .byte 0xeb /* jmp <disp8> */
21201diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
21202index 1e572c5..2a162cd 100644
21203--- a/arch/x86/lib/cmpxchg16b_emu.S
21204+++ b/arch/x86/lib/cmpxchg16b_emu.S
21205@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
21206
21207 popf
21208 mov $1, %al
21209+ pax_force_retaddr
21210 ret
21211
21212 not_same:
21213 popf
21214 xor %al,%al
21215+ pax_force_retaddr
21216 ret
21217
21218 CFI_ENDPROC
21219diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
21220index 01c805b..dccb07f 100644
21221--- a/arch/x86/lib/copy_page_64.S
21222+++ b/arch/x86/lib/copy_page_64.S
21223@@ -9,6 +9,7 @@ copy_page_c:
21224 CFI_STARTPROC
21225 movl $4096/8,%ecx
21226 rep movsq
21227+ pax_force_retaddr
21228 ret
21229 CFI_ENDPROC
21230 ENDPROC(copy_page_c)
21231@@ -39,7 +40,7 @@ ENTRY(copy_page)
21232 movq 16 (%rsi), %rdx
21233 movq 24 (%rsi), %r8
21234 movq 32 (%rsi), %r9
21235- movq 40 (%rsi), %r10
21236+ movq 40 (%rsi), %r13
21237 movq 48 (%rsi), %r11
21238 movq 56 (%rsi), %r12
21239
21240@@ -50,7 +51,7 @@ ENTRY(copy_page)
21241 movq %rdx, 16 (%rdi)
21242 movq %r8, 24 (%rdi)
21243 movq %r9, 32 (%rdi)
21244- movq %r10, 40 (%rdi)
21245+ movq %r13, 40 (%rdi)
21246 movq %r11, 48 (%rdi)
21247 movq %r12, 56 (%rdi)
21248
21249@@ -69,7 +70,7 @@ ENTRY(copy_page)
21250 movq 16 (%rsi), %rdx
21251 movq 24 (%rsi), %r8
21252 movq 32 (%rsi), %r9
21253- movq 40 (%rsi), %r10
21254+ movq 40 (%rsi), %r13
21255 movq 48 (%rsi), %r11
21256 movq 56 (%rsi), %r12
21257
21258@@ -78,7 +79,7 @@ ENTRY(copy_page)
21259 movq %rdx, 16 (%rdi)
21260 movq %r8, 24 (%rdi)
21261 movq %r9, 32 (%rdi)
21262- movq %r10, 40 (%rdi)
21263+ movq %r13, 40 (%rdi)
21264 movq %r11, 48 (%rdi)
21265 movq %r12, 56 (%rdi)
21266
21267@@ -95,6 +96,7 @@ ENTRY(copy_page)
21268 CFI_RESTORE r13
21269 addq $3*8,%rsp
21270 CFI_ADJUST_CFA_OFFSET -3*8
21271+ pax_force_retaddr
21272 ret
21273 .Lcopy_page_end:
21274 CFI_ENDPROC
21275@@ -105,7 +107,7 @@ ENDPROC(copy_page)
21276
21277 #include <asm/cpufeature.h>
21278
21279- .section .altinstr_replacement,"ax"
21280+ .section .altinstr_replacement,"a"
21281 1: .byte 0xeb /* jmp <disp8> */
21282 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
21283 2:
21284diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
21285index 0248402..821c786 100644
21286--- a/arch/x86/lib/copy_user_64.S
21287+++ b/arch/x86/lib/copy_user_64.S
21288@@ -16,6 +16,7 @@
21289 #include <asm/thread_info.h>
21290 #include <asm/cpufeature.h>
21291 #include <asm/alternative-asm.h>
21292+#include <asm/pgtable.h>
21293
21294 /*
21295 * By placing feature2 after feature1 in altinstructions section, we logically
21296@@ -29,7 +30,7 @@
21297 .byte 0xe9 /* 32bit jump */
21298 .long \orig-1f /* by default jump to orig */
21299 1:
21300- .section .altinstr_replacement,"ax"
21301+ .section .altinstr_replacement,"a"
21302 2: .byte 0xe9 /* near jump with 32bit immediate */
21303 .long \alt1-1b /* offset */ /* or alternatively to alt1 */
21304 3: .byte 0xe9 /* near jump with 32bit immediate */
21305@@ -71,47 +72,20 @@
21306 #endif
21307 .endm
21308
21309-/* Standard copy_to_user with segment limit checking */
21310-ENTRY(_copy_to_user)
21311- CFI_STARTPROC
21312- GET_THREAD_INFO(%rax)
21313- movq %rdi,%rcx
21314- addq %rdx,%rcx
21315- jc bad_to_user
21316- cmpq TI_addr_limit(%rax),%rcx
21317- ja bad_to_user
21318- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21319- copy_user_generic_unrolled,copy_user_generic_string, \
21320- copy_user_enhanced_fast_string
21321- CFI_ENDPROC
21322-ENDPROC(_copy_to_user)
21323-
21324-/* Standard copy_from_user with segment limit checking */
21325-ENTRY(_copy_from_user)
21326- CFI_STARTPROC
21327- GET_THREAD_INFO(%rax)
21328- movq %rsi,%rcx
21329- addq %rdx,%rcx
21330- jc bad_from_user
21331- cmpq TI_addr_limit(%rax),%rcx
21332- ja bad_from_user
21333- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21334- copy_user_generic_unrolled,copy_user_generic_string, \
21335- copy_user_enhanced_fast_string
21336- CFI_ENDPROC
21337-ENDPROC(_copy_from_user)
21338-
21339 .section .fixup,"ax"
21340 /* must zero dest */
21341 ENTRY(bad_from_user)
21342 bad_from_user:
21343 CFI_STARTPROC
21344+ testl %edx,%edx
21345+ js bad_to_user
21346 movl %edx,%ecx
21347 xorl %eax,%eax
21348 rep
21349 stosb
21350 bad_to_user:
21351 movl %edx,%eax
21352+ pax_force_retaddr
21353 ret
21354 CFI_ENDPROC
21355 ENDPROC(bad_from_user)
21356@@ -141,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
21357 jz 17f
21358 1: movq (%rsi),%r8
21359 2: movq 1*8(%rsi),%r9
21360-3: movq 2*8(%rsi),%r10
21361+3: movq 2*8(%rsi),%rax
21362 4: movq 3*8(%rsi),%r11
21363 5: movq %r8,(%rdi)
21364 6: movq %r9,1*8(%rdi)
21365-7: movq %r10,2*8(%rdi)
21366+7: movq %rax,2*8(%rdi)
21367 8: movq %r11,3*8(%rdi)
21368 9: movq 4*8(%rsi),%r8
21369 10: movq 5*8(%rsi),%r9
21370-11: movq 6*8(%rsi),%r10
21371+11: movq 6*8(%rsi),%rax
21372 12: movq 7*8(%rsi),%r11
21373 13: movq %r8,4*8(%rdi)
21374 14: movq %r9,5*8(%rdi)
21375-15: movq %r10,6*8(%rdi)
21376+15: movq %rax,6*8(%rdi)
21377 16: movq %r11,7*8(%rdi)
21378 leaq 64(%rsi),%rsi
21379 leaq 64(%rdi),%rdi
21380@@ -179,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
21381 decl %ecx
21382 jnz 21b
21383 23: xor %eax,%eax
21384+ pax_force_retaddr
21385 ret
21386
21387 .section .fixup,"ax"
21388@@ -251,6 +226,7 @@ ENTRY(copy_user_generic_string)
21389 3: rep
21390 movsb
21391 4: xorl %eax,%eax
21392+ pax_force_retaddr
21393 ret
21394
21395 .section .fixup,"ax"
21396@@ -287,6 +263,7 @@ ENTRY(copy_user_enhanced_fast_string)
21397 1: rep
21398 movsb
21399 2: xorl %eax,%eax
21400+ pax_force_retaddr
21401 ret
21402
21403 .section .fixup,"ax"
21404diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
21405index cb0c112..e3a6895 100644
21406--- a/arch/x86/lib/copy_user_nocache_64.S
21407+++ b/arch/x86/lib/copy_user_nocache_64.S
21408@@ -8,12 +8,14 @@
21409
21410 #include <linux/linkage.h>
21411 #include <asm/dwarf2.h>
21412+#include <asm/alternative-asm.h>
21413
21414 #define FIX_ALIGNMENT 1
21415
21416 #include <asm/current.h>
21417 #include <asm/asm-offsets.h>
21418 #include <asm/thread_info.h>
21419+#include <asm/pgtable.h>
21420
21421 .macro ALIGN_DESTINATION
21422 #ifdef FIX_ALIGNMENT
21423@@ -50,6 +52,15 @@
21424 */
21425 ENTRY(__copy_user_nocache)
21426 CFI_STARTPROC
21427+
21428+#ifdef CONFIG_PAX_MEMORY_UDEREF
21429+ mov $PAX_USER_SHADOW_BASE,%rcx
21430+ cmp %rcx,%rsi
21431+ jae 1f
21432+ add %rcx,%rsi
21433+1:
21434+#endif
21435+
21436 cmpl $8,%edx
21437 jb 20f /* less then 8 bytes, go to byte copy loop */
21438 ALIGN_DESTINATION
21439@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
21440 jz 17f
21441 1: movq (%rsi),%r8
21442 2: movq 1*8(%rsi),%r9
21443-3: movq 2*8(%rsi),%r10
21444+3: movq 2*8(%rsi),%rax
21445 4: movq 3*8(%rsi),%r11
21446 5: movnti %r8,(%rdi)
21447 6: movnti %r9,1*8(%rdi)
21448-7: movnti %r10,2*8(%rdi)
21449+7: movnti %rax,2*8(%rdi)
21450 8: movnti %r11,3*8(%rdi)
21451 9: movq 4*8(%rsi),%r8
21452 10: movq 5*8(%rsi),%r9
21453-11: movq 6*8(%rsi),%r10
21454+11: movq 6*8(%rsi),%rax
21455 12: movq 7*8(%rsi),%r11
21456 13: movnti %r8,4*8(%rdi)
21457 14: movnti %r9,5*8(%rdi)
21458-15: movnti %r10,6*8(%rdi)
21459+15: movnti %rax,6*8(%rdi)
21460 16: movnti %r11,7*8(%rdi)
21461 leaq 64(%rsi),%rsi
21462 leaq 64(%rdi),%rdi
21463@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
21464 jnz 21b
21465 23: xorl %eax,%eax
21466 sfence
21467+ pax_force_retaddr
21468 ret
21469
21470 .section .fixup,"ax"
21471diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
21472index fb903b7..c92b7f7 100644
21473--- a/arch/x86/lib/csum-copy_64.S
21474+++ b/arch/x86/lib/csum-copy_64.S
21475@@ -8,6 +8,7 @@
21476 #include <linux/linkage.h>
21477 #include <asm/dwarf2.h>
21478 #include <asm/errno.h>
21479+#include <asm/alternative-asm.h>
21480
21481 /*
21482 * Checksum copy with exception handling.
21483@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
21484 CFI_RESTORE rbp
21485 addq $7*8, %rsp
21486 CFI_ADJUST_CFA_OFFSET -7*8
21487+ pax_force_retaddr 0, 1
21488 ret
21489 CFI_RESTORE_STATE
21490
21491diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
21492index 459b58a..9570bc7 100644
21493--- a/arch/x86/lib/csum-wrappers_64.c
21494+++ b/arch/x86/lib/csum-wrappers_64.c
21495@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
21496 len -= 2;
21497 }
21498 }
21499- isum = csum_partial_copy_generic((__force const void *)src,
21500+
21501+#ifdef CONFIG_PAX_MEMORY_UDEREF
21502+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
21503+ src += PAX_USER_SHADOW_BASE;
21504+#endif
21505+
21506+ isum = csum_partial_copy_generic((const void __force_kernel *)src,
21507 dst, len, isum, errp, NULL);
21508 if (unlikely(*errp))
21509 goto out_err;
21510@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
21511 }
21512
21513 *errp = 0;
21514- return csum_partial_copy_generic(src, (void __force *)dst,
21515+
21516+#ifdef CONFIG_PAX_MEMORY_UDEREF
21517+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
21518+ dst += PAX_USER_SHADOW_BASE;
21519+#endif
21520+
21521+ return csum_partial_copy_generic(src, (void __force_kernel *)dst,
21522 len, isum, NULL, errp);
21523 }
21524 EXPORT_SYMBOL(csum_partial_copy_to_user);
21525diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
21526index 51f1504..ddac4c1 100644
21527--- a/arch/x86/lib/getuser.S
21528+++ b/arch/x86/lib/getuser.S
21529@@ -33,15 +33,38 @@
21530 #include <asm/asm-offsets.h>
21531 #include <asm/thread_info.h>
21532 #include <asm/asm.h>
21533+#include <asm/segment.h>
21534+#include <asm/pgtable.h>
21535+#include <asm/alternative-asm.h>
21536+
21537+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
21538+#define __copyuser_seg gs;
21539+#else
21540+#define __copyuser_seg
21541+#endif
21542
21543 .text
21544 ENTRY(__get_user_1)
21545 CFI_STARTPROC
21546+
21547+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21548 GET_THREAD_INFO(%_ASM_DX)
21549 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21550 jae bad_get_user
21551-1: movzb (%_ASM_AX),%edx
21552+
21553+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21554+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21555+ cmp %_ASM_DX,%_ASM_AX
21556+ jae 1234f
21557+ add %_ASM_DX,%_ASM_AX
21558+1234:
21559+#endif
21560+
21561+#endif
21562+
21563+1: __copyuser_seg movzb (%_ASM_AX),%edx
21564 xor %eax,%eax
21565+ pax_force_retaddr
21566 ret
21567 CFI_ENDPROC
21568 ENDPROC(__get_user_1)
21569@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
21570 ENTRY(__get_user_2)
21571 CFI_STARTPROC
21572 add $1,%_ASM_AX
21573+
21574+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21575 jc bad_get_user
21576 GET_THREAD_INFO(%_ASM_DX)
21577 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21578 jae bad_get_user
21579-2: movzwl -1(%_ASM_AX),%edx
21580+
21581+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21582+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21583+ cmp %_ASM_DX,%_ASM_AX
21584+ jae 1234f
21585+ add %_ASM_DX,%_ASM_AX
21586+1234:
21587+#endif
21588+
21589+#endif
21590+
21591+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
21592 xor %eax,%eax
21593+ pax_force_retaddr
21594 ret
21595 CFI_ENDPROC
21596 ENDPROC(__get_user_2)
21597@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
21598 ENTRY(__get_user_4)
21599 CFI_STARTPROC
21600 add $3,%_ASM_AX
21601+
21602+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21603 jc bad_get_user
21604 GET_THREAD_INFO(%_ASM_DX)
21605 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21606 jae bad_get_user
21607-3: mov -3(%_ASM_AX),%edx
21608+
21609+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21610+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21611+ cmp %_ASM_DX,%_ASM_AX
21612+ jae 1234f
21613+ add %_ASM_DX,%_ASM_AX
21614+1234:
21615+#endif
21616+
21617+#endif
21618+
21619+3: __copyuser_seg mov -3(%_ASM_AX),%edx
21620 xor %eax,%eax
21621+ pax_force_retaddr
21622 ret
21623 CFI_ENDPROC
21624 ENDPROC(__get_user_4)
21625@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
21626 GET_THREAD_INFO(%_ASM_DX)
21627 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21628 jae bad_get_user
21629+
21630+#ifdef CONFIG_PAX_MEMORY_UDEREF
21631+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21632+ cmp %_ASM_DX,%_ASM_AX
21633+ jae 1234f
21634+ add %_ASM_DX,%_ASM_AX
21635+1234:
21636+#endif
21637+
21638 4: movq -7(%_ASM_AX),%_ASM_DX
21639 xor %eax,%eax
21640+ pax_force_retaddr
21641 ret
21642 CFI_ENDPROC
21643 ENDPROC(__get_user_8)
21644@@ -91,6 +152,7 @@ bad_get_user:
21645 CFI_STARTPROC
21646 xor %edx,%edx
21647 mov $(-EFAULT),%_ASM_AX
21648+ pax_force_retaddr
21649 ret
21650 CFI_ENDPROC
21651 END(bad_get_user)
21652diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
21653index 5a1f9f3..ba9f577 100644
21654--- a/arch/x86/lib/insn.c
21655+++ b/arch/x86/lib/insn.c
21656@@ -21,6 +21,11 @@
21657 #include <linux/string.h>
21658 #include <asm/inat.h>
21659 #include <asm/insn.h>
21660+#ifdef __KERNEL__
21661+#include <asm/pgtable_types.h>
21662+#else
21663+#define ktla_ktva(addr) addr
21664+#endif
21665
21666 /* Verify next sizeof(t) bytes can be on the same instruction */
21667 #define validate_next(t, insn, n) \
21668@@ -49,8 +54,8 @@
21669 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
21670 {
21671 memset(insn, 0, sizeof(*insn));
21672- insn->kaddr = kaddr;
21673- insn->next_byte = kaddr;
21674+ insn->kaddr = ktla_ktva(kaddr);
21675+ insn->next_byte = ktla_ktva(kaddr);
21676 insn->x86_64 = x86_64 ? 1 : 0;
21677 insn->opnd_bytes = 4;
21678 if (x86_64)
21679diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
21680index 05a95e7..326f2fa 100644
21681--- a/arch/x86/lib/iomap_copy_64.S
21682+++ b/arch/x86/lib/iomap_copy_64.S
21683@@ -17,6 +17,7 @@
21684
21685 #include <linux/linkage.h>
21686 #include <asm/dwarf2.h>
21687+#include <asm/alternative-asm.h>
21688
21689 /*
21690 * override generic version in lib/iomap_copy.c
21691@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
21692 CFI_STARTPROC
21693 movl %edx,%ecx
21694 rep movsd
21695+ pax_force_retaddr
21696 ret
21697 CFI_ENDPROC
21698 ENDPROC(__iowrite32_copy)
21699diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
21700index efbf2a0..8893637 100644
21701--- a/arch/x86/lib/memcpy_64.S
21702+++ b/arch/x86/lib/memcpy_64.S
21703@@ -34,6 +34,7 @@
21704 rep movsq
21705 movl %edx, %ecx
21706 rep movsb
21707+ pax_force_retaddr
21708 ret
21709 .Lmemcpy_e:
21710 .previous
21711@@ -51,6 +52,7 @@
21712
21713 movl %edx, %ecx
21714 rep movsb
21715+ pax_force_retaddr
21716 ret
21717 .Lmemcpy_e_e:
21718 .previous
21719@@ -81,13 +83,13 @@ ENTRY(memcpy)
21720 */
21721 movq 0*8(%rsi), %r8
21722 movq 1*8(%rsi), %r9
21723- movq 2*8(%rsi), %r10
21724+ movq 2*8(%rsi), %rcx
21725 movq 3*8(%rsi), %r11
21726 leaq 4*8(%rsi), %rsi
21727
21728 movq %r8, 0*8(%rdi)
21729 movq %r9, 1*8(%rdi)
21730- movq %r10, 2*8(%rdi)
21731+ movq %rcx, 2*8(%rdi)
21732 movq %r11, 3*8(%rdi)
21733 leaq 4*8(%rdi), %rdi
21734 jae .Lcopy_forward_loop
21735@@ -110,12 +112,12 @@ ENTRY(memcpy)
21736 subq $0x20, %rdx
21737 movq -1*8(%rsi), %r8
21738 movq -2*8(%rsi), %r9
21739- movq -3*8(%rsi), %r10
21740+ movq -3*8(%rsi), %rcx
21741 movq -4*8(%rsi), %r11
21742 leaq -4*8(%rsi), %rsi
21743 movq %r8, -1*8(%rdi)
21744 movq %r9, -2*8(%rdi)
21745- movq %r10, -3*8(%rdi)
21746+ movq %rcx, -3*8(%rdi)
21747 movq %r11, -4*8(%rdi)
21748 leaq -4*8(%rdi), %rdi
21749 jae .Lcopy_backward_loop
21750@@ -135,12 +137,13 @@ ENTRY(memcpy)
21751 */
21752 movq 0*8(%rsi), %r8
21753 movq 1*8(%rsi), %r9
21754- movq -2*8(%rsi, %rdx), %r10
21755+ movq -2*8(%rsi, %rdx), %rcx
21756 movq -1*8(%rsi, %rdx), %r11
21757 movq %r8, 0*8(%rdi)
21758 movq %r9, 1*8(%rdi)
21759- movq %r10, -2*8(%rdi, %rdx)
21760+ movq %rcx, -2*8(%rdi, %rdx)
21761 movq %r11, -1*8(%rdi, %rdx)
21762+ pax_force_retaddr
21763 retq
21764 .p2align 4
21765 .Lless_16bytes:
21766@@ -153,6 +156,7 @@ ENTRY(memcpy)
21767 movq -1*8(%rsi, %rdx), %r9
21768 movq %r8, 0*8(%rdi)
21769 movq %r9, -1*8(%rdi, %rdx)
21770+ pax_force_retaddr
21771 retq
21772 .p2align 4
21773 .Lless_8bytes:
21774@@ -166,6 +170,7 @@ ENTRY(memcpy)
21775 movl -4(%rsi, %rdx), %r8d
21776 movl %ecx, (%rdi)
21777 movl %r8d, -4(%rdi, %rdx)
21778+ pax_force_retaddr
21779 retq
21780 .p2align 4
21781 .Lless_3bytes:
21782@@ -183,6 +188,7 @@ ENTRY(memcpy)
21783 jnz .Lloop_1
21784
21785 .Lend:
21786+ pax_force_retaddr
21787 retq
21788 CFI_ENDPROC
21789 ENDPROC(memcpy)
21790diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
21791index ee16461..c39c199 100644
21792--- a/arch/x86/lib/memmove_64.S
21793+++ b/arch/x86/lib/memmove_64.S
21794@@ -61,13 +61,13 @@ ENTRY(memmove)
21795 5:
21796 sub $0x20, %rdx
21797 movq 0*8(%rsi), %r11
21798- movq 1*8(%rsi), %r10
21799+ movq 1*8(%rsi), %rcx
21800 movq 2*8(%rsi), %r9
21801 movq 3*8(%rsi), %r8
21802 leaq 4*8(%rsi), %rsi
21803
21804 movq %r11, 0*8(%rdi)
21805- movq %r10, 1*8(%rdi)
21806+ movq %rcx, 1*8(%rdi)
21807 movq %r9, 2*8(%rdi)
21808 movq %r8, 3*8(%rdi)
21809 leaq 4*8(%rdi), %rdi
21810@@ -81,10 +81,10 @@ ENTRY(memmove)
21811 4:
21812 movq %rdx, %rcx
21813 movq -8(%rsi, %rdx), %r11
21814- lea -8(%rdi, %rdx), %r10
21815+ lea -8(%rdi, %rdx), %r9
21816 shrq $3, %rcx
21817 rep movsq
21818- movq %r11, (%r10)
21819+ movq %r11, (%r9)
21820 jmp 13f
21821 .Lmemmove_end_forward:
21822
21823@@ -95,14 +95,14 @@ ENTRY(memmove)
21824 7:
21825 movq %rdx, %rcx
21826 movq (%rsi), %r11
21827- movq %rdi, %r10
21828+ movq %rdi, %r9
21829 leaq -8(%rsi, %rdx), %rsi
21830 leaq -8(%rdi, %rdx), %rdi
21831 shrq $3, %rcx
21832 std
21833 rep movsq
21834 cld
21835- movq %r11, (%r10)
21836+ movq %r11, (%r9)
21837 jmp 13f
21838
21839 /*
21840@@ -127,13 +127,13 @@ ENTRY(memmove)
21841 8:
21842 subq $0x20, %rdx
21843 movq -1*8(%rsi), %r11
21844- movq -2*8(%rsi), %r10
21845+ movq -2*8(%rsi), %rcx
21846 movq -3*8(%rsi), %r9
21847 movq -4*8(%rsi), %r8
21848 leaq -4*8(%rsi), %rsi
21849
21850 movq %r11, -1*8(%rdi)
21851- movq %r10, -2*8(%rdi)
21852+ movq %rcx, -2*8(%rdi)
21853 movq %r9, -3*8(%rdi)
21854 movq %r8, -4*8(%rdi)
21855 leaq -4*8(%rdi), %rdi
21856@@ -151,11 +151,11 @@ ENTRY(memmove)
21857 * Move data from 16 bytes to 31 bytes.
21858 */
21859 movq 0*8(%rsi), %r11
21860- movq 1*8(%rsi), %r10
21861+ movq 1*8(%rsi), %rcx
21862 movq -2*8(%rsi, %rdx), %r9
21863 movq -1*8(%rsi, %rdx), %r8
21864 movq %r11, 0*8(%rdi)
21865- movq %r10, 1*8(%rdi)
21866+ movq %rcx, 1*8(%rdi)
21867 movq %r9, -2*8(%rdi, %rdx)
21868 movq %r8, -1*8(%rdi, %rdx)
21869 jmp 13f
21870@@ -167,9 +167,9 @@ ENTRY(memmove)
21871 * Move data from 8 bytes to 15 bytes.
21872 */
21873 movq 0*8(%rsi), %r11
21874- movq -1*8(%rsi, %rdx), %r10
21875+ movq -1*8(%rsi, %rdx), %r9
21876 movq %r11, 0*8(%rdi)
21877- movq %r10, -1*8(%rdi, %rdx)
21878+ movq %r9, -1*8(%rdi, %rdx)
21879 jmp 13f
21880 10:
21881 cmpq $4, %rdx
21882@@ -178,9 +178,9 @@ ENTRY(memmove)
21883 * Move data from 4 bytes to 7 bytes.
21884 */
21885 movl (%rsi), %r11d
21886- movl -4(%rsi, %rdx), %r10d
21887+ movl -4(%rsi, %rdx), %r9d
21888 movl %r11d, (%rdi)
21889- movl %r10d, -4(%rdi, %rdx)
21890+ movl %r9d, -4(%rdi, %rdx)
21891 jmp 13f
21892 11:
21893 cmp $2, %rdx
21894@@ -189,9 +189,9 @@ ENTRY(memmove)
21895 * Move data from 2 bytes to 3 bytes.
21896 */
21897 movw (%rsi), %r11w
21898- movw -2(%rsi, %rdx), %r10w
21899+ movw -2(%rsi, %rdx), %r9w
21900 movw %r11w, (%rdi)
21901- movw %r10w, -2(%rdi, %rdx)
21902+ movw %r9w, -2(%rdi, %rdx)
21903 jmp 13f
21904 12:
21905 cmp $1, %rdx
21906@@ -202,6 +202,7 @@ ENTRY(memmove)
21907 movb (%rsi), %r11b
21908 movb %r11b, (%rdi)
21909 13:
21910+ pax_force_retaddr
21911 retq
21912 CFI_ENDPROC
21913
21914@@ -210,6 +211,7 @@ ENTRY(memmove)
21915 /* Forward moving data. */
21916 movq %rdx, %rcx
21917 rep movsb
21918+ pax_force_retaddr
21919 retq
21920 .Lmemmove_end_forward_efs:
21921 .previous
21922diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
21923index 79bd454..dff325a 100644
21924--- a/arch/x86/lib/memset_64.S
21925+++ b/arch/x86/lib/memset_64.S
21926@@ -31,6 +31,7 @@
21927 movl %r8d,%ecx
21928 rep stosb
21929 movq %r9,%rax
21930+ pax_force_retaddr
21931 ret
21932 .Lmemset_e:
21933 .previous
21934@@ -53,6 +54,7 @@
21935 movl %edx,%ecx
21936 rep stosb
21937 movq %r9,%rax
21938+ pax_force_retaddr
21939 ret
21940 .Lmemset_e_e:
21941 .previous
21942@@ -60,13 +62,13 @@
21943 ENTRY(memset)
21944 ENTRY(__memset)
21945 CFI_STARTPROC
21946- movq %rdi,%r10
21947 movq %rdx,%r11
21948
21949 /* expand byte value */
21950 movzbl %sil,%ecx
21951 movabs $0x0101010101010101,%rax
21952 mul %rcx /* with rax, clobbers rdx */
21953+ movq %rdi,%rdx
21954
21955 /* align dst */
21956 movl %edi,%r9d
21957@@ -120,7 +122,8 @@ ENTRY(__memset)
21958 jnz .Lloop_1
21959
21960 .Lende:
21961- movq %r10,%rax
21962+ movq %rdx,%rax
21963+ pax_force_retaddr
21964 ret
21965
21966 CFI_RESTORE_STATE
21967diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
21968index c9f2d9b..e7fd2c0 100644
21969--- a/arch/x86/lib/mmx_32.c
21970+++ b/arch/x86/lib/mmx_32.c
21971@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
21972 {
21973 void *p;
21974 int i;
21975+ unsigned long cr0;
21976
21977 if (unlikely(in_interrupt()))
21978 return __memcpy(to, from, len);
21979@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
21980 kernel_fpu_begin();
21981
21982 __asm__ __volatile__ (
21983- "1: prefetch (%0)\n" /* This set is 28 bytes */
21984- " prefetch 64(%0)\n"
21985- " prefetch 128(%0)\n"
21986- " prefetch 192(%0)\n"
21987- " prefetch 256(%0)\n"
21988+ "1: prefetch (%1)\n" /* This set is 28 bytes */
21989+ " prefetch 64(%1)\n"
21990+ " prefetch 128(%1)\n"
21991+ " prefetch 192(%1)\n"
21992+ " prefetch 256(%1)\n"
21993 "2: \n"
21994 ".section .fixup, \"ax\"\n"
21995- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
21996+ "3: \n"
21997+
21998+#ifdef CONFIG_PAX_KERNEXEC
21999+ " movl %%cr0, %0\n"
22000+ " movl %0, %%eax\n"
22001+ " andl $0xFFFEFFFF, %%eax\n"
22002+ " movl %%eax, %%cr0\n"
22003+#endif
22004+
22005+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22006+
22007+#ifdef CONFIG_PAX_KERNEXEC
22008+ " movl %0, %%cr0\n"
22009+#endif
22010+
22011 " jmp 2b\n"
22012 ".previous\n"
22013 _ASM_EXTABLE(1b, 3b)
22014- : : "r" (from));
22015+ : "=&r" (cr0) : "r" (from) : "ax");
22016
22017 for ( ; i > 5; i--) {
22018 __asm__ __volatile__ (
22019- "1: prefetch 320(%0)\n"
22020- "2: movq (%0), %%mm0\n"
22021- " movq 8(%0), %%mm1\n"
22022- " movq 16(%0), %%mm2\n"
22023- " movq 24(%0), %%mm3\n"
22024- " movq %%mm0, (%1)\n"
22025- " movq %%mm1, 8(%1)\n"
22026- " movq %%mm2, 16(%1)\n"
22027- " movq %%mm3, 24(%1)\n"
22028- " movq 32(%0), %%mm0\n"
22029- " movq 40(%0), %%mm1\n"
22030- " movq 48(%0), %%mm2\n"
22031- " movq 56(%0), %%mm3\n"
22032- " movq %%mm0, 32(%1)\n"
22033- " movq %%mm1, 40(%1)\n"
22034- " movq %%mm2, 48(%1)\n"
22035- " movq %%mm3, 56(%1)\n"
22036+ "1: prefetch 320(%1)\n"
22037+ "2: movq (%1), %%mm0\n"
22038+ " movq 8(%1), %%mm1\n"
22039+ " movq 16(%1), %%mm2\n"
22040+ " movq 24(%1), %%mm3\n"
22041+ " movq %%mm0, (%2)\n"
22042+ " movq %%mm1, 8(%2)\n"
22043+ " movq %%mm2, 16(%2)\n"
22044+ " movq %%mm3, 24(%2)\n"
22045+ " movq 32(%1), %%mm0\n"
22046+ " movq 40(%1), %%mm1\n"
22047+ " movq 48(%1), %%mm2\n"
22048+ " movq 56(%1), %%mm3\n"
22049+ " movq %%mm0, 32(%2)\n"
22050+ " movq %%mm1, 40(%2)\n"
22051+ " movq %%mm2, 48(%2)\n"
22052+ " movq %%mm3, 56(%2)\n"
22053 ".section .fixup, \"ax\"\n"
22054- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22055+ "3:\n"
22056+
22057+#ifdef CONFIG_PAX_KERNEXEC
22058+ " movl %%cr0, %0\n"
22059+ " movl %0, %%eax\n"
22060+ " andl $0xFFFEFFFF, %%eax\n"
22061+ " movl %%eax, %%cr0\n"
22062+#endif
22063+
22064+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22065+
22066+#ifdef CONFIG_PAX_KERNEXEC
22067+ " movl %0, %%cr0\n"
22068+#endif
22069+
22070 " jmp 2b\n"
22071 ".previous\n"
22072 _ASM_EXTABLE(1b, 3b)
22073- : : "r" (from), "r" (to) : "memory");
22074+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22075
22076 from += 64;
22077 to += 64;
22078@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
22079 static void fast_copy_page(void *to, void *from)
22080 {
22081 int i;
22082+ unsigned long cr0;
22083
22084 kernel_fpu_begin();
22085
22086@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
22087 * but that is for later. -AV
22088 */
22089 __asm__ __volatile__(
22090- "1: prefetch (%0)\n"
22091- " prefetch 64(%0)\n"
22092- " prefetch 128(%0)\n"
22093- " prefetch 192(%0)\n"
22094- " prefetch 256(%0)\n"
22095+ "1: prefetch (%1)\n"
22096+ " prefetch 64(%1)\n"
22097+ " prefetch 128(%1)\n"
22098+ " prefetch 192(%1)\n"
22099+ " prefetch 256(%1)\n"
22100 "2: \n"
22101 ".section .fixup, \"ax\"\n"
22102- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22103+ "3: \n"
22104+
22105+#ifdef CONFIG_PAX_KERNEXEC
22106+ " movl %%cr0, %0\n"
22107+ " movl %0, %%eax\n"
22108+ " andl $0xFFFEFFFF, %%eax\n"
22109+ " movl %%eax, %%cr0\n"
22110+#endif
22111+
22112+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22113+
22114+#ifdef CONFIG_PAX_KERNEXEC
22115+ " movl %0, %%cr0\n"
22116+#endif
22117+
22118 " jmp 2b\n"
22119 ".previous\n"
22120- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22121+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22122
22123 for (i = 0; i < (4096-320)/64; i++) {
22124 __asm__ __volatile__ (
22125- "1: prefetch 320(%0)\n"
22126- "2: movq (%0), %%mm0\n"
22127- " movntq %%mm0, (%1)\n"
22128- " movq 8(%0), %%mm1\n"
22129- " movntq %%mm1, 8(%1)\n"
22130- " movq 16(%0), %%mm2\n"
22131- " movntq %%mm2, 16(%1)\n"
22132- " movq 24(%0), %%mm3\n"
22133- " movntq %%mm3, 24(%1)\n"
22134- " movq 32(%0), %%mm4\n"
22135- " movntq %%mm4, 32(%1)\n"
22136- " movq 40(%0), %%mm5\n"
22137- " movntq %%mm5, 40(%1)\n"
22138- " movq 48(%0), %%mm6\n"
22139- " movntq %%mm6, 48(%1)\n"
22140- " movq 56(%0), %%mm7\n"
22141- " movntq %%mm7, 56(%1)\n"
22142+ "1: prefetch 320(%1)\n"
22143+ "2: movq (%1), %%mm0\n"
22144+ " movntq %%mm0, (%2)\n"
22145+ " movq 8(%1), %%mm1\n"
22146+ " movntq %%mm1, 8(%2)\n"
22147+ " movq 16(%1), %%mm2\n"
22148+ " movntq %%mm2, 16(%2)\n"
22149+ " movq 24(%1), %%mm3\n"
22150+ " movntq %%mm3, 24(%2)\n"
22151+ " movq 32(%1), %%mm4\n"
22152+ " movntq %%mm4, 32(%2)\n"
22153+ " movq 40(%1), %%mm5\n"
22154+ " movntq %%mm5, 40(%2)\n"
22155+ " movq 48(%1), %%mm6\n"
22156+ " movntq %%mm6, 48(%2)\n"
22157+ " movq 56(%1), %%mm7\n"
22158+ " movntq %%mm7, 56(%2)\n"
22159 ".section .fixup, \"ax\"\n"
22160- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22161+ "3:\n"
22162+
22163+#ifdef CONFIG_PAX_KERNEXEC
22164+ " movl %%cr0, %0\n"
22165+ " movl %0, %%eax\n"
22166+ " andl $0xFFFEFFFF, %%eax\n"
22167+ " movl %%eax, %%cr0\n"
22168+#endif
22169+
22170+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22171+
22172+#ifdef CONFIG_PAX_KERNEXEC
22173+ " movl %0, %%cr0\n"
22174+#endif
22175+
22176 " jmp 2b\n"
22177 ".previous\n"
22178- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
22179+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22180
22181 from += 64;
22182 to += 64;
22183@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
22184 static void fast_copy_page(void *to, void *from)
22185 {
22186 int i;
22187+ unsigned long cr0;
22188
22189 kernel_fpu_begin();
22190
22191 __asm__ __volatile__ (
22192- "1: prefetch (%0)\n"
22193- " prefetch 64(%0)\n"
22194- " prefetch 128(%0)\n"
22195- " prefetch 192(%0)\n"
22196- " prefetch 256(%0)\n"
22197+ "1: prefetch (%1)\n"
22198+ " prefetch 64(%1)\n"
22199+ " prefetch 128(%1)\n"
22200+ " prefetch 192(%1)\n"
22201+ " prefetch 256(%1)\n"
22202 "2: \n"
22203 ".section .fixup, \"ax\"\n"
22204- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22205+ "3: \n"
22206+
22207+#ifdef CONFIG_PAX_KERNEXEC
22208+ " movl %%cr0, %0\n"
22209+ " movl %0, %%eax\n"
22210+ " andl $0xFFFEFFFF, %%eax\n"
22211+ " movl %%eax, %%cr0\n"
22212+#endif
22213+
22214+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22215+
22216+#ifdef CONFIG_PAX_KERNEXEC
22217+ " movl %0, %%cr0\n"
22218+#endif
22219+
22220 " jmp 2b\n"
22221 ".previous\n"
22222- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22223+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22224
22225 for (i = 0; i < 4096/64; i++) {
22226 __asm__ __volatile__ (
22227- "1: prefetch 320(%0)\n"
22228- "2: movq (%0), %%mm0\n"
22229- " movq 8(%0), %%mm1\n"
22230- " movq 16(%0), %%mm2\n"
22231- " movq 24(%0), %%mm3\n"
22232- " movq %%mm0, (%1)\n"
22233- " movq %%mm1, 8(%1)\n"
22234- " movq %%mm2, 16(%1)\n"
22235- " movq %%mm3, 24(%1)\n"
22236- " movq 32(%0), %%mm0\n"
22237- " movq 40(%0), %%mm1\n"
22238- " movq 48(%0), %%mm2\n"
22239- " movq 56(%0), %%mm3\n"
22240- " movq %%mm0, 32(%1)\n"
22241- " movq %%mm1, 40(%1)\n"
22242- " movq %%mm2, 48(%1)\n"
22243- " movq %%mm3, 56(%1)\n"
22244+ "1: prefetch 320(%1)\n"
22245+ "2: movq (%1), %%mm0\n"
22246+ " movq 8(%1), %%mm1\n"
22247+ " movq 16(%1), %%mm2\n"
22248+ " movq 24(%1), %%mm3\n"
22249+ " movq %%mm0, (%2)\n"
22250+ " movq %%mm1, 8(%2)\n"
22251+ " movq %%mm2, 16(%2)\n"
22252+ " movq %%mm3, 24(%2)\n"
22253+ " movq 32(%1), %%mm0\n"
22254+ " movq 40(%1), %%mm1\n"
22255+ " movq 48(%1), %%mm2\n"
22256+ " movq 56(%1), %%mm3\n"
22257+ " movq %%mm0, 32(%2)\n"
22258+ " movq %%mm1, 40(%2)\n"
22259+ " movq %%mm2, 48(%2)\n"
22260+ " movq %%mm3, 56(%2)\n"
22261 ".section .fixup, \"ax\"\n"
22262- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22263+ "3:\n"
22264+
22265+#ifdef CONFIG_PAX_KERNEXEC
22266+ " movl %%cr0, %0\n"
22267+ " movl %0, %%eax\n"
22268+ " andl $0xFFFEFFFF, %%eax\n"
22269+ " movl %%eax, %%cr0\n"
22270+#endif
22271+
22272+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22273+
22274+#ifdef CONFIG_PAX_KERNEXEC
22275+ " movl %0, %%cr0\n"
22276+#endif
22277+
22278 " jmp 2b\n"
22279 ".previous\n"
22280 _ASM_EXTABLE(1b, 3b)
22281- : : "r" (from), "r" (to) : "memory");
22282+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22283
22284 from += 64;
22285 to += 64;
22286diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
22287index 69fa106..adda88b 100644
22288--- a/arch/x86/lib/msr-reg.S
22289+++ b/arch/x86/lib/msr-reg.S
22290@@ -3,6 +3,7 @@
22291 #include <asm/dwarf2.h>
22292 #include <asm/asm.h>
22293 #include <asm/msr.h>
22294+#include <asm/alternative-asm.h>
22295
22296 #ifdef CONFIG_X86_64
22297 /*
22298@@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
22299 CFI_STARTPROC
22300 pushq_cfi %rbx
22301 pushq_cfi %rbp
22302- movq %rdi, %r10 /* Save pointer */
22303+ movq %rdi, %r9 /* Save pointer */
22304 xorl %r11d, %r11d /* Return value */
22305 movl (%rdi), %eax
22306 movl 4(%rdi), %ecx
22307@@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
22308 movl 28(%rdi), %edi
22309 CFI_REMEMBER_STATE
22310 1: \op
22311-2: movl %eax, (%r10)
22312+2: movl %eax, (%r9)
22313 movl %r11d, %eax /* Return value */
22314- movl %ecx, 4(%r10)
22315- movl %edx, 8(%r10)
22316- movl %ebx, 12(%r10)
22317- movl %ebp, 20(%r10)
22318- movl %esi, 24(%r10)
22319- movl %edi, 28(%r10)
22320+ movl %ecx, 4(%r9)
22321+ movl %edx, 8(%r9)
22322+ movl %ebx, 12(%r9)
22323+ movl %ebp, 20(%r9)
22324+ movl %esi, 24(%r9)
22325+ movl %edi, 28(%r9)
22326 popq_cfi %rbp
22327 popq_cfi %rbx
22328+ pax_force_retaddr
22329 ret
22330 3:
22331 CFI_RESTORE_STATE
22332diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
22333index 36b0d15..d381858 100644
22334--- a/arch/x86/lib/putuser.S
22335+++ b/arch/x86/lib/putuser.S
22336@@ -15,7 +15,9 @@
22337 #include <asm/thread_info.h>
22338 #include <asm/errno.h>
22339 #include <asm/asm.h>
22340-
22341+#include <asm/segment.h>
22342+#include <asm/pgtable.h>
22343+#include <asm/alternative-asm.h>
22344
22345 /*
22346 * __put_user_X
22347@@ -29,52 +31,119 @@
22348 * as they get called from within inline assembly.
22349 */
22350
22351-#define ENTER CFI_STARTPROC ; \
22352- GET_THREAD_INFO(%_ASM_BX)
22353-#define EXIT ret ; \
22354+#define ENTER CFI_STARTPROC
22355+#define EXIT pax_force_retaddr; ret ; \
22356 CFI_ENDPROC
22357
22358+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22359+#define _DEST %_ASM_CX,%_ASM_BX
22360+#else
22361+#define _DEST %_ASM_CX
22362+#endif
22363+
22364+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22365+#define __copyuser_seg gs;
22366+#else
22367+#define __copyuser_seg
22368+#endif
22369+
22370 .text
22371 ENTRY(__put_user_1)
22372 ENTER
22373+
22374+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22375+ GET_THREAD_INFO(%_ASM_BX)
22376 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
22377 jae bad_put_user
22378-1: movb %al,(%_ASM_CX)
22379+
22380+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22381+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22382+ cmp %_ASM_BX,%_ASM_CX
22383+ jb 1234f
22384+ xor %ebx,%ebx
22385+1234:
22386+#endif
22387+
22388+#endif
22389+
22390+1: __copyuser_seg movb %al,(_DEST)
22391 xor %eax,%eax
22392 EXIT
22393 ENDPROC(__put_user_1)
22394
22395 ENTRY(__put_user_2)
22396 ENTER
22397+
22398+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22399+ GET_THREAD_INFO(%_ASM_BX)
22400 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22401 sub $1,%_ASM_BX
22402 cmp %_ASM_BX,%_ASM_CX
22403 jae bad_put_user
22404-2: movw %ax,(%_ASM_CX)
22405+
22406+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22407+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22408+ cmp %_ASM_BX,%_ASM_CX
22409+ jb 1234f
22410+ xor %ebx,%ebx
22411+1234:
22412+#endif
22413+
22414+#endif
22415+
22416+2: __copyuser_seg movw %ax,(_DEST)
22417 xor %eax,%eax
22418 EXIT
22419 ENDPROC(__put_user_2)
22420
22421 ENTRY(__put_user_4)
22422 ENTER
22423+
22424+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22425+ GET_THREAD_INFO(%_ASM_BX)
22426 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22427 sub $3,%_ASM_BX
22428 cmp %_ASM_BX,%_ASM_CX
22429 jae bad_put_user
22430-3: movl %eax,(%_ASM_CX)
22431+
22432+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22433+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22434+ cmp %_ASM_BX,%_ASM_CX
22435+ jb 1234f
22436+ xor %ebx,%ebx
22437+1234:
22438+#endif
22439+
22440+#endif
22441+
22442+3: __copyuser_seg movl %eax,(_DEST)
22443 xor %eax,%eax
22444 EXIT
22445 ENDPROC(__put_user_4)
22446
22447 ENTRY(__put_user_8)
22448 ENTER
22449+
22450+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22451+ GET_THREAD_INFO(%_ASM_BX)
22452 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22453 sub $7,%_ASM_BX
22454 cmp %_ASM_BX,%_ASM_CX
22455 jae bad_put_user
22456-4: mov %_ASM_AX,(%_ASM_CX)
22457+
22458+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22459+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22460+ cmp %_ASM_BX,%_ASM_CX
22461+ jb 1234f
22462+ xor %ebx,%ebx
22463+1234:
22464+#endif
22465+
22466+#endif
22467+
22468+4: __copyuser_seg mov %_ASM_AX,(_DEST)
22469 #ifdef CONFIG_X86_32
22470-5: movl %edx,4(%_ASM_CX)
22471+5: __copyuser_seg movl %edx,4(_DEST)
22472 #endif
22473 xor %eax,%eax
22474 EXIT
22475diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
22476index 1cad221..de671ee 100644
22477--- a/arch/x86/lib/rwlock.S
22478+++ b/arch/x86/lib/rwlock.S
22479@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
22480 FRAME
22481 0: LOCK_PREFIX
22482 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22483+
22484+#ifdef CONFIG_PAX_REFCOUNT
22485+ jno 1234f
22486+ LOCK_PREFIX
22487+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22488+ int $4
22489+1234:
22490+ _ASM_EXTABLE(1234b, 1234b)
22491+#endif
22492+
22493 1: rep; nop
22494 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
22495 jne 1b
22496 LOCK_PREFIX
22497 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22498+
22499+#ifdef CONFIG_PAX_REFCOUNT
22500+ jno 1234f
22501+ LOCK_PREFIX
22502+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22503+ int $4
22504+1234:
22505+ _ASM_EXTABLE(1234b, 1234b)
22506+#endif
22507+
22508 jnz 0b
22509 ENDFRAME
22510+ pax_force_retaddr
22511 ret
22512 CFI_ENDPROC
22513 END(__write_lock_failed)
22514@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
22515 FRAME
22516 0: LOCK_PREFIX
22517 READ_LOCK_SIZE(inc) (%__lock_ptr)
22518+
22519+#ifdef CONFIG_PAX_REFCOUNT
22520+ jno 1234f
22521+ LOCK_PREFIX
22522+ READ_LOCK_SIZE(dec) (%__lock_ptr)
22523+ int $4
22524+1234:
22525+ _ASM_EXTABLE(1234b, 1234b)
22526+#endif
22527+
22528 1: rep; nop
22529 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
22530 js 1b
22531 LOCK_PREFIX
22532 READ_LOCK_SIZE(dec) (%__lock_ptr)
22533+
22534+#ifdef CONFIG_PAX_REFCOUNT
22535+ jno 1234f
22536+ LOCK_PREFIX
22537+ READ_LOCK_SIZE(inc) (%__lock_ptr)
22538+ int $4
22539+1234:
22540+ _ASM_EXTABLE(1234b, 1234b)
22541+#endif
22542+
22543 js 0b
22544 ENDFRAME
22545+ pax_force_retaddr
22546 ret
22547 CFI_ENDPROC
22548 END(__read_lock_failed)
22549diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
22550index 5dff5f0..cadebf4 100644
22551--- a/arch/x86/lib/rwsem.S
22552+++ b/arch/x86/lib/rwsem.S
22553@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
22554 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22555 CFI_RESTORE __ASM_REG(dx)
22556 restore_common_regs
22557+ pax_force_retaddr
22558 ret
22559 CFI_ENDPROC
22560 ENDPROC(call_rwsem_down_read_failed)
22561@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
22562 movq %rax,%rdi
22563 call rwsem_down_write_failed
22564 restore_common_regs
22565+ pax_force_retaddr
22566 ret
22567 CFI_ENDPROC
22568 ENDPROC(call_rwsem_down_write_failed)
22569@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
22570 movq %rax,%rdi
22571 call rwsem_wake
22572 restore_common_regs
22573-1: ret
22574+1: pax_force_retaddr
22575+ ret
22576 CFI_ENDPROC
22577 ENDPROC(call_rwsem_wake)
22578
22579@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
22580 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22581 CFI_RESTORE __ASM_REG(dx)
22582 restore_common_regs
22583+ pax_force_retaddr
22584 ret
22585 CFI_ENDPROC
22586 ENDPROC(call_rwsem_downgrade_wake)
22587diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
22588index a63efd6..ccecad8 100644
22589--- a/arch/x86/lib/thunk_64.S
22590+++ b/arch/x86/lib/thunk_64.S
22591@@ -8,6 +8,7 @@
22592 #include <linux/linkage.h>
22593 #include <asm/dwarf2.h>
22594 #include <asm/calling.h>
22595+#include <asm/alternative-asm.h>
22596
22597 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
22598 .macro THUNK name, func, put_ret_addr_in_rdi=0
22599@@ -41,5 +42,6 @@
22600 SAVE_ARGS
22601 restore:
22602 RESTORE_ARGS
22603+ pax_force_retaddr
22604 ret
22605 CFI_ENDPROC
22606diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
22607index e218d5d..a99a1eb 100644
22608--- a/arch/x86/lib/usercopy_32.c
22609+++ b/arch/x86/lib/usercopy_32.c
22610@@ -43,7 +43,7 @@ do { \
22611 __asm__ __volatile__( \
22612 " testl %1,%1\n" \
22613 " jz 2f\n" \
22614- "0: lodsb\n" \
22615+ "0: "__copyuser_seg"lodsb\n" \
22616 " stosb\n" \
22617 " testb %%al,%%al\n" \
22618 " jz 1f\n" \
22619@@ -128,10 +128,12 @@ do { \
22620 int __d0; \
22621 might_fault(); \
22622 __asm__ __volatile__( \
22623+ __COPYUSER_SET_ES \
22624 "0: rep; stosl\n" \
22625 " movl %2,%0\n" \
22626 "1: rep; stosb\n" \
22627 "2:\n" \
22628+ __COPYUSER_RESTORE_ES \
22629 ".section .fixup,\"ax\"\n" \
22630 "3: lea 0(%2,%0,4),%0\n" \
22631 " jmp 2b\n" \
22632@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n)
22633 might_fault();
22634
22635 __asm__ __volatile__(
22636+ __COPYUSER_SET_ES
22637 " testl %0, %0\n"
22638 " jz 3f\n"
22639 " andl %0,%%ecx\n"
22640@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
22641 " subl %%ecx,%0\n"
22642 " addl %0,%%eax\n"
22643 "1:\n"
22644+ __COPYUSER_RESTORE_ES
22645 ".section .fixup,\"ax\"\n"
22646 "2: xorl %%eax,%%eax\n"
22647 " jmp 1b\n"
22648@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
22649
22650 #ifdef CONFIG_X86_INTEL_USERCOPY
22651 static unsigned long
22652-__copy_user_intel(void __user *to, const void *from, unsigned long size)
22653+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
22654 {
22655 int d0, d1;
22656 __asm__ __volatile__(
22657@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22658 " .align 2,0x90\n"
22659 "3: movl 0(%4), %%eax\n"
22660 "4: movl 4(%4), %%edx\n"
22661- "5: movl %%eax, 0(%3)\n"
22662- "6: movl %%edx, 4(%3)\n"
22663+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
22664+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
22665 "7: movl 8(%4), %%eax\n"
22666 "8: movl 12(%4),%%edx\n"
22667- "9: movl %%eax, 8(%3)\n"
22668- "10: movl %%edx, 12(%3)\n"
22669+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
22670+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
22671 "11: movl 16(%4), %%eax\n"
22672 "12: movl 20(%4), %%edx\n"
22673- "13: movl %%eax, 16(%3)\n"
22674- "14: movl %%edx, 20(%3)\n"
22675+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
22676+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
22677 "15: movl 24(%4), %%eax\n"
22678 "16: movl 28(%4), %%edx\n"
22679- "17: movl %%eax, 24(%3)\n"
22680- "18: movl %%edx, 28(%3)\n"
22681+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
22682+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
22683 "19: movl 32(%4), %%eax\n"
22684 "20: movl 36(%4), %%edx\n"
22685- "21: movl %%eax, 32(%3)\n"
22686- "22: movl %%edx, 36(%3)\n"
22687+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
22688+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
22689 "23: movl 40(%4), %%eax\n"
22690 "24: movl 44(%4), %%edx\n"
22691- "25: movl %%eax, 40(%3)\n"
22692- "26: movl %%edx, 44(%3)\n"
22693+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
22694+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
22695 "27: movl 48(%4), %%eax\n"
22696 "28: movl 52(%4), %%edx\n"
22697- "29: movl %%eax, 48(%3)\n"
22698- "30: movl %%edx, 52(%3)\n"
22699+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
22700+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
22701 "31: movl 56(%4), %%eax\n"
22702 "32: movl 60(%4), %%edx\n"
22703- "33: movl %%eax, 56(%3)\n"
22704- "34: movl %%edx, 60(%3)\n"
22705+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
22706+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
22707 " addl $-64, %0\n"
22708 " addl $64, %4\n"
22709 " addl $64, %3\n"
22710@@ -278,10 +282,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22711 " shrl $2, %0\n"
22712 " andl $3, %%eax\n"
22713 " cld\n"
22714+ __COPYUSER_SET_ES
22715 "99: rep; movsl\n"
22716 "36: movl %%eax, %0\n"
22717 "37: rep; movsb\n"
22718 "100:\n"
22719+ __COPYUSER_RESTORE_ES
22720 ".section .fixup,\"ax\"\n"
22721 "101: lea 0(%%eax,%0,4),%0\n"
22722 " jmp 100b\n"
22723@@ -334,46 +340,155 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22724 }
22725
22726 static unsigned long
22727+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
22728+{
22729+ int d0, d1;
22730+ __asm__ __volatile__(
22731+ " .align 2,0x90\n"
22732+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
22733+ " cmpl $67, %0\n"
22734+ " jbe 3f\n"
22735+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
22736+ " .align 2,0x90\n"
22737+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
22738+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
22739+ "5: movl %%eax, 0(%3)\n"
22740+ "6: movl %%edx, 4(%3)\n"
22741+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
22742+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
22743+ "9: movl %%eax, 8(%3)\n"
22744+ "10: movl %%edx, 12(%3)\n"
22745+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
22746+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
22747+ "13: movl %%eax, 16(%3)\n"
22748+ "14: movl %%edx, 20(%3)\n"
22749+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
22750+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
22751+ "17: movl %%eax, 24(%3)\n"
22752+ "18: movl %%edx, 28(%3)\n"
22753+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
22754+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
22755+ "21: movl %%eax, 32(%3)\n"
22756+ "22: movl %%edx, 36(%3)\n"
22757+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
22758+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
22759+ "25: movl %%eax, 40(%3)\n"
22760+ "26: movl %%edx, 44(%3)\n"
22761+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
22762+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
22763+ "29: movl %%eax, 48(%3)\n"
22764+ "30: movl %%edx, 52(%3)\n"
22765+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
22766+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
22767+ "33: movl %%eax, 56(%3)\n"
22768+ "34: movl %%edx, 60(%3)\n"
22769+ " addl $-64, %0\n"
22770+ " addl $64, %4\n"
22771+ " addl $64, %3\n"
22772+ " cmpl $63, %0\n"
22773+ " ja 1b\n"
22774+ "35: movl %0, %%eax\n"
22775+ " shrl $2, %0\n"
22776+ " andl $3, %%eax\n"
22777+ " cld\n"
22778+ "99: rep; "__copyuser_seg" movsl\n"
22779+ "36: movl %%eax, %0\n"
22780+ "37: rep; "__copyuser_seg" movsb\n"
22781+ "100:\n"
22782+ ".section .fixup,\"ax\"\n"
22783+ "101: lea 0(%%eax,%0,4),%0\n"
22784+ " jmp 100b\n"
22785+ ".previous\n"
22786+ ".section __ex_table,\"a\"\n"
22787+ " .align 4\n"
22788+ " .long 1b,100b\n"
22789+ " .long 2b,100b\n"
22790+ " .long 3b,100b\n"
22791+ " .long 4b,100b\n"
22792+ " .long 5b,100b\n"
22793+ " .long 6b,100b\n"
22794+ " .long 7b,100b\n"
22795+ " .long 8b,100b\n"
22796+ " .long 9b,100b\n"
22797+ " .long 10b,100b\n"
22798+ " .long 11b,100b\n"
22799+ " .long 12b,100b\n"
22800+ " .long 13b,100b\n"
22801+ " .long 14b,100b\n"
22802+ " .long 15b,100b\n"
22803+ " .long 16b,100b\n"
22804+ " .long 17b,100b\n"
22805+ " .long 18b,100b\n"
22806+ " .long 19b,100b\n"
22807+ " .long 20b,100b\n"
22808+ " .long 21b,100b\n"
22809+ " .long 22b,100b\n"
22810+ " .long 23b,100b\n"
22811+ " .long 24b,100b\n"
22812+ " .long 25b,100b\n"
22813+ " .long 26b,100b\n"
22814+ " .long 27b,100b\n"
22815+ " .long 28b,100b\n"
22816+ " .long 29b,100b\n"
22817+ " .long 30b,100b\n"
22818+ " .long 31b,100b\n"
22819+ " .long 32b,100b\n"
22820+ " .long 33b,100b\n"
22821+ " .long 34b,100b\n"
22822+ " .long 35b,100b\n"
22823+ " .long 36b,100b\n"
22824+ " .long 37b,100b\n"
22825+ " .long 99b,101b\n"
22826+ ".previous"
22827+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
22828+ : "1"(to), "2"(from), "0"(size)
22829+ : "eax", "edx", "memory");
22830+ return size;
22831+}
22832+
22833+static unsigned long
22834+__copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size) __size_overflow(3);
22835+static unsigned long
22836 __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22837 {
22838 int d0, d1;
22839 __asm__ __volatile__(
22840 " .align 2,0x90\n"
22841- "0: movl 32(%4), %%eax\n"
22842+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
22843 " cmpl $67, %0\n"
22844 " jbe 2f\n"
22845- "1: movl 64(%4), %%eax\n"
22846+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
22847 " .align 2,0x90\n"
22848- "2: movl 0(%4), %%eax\n"
22849- "21: movl 4(%4), %%edx\n"
22850+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
22851+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
22852 " movl %%eax, 0(%3)\n"
22853 " movl %%edx, 4(%3)\n"
22854- "3: movl 8(%4), %%eax\n"
22855- "31: movl 12(%4),%%edx\n"
22856+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
22857+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
22858 " movl %%eax, 8(%3)\n"
22859 " movl %%edx, 12(%3)\n"
22860- "4: movl 16(%4), %%eax\n"
22861- "41: movl 20(%4), %%edx\n"
22862+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
22863+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
22864 " movl %%eax, 16(%3)\n"
22865 " movl %%edx, 20(%3)\n"
22866- "10: movl 24(%4), %%eax\n"
22867- "51: movl 28(%4), %%edx\n"
22868+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
22869+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
22870 " movl %%eax, 24(%3)\n"
22871 " movl %%edx, 28(%3)\n"
22872- "11: movl 32(%4), %%eax\n"
22873- "61: movl 36(%4), %%edx\n"
22874+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
22875+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
22876 " movl %%eax, 32(%3)\n"
22877 " movl %%edx, 36(%3)\n"
22878- "12: movl 40(%4), %%eax\n"
22879- "71: movl 44(%4), %%edx\n"
22880+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
22881+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
22882 " movl %%eax, 40(%3)\n"
22883 " movl %%edx, 44(%3)\n"
22884- "13: movl 48(%4), %%eax\n"
22885- "81: movl 52(%4), %%edx\n"
22886+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
22887+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
22888 " movl %%eax, 48(%3)\n"
22889 " movl %%edx, 52(%3)\n"
22890- "14: movl 56(%4), %%eax\n"
22891- "91: movl 60(%4), %%edx\n"
22892+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
22893+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
22894 " movl %%eax, 56(%3)\n"
22895 " movl %%edx, 60(%3)\n"
22896 " addl $-64, %0\n"
22897@@ -385,9 +500,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22898 " shrl $2, %0\n"
22899 " andl $3, %%eax\n"
22900 " cld\n"
22901- "6: rep; movsl\n"
22902+ "6: rep; "__copyuser_seg" movsl\n"
22903 " movl %%eax,%0\n"
22904- "7: rep; movsb\n"
22905+ "7: rep; "__copyuser_seg" movsb\n"
22906 "8:\n"
22907 ".section .fixup,\"ax\"\n"
22908 "9: lea 0(%%eax,%0,4),%0\n"
22909@@ -434,47 +549,49 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22910 */
22911
22912 static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22913+ const void __user *from, unsigned long size) __size_overflow(3);
22914+static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22915 const void __user *from, unsigned long size)
22916 {
22917 int d0, d1;
22918
22919 __asm__ __volatile__(
22920 " .align 2,0x90\n"
22921- "0: movl 32(%4), %%eax\n"
22922+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
22923 " cmpl $67, %0\n"
22924 " jbe 2f\n"
22925- "1: movl 64(%4), %%eax\n"
22926+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
22927 " .align 2,0x90\n"
22928- "2: movl 0(%4), %%eax\n"
22929- "21: movl 4(%4), %%edx\n"
22930+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
22931+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
22932 " movnti %%eax, 0(%3)\n"
22933 " movnti %%edx, 4(%3)\n"
22934- "3: movl 8(%4), %%eax\n"
22935- "31: movl 12(%4),%%edx\n"
22936+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
22937+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
22938 " movnti %%eax, 8(%3)\n"
22939 " movnti %%edx, 12(%3)\n"
22940- "4: movl 16(%4), %%eax\n"
22941- "41: movl 20(%4), %%edx\n"
22942+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
22943+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
22944 " movnti %%eax, 16(%3)\n"
22945 " movnti %%edx, 20(%3)\n"
22946- "10: movl 24(%4), %%eax\n"
22947- "51: movl 28(%4), %%edx\n"
22948+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
22949+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
22950 " movnti %%eax, 24(%3)\n"
22951 " movnti %%edx, 28(%3)\n"
22952- "11: movl 32(%4), %%eax\n"
22953- "61: movl 36(%4), %%edx\n"
22954+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
22955+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
22956 " movnti %%eax, 32(%3)\n"
22957 " movnti %%edx, 36(%3)\n"
22958- "12: movl 40(%4), %%eax\n"
22959- "71: movl 44(%4), %%edx\n"
22960+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
22961+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
22962 " movnti %%eax, 40(%3)\n"
22963 " movnti %%edx, 44(%3)\n"
22964- "13: movl 48(%4), %%eax\n"
22965- "81: movl 52(%4), %%edx\n"
22966+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
22967+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
22968 " movnti %%eax, 48(%3)\n"
22969 " movnti %%edx, 52(%3)\n"
22970- "14: movl 56(%4), %%eax\n"
22971- "91: movl 60(%4), %%edx\n"
22972+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
22973+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
22974 " movnti %%eax, 56(%3)\n"
22975 " movnti %%edx, 60(%3)\n"
22976 " addl $-64, %0\n"
22977@@ -487,9 +604,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22978 " shrl $2, %0\n"
22979 " andl $3, %%eax\n"
22980 " cld\n"
22981- "6: rep; movsl\n"
22982+ "6: rep; "__copyuser_seg" movsl\n"
22983 " movl %%eax,%0\n"
22984- "7: rep; movsb\n"
22985+ "7: rep; "__copyuser_seg" movsb\n"
22986 "8:\n"
22987 ".section .fixup,\"ax\"\n"
22988 "9: lea 0(%%eax,%0,4),%0\n"
22989@@ -531,47 +648,49 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22990 }
22991
22992 static unsigned long __copy_user_intel_nocache(void *to,
22993+ const void __user *from, unsigned long size) __size_overflow(3);
22994+static unsigned long __copy_user_intel_nocache(void *to,
22995 const void __user *from, unsigned long size)
22996 {
22997 int d0, d1;
22998
22999 __asm__ __volatile__(
23000 " .align 2,0x90\n"
23001- "0: movl 32(%4), %%eax\n"
23002+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23003 " cmpl $67, %0\n"
23004 " jbe 2f\n"
23005- "1: movl 64(%4), %%eax\n"
23006+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23007 " .align 2,0x90\n"
23008- "2: movl 0(%4), %%eax\n"
23009- "21: movl 4(%4), %%edx\n"
23010+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23011+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23012 " movnti %%eax, 0(%3)\n"
23013 " movnti %%edx, 4(%3)\n"
23014- "3: movl 8(%4), %%eax\n"
23015- "31: movl 12(%4),%%edx\n"
23016+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23017+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23018 " movnti %%eax, 8(%3)\n"
23019 " movnti %%edx, 12(%3)\n"
23020- "4: movl 16(%4), %%eax\n"
23021- "41: movl 20(%4), %%edx\n"
23022+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23023+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23024 " movnti %%eax, 16(%3)\n"
23025 " movnti %%edx, 20(%3)\n"
23026- "10: movl 24(%4), %%eax\n"
23027- "51: movl 28(%4), %%edx\n"
23028+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23029+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23030 " movnti %%eax, 24(%3)\n"
23031 " movnti %%edx, 28(%3)\n"
23032- "11: movl 32(%4), %%eax\n"
23033- "61: movl 36(%4), %%edx\n"
23034+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23035+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23036 " movnti %%eax, 32(%3)\n"
23037 " movnti %%edx, 36(%3)\n"
23038- "12: movl 40(%4), %%eax\n"
23039- "71: movl 44(%4), %%edx\n"
23040+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23041+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23042 " movnti %%eax, 40(%3)\n"
23043 " movnti %%edx, 44(%3)\n"
23044- "13: movl 48(%4), %%eax\n"
23045- "81: movl 52(%4), %%edx\n"
23046+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23047+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23048 " movnti %%eax, 48(%3)\n"
23049 " movnti %%edx, 52(%3)\n"
23050- "14: movl 56(%4), %%eax\n"
23051- "91: movl 60(%4), %%edx\n"
23052+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23053+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23054 " movnti %%eax, 56(%3)\n"
23055 " movnti %%edx, 60(%3)\n"
23056 " addl $-64, %0\n"
23057@@ -584,9 +703,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
23058 " shrl $2, %0\n"
23059 " andl $3, %%eax\n"
23060 " cld\n"
23061- "6: rep; movsl\n"
23062+ "6: rep; "__copyuser_seg" movsl\n"
23063 " movl %%eax,%0\n"
23064- "7: rep; movsb\n"
23065+ "7: rep; "__copyuser_seg" movsb\n"
23066 "8:\n"
23067 ".section .fixup,\"ax\"\n"
23068 "9: lea 0(%%eax,%0,4),%0\n"
23069@@ -629,32 +748,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
23070 */
23071 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
23072 unsigned long size);
23073-unsigned long __copy_user_intel(void __user *to, const void *from,
23074+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
23075+ unsigned long size);
23076+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
23077 unsigned long size);
23078 unsigned long __copy_user_zeroing_intel_nocache(void *to,
23079 const void __user *from, unsigned long size);
23080 #endif /* CONFIG_X86_INTEL_USERCOPY */
23081
23082 /* Generic arbitrary sized copy. */
23083-#define __copy_user(to, from, size) \
23084+#define __copy_user(to, from, size, prefix, set, restore) \
23085 do { \
23086 int __d0, __d1, __d2; \
23087 __asm__ __volatile__( \
23088+ set \
23089 " cmp $7,%0\n" \
23090 " jbe 1f\n" \
23091 " movl %1,%0\n" \
23092 " negl %0\n" \
23093 " andl $7,%0\n" \
23094 " subl %0,%3\n" \
23095- "4: rep; movsb\n" \
23096+ "4: rep; "prefix"movsb\n" \
23097 " movl %3,%0\n" \
23098 " shrl $2,%0\n" \
23099 " andl $3,%3\n" \
23100 " .align 2,0x90\n" \
23101- "0: rep; movsl\n" \
23102+ "0: rep; "prefix"movsl\n" \
23103 " movl %3,%0\n" \
23104- "1: rep; movsb\n" \
23105+ "1: rep; "prefix"movsb\n" \
23106 "2:\n" \
23107+ restore \
23108 ".section .fixup,\"ax\"\n" \
23109 "5: addl %3,%0\n" \
23110 " jmp 2b\n" \
23111@@ -682,14 +805,14 @@ do { \
23112 " negl %0\n" \
23113 " andl $7,%0\n" \
23114 " subl %0,%3\n" \
23115- "4: rep; movsb\n" \
23116+ "4: rep; "__copyuser_seg"movsb\n" \
23117 " movl %3,%0\n" \
23118 " shrl $2,%0\n" \
23119 " andl $3,%3\n" \
23120 " .align 2,0x90\n" \
23121- "0: rep; movsl\n" \
23122+ "0: rep; "__copyuser_seg"movsl\n" \
23123 " movl %3,%0\n" \
23124- "1: rep; movsb\n" \
23125+ "1: rep; "__copyuser_seg"movsb\n" \
23126 "2:\n" \
23127 ".section .fixup,\"ax\"\n" \
23128 "5: addl %3,%0\n" \
23129@@ -775,9 +898,9 @@ survive:
23130 }
23131 #endif
23132 if (movsl_is_ok(to, from, n))
23133- __copy_user(to, from, n);
23134+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
23135 else
23136- n = __copy_user_intel(to, from, n);
23137+ n = __generic_copy_to_user_intel(to, from, n);
23138 return n;
23139 }
23140 EXPORT_SYMBOL(__copy_to_user_ll);
23141@@ -797,10 +920,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
23142 unsigned long n)
23143 {
23144 if (movsl_is_ok(to, from, n))
23145- __copy_user(to, from, n);
23146+ __copy_user(to, from, n, __copyuser_seg, "", "");
23147 else
23148- n = __copy_user_intel((void __user *)to,
23149- (const void *)from, n);
23150+ n = __generic_copy_from_user_intel(to, from, n);
23151 return n;
23152 }
23153 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
23154@@ -827,65 +949,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
23155 if (n > 64 && cpu_has_xmm2)
23156 n = __copy_user_intel_nocache(to, from, n);
23157 else
23158- __copy_user(to, from, n);
23159+ __copy_user(to, from, n, __copyuser_seg, "", "");
23160 #else
23161- __copy_user(to, from, n);
23162+ __copy_user(to, from, n, __copyuser_seg, "", "");
23163 #endif
23164 return n;
23165 }
23166 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
23167
23168-/**
23169- * copy_to_user: - Copy a block of data into user space.
23170- * @to: Destination address, in user space.
23171- * @from: Source address, in kernel space.
23172- * @n: Number of bytes to copy.
23173- *
23174- * Context: User context only. This function may sleep.
23175- *
23176- * Copy data from kernel space to user space.
23177- *
23178- * Returns number of bytes that could not be copied.
23179- * On success, this will be zero.
23180- */
23181-unsigned long
23182-copy_to_user(void __user *to, const void *from, unsigned long n)
23183-{
23184- if (access_ok(VERIFY_WRITE, to, n))
23185- n = __copy_to_user(to, from, n);
23186- return n;
23187-}
23188-EXPORT_SYMBOL(copy_to_user);
23189-
23190-/**
23191- * copy_from_user: - Copy a block of data from user space.
23192- * @to: Destination address, in kernel space.
23193- * @from: Source address, in user space.
23194- * @n: Number of bytes to copy.
23195- *
23196- * Context: User context only. This function may sleep.
23197- *
23198- * Copy data from user space to kernel space.
23199- *
23200- * Returns number of bytes that could not be copied.
23201- * On success, this will be zero.
23202- *
23203- * If some data could not be copied, this function will pad the copied
23204- * data to the requested size using zero bytes.
23205- */
23206-unsigned long
23207-_copy_from_user(void *to, const void __user *from, unsigned long n)
23208-{
23209- if (access_ok(VERIFY_READ, from, n))
23210- n = __copy_from_user(to, from, n);
23211- else
23212- memset(to, 0, n);
23213- return n;
23214-}
23215-EXPORT_SYMBOL(_copy_from_user);
23216-
23217 void copy_from_user_overflow(void)
23218 {
23219 WARN(1, "Buffer overflow detected!\n");
23220 }
23221 EXPORT_SYMBOL(copy_from_user_overflow);
23222+
23223+void copy_to_user_overflow(void)
23224+{
23225+ WARN(1, "Buffer overflow detected!\n");
23226+}
23227+EXPORT_SYMBOL(copy_to_user_overflow);
23228+
23229+#ifdef CONFIG_PAX_MEMORY_UDEREF
23230+void __set_fs(mm_segment_t x)
23231+{
23232+ switch (x.seg) {
23233+ case 0:
23234+ loadsegment(gs, 0);
23235+ break;
23236+ case TASK_SIZE_MAX:
23237+ loadsegment(gs, __USER_DS);
23238+ break;
23239+ case -1UL:
23240+ loadsegment(gs, __KERNEL_DS);
23241+ break;
23242+ default:
23243+ BUG();
23244+ }
23245+ return;
23246+}
23247+EXPORT_SYMBOL(__set_fs);
23248+
23249+void set_fs(mm_segment_t x)
23250+{
23251+ current_thread_info()->addr_limit = x;
23252+ __set_fs(x);
23253+}
23254+EXPORT_SYMBOL(set_fs);
23255+#endif
23256diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
23257index b7c2849..8633ad8 100644
23258--- a/arch/x86/lib/usercopy_64.c
23259+++ b/arch/x86/lib/usercopy_64.c
23260@@ -42,6 +42,12 @@ long
23261 __strncpy_from_user(char *dst, const char __user *src, long count)
23262 {
23263 long res;
23264+
23265+#ifdef CONFIG_PAX_MEMORY_UDEREF
23266+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
23267+ src += PAX_USER_SHADOW_BASE;
23268+#endif
23269+
23270 __do_strncpy_from_user(dst, src, count, res);
23271 return res;
23272 }
23273@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
23274 {
23275 long __d0;
23276 might_fault();
23277+
23278+#ifdef CONFIG_PAX_MEMORY_UDEREF
23279+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
23280+ addr += PAX_USER_SHADOW_BASE;
23281+#endif
23282+
23283 /* no memory constraint because it doesn't change any memory gcc knows
23284 about */
23285 asm volatile(
23286@@ -149,12 +161,20 @@ long strlen_user(const char __user *s)
23287 }
23288 EXPORT_SYMBOL(strlen_user);
23289
23290-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
23291+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
23292 {
23293- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23294- return copy_user_generic((__force void *)to, (__force void *)from, len);
23295- }
23296- return len;
23297+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23298+
23299+#ifdef CONFIG_PAX_MEMORY_UDEREF
23300+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
23301+ to += PAX_USER_SHADOW_BASE;
23302+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
23303+ from += PAX_USER_SHADOW_BASE;
23304+#endif
23305+
23306+ return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
23307+ }
23308+ return len;
23309 }
23310 EXPORT_SYMBOL(copy_in_user);
23311
23312@@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
23313 * it is not necessary to optimize tail handling.
23314 */
23315 unsigned long
23316-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23317+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
23318 {
23319 char c;
23320 unsigned zero_len;
23321diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
23322index 1fb85db..8b3540b 100644
23323--- a/arch/x86/mm/extable.c
23324+++ b/arch/x86/mm/extable.c
23325@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs)
23326 const struct exception_table_entry *fixup;
23327
23328 #ifdef CONFIG_PNPBIOS
23329- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
23330+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
23331 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
23332 extern u32 pnp_bios_is_utter_crap;
23333 pnp_bios_is_utter_crap = 1;
23334diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
23335index f0b4caf..d92fd42 100644
23336--- a/arch/x86/mm/fault.c
23337+++ b/arch/x86/mm/fault.c
23338@@ -13,11 +13,18 @@
23339 #include <linux/perf_event.h> /* perf_sw_event */
23340 #include <linux/hugetlb.h> /* hstate_index_to_shift */
23341 #include <linux/prefetch.h> /* prefetchw */
23342+#include <linux/unistd.h>
23343+#include <linux/compiler.h>
23344
23345 #include <asm/traps.h> /* dotraplinkage, ... */
23346 #include <asm/pgalloc.h> /* pgd_*(), ... */
23347 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
23348 #include <asm/fixmap.h> /* VSYSCALL_START */
23349+#include <asm/tlbflush.h>
23350+
23351+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23352+#include <asm/stacktrace.h>
23353+#endif
23354
23355 /*
23356 * Page fault error code bits:
23357@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
23358 int ret = 0;
23359
23360 /* kprobe_running() needs smp_processor_id() */
23361- if (kprobes_built_in() && !user_mode_vm(regs)) {
23362+ if (kprobes_built_in() && !user_mode(regs)) {
23363 preempt_disable();
23364 if (kprobe_running() && kprobe_fault_handler(regs, 14))
23365 ret = 1;
23366@@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
23367 return !instr_lo || (instr_lo>>1) == 1;
23368 case 0x00:
23369 /* Prefetch instruction is 0x0F0D or 0x0F18 */
23370- if (probe_kernel_address(instr, opcode))
23371+ if (user_mode(regs)) {
23372+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23373+ return 0;
23374+ } else if (probe_kernel_address(instr, opcode))
23375 return 0;
23376
23377 *prefetch = (instr_lo == 0xF) &&
23378@@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
23379 while (instr < max_instr) {
23380 unsigned char opcode;
23381
23382- if (probe_kernel_address(instr, opcode))
23383+ if (user_mode(regs)) {
23384+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23385+ break;
23386+ } else if (probe_kernel_address(instr, opcode))
23387 break;
23388
23389 instr++;
23390@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
23391 force_sig_info(si_signo, &info, tsk);
23392 }
23393
23394+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23395+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
23396+#endif
23397+
23398+#ifdef CONFIG_PAX_EMUTRAMP
23399+static int pax_handle_fetch_fault(struct pt_regs *regs);
23400+#endif
23401+
23402+#ifdef CONFIG_PAX_PAGEEXEC
23403+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
23404+{
23405+ pgd_t *pgd;
23406+ pud_t *pud;
23407+ pmd_t *pmd;
23408+
23409+ pgd = pgd_offset(mm, address);
23410+ if (!pgd_present(*pgd))
23411+ return NULL;
23412+ pud = pud_offset(pgd, address);
23413+ if (!pud_present(*pud))
23414+ return NULL;
23415+ pmd = pmd_offset(pud, address);
23416+ if (!pmd_present(*pmd))
23417+ return NULL;
23418+ return pmd;
23419+}
23420+#endif
23421+
23422 DEFINE_SPINLOCK(pgd_lock);
23423 LIST_HEAD(pgd_list);
23424
23425@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
23426 for (address = VMALLOC_START & PMD_MASK;
23427 address >= TASK_SIZE && address < FIXADDR_TOP;
23428 address += PMD_SIZE) {
23429+
23430+#ifdef CONFIG_PAX_PER_CPU_PGD
23431+ unsigned long cpu;
23432+#else
23433 struct page *page;
23434+#endif
23435
23436 spin_lock(&pgd_lock);
23437+
23438+#ifdef CONFIG_PAX_PER_CPU_PGD
23439+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
23440+ pgd_t *pgd = get_cpu_pgd(cpu);
23441+ pmd_t *ret;
23442+#else
23443 list_for_each_entry(page, &pgd_list, lru) {
23444+ pgd_t *pgd = page_address(page);
23445 spinlock_t *pgt_lock;
23446 pmd_t *ret;
23447
23448@@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
23449 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
23450
23451 spin_lock(pgt_lock);
23452- ret = vmalloc_sync_one(page_address(page), address);
23453+#endif
23454+
23455+ ret = vmalloc_sync_one(pgd, address);
23456+
23457+#ifndef CONFIG_PAX_PER_CPU_PGD
23458 spin_unlock(pgt_lock);
23459+#endif
23460
23461 if (!ret)
23462 break;
23463@@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23464 * an interrupt in the middle of a task switch..
23465 */
23466 pgd_paddr = read_cr3();
23467+
23468+#ifdef CONFIG_PAX_PER_CPU_PGD
23469+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
23470+#endif
23471+
23472 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
23473 if (!pmd_k)
23474 return -1;
23475@@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23476 * happen within a race in page table update. In the later
23477 * case just flush:
23478 */
23479+
23480+#ifdef CONFIG_PAX_PER_CPU_PGD
23481+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
23482+ pgd = pgd_offset_cpu(smp_processor_id(), address);
23483+#else
23484 pgd = pgd_offset(current->active_mm, address);
23485+#endif
23486+
23487 pgd_ref = pgd_offset_k(address);
23488 if (pgd_none(*pgd_ref))
23489 return -1;
23490@@ -540,7 +610,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
23491 static int is_errata100(struct pt_regs *regs, unsigned long address)
23492 {
23493 #ifdef CONFIG_X86_64
23494- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
23495+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
23496 return 1;
23497 #endif
23498 return 0;
23499@@ -567,7 +637,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
23500 }
23501
23502 static const char nx_warning[] = KERN_CRIT
23503-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
23504+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
23505
23506 static void
23507 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23508@@ -576,15 +646,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23509 if (!oops_may_print())
23510 return;
23511
23512- if (error_code & PF_INSTR) {
23513+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
23514 unsigned int level;
23515
23516 pte_t *pte = lookup_address(address, &level);
23517
23518 if (pte && pte_present(*pte) && !pte_exec(*pte))
23519- printk(nx_warning, current_uid());
23520+ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
23521 }
23522
23523+#ifdef CONFIG_PAX_KERNEXEC
23524+ if (init_mm.start_code <= address && address < init_mm.end_code) {
23525+ if (current->signal->curr_ip)
23526+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23527+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
23528+ else
23529+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23530+ current->comm, task_pid_nr(current), current_uid(), current_euid());
23531+ }
23532+#endif
23533+
23534 printk(KERN_ALERT "BUG: unable to handle kernel ");
23535 if (address < PAGE_SIZE)
23536 printk(KERN_CONT "NULL pointer dereference");
23537@@ -748,6 +829,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
23538 }
23539 #endif
23540
23541+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23542+ if (pax_is_fetch_fault(regs, error_code, address)) {
23543+
23544+#ifdef CONFIG_PAX_EMUTRAMP
23545+ switch (pax_handle_fetch_fault(regs)) {
23546+ case 2:
23547+ return;
23548+ }
23549+#endif
23550+
23551+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23552+ do_group_exit(SIGKILL);
23553+ }
23554+#endif
23555+
23556 if (unlikely(show_unhandled_signals))
23557 show_signal_msg(regs, error_code, address, tsk);
23558
23559@@ -844,7 +940,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
23560 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
23561 printk(KERN_ERR
23562 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
23563- tsk->comm, tsk->pid, address);
23564+ tsk->comm, task_pid_nr(tsk), address);
23565 code = BUS_MCEERR_AR;
23566 }
23567 #endif
23568@@ -900,6 +996,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
23569 return 1;
23570 }
23571
23572+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23573+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
23574+{
23575+ pte_t *pte;
23576+ pmd_t *pmd;
23577+ spinlock_t *ptl;
23578+ unsigned char pte_mask;
23579+
23580+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
23581+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
23582+ return 0;
23583+
23584+ /* PaX: it's our fault, let's handle it if we can */
23585+
23586+ /* PaX: take a look at read faults before acquiring any locks */
23587+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
23588+ /* instruction fetch attempt from a protected page in user mode */
23589+ up_read(&mm->mmap_sem);
23590+
23591+#ifdef CONFIG_PAX_EMUTRAMP
23592+ switch (pax_handle_fetch_fault(regs)) {
23593+ case 2:
23594+ return 1;
23595+ }
23596+#endif
23597+
23598+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23599+ do_group_exit(SIGKILL);
23600+ }
23601+
23602+ pmd = pax_get_pmd(mm, address);
23603+ if (unlikely(!pmd))
23604+ return 0;
23605+
23606+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
23607+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
23608+ pte_unmap_unlock(pte, ptl);
23609+ return 0;
23610+ }
23611+
23612+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
23613+ /* write attempt to a protected page in user mode */
23614+ pte_unmap_unlock(pte, ptl);
23615+ return 0;
23616+ }
23617+
23618+#ifdef CONFIG_SMP
23619+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
23620+#else
23621+ if (likely(address > get_limit(regs->cs)))
23622+#endif
23623+ {
23624+ set_pte(pte, pte_mkread(*pte));
23625+ __flush_tlb_one(address);
23626+ pte_unmap_unlock(pte, ptl);
23627+ up_read(&mm->mmap_sem);
23628+ return 1;
23629+ }
23630+
23631+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
23632+
23633+ /*
23634+ * PaX: fill DTLB with user rights and retry
23635+ */
23636+ __asm__ __volatile__ (
23637+ "orb %2,(%1)\n"
23638+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
23639+/*
23640+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
23641+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
23642+ * page fault when examined during a TLB load attempt. this is true not only
23643+ * for PTEs holding a non-present entry but also present entries that will
23644+ * raise a page fault (such as those set up by PaX, or the copy-on-write
23645+ * mechanism). in effect it means that we do *not* need to flush the TLBs
23646+ * for our target pages since their PTEs are simply not in the TLBs at all.
23647+
23648+ * the best thing in omitting it is that we gain around 15-20% speed in the
23649+ * fast path of the page fault handler and can get rid of tracing since we
23650+ * can no longer flush unintended entries.
23651+ */
23652+ "invlpg (%0)\n"
23653+#endif
23654+ __copyuser_seg"testb $0,(%0)\n"
23655+ "xorb %3,(%1)\n"
23656+ :
23657+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
23658+ : "memory", "cc");
23659+ pte_unmap_unlock(pte, ptl);
23660+ up_read(&mm->mmap_sem);
23661+ return 1;
23662+}
23663+#endif
23664+
23665 /*
23666 * Handle a spurious fault caused by a stale TLB entry.
23667 *
23668@@ -972,6 +1161,9 @@ int show_unhandled_signals = 1;
23669 static inline int
23670 access_error(unsigned long error_code, struct vm_area_struct *vma)
23671 {
23672+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
23673+ return 1;
23674+
23675 if (error_code & PF_WRITE) {
23676 /* write, present and write, not present: */
23677 if (unlikely(!(vma->vm_flags & VM_WRITE)))
23678@@ -1005,18 +1197,32 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23679 {
23680 struct vm_area_struct *vma;
23681 struct task_struct *tsk;
23682- unsigned long address;
23683 struct mm_struct *mm;
23684 int fault;
23685 int write = error_code & PF_WRITE;
23686 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
23687 (write ? FAULT_FLAG_WRITE : 0);
23688
23689- tsk = current;
23690- mm = tsk->mm;
23691-
23692 /* Get the faulting address: */
23693- address = read_cr2();
23694+ unsigned long address = read_cr2();
23695+
23696+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23697+ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
23698+ if (!search_exception_tables(regs->ip)) {
23699+ bad_area_nosemaphore(regs, error_code, address);
23700+ return;
23701+ }
23702+ if (address < PAX_USER_SHADOW_BASE) {
23703+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
23704+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
23705+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
23706+ } else
23707+ address -= PAX_USER_SHADOW_BASE;
23708+ }
23709+#endif
23710+
23711+ tsk = current;
23712+ mm = tsk->mm;
23713
23714 /*
23715 * Detect and handle instructions that would cause a page fault for
23716@@ -1077,7 +1283,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23717 * User-mode registers count as a user access even for any
23718 * potential system fault or CPU buglet:
23719 */
23720- if (user_mode_vm(regs)) {
23721+ if (user_mode(regs)) {
23722 local_irq_enable();
23723 error_code |= PF_USER;
23724 } else {
23725@@ -1132,6 +1338,11 @@ retry:
23726 might_sleep();
23727 }
23728
23729+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23730+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
23731+ return;
23732+#endif
23733+
23734 vma = find_vma(mm, address);
23735 if (unlikely(!vma)) {
23736 bad_area(regs, error_code, address);
23737@@ -1143,18 +1354,24 @@ retry:
23738 bad_area(regs, error_code, address);
23739 return;
23740 }
23741- if (error_code & PF_USER) {
23742- /*
23743- * Accessing the stack below %sp is always a bug.
23744- * The large cushion allows instructions like enter
23745- * and pusha to work. ("enter $65535, $31" pushes
23746- * 32 pointers and then decrements %sp by 65535.)
23747- */
23748- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
23749- bad_area(regs, error_code, address);
23750- return;
23751- }
23752+ /*
23753+ * Accessing the stack below %sp is always a bug.
23754+ * The large cushion allows instructions like enter
23755+ * and pusha to work. ("enter $65535, $31" pushes
23756+ * 32 pointers and then decrements %sp by 65535.)
23757+ */
23758+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
23759+ bad_area(regs, error_code, address);
23760+ return;
23761 }
23762+
23763+#ifdef CONFIG_PAX_SEGMEXEC
23764+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
23765+ bad_area(regs, error_code, address);
23766+ return;
23767+ }
23768+#endif
23769+
23770 if (unlikely(expand_stack(vma, address))) {
23771 bad_area(regs, error_code, address);
23772 return;
23773@@ -1209,3 +1426,292 @@ good_area:
23774
23775 up_read(&mm->mmap_sem);
23776 }
23777+
23778+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23779+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
23780+{
23781+ struct mm_struct *mm = current->mm;
23782+ unsigned long ip = regs->ip;
23783+
23784+ if (v8086_mode(regs))
23785+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
23786+
23787+#ifdef CONFIG_PAX_PAGEEXEC
23788+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
23789+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
23790+ return true;
23791+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
23792+ return true;
23793+ return false;
23794+ }
23795+#endif
23796+
23797+#ifdef CONFIG_PAX_SEGMEXEC
23798+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
23799+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
23800+ return true;
23801+ return false;
23802+ }
23803+#endif
23804+
23805+ return false;
23806+}
23807+#endif
23808+
23809+#ifdef CONFIG_PAX_EMUTRAMP
23810+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
23811+{
23812+ int err;
23813+
23814+ do { /* PaX: libffi trampoline emulation */
23815+ unsigned char mov, jmp;
23816+ unsigned int addr1, addr2;
23817+
23818+#ifdef CONFIG_X86_64
23819+ if ((regs->ip + 9) >> 32)
23820+ break;
23821+#endif
23822+
23823+ err = get_user(mov, (unsigned char __user *)regs->ip);
23824+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23825+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
23826+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23827+
23828+ if (err)
23829+ break;
23830+
23831+ if (mov == 0xB8 && jmp == 0xE9) {
23832+ regs->ax = addr1;
23833+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
23834+ return 2;
23835+ }
23836+ } while (0);
23837+
23838+ do { /* PaX: gcc trampoline emulation #1 */
23839+ unsigned char mov1, mov2;
23840+ unsigned short jmp;
23841+ unsigned int addr1, addr2;
23842+
23843+#ifdef CONFIG_X86_64
23844+ if ((regs->ip + 11) >> 32)
23845+ break;
23846+#endif
23847+
23848+ err = get_user(mov1, (unsigned char __user *)regs->ip);
23849+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23850+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
23851+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23852+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
23853+
23854+ if (err)
23855+ break;
23856+
23857+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
23858+ regs->cx = addr1;
23859+ regs->ax = addr2;
23860+ regs->ip = addr2;
23861+ return 2;
23862+ }
23863+ } while (0);
23864+
23865+ do { /* PaX: gcc trampoline emulation #2 */
23866+ unsigned char mov, jmp;
23867+ unsigned int addr1, addr2;
23868+
23869+#ifdef CONFIG_X86_64
23870+ if ((regs->ip + 9) >> 32)
23871+ break;
23872+#endif
23873+
23874+ err = get_user(mov, (unsigned char __user *)regs->ip);
23875+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23876+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
23877+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23878+
23879+ if (err)
23880+ break;
23881+
23882+ if (mov == 0xB9 && jmp == 0xE9) {
23883+ regs->cx = addr1;
23884+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
23885+ return 2;
23886+ }
23887+ } while (0);
23888+
23889+ return 1; /* PaX in action */
23890+}
23891+
23892+#ifdef CONFIG_X86_64
23893+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
23894+{
23895+ int err;
23896+
23897+ do { /* PaX: libffi trampoline emulation */
23898+ unsigned short mov1, mov2, jmp1;
23899+ unsigned char stcclc, jmp2;
23900+ unsigned long addr1, addr2;
23901+
23902+ err = get_user(mov1, (unsigned short __user *)regs->ip);
23903+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
23904+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
23905+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
23906+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
23907+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
23908+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
23909+
23910+ if (err)
23911+ break;
23912+
23913+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
23914+ regs->r11 = addr1;
23915+ regs->r10 = addr2;
23916+ if (stcclc == 0xF8)
23917+ regs->flags &= ~X86_EFLAGS_CF;
23918+ else
23919+ regs->flags |= X86_EFLAGS_CF;
23920+ regs->ip = addr1;
23921+ return 2;
23922+ }
23923+ } while (0);
23924+
23925+ do { /* PaX: gcc trampoline emulation #1 */
23926+ unsigned short mov1, mov2, jmp1;
23927+ unsigned char jmp2;
23928+ unsigned int addr1;
23929+ unsigned long addr2;
23930+
23931+ err = get_user(mov1, (unsigned short __user *)regs->ip);
23932+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
23933+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
23934+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
23935+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
23936+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
23937+
23938+ if (err)
23939+ break;
23940+
23941+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
23942+ regs->r11 = addr1;
23943+ regs->r10 = addr2;
23944+ regs->ip = addr1;
23945+ return 2;
23946+ }
23947+ } while (0);
23948+
23949+ do { /* PaX: gcc trampoline emulation #2 */
23950+ unsigned short mov1, mov2, jmp1;
23951+ unsigned char jmp2;
23952+ unsigned long addr1, addr2;
23953+
23954+ err = get_user(mov1, (unsigned short __user *)regs->ip);
23955+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
23956+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
23957+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
23958+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
23959+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
23960+
23961+ if (err)
23962+ break;
23963+
23964+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
23965+ regs->r11 = addr1;
23966+ regs->r10 = addr2;
23967+ regs->ip = addr1;
23968+ return 2;
23969+ }
23970+ } while (0);
23971+
23972+ return 1; /* PaX in action */
23973+}
23974+#endif
23975+
23976+/*
23977+ * PaX: decide what to do with offenders (regs->ip = fault address)
23978+ *
23979+ * returns 1 when task should be killed
23980+ * 2 when gcc trampoline was detected
23981+ */
23982+static int pax_handle_fetch_fault(struct pt_regs *regs)
23983+{
23984+ if (v8086_mode(regs))
23985+ return 1;
23986+
23987+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
23988+ return 1;
23989+
23990+#ifdef CONFIG_X86_32
23991+ return pax_handle_fetch_fault_32(regs);
23992+#else
23993+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
23994+ return pax_handle_fetch_fault_32(regs);
23995+ else
23996+ return pax_handle_fetch_fault_64(regs);
23997+#endif
23998+}
23999+#endif
24000+
24001+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24002+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
24003+{
24004+ long i;
24005+
24006+ printk(KERN_ERR "PAX: bytes at PC: ");
24007+ for (i = 0; i < 20; i++) {
24008+ unsigned char c;
24009+ if (get_user(c, (unsigned char __force_user *)pc+i))
24010+ printk(KERN_CONT "?? ");
24011+ else
24012+ printk(KERN_CONT "%02x ", c);
24013+ }
24014+ printk("\n");
24015+
24016+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
24017+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
24018+ unsigned long c;
24019+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
24020+#ifdef CONFIG_X86_32
24021+ printk(KERN_CONT "???????? ");
24022+#else
24023+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
24024+ printk(KERN_CONT "???????? ???????? ");
24025+ else
24026+ printk(KERN_CONT "???????????????? ");
24027+#endif
24028+ } else {
24029+#ifdef CONFIG_X86_64
24030+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
24031+ printk(KERN_CONT "%08x ", (unsigned int)c);
24032+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
24033+ } else
24034+#endif
24035+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
24036+ }
24037+ }
24038+ printk("\n");
24039+}
24040+#endif
24041+
24042+/**
24043+ * probe_kernel_write(): safely attempt to write to a location
24044+ * @dst: address to write to
24045+ * @src: pointer to the data that shall be written
24046+ * @size: size of the data chunk
24047+ *
24048+ * Safely write to address @dst from the buffer at @src. If a kernel fault
24049+ * happens, handle that and return -EFAULT.
24050+ */
24051+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
24052+{
24053+ long ret;
24054+ mm_segment_t old_fs = get_fs();
24055+
24056+ set_fs(KERNEL_DS);
24057+ pagefault_disable();
24058+ pax_open_kernel();
24059+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
24060+ pax_close_kernel();
24061+ pagefault_enable();
24062+ set_fs(old_fs);
24063+
24064+ return ret ? -EFAULT : 0;
24065+}
24066diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
24067index dd74e46..7d26398 100644
24068--- a/arch/x86/mm/gup.c
24069+++ b/arch/x86/mm/gup.c
24070@@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
24071 addr = start;
24072 len = (unsigned long) nr_pages << PAGE_SHIFT;
24073 end = start + len;
24074- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24075+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24076 (void __user *)start, len)))
24077 return 0;
24078
24079diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
24080index f4f29b1..5cac4fb 100644
24081--- a/arch/x86/mm/highmem_32.c
24082+++ b/arch/x86/mm/highmem_32.c
24083@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
24084 idx = type + KM_TYPE_NR*smp_processor_id();
24085 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24086 BUG_ON(!pte_none(*(kmap_pte-idx)));
24087+
24088+ pax_open_kernel();
24089 set_pte(kmap_pte-idx, mk_pte(page, prot));
24090+ pax_close_kernel();
24091+
24092 arch_flush_lazy_mmu_mode();
24093
24094 return (void *)vaddr;
24095diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
24096index 8ecbb4b..29efd37 100644
24097--- a/arch/x86/mm/hugetlbpage.c
24098+++ b/arch/x86/mm/hugetlbpage.c
24099@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
24100 struct hstate *h = hstate_file(file);
24101 struct mm_struct *mm = current->mm;
24102 struct vm_area_struct *vma;
24103- unsigned long start_addr;
24104+ unsigned long start_addr, pax_task_size = TASK_SIZE;
24105+
24106+#ifdef CONFIG_PAX_SEGMEXEC
24107+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24108+ pax_task_size = SEGMEXEC_TASK_SIZE;
24109+#endif
24110+
24111+ pax_task_size -= PAGE_SIZE;
24112
24113 if (len > mm->cached_hole_size) {
24114- start_addr = mm->free_area_cache;
24115+ start_addr = mm->free_area_cache;
24116 } else {
24117- start_addr = TASK_UNMAPPED_BASE;
24118- mm->cached_hole_size = 0;
24119+ start_addr = mm->mmap_base;
24120+ mm->cached_hole_size = 0;
24121 }
24122
24123 full_search:
24124@@ -280,26 +287,27 @@ full_search:
24125
24126 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
24127 /* At this point: (!vma || addr < vma->vm_end). */
24128- if (TASK_SIZE - len < addr) {
24129+ if (pax_task_size - len < addr) {
24130 /*
24131 * Start a new search - just in case we missed
24132 * some holes.
24133 */
24134- if (start_addr != TASK_UNMAPPED_BASE) {
24135- start_addr = TASK_UNMAPPED_BASE;
24136+ if (start_addr != mm->mmap_base) {
24137+ start_addr = mm->mmap_base;
24138 mm->cached_hole_size = 0;
24139 goto full_search;
24140 }
24141 return -ENOMEM;
24142 }
24143- if (!vma || addr + len <= vma->vm_start) {
24144- mm->free_area_cache = addr + len;
24145- return addr;
24146- }
24147+ if (check_heap_stack_gap(vma, addr, len))
24148+ break;
24149 if (addr + mm->cached_hole_size < vma->vm_start)
24150 mm->cached_hole_size = vma->vm_start - addr;
24151 addr = ALIGN(vma->vm_end, huge_page_size(h));
24152 }
24153+
24154+ mm->free_area_cache = addr + len;
24155+ return addr;
24156 }
24157
24158 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24159@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24160 {
24161 struct hstate *h = hstate_file(file);
24162 struct mm_struct *mm = current->mm;
24163- struct vm_area_struct *vma, *prev_vma;
24164- unsigned long base = mm->mmap_base, addr = addr0;
24165+ struct vm_area_struct *vma;
24166+ unsigned long base = mm->mmap_base, addr;
24167 unsigned long largest_hole = mm->cached_hole_size;
24168- int first_time = 1;
24169
24170 /* don't allow allocations above current base */
24171 if (mm->free_area_cache > base)
24172@@ -321,66 +328,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24173 largest_hole = 0;
24174 mm->free_area_cache = base;
24175 }
24176-try_again:
24177+
24178 /* make sure it can fit in the remaining address space */
24179 if (mm->free_area_cache < len)
24180 goto fail;
24181
24182 /* either no address requested or can't fit in requested address hole */
24183- addr = (mm->free_area_cache - len) & huge_page_mask(h);
24184+ addr = (mm->free_area_cache - len);
24185 do {
24186+ addr &= huge_page_mask(h);
24187+ vma = find_vma(mm, addr);
24188 /*
24189 * Lookup failure means no vma is above this address,
24190 * i.e. return with success:
24191- */
24192- vma = find_vma(mm, addr);
24193- if (!vma)
24194- return addr;
24195-
24196- /*
24197 * new region fits between prev_vma->vm_end and
24198 * vma->vm_start, use it:
24199 */
24200- prev_vma = vma->vm_prev;
24201- if (addr + len <= vma->vm_start &&
24202- (!prev_vma || (addr >= prev_vma->vm_end))) {
24203+ if (check_heap_stack_gap(vma, addr, len)) {
24204 /* remember the address as a hint for next time */
24205- mm->cached_hole_size = largest_hole;
24206- return (mm->free_area_cache = addr);
24207- } else {
24208- /* pull free_area_cache down to the first hole */
24209- if (mm->free_area_cache == vma->vm_end) {
24210- mm->free_area_cache = vma->vm_start;
24211- mm->cached_hole_size = largest_hole;
24212- }
24213+ mm->cached_hole_size = largest_hole;
24214+ return (mm->free_area_cache = addr);
24215+ }
24216+ /* pull free_area_cache down to the first hole */
24217+ if (mm->free_area_cache == vma->vm_end) {
24218+ mm->free_area_cache = vma->vm_start;
24219+ mm->cached_hole_size = largest_hole;
24220 }
24221
24222 /* remember the largest hole we saw so far */
24223 if (addr + largest_hole < vma->vm_start)
24224- largest_hole = vma->vm_start - addr;
24225+ largest_hole = vma->vm_start - addr;
24226
24227 /* try just below the current vma->vm_start */
24228- addr = (vma->vm_start - len) & huge_page_mask(h);
24229- } while (len <= vma->vm_start);
24230+ addr = skip_heap_stack_gap(vma, len);
24231+ } while (!IS_ERR_VALUE(addr));
24232
24233 fail:
24234 /*
24235- * if hint left us with no space for the requested
24236- * mapping then try again:
24237- */
24238- if (first_time) {
24239- mm->free_area_cache = base;
24240- largest_hole = 0;
24241- first_time = 0;
24242- goto try_again;
24243- }
24244- /*
24245 * A failed mmap() very likely causes application failure,
24246 * so fall back to the bottom-up function here. This scenario
24247 * can happen with large stack limits and large mmap()
24248 * allocations.
24249 */
24250- mm->free_area_cache = TASK_UNMAPPED_BASE;
24251+
24252+#ifdef CONFIG_PAX_SEGMEXEC
24253+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24254+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
24255+ else
24256+#endif
24257+
24258+ mm->mmap_base = TASK_UNMAPPED_BASE;
24259+
24260+#ifdef CONFIG_PAX_RANDMMAP
24261+ if (mm->pax_flags & MF_PAX_RANDMMAP)
24262+ mm->mmap_base += mm->delta_mmap;
24263+#endif
24264+
24265+ mm->free_area_cache = mm->mmap_base;
24266 mm->cached_hole_size = ~0UL;
24267 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
24268 len, pgoff, flags);
24269@@ -388,6 +392,7 @@ fail:
24270 /*
24271 * Restore the topdown base:
24272 */
24273+ mm->mmap_base = base;
24274 mm->free_area_cache = base;
24275 mm->cached_hole_size = ~0UL;
24276
24277@@ -401,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24278 struct hstate *h = hstate_file(file);
24279 struct mm_struct *mm = current->mm;
24280 struct vm_area_struct *vma;
24281+ unsigned long pax_task_size = TASK_SIZE;
24282
24283 if (len & ~huge_page_mask(h))
24284 return -EINVAL;
24285- if (len > TASK_SIZE)
24286+
24287+#ifdef CONFIG_PAX_SEGMEXEC
24288+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24289+ pax_task_size = SEGMEXEC_TASK_SIZE;
24290+#endif
24291+
24292+ pax_task_size -= PAGE_SIZE;
24293+
24294+ if (len > pax_task_size)
24295 return -ENOMEM;
24296
24297 if (flags & MAP_FIXED) {
24298@@ -416,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24299 if (addr) {
24300 addr = ALIGN(addr, huge_page_size(h));
24301 vma = find_vma(mm, addr);
24302- if (TASK_SIZE - len >= addr &&
24303- (!vma || addr + len <= vma->vm_start))
24304+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
24305 return addr;
24306 }
24307 if (mm->get_unmapped_area == arch_get_unmapped_area)
24308diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
24309index 6cabf65..77e9c1c 100644
24310--- a/arch/x86/mm/init.c
24311+++ b/arch/x86/mm/init.c
24312@@ -17,6 +17,7 @@
24313 #include <asm/tlb.h>
24314 #include <asm/proto.h>
24315 #include <asm/dma.h> /* for MAX_DMA_PFN */
24316+#include <asm/desc.h>
24317
24318 unsigned long __initdata pgt_buf_start;
24319 unsigned long __meminitdata pgt_buf_end;
24320@@ -33,7 +34,7 @@ int direct_gbpages
24321 static void __init find_early_table_space(unsigned long end, int use_pse,
24322 int use_gbpages)
24323 {
24324- unsigned long puds, pmds, ptes, tables, start = 0, good_end = end;
24325+ unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end;
24326 phys_addr_t base;
24327
24328 puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
24329@@ -314,8 +315,29 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24330 */
24331 int devmem_is_allowed(unsigned long pagenr)
24332 {
24333+#ifdef CONFIG_GRKERNSEC_KMEM
24334+ /* allow BDA */
24335+ if (!pagenr)
24336+ return 1;
24337+ /* allow EBDA */
24338+ if ((0x9f000 >> PAGE_SHIFT) == pagenr)
24339+ return 1;
24340+#else
24341+ if (!pagenr)
24342+ return 1;
24343+#ifdef CONFIG_VM86
24344+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
24345+ return 1;
24346+#endif
24347+#endif
24348+
24349+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
24350+ return 1;
24351+#ifdef CONFIG_GRKERNSEC_KMEM
24352+ /* throw out everything else below 1MB */
24353 if (pagenr <= 256)
24354- return 1;
24355+ return 0;
24356+#endif
24357 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
24358 return 0;
24359 if (!page_is_ram(pagenr))
24360@@ -374,6 +396,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
24361
24362 void free_initmem(void)
24363 {
24364+
24365+#ifdef CONFIG_PAX_KERNEXEC
24366+#ifdef CONFIG_X86_32
24367+ /* PaX: limit KERNEL_CS to actual size */
24368+ unsigned long addr, limit;
24369+ struct desc_struct d;
24370+ int cpu;
24371+
24372+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
24373+ limit = (limit - 1UL) >> PAGE_SHIFT;
24374+
24375+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
24376+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
24377+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
24378+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
24379+ }
24380+
24381+ /* PaX: make KERNEL_CS read-only */
24382+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
24383+ if (!paravirt_enabled())
24384+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
24385+/*
24386+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
24387+ pgd = pgd_offset_k(addr);
24388+ pud = pud_offset(pgd, addr);
24389+ pmd = pmd_offset(pud, addr);
24390+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24391+ }
24392+*/
24393+#ifdef CONFIG_X86_PAE
24394+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
24395+/*
24396+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
24397+ pgd = pgd_offset_k(addr);
24398+ pud = pud_offset(pgd, addr);
24399+ pmd = pmd_offset(pud, addr);
24400+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24401+ }
24402+*/
24403+#endif
24404+
24405+#ifdef CONFIG_MODULES
24406+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
24407+#endif
24408+
24409+#else
24410+ pgd_t *pgd;
24411+ pud_t *pud;
24412+ pmd_t *pmd;
24413+ unsigned long addr, end;
24414+
24415+ /* PaX: make kernel code/rodata read-only, rest non-executable */
24416+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
24417+ pgd = pgd_offset_k(addr);
24418+ pud = pud_offset(pgd, addr);
24419+ pmd = pmd_offset(pud, addr);
24420+ if (!pmd_present(*pmd))
24421+ continue;
24422+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
24423+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24424+ else
24425+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24426+ }
24427+
24428+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
24429+ end = addr + KERNEL_IMAGE_SIZE;
24430+ for (; addr < end; addr += PMD_SIZE) {
24431+ pgd = pgd_offset_k(addr);
24432+ pud = pud_offset(pgd, addr);
24433+ pmd = pmd_offset(pud, addr);
24434+ if (!pmd_present(*pmd))
24435+ continue;
24436+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
24437+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24438+ }
24439+#endif
24440+
24441+ flush_tlb_all();
24442+#endif
24443+
24444 free_init_pages("unused kernel memory",
24445 (unsigned long)(&__init_begin),
24446 (unsigned long)(&__init_end));
24447diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
24448index 8663f6c..829ae76 100644
24449--- a/arch/x86/mm/init_32.c
24450+++ b/arch/x86/mm/init_32.c
24451@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
24452 }
24453
24454 /*
24455- * Creates a middle page table and puts a pointer to it in the
24456- * given global directory entry. This only returns the gd entry
24457- * in non-PAE compilation mode, since the middle layer is folded.
24458- */
24459-static pmd_t * __init one_md_table_init(pgd_t *pgd)
24460-{
24461- pud_t *pud;
24462- pmd_t *pmd_table;
24463-
24464-#ifdef CONFIG_X86_PAE
24465- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
24466- if (after_bootmem)
24467- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
24468- else
24469- pmd_table = (pmd_t *)alloc_low_page();
24470- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
24471- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
24472- pud = pud_offset(pgd, 0);
24473- BUG_ON(pmd_table != pmd_offset(pud, 0));
24474-
24475- return pmd_table;
24476- }
24477-#endif
24478- pud = pud_offset(pgd, 0);
24479- pmd_table = pmd_offset(pud, 0);
24480-
24481- return pmd_table;
24482-}
24483-
24484-/*
24485 * Create a page table and place a pointer to it in a middle page
24486 * directory entry:
24487 */
24488@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
24489 page_table = (pte_t *)alloc_low_page();
24490
24491 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
24492+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24493+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
24494+#else
24495 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
24496+#endif
24497 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
24498 }
24499
24500 return pte_offset_kernel(pmd, 0);
24501 }
24502
24503+static pmd_t * __init one_md_table_init(pgd_t *pgd)
24504+{
24505+ pud_t *pud;
24506+ pmd_t *pmd_table;
24507+
24508+ pud = pud_offset(pgd, 0);
24509+ pmd_table = pmd_offset(pud, 0);
24510+
24511+ return pmd_table;
24512+}
24513+
24514 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
24515 {
24516 int pgd_idx = pgd_index(vaddr);
24517@@ -203,6 +188,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24518 int pgd_idx, pmd_idx;
24519 unsigned long vaddr;
24520 pgd_t *pgd;
24521+ pud_t *pud;
24522 pmd_t *pmd;
24523 pte_t *pte = NULL;
24524
24525@@ -212,8 +198,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24526 pgd = pgd_base + pgd_idx;
24527
24528 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
24529- pmd = one_md_table_init(pgd);
24530- pmd = pmd + pmd_index(vaddr);
24531+ pud = pud_offset(pgd, vaddr);
24532+ pmd = pmd_offset(pud, vaddr);
24533+
24534+#ifdef CONFIG_X86_PAE
24535+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24536+#endif
24537+
24538 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
24539 pmd++, pmd_idx++) {
24540 pte = page_table_kmap_check(one_page_table_init(pmd),
24541@@ -225,11 +216,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24542 }
24543 }
24544
24545-static inline int is_kernel_text(unsigned long addr)
24546+static inline int is_kernel_text(unsigned long start, unsigned long end)
24547 {
24548- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
24549- return 1;
24550- return 0;
24551+ if ((start > ktla_ktva((unsigned long)_etext) ||
24552+ end <= ktla_ktva((unsigned long)_stext)) &&
24553+ (start > ktla_ktva((unsigned long)_einittext) ||
24554+ end <= ktla_ktva((unsigned long)_sinittext)) &&
24555+
24556+#ifdef CONFIG_ACPI_SLEEP
24557+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
24558+#endif
24559+
24560+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
24561+ return 0;
24562+ return 1;
24563 }
24564
24565 /*
24566@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned long start,
24567 unsigned long last_map_addr = end;
24568 unsigned long start_pfn, end_pfn;
24569 pgd_t *pgd_base = swapper_pg_dir;
24570- int pgd_idx, pmd_idx, pte_ofs;
24571+ unsigned int pgd_idx, pmd_idx, pte_ofs;
24572 unsigned long pfn;
24573 pgd_t *pgd;
24574+ pud_t *pud;
24575 pmd_t *pmd;
24576 pte_t *pte;
24577 unsigned pages_2m, pages_4k;
24578@@ -281,8 +282,13 @@ repeat:
24579 pfn = start_pfn;
24580 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24581 pgd = pgd_base + pgd_idx;
24582- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
24583- pmd = one_md_table_init(pgd);
24584+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
24585+ pud = pud_offset(pgd, 0);
24586+ pmd = pmd_offset(pud, 0);
24587+
24588+#ifdef CONFIG_X86_PAE
24589+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24590+#endif
24591
24592 if (pfn >= end_pfn)
24593 continue;
24594@@ -294,14 +300,13 @@ repeat:
24595 #endif
24596 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
24597 pmd++, pmd_idx++) {
24598- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
24599+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
24600
24601 /*
24602 * Map with big pages if possible, otherwise
24603 * create normal page tables:
24604 */
24605 if (use_pse) {
24606- unsigned int addr2;
24607 pgprot_t prot = PAGE_KERNEL_LARGE;
24608 /*
24609 * first pass will use the same initial
24610@@ -311,11 +316,7 @@ repeat:
24611 __pgprot(PTE_IDENT_ATTR |
24612 _PAGE_PSE);
24613
24614- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
24615- PAGE_OFFSET + PAGE_SIZE-1;
24616-
24617- if (is_kernel_text(addr) ||
24618- is_kernel_text(addr2))
24619+ if (is_kernel_text(address, address + PMD_SIZE))
24620 prot = PAGE_KERNEL_LARGE_EXEC;
24621
24622 pages_2m++;
24623@@ -332,7 +333,7 @@ repeat:
24624 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24625 pte += pte_ofs;
24626 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
24627- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
24628+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
24629 pgprot_t prot = PAGE_KERNEL;
24630 /*
24631 * first pass will use the same initial
24632@@ -340,7 +341,7 @@ repeat:
24633 */
24634 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
24635
24636- if (is_kernel_text(addr))
24637+ if (is_kernel_text(address, address + PAGE_SIZE))
24638 prot = PAGE_KERNEL_EXEC;
24639
24640 pages_4k++;
24641@@ -466,7 +467,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
24642
24643 pud = pud_offset(pgd, va);
24644 pmd = pmd_offset(pud, va);
24645- if (!pmd_present(*pmd))
24646+ if (!pmd_present(*pmd) || pmd_huge(*pmd))
24647 break;
24648
24649 pte = pte_offset_kernel(pmd, va);
24650@@ -518,12 +519,10 @@ void __init early_ioremap_page_table_range_init(void)
24651
24652 static void __init pagetable_init(void)
24653 {
24654- pgd_t *pgd_base = swapper_pg_dir;
24655-
24656- permanent_kmaps_init(pgd_base);
24657+ permanent_kmaps_init(swapper_pg_dir);
24658 }
24659
24660-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24661+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24662 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24663
24664 /* user-defined highmem size */
24665@@ -735,6 +734,12 @@ void __init mem_init(void)
24666
24667 pci_iommu_alloc();
24668
24669+#ifdef CONFIG_PAX_PER_CPU_PGD
24670+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
24671+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24672+ KERNEL_PGD_PTRS);
24673+#endif
24674+
24675 #ifdef CONFIG_FLATMEM
24676 BUG_ON(!mem_map);
24677 #endif
24678@@ -761,7 +766,7 @@ void __init mem_init(void)
24679 reservedpages++;
24680
24681 codesize = (unsigned long) &_etext - (unsigned long) &_text;
24682- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
24683+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
24684 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
24685
24686 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
24687@@ -802,10 +807,10 @@ void __init mem_init(void)
24688 ((unsigned long)&__init_end -
24689 (unsigned long)&__init_begin) >> 10,
24690
24691- (unsigned long)&_etext, (unsigned long)&_edata,
24692- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
24693+ (unsigned long)&_sdata, (unsigned long)&_edata,
24694+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
24695
24696- (unsigned long)&_text, (unsigned long)&_etext,
24697+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
24698 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
24699
24700 /*
24701@@ -883,6 +888,7 @@ void set_kernel_text_rw(void)
24702 if (!kernel_set_to_readonly)
24703 return;
24704
24705+ start = ktla_ktva(start);
24706 pr_debug("Set kernel text: %lx - %lx for read write\n",
24707 start, start+size);
24708
24709@@ -897,6 +903,7 @@ void set_kernel_text_ro(void)
24710 if (!kernel_set_to_readonly)
24711 return;
24712
24713+ start = ktla_ktva(start);
24714 pr_debug("Set kernel text: %lx - %lx for read only\n",
24715 start, start+size);
24716
24717@@ -925,6 +932,7 @@ void mark_rodata_ro(void)
24718 unsigned long start = PFN_ALIGN(_text);
24719 unsigned long size = PFN_ALIGN(_etext) - start;
24720
24721+ start = ktla_ktva(start);
24722 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
24723 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
24724 size >> 10);
24725diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
24726index 436a030..b8596b9 100644
24727--- a/arch/x86/mm/init_64.c
24728+++ b/arch/x86/mm/init_64.c
24729@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpages_on);
24730 * around without checking the pgd every time.
24731 */
24732
24733-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
24734+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
24735 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24736
24737 int force_personality32;
24738@@ -108,12 +108,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24739
24740 for (address = start; address <= end; address += PGDIR_SIZE) {
24741 const pgd_t *pgd_ref = pgd_offset_k(address);
24742+
24743+#ifdef CONFIG_PAX_PER_CPU_PGD
24744+ unsigned long cpu;
24745+#else
24746 struct page *page;
24747+#endif
24748
24749 if (pgd_none(*pgd_ref))
24750 continue;
24751
24752 spin_lock(&pgd_lock);
24753+
24754+#ifdef CONFIG_PAX_PER_CPU_PGD
24755+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
24756+ pgd_t *pgd = pgd_offset_cpu(cpu, address);
24757+#else
24758 list_for_each_entry(page, &pgd_list, lru) {
24759 pgd_t *pgd;
24760 spinlock_t *pgt_lock;
24761@@ -122,6 +132,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24762 /* the pgt_lock only for Xen */
24763 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
24764 spin_lock(pgt_lock);
24765+#endif
24766
24767 if (pgd_none(*pgd))
24768 set_pgd(pgd, *pgd_ref);
24769@@ -129,7 +140,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24770 BUG_ON(pgd_page_vaddr(*pgd)
24771 != pgd_page_vaddr(*pgd_ref));
24772
24773+#ifndef CONFIG_PAX_PER_CPU_PGD
24774 spin_unlock(pgt_lock);
24775+#endif
24776+
24777 }
24778 spin_unlock(&pgd_lock);
24779 }
24780@@ -203,7 +217,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
24781 pmd = fill_pmd(pud, vaddr);
24782 pte = fill_pte(pmd, vaddr);
24783
24784+ pax_open_kernel();
24785 set_pte(pte, new_pte);
24786+ pax_close_kernel();
24787
24788 /*
24789 * It's enough to flush this one mapping.
24790@@ -262,14 +278,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
24791 pgd = pgd_offset_k((unsigned long)__va(phys));
24792 if (pgd_none(*pgd)) {
24793 pud = (pud_t *) spp_getpage();
24794- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
24795- _PAGE_USER));
24796+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
24797 }
24798 pud = pud_offset(pgd, (unsigned long)__va(phys));
24799 if (pud_none(*pud)) {
24800 pmd = (pmd_t *) spp_getpage();
24801- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
24802- _PAGE_USER));
24803+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
24804 }
24805 pmd = pmd_offset(pud, phys);
24806 BUG_ON(!pmd_none(*pmd));
24807@@ -330,7 +344,7 @@ static __ref void *alloc_low_page(unsigned long *phys)
24808 if (pfn >= pgt_buf_top)
24809 panic("alloc_low_page: ran out of memory");
24810
24811- adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
24812+ adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
24813 clear_page(adr);
24814 *phys = pfn * PAGE_SIZE;
24815 return adr;
24816@@ -346,7 +360,7 @@ static __ref void *map_low_page(void *virt)
24817
24818 phys = __pa(virt);
24819 left = phys & (PAGE_SIZE - 1);
24820- adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
24821+ adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
24822 adr = (void *)(((unsigned long)adr) | left);
24823
24824 return adr;
24825@@ -684,6 +698,12 @@ void __init mem_init(void)
24826
24827 pci_iommu_alloc();
24828
24829+#ifdef CONFIG_PAX_PER_CPU_PGD
24830+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
24831+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24832+ KERNEL_PGD_PTRS);
24833+#endif
24834+
24835 /* clear_bss() already clear the empty_zero_page */
24836
24837 reservedpages = 0;
24838@@ -844,8 +864,8 @@ int kern_addr_valid(unsigned long addr)
24839 static struct vm_area_struct gate_vma = {
24840 .vm_start = VSYSCALL_START,
24841 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
24842- .vm_page_prot = PAGE_READONLY_EXEC,
24843- .vm_flags = VM_READ | VM_EXEC
24844+ .vm_page_prot = PAGE_READONLY,
24845+ .vm_flags = VM_READ
24846 };
24847
24848 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
24849@@ -879,7 +899,7 @@ int in_gate_area_no_mm(unsigned long addr)
24850
24851 const char *arch_vma_name(struct vm_area_struct *vma)
24852 {
24853- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
24854+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
24855 return "[vdso]";
24856 if (vma == &gate_vma)
24857 return "[vsyscall]";
24858diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
24859index 7b179b4..6bd1777 100644
24860--- a/arch/x86/mm/iomap_32.c
24861+++ b/arch/x86/mm/iomap_32.c
24862@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
24863 type = kmap_atomic_idx_push();
24864 idx = type + KM_TYPE_NR * smp_processor_id();
24865 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24866+
24867+ pax_open_kernel();
24868 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
24869+ pax_close_kernel();
24870+
24871 arch_flush_lazy_mmu_mode();
24872
24873 return (void *)vaddr;
24874diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
24875index be1ef57..55f0160 100644
24876--- a/arch/x86/mm/ioremap.c
24877+++ b/arch/x86/mm/ioremap.c
24878@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
24879 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
24880 int is_ram = page_is_ram(pfn);
24881
24882- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
24883+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
24884 return NULL;
24885 WARN_ON_ONCE(is_ram);
24886 }
24887@@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
24888
24889 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
24890 if (page_is_ram(start >> PAGE_SHIFT))
24891+#ifdef CONFIG_HIGHMEM
24892+ if ((start >> PAGE_SHIFT) < max_low_pfn)
24893+#endif
24894 return __va(phys);
24895
24896 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
24897@@ -344,7 +347,7 @@ static int __init early_ioremap_debug_setup(char *str)
24898 early_param("early_ioremap_debug", early_ioremap_debug_setup);
24899
24900 static __initdata int after_paging_init;
24901-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
24902+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
24903
24904 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
24905 {
24906@@ -381,8 +384,7 @@ void __init early_ioremap_init(void)
24907 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
24908
24909 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
24910- memset(bm_pte, 0, sizeof(bm_pte));
24911- pmd_populate_kernel(&init_mm, pmd, bm_pte);
24912+ pmd_populate_user(&init_mm, pmd, bm_pte);
24913
24914 /*
24915 * The boot-ioremap range spans multiple pmds, for which
24916diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
24917index d87dd6d..bf3fa66 100644
24918--- a/arch/x86/mm/kmemcheck/kmemcheck.c
24919+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
24920@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
24921 * memory (e.g. tracked pages)? For now, we need this to avoid
24922 * invoking kmemcheck for PnP BIOS calls.
24923 */
24924- if (regs->flags & X86_VM_MASK)
24925+ if (v8086_mode(regs))
24926 return false;
24927- if (regs->cs != __KERNEL_CS)
24928+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
24929 return false;
24930
24931 pte = kmemcheck_pte_lookup(address);
24932diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
24933index 845df68..1d8d29f 100644
24934--- a/arch/x86/mm/mmap.c
24935+++ b/arch/x86/mm/mmap.c
24936@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
24937 * Leave an at least ~128 MB hole with possible stack randomization.
24938 */
24939 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
24940-#define MAX_GAP (TASK_SIZE/6*5)
24941+#define MAX_GAP (pax_task_size/6*5)
24942
24943 static int mmap_is_legacy(void)
24944 {
24945@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
24946 return rnd << PAGE_SHIFT;
24947 }
24948
24949-static unsigned long mmap_base(void)
24950+static unsigned long mmap_base(struct mm_struct *mm)
24951 {
24952 unsigned long gap = rlimit(RLIMIT_STACK);
24953+ unsigned long pax_task_size = TASK_SIZE;
24954+
24955+#ifdef CONFIG_PAX_SEGMEXEC
24956+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24957+ pax_task_size = SEGMEXEC_TASK_SIZE;
24958+#endif
24959
24960 if (gap < MIN_GAP)
24961 gap = MIN_GAP;
24962 else if (gap > MAX_GAP)
24963 gap = MAX_GAP;
24964
24965- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
24966+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
24967 }
24968
24969 /*
24970 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
24971 * does, but not when emulating X86_32
24972 */
24973-static unsigned long mmap_legacy_base(void)
24974+static unsigned long mmap_legacy_base(struct mm_struct *mm)
24975 {
24976- if (mmap_is_ia32())
24977+ if (mmap_is_ia32()) {
24978+
24979+#ifdef CONFIG_PAX_SEGMEXEC
24980+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24981+ return SEGMEXEC_TASK_UNMAPPED_BASE;
24982+ else
24983+#endif
24984+
24985 return TASK_UNMAPPED_BASE;
24986- else
24987+ } else
24988 return TASK_UNMAPPED_BASE + mmap_rnd();
24989 }
24990
24991@@ -113,11 +126,23 @@ static unsigned long mmap_legacy_base(void)
24992 void arch_pick_mmap_layout(struct mm_struct *mm)
24993 {
24994 if (mmap_is_legacy()) {
24995- mm->mmap_base = mmap_legacy_base();
24996+ mm->mmap_base = mmap_legacy_base(mm);
24997+
24998+#ifdef CONFIG_PAX_RANDMMAP
24999+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25000+ mm->mmap_base += mm->delta_mmap;
25001+#endif
25002+
25003 mm->get_unmapped_area = arch_get_unmapped_area;
25004 mm->unmap_area = arch_unmap_area;
25005 } else {
25006- mm->mmap_base = mmap_base();
25007+ mm->mmap_base = mmap_base(mm);
25008+
25009+#ifdef CONFIG_PAX_RANDMMAP
25010+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25011+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
25012+#endif
25013+
25014 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
25015 mm->unmap_area = arch_unmap_area_topdown;
25016 }
25017diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
25018index dc0b727..dc9d71a 100644
25019--- a/arch/x86/mm/mmio-mod.c
25020+++ b/arch/x86/mm/mmio-mod.c
25021@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
25022 break;
25023 default:
25024 {
25025- unsigned char *ip = (unsigned char *)instptr;
25026+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
25027 my_trace->opcode = MMIO_UNKNOWN_OP;
25028 my_trace->width = 0;
25029 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
25030@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
25031 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25032 void __iomem *addr)
25033 {
25034- static atomic_t next_id;
25035+ static atomic_unchecked_t next_id;
25036 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
25037 /* These are page-unaligned. */
25038 struct mmiotrace_map map = {
25039@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25040 .private = trace
25041 },
25042 .phys = offset,
25043- .id = atomic_inc_return(&next_id)
25044+ .id = atomic_inc_return_unchecked(&next_id)
25045 };
25046 map.map_id = trace->id;
25047
25048diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
25049index b008656..773eac2 100644
25050--- a/arch/x86/mm/pageattr-test.c
25051+++ b/arch/x86/mm/pageattr-test.c
25052@@ -36,7 +36,7 @@ enum {
25053
25054 static int pte_testbit(pte_t pte)
25055 {
25056- return pte_flags(pte) & _PAGE_UNUSED1;
25057+ return pte_flags(pte) & _PAGE_CPA_TEST;
25058 }
25059
25060 struct split_state {
25061diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
25062index e1ebde3..b1e1db38 100644
25063--- a/arch/x86/mm/pageattr.c
25064+++ b/arch/x86/mm/pageattr.c
25065@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25066 */
25067 #ifdef CONFIG_PCI_BIOS
25068 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
25069- pgprot_val(forbidden) |= _PAGE_NX;
25070+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25071 #endif
25072
25073 /*
25074@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25075 * Does not cover __inittext since that is gone later on. On
25076 * 64bit we do not enforce !NX on the low mapping
25077 */
25078- if (within(address, (unsigned long)_text, (unsigned long)_etext))
25079- pgprot_val(forbidden) |= _PAGE_NX;
25080+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
25081+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25082
25083+#ifdef CONFIG_DEBUG_RODATA
25084 /*
25085 * The .rodata section needs to be read-only. Using the pfn
25086 * catches all aliases.
25087@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25088 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
25089 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
25090 pgprot_val(forbidden) |= _PAGE_RW;
25091+#endif
25092
25093 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
25094 /*
25095@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25096 }
25097 #endif
25098
25099+#ifdef CONFIG_PAX_KERNEXEC
25100+ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
25101+ pgprot_val(forbidden) |= _PAGE_RW;
25102+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25103+ }
25104+#endif
25105+
25106 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
25107
25108 return prot;
25109@@ -369,23 +378,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
25110 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
25111 {
25112 /* change init_mm */
25113+ pax_open_kernel();
25114 set_pte_atomic(kpte, pte);
25115+
25116 #ifdef CONFIG_X86_32
25117 if (!SHARED_KERNEL_PMD) {
25118+
25119+#ifdef CONFIG_PAX_PER_CPU_PGD
25120+ unsigned long cpu;
25121+#else
25122 struct page *page;
25123+#endif
25124
25125+#ifdef CONFIG_PAX_PER_CPU_PGD
25126+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
25127+ pgd_t *pgd = get_cpu_pgd(cpu);
25128+#else
25129 list_for_each_entry(page, &pgd_list, lru) {
25130- pgd_t *pgd;
25131+ pgd_t *pgd = (pgd_t *)page_address(page);
25132+#endif
25133+
25134 pud_t *pud;
25135 pmd_t *pmd;
25136
25137- pgd = (pgd_t *)page_address(page) + pgd_index(address);
25138+ pgd += pgd_index(address);
25139 pud = pud_offset(pgd, address);
25140 pmd = pmd_offset(pud, address);
25141 set_pte_atomic((pte_t *)pmd, pte);
25142 }
25143 }
25144 #endif
25145+ pax_close_kernel();
25146 }
25147
25148 static int
25149diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
25150index f6ff57b..481690f 100644
25151--- a/arch/x86/mm/pat.c
25152+++ b/arch/x86/mm/pat.c
25153@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
25154
25155 if (!entry) {
25156 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
25157- current->comm, current->pid, start, end);
25158+ current->comm, task_pid_nr(current), start, end);
25159 return -EINVAL;
25160 }
25161
25162@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
25163 while (cursor < to) {
25164 if (!devmem_is_allowed(pfn)) {
25165 printk(KERN_INFO
25166- "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
25167- current->comm, from, to);
25168+ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
25169+ current->comm, from, to, cursor);
25170 return 0;
25171 }
25172 cursor += PAGE_SIZE;
25173@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
25174 printk(KERN_INFO
25175 "%s:%d ioremap_change_attr failed %s "
25176 "for %Lx-%Lx\n",
25177- current->comm, current->pid,
25178+ current->comm, task_pid_nr(current),
25179 cattr_name(flags),
25180 base, (unsigned long long)(base + size));
25181 return -EINVAL;
25182@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25183 if (want_flags != flags) {
25184 printk(KERN_WARNING
25185 "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
25186- current->comm, current->pid,
25187+ current->comm, task_pid_nr(current),
25188 cattr_name(want_flags),
25189 (unsigned long long)paddr,
25190 (unsigned long long)(paddr + size),
25191@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25192 free_memtype(paddr, paddr + size);
25193 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
25194 " for %Lx-%Lx, got %s\n",
25195- current->comm, current->pid,
25196+ current->comm, task_pid_nr(current),
25197 cattr_name(want_flags),
25198 (unsigned long long)paddr,
25199 (unsigned long long)(paddr + size),
25200diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
25201index 9f0614d..92ae64a 100644
25202--- a/arch/x86/mm/pf_in.c
25203+++ b/arch/x86/mm/pf_in.c
25204@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
25205 int i;
25206 enum reason_type rv = OTHERS;
25207
25208- p = (unsigned char *)ins_addr;
25209+ p = (unsigned char *)ktla_ktva(ins_addr);
25210 p += skip_prefix(p, &prf);
25211 p += get_opcode(p, &opcode);
25212
25213@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
25214 struct prefix_bits prf;
25215 int i;
25216
25217- p = (unsigned char *)ins_addr;
25218+ p = (unsigned char *)ktla_ktva(ins_addr);
25219 p += skip_prefix(p, &prf);
25220 p += get_opcode(p, &opcode);
25221
25222@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
25223 struct prefix_bits prf;
25224 int i;
25225
25226- p = (unsigned char *)ins_addr;
25227+ p = (unsigned char *)ktla_ktva(ins_addr);
25228 p += skip_prefix(p, &prf);
25229 p += get_opcode(p, &opcode);
25230
25231@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
25232 struct prefix_bits prf;
25233 int i;
25234
25235- p = (unsigned char *)ins_addr;
25236+ p = (unsigned char *)ktla_ktva(ins_addr);
25237 p += skip_prefix(p, &prf);
25238 p += get_opcode(p, &opcode);
25239 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
25240@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
25241 struct prefix_bits prf;
25242 int i;
25243
25244- p = (unsigned char *)ins_addr;
25245+ p = (unsigned char *)ktla_ktva(ins_addr);
25246 p += skip_prefix(p, &prf);
25247 p += get_opcode(p, &opcode);
25248 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
25249diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
25250index 8573b83..7d9628f 100644
25251--- a/arch/x86/mm/pgtable.c
25252+++ b/arch/x86/mm/pgtable.c
25253@@ -84,10 +84,60 @@ static inline void pgd_list_del(pgd_t *pgd)
25254 list_del(&page->lru);
25255 }
25256
25257-#define UNSHARED_PTRS_PER_PGD \
25258- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25259+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25260+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
25261
25262+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25263+{
25264+ while (count--)
25265+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
25266+}
25267+#endif
25268
25269+#ifdef CONFIG_PAX_PER_CPU_PGD
25270+void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25271+{
25272+ while (count--) {
25273+ pgd_t pgd;
25274+
25275+#ifdef CONFIG_X86_64
25276+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
25277+#else
25278+ pgd = *src++;
25279+#endif
25280+
25281+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25282+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
25283+#endif
25284+
25285+ *dst++ = pgd;
25286+ }
25287+
25288+}
25289+#endif
25290+
25291+#ifdef CONFIG_X86_64
25292+#define pxd_t pud_t
25293+#define pyd_t pgd_t
25294+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
25295+#define pxd_free(mm, pud) pud_free((mm), (pud))
25296+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
25297+#define pyd_offset(mm, address) pgd_offset((mm), (address))
25298+#define PYD_SIZE PGDIR_SIZE
25299+#else
25300+#define pxd_t pmd_t
25301+#define pyd_t pud_t
25302+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
25303+#define pxd_free(mm, pud) pmd_free((mm), (pud))
25304+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
25305+#define pyd_offset(mm, address) pud_offset((mm), (address))
25306+#define PYD_SIZE PUD_SIZE
25307+#endif
25308+
25309+#ifdef CONFIG_PAX_PER_CPU_PGD
25310+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
25311+static inline void pgd_dtor(pgd_t *pgd) {}
25312+#else
25313 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
25314 {
25315 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
25316@@ -128,6 +178,7 @@ static void pgd_dtor(pgd_t *pgd)
25317 pgd_list_del(pgd);
25318 spin_unlock(&pgd_lock);
25319 }
25320+#endif
25321
25322 /*
25323 * List of all pgd's needed for non-PAE so it can invalidate entries
25324@@ -140,7 +191,7 @@ static void pgd_dtor(pgd_t *pgd)
25325 * -- wli
25326 */
25327
25328-#ifdef CONFIG_X86_PAE
25329+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25330 /*
25331 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
25332 * updating the top-level pagetable entries to guarantee the
25333@@ -152,7 +203,7 @@ static void pgd_dtor(pgd_t *pgd)
25334 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
25335 * and initialize the kernel pmds here.
25336 */
25337-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
25338+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25339
25340 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25341 {
25342@@ -170,36 +221,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25343 */
25344 flush_tlb_mm(mm);
25345 }
25346+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
25347+#define PREALLOCATED_PXDS USER_PGD_PTRS
25348 #else /* !CONFIG_X86_PAE */
25349
25350 /* No need to prepopulate any pagetable entries in non-PAE modes. */
25351-#define PREALLOCATED_PMDS 0
25352+#define PREALLOCATED_PXDS 0
25353
25354 #endif /* CONFIG_X86_PAE */
25355
25356-static void free_pmds(pmd_t *pmds[])
25357+static void free_pxds(pxd_t *pxds[])
25358 {
25359 int i;
25360
25361- for(i = 0; i < PREALLOCATED_PMDS; i++)
25362- if (pmds[i])
25363- free_page((unsigned long)pmds[i]);
25364+ for(i = 0; i < PREALLOCATED_PXDS; i++)
25365+ if (pxds[i])
25366+ free_page((unsigned long)pxds[i]);
25367 }
25368
25369-static int preallocate_pmds(pmd_t *pmds[])
25370+static int preallocate_pxds(pxd_t *pxds[])
25371 {
25372 int i;
25373 bool failed = false;
25374
25375- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25376- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
25377- if (pmd == NULL)
25378+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25379+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
25380+ if (pxd == NULL)
25381 failed = true;
25382- pmds[i] = pmd;
25383+ pxds[i] = pxd;
25384 }
25385
25386 if (failed) {
25387- free_pmds(pmds);
25388+ free_pxds(pxds);
25389 return -ENOMEM;
25390 }
25391
25392@@ -212,51 +265,55 @@ static int preallocate_pmds(pmd_t *pmds[])
25393 * preallocate which never got a corresponding vma will need to be
25394 * freed manually.
25395 */
25396-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
25397+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
25398 {
25399 int i;
25400
25401- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25402+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25403 pgd_t pgd = pgdp[i];
25404
25405 if (pgd_val(pgd) != 0) {
25406- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
25407+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
25408
25409- pgdp[i] = native_make_pgd(0);
25410+ set_pgd(pgdp + i, native_make_pgd(0));
25411
25412- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
25413- pmd_free(mm, pmd);
25414+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
25415+ pxd_free(mm, pxd);
25416 }
25417 }
25418 }
25419
25420-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
25421+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
25422 {
25423- pud_t *pud;
25424+ pyd_t *pyd;
25425 unsigned long addr;
25426 int i;
25427
25428- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
25429+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
25430 return;
25431
25432- pud = pud_offset(pgd, 0);
25433+#ifdef CONFIG_X86_64
25434+ pyd = pyd_offset(mm, 0L);
25435+#else
25436+ pyd = pyd_offset(pgd, 0L);
25437+#endif
25438
25439- for (addr = i = 0; i < PREALLOCATED_PMDS;
25440- i++, pud++, addr += PUD_SIZE) {
25441- pmd_t *pmd = pmds[i];
25442+ for (addr = i = 0; i < PREALLOCATED_PXDS;
25443+ i++, pyd++, addr += PYD_SIZE) {
25444+ pxd_t *pxd = pxds[i];
25445
25446 if (i >= KERNEL_PGD_BOUNDARY)
25447- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25448- sizeof(pmd_t) * PTRS_PER_PMD);
25449+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25450+ sizeof(pxd_t) * PTRS_PER_PMD);
25451
25452- pud_populate(mm, pud, pmd);
25453+ pyd_populate(mm, pyd, pxd);
25454 }
25455 }
25456
25457 pgd_t *pgd_alloc(struct mm_struct *mm)
25458 {
25459 pgd_t *pgd;
25460- pmd_t *pmds[PREALLOCATED_PMDS];
25461+ pxd_t *pxds[PREALLOCATED_PXDS];
25462
25463 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
25464
25465@@ -265,11 +322,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25466
25467 mm->pgd = pgd;
25468
25469- if (preallocate_pmds(pmds) != 0)
25470+ if (preallocate_pxds(pxds) != 0)
25471 goto out_free_pgd;
25472
25473 if (paravirt_pgd_alloc(mm) != 0)
25474- goto out_free_pmds;
25475+ goto out_free_pxds;
25476
25477 /*
25478 * Make sure that pre-populating the pmds is atomic with
25479@@ -279,14 +336,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25480 spin_lock(&pgd_lock);
25481
25482 pgd_ctor(mm, pgd);
25483- pgd_prepopulate_pmd(mm, pgd, pmds);
25484+ pgd_prepopulate_pxd(mm, pgd, pxds);
25485
25486 spin_unlock(&pgd_lock);
25487
25488 return pgd;
25489
25490-out_free_pmds:
25491- free_pmds(pmds);
25492+out_free_pxds:
25493+ free_pxds(pxds);
25494 out_free_pgd:
25495 free_page((unsigned long)pgd);
25496 out:
25497@@ -295,7 +352,7 @@ out:
25498
25499 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
25500 {
25501- pgd_mop_up_pmds(mm, pgd);
25502+ pgd_mop_up_pxds(mm, pgd);
25503 pgd_dtor(pgd);
25504 paravirt_pgd_free(mm, pgd);
25505 free_page((unsigned long)pgd);
25506diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
25507index cac7184..09a39fa 100644
25508--- a/arch/x86/mm/pgtable_32.c
25509+++ b/arch/x86/mm/pgtable_32.c
25510@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
25511 return;
25512 }
25513 pte = pte_offset_kernel(pmd, vaddr);
25514+
25515+ pax_open_kernel();
25516 if (pte_val(pteval))
25517 set_pte_at(&init_mm, vaddr, pte, pteval);
25518 else
25519 pte_clear(&init_mm, vaddr, pte);
25520+ pax_close_kernel();
25521
25522 /*
25523 * It's enough to flush this one mapping.
25524diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
25525index 410531d..0f16030 100644
25526--- a/arch/x86/mm/setup_nx.c
25527+++ b/arch/x86/mm/setup_nx.c
25528@@ -5,8 +5,10 @@
25529 #include <asm/pgtable.h>
25530 #include <asm/proto.h>
25531
25532+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25533 static int disable_nx __cpuinitdata;
25534
25535+#ifndef CONFIG_PAX_PAGEEXEC
25536 /*
25537 * noexec = on|off
25538 *
25539@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
25540 return 0;
25541 }
25542 early_param("noexec", noexec_setup);
25543+#endif
25544+
25545+#endif
25546
25547 void __cpuinit x86_configure_nx(void)
25548 {
25549+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25550 if (cpu_has_nx && !disable_nx)
25551 __supported_pte_mask |= _PAGE_NX;
25552 else
25553+#endif
25554 __supported_pte_mask &= ~_PAGE_NX;
25555 }
25556
25557diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
25558index d6c0418..06a0ad5 100644
25559--- a/arch/x86/mm/tlb.c
25560+++ b/arch/x86/mm/tlb.c
25561@@ -65,7 +65,11 @@ void leave_mm(int cpu)
25562 BUG();
25563 cpumask_clear_cpu(cpu,
25564 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
25565+
25566+#ifndef CONFIG_PAX_PER_CPU_PGD
25567 load_cr3(swapper_pg_dir);
25568+#endif
25569+
25570 }
25571 EXPORT_SYMBOL_GPL(leave_mm);
25572
25573diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
25574index 6687022..ceabcfa 100644
25575--- a/arch/x86/net/bpf_jit.S
25576+++ b/arch/x86/net/bpf_jit.S
25577@@ -9,6 +9,7 @@
25578 */
25579 #include <linux/linkage.h>
25580 #include <asm/dwarf2.h>
25581+#include <asm/alternative-asm.h>
25582
25583 /*
25584 * Calling convention :
25585@@ -35,6 +36,7 @@ sk_load_word:
25586 jle bpf_slow_path_word
25587 mov (SKBDATA,%rsi),%eax
25588 bswap %eax /* ntohl() */
25589+ pax_force_retaddr
25590 ret
25591
25592
25593@@ -53,6 +55,7 @@ sk_load_half:
25594 jle bpf_slow_path_half
25595 movzwl (SKBDATA,%rsi),%eax
25596 rol $8,%ax # ntohs()
25597+ pax_force_retaddr
25598 ret
25599
25600 sk_load_byte_ind:
25601@@ -66,6 +69,7 @@ sk_load_byte:
25602 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
25603 jle bpf_slow_path_byte
25604 movzbl (SKBDATA,%rsi),%eax
25605+ pax_force_retaddr
25606 ret
25607
25608 /**
25609@@ -82,6 +86,7 @@ ENTRY(sk_load_byte_msh)
25610 movzbl (SKBDATA,%rsi),%ebx
25611 and $15,%bl
25612 shl $2,%bl
25613+ pax_force_retaddr
25614 ret
25615 CFI_ENDPROC
25616 ENDPROC(sk_load_byte_msh)
25617@@ -91,6 +96,7 @@ bpf_error:
25618 xor %eax,%eax
25619 mov -8(%rbp),%rbx
25620 leaveq
25621+ pax_force_retaddr
25622 ret
25623
25624 /* rsi contains offset and can be scratched */
25625@@ -113,6 +119,7 @@ bpf_slow_path_word:
25626 js bpf_error
25627 mov -12(%rbp),%eax
25628 bswap %eax
25629+ pax_force_retaddr
25630 ret
25631
25632 bpf_slow_path_half:
25633@@ -121,12 +128,14 @@ bpf_slow_path_half:
25634 mov -12(%rbp),%ax
25635 rol $8,%ax
25636 movzwl %ax,%eax
25637+ pax_force_retaddr
25638 ret
25639
25640 bpf_slow_path_byte:
25641 bpf_slow_path_common(1)
25642 js bpf_error
25643 movzbl -12(%rbp),%eax
25644+ pax_force_retaddr
25645 ret
25646
25647 bpf_slow_path_byte_msh:
25648@@ -137,4 +146,5 @@ bpf_slow_path_byte_msh:
25649 and $15,%al
25650 shl $2,%al
25651 xchg %eax,%ebx
25652+ pax_force_retaddr
25653 ret
25654diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
25655index 5a5b6e4..201d42e 100644
25656--- a/arch/x86/net/bpf_jit_comp.c
25657+++ b/arch/x86/net/bpf_jit_comp.c
25658@@ -117,6 +117,10 @@ static inline void bpf_flush_icache(void *start, void *end)
25659 set_fs(old_fs);
25660 }
25661
25662+struct bpf_jit_work {
25663+ struct work_struct work;
25664+ void *image;
25665+};
25666
25667 void bpf_jit_compile(struct sk_filter *fp)
25668 {
25669@@ -141,6 +145,10 @@ void bpf_jit_compile(struct sk_filter *fp)
25670 if (addrs == NULL)
25671 return;
25672
25673+ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
25674+ if (!fp->work)
25675+ goto out;
25676+
25677 /* Before first pass, make a rough estimation of addrs[]
25678 * each bpf instruction is translated to less than 64 bytes
25679 */
25680@@ -477,7 +485,7 @@ void bpf_jit_compile(struct sk_filter *fp)
25681 common_load: seen |= SEEN_DATAREF;
25682 if ((int)K < 0) {
25683 /* Abort the JIT because __load_pointer() is needed. */
25684- goto out;
25685+ goto error;
25686 }
25687 t_offset = func - (image + addrs[i]);
25688 EMIT1_off32(0xbe, K); /* mov imm32,%esi */
25689@@ -492,7 +500,7 @@ common_load: seen |= SEEN_DATAREF;
25690 case BPF_S_LDX_B_MSH:
25691 if ((int)K < 0) {
25692 /* Abort the JIT because __load_pointer() is needed. */
25693- goto out;
25694+ goto error;
25695 }
25696 seen |= SEEN_DATAREF | SEEN_XREG;
25697 t_offset = sk_load_byte_msh - (image + addrs[i]);
25698@@ -582,17 +590,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25699 break;
25700 default:
25701 /* hmm, too complex filter, give up with jit compiler */
25702- goto out;
25703+ goto error;
25704 }
25705 ilen = prog - temp;
25706 if (image) {
25707 if (unlikely(proglen + ilen > oldproglen)) {
25708 pr_err("bpb_jit_compile fatal error\n");
25709- kfree(addrs);
25710- module_free(NULL, image);
25711- return;
25712+ module_free_exec(NULL, image);
25713+ goto error;
25714 }
25715+ pax_open_kernel();
25716 memcpy(image + proglen, temp, ilen);
25717+ pax_close_kernel();
25718 }
25719 proglen += ilen;
25720 addrs[i] = proglen;
25721@@ -613,11 +622,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25722 break;
25723 }
25724 if (proglen == oldproglen) {
25725- image = module_alloc(max_t(unsigned int,
25726- proglen,
25727- sizeof(struct work_struct)));
25728+ image = module_alloc_exec(proglen);
25729 if (!image)
25730- goto out;
25731+ goto error;
25732 }
25733 oldproglen = proglen;
25734 }
25735@@ -633,7 +640,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25736 bpf_flush_icache(image, image + proglen);
25737
25738 fp->bpf_func = (void *)image;
25739- }
25740+ } else
25741+error:
25742+ kfree(fp->work);
25743+
25744 out:
25745 kfree(addrs);
25746 return;
25747@@ -641,18 +651,20 @@ out:
25748
25749 static void jit_free_defer(struct work_struct *arg)
25750 {
25751- module_free(NULL, arg);
25752+ module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
25753+ kfree(arg);
25754 }
25755
25756 /* run from softirq, we must use a work_struct to call
25757- * module_free() from process context
25758+ * module_free_exec() from process context
25759 */
25760 void bpf_jit_free(struct sk_filter *fp)
25761 {
25762 if (fp->bpf_func != sk_run_filter) {
25763- struct work_struct *work = (struct work_struct *)fp->bpf_func;
25764+ struct work_struct *work = &fp->work->work;
25765
25766 INIT_WORK(work, jit_free_defer);
25767+ fp->work->image = fp->bpf_func;
25768 schedule_work(work);
25769 }
25770 }
25771diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
25772index bff89df..377758a 100644
25773--- a/arch/x86/oprofile/backtrace.c
25774+++ b/arch/x86/oprofile/backtrace.c
25775@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
25776 struct stack_frame_ia32 *fp;
25777 unsigned long bytes;
25778
25779- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
25780+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
25781 if (bytes != sizeof(bufhead))
25782 return NULL;
25783
25784- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
25785+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
25786
25787 oprofile_add_trace(bufhead[0].return_address);
25788
25789@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
25790 struct stack_frame bufhead[2];
25791 unsigned long bytes;
25792
25793- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
25794+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
25795 if (bytes != sizeof(bufhead))
25796 return NULL;
25797
25798@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
25799 {
25800 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
25801
25802- if (!user_mode_vm(regs)) {
25803+ if (!user_mode(regs)) {
25804 unsigned long stack = kernel_stack_pointer(regs);
25805 if (depth)
25806 dump_trace(NULL, regs, (unsigned long *)stack, 0,
25807diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
25808index cb29191..036766d 100644
25809--- a/arch/x86/pci/mrst.c
25810+++ b/arch/x86/pci/mrst.c
25811@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
25812 printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
25813 pci_mmcfg_late_init();
25814 pcibios_enable_irq = mrst_pci_irq_enable;
25815- pci_root_ops = pci_mrst_ops;
25816+ pax_open_kernel();
25817+ memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
25818+ pax_close_kernel();
25819 /* Continue with standard init */
25820 return 1;
25821 }
25822diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
25823index da8fe05..7ee6704 100644
25824--- a/arch/x86/pci/pcbios.c
25825+++ b/arch/x86/pci/pcbios.c
25826@@ -79,50 +79,93 @@ union bios32 {
25827 static struct {
25828 unsigned long address;
25829 unsigned short segment;
25830-} bios32_indirect = { 0, __KERNEL_CS };
25831+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
25832
25833 /*
25834 * Returns the entry point for the given service, NULL on error
25835 */
25836
25837-static unsigned long bios32_service(unsigned long service)
25838+static unsigned long __devinit bios32_service(unsigned long service)
25839 {
25840 unsigned char return_code; /* %al */
25841 unsigned long address; /* %ebx */
25842 unsigned long length; /* %ecx */
25843 unsigned long entry; /* %edx */
25844 unsigned long flags;
25845+ struct desc_struct d, *gdt;
25846
25847 local_irq_save(flags);
25848- __asm__("lcall *(%%edi); cld"
25849+
25850+ gdt = get_cpu_gdt_table(smp_processor_id());
25851+
25852+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
25853+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
25854+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
25855+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
25856+
25857+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
25858 : "=a" (return_code),
25859 "=b" (address),
25860 "=c" (length),
25861 "=d" (entry)
25862 : "0" (service),
25863 "1" (0),
25864- "D" (&bios32_indirect));
25865+ "D" (&bios32_indirect),
25866+ "r"(__PCIBIOS_DS)
25867+ : "memory");
25868+
25869+ pax_open_kernel();
25870+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
25871+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
25872+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
25873+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
25874+ pax_close_kernel();
25875+
25876 local_irq_restore(flags);
25877
25878 switch (return_code) {
25879- case 0:
25880- return address + entry;
25881- case 0x80: /* Not present */
25882- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
25883- return 0;
25884- default: /* Shouldn't happen */
25885- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
25886- service, return_code);
25887+ case 0: {
25888+ int cpu;
25889+ unsigned char flags;
25890+
25891+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
25892+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
25893+ printk(KERN_WARNING "bios32_service: not valid\n");
25894 return 0;
25895+ }
25896+ address = address + PAGE_OFFSET;
25897+ length += 16UL; /* some BIOSs underreport this... */
25898+ flags = 4;
25899+ if (length >= 64*1024*1024) {
25900+ length >>= PAGE_SHIFT;
25901+ flags |= 8;
25902+ }
25903+
25904+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
25905+ gdt = get_cpu_gdt_table(cpu);
25906+ pack_descriptor(&d, address, length, 0x9b, flags);
25907+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
25908+ pack_descriptor(&d, address, length, 0x93, flags);
25909+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
25910+ }
25911+ return entry;
25912+ }
25913+ case 0x80: /* Not present */
25914+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
25915+ return 0;
25916+ default: /* Shouldn't happen */
25917+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
25918+ service, return_code);
25919+ return 0;
25920 }
25921 }
25922
25923 static struct {
25924 unsigned long address;
25925 unsigned short segment;
25926-} pci_indirect = { 0, __KERNEL_CS };
25927+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
25928
25929-static int pci_bios_present;
25930+static int pci_bios_present __read_only;
25931
25932 static int __devinit check_pcibios(void)
25933 {
25934@@ -131,11 +174,13 @@ static int __devinit check_pcibios(void)
25935 unsigned long flags, pcibios_entry;
25936
25937 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
25938- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
25939+ pci_indirect.address = pcibios_entry;
25940
25941 local_irq_save(flags);
25942- __asm__(
25943- "lcall *(%%edi); cld\n\t"
25944+ __asm__("movw %w6, %%ds\n\t"
25945+ "lcall *%%ss:(%%edi); cld\n\t"
25946+ "push %%ss\n\t"
25947+ "pop %%ds\n\t"
25948 "jc 1f\n\t"
25949 "xor %%ah, %%ah\n"
25950 "1:"
25951@@ -144,7 +189,8 @@ static int __devinit check_pcibios(void)
25952 "=b" (ebx),
25953 "=c" (ecx)
25954 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
25955- "D" (&pci_indirect)
25956+ "D" (&pci_indirect),
25957+ "r" (__PCIBIOS_DS)
25958 : "memory");
25959 local_irq_restore(flags);
25960
25961@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
25962
25963 switch (len) {
25964 case 1:
25965- __asm__("lcall *(%%esi); cld\n\t"
25966+ __asm__("movw %w6, %%ds\n\t"
25967+ "lcall *%%ss:(%%esi); cld\n\t"
25968+ "push %%ss\n\t"
25969+ "pop %%ds\n\t"
25970 "jc 1f\n\t"
25971 "xor %%ah, %%ah\n"
25972 "1:"
25973@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
25974 : "1" (PCIBIOS_READ_CONFIG_BYTE),
25975 "b" (bx),
25976 "D" ((long)reg),
25977- "S" (&pci_indirect));
25978+ "S" (&pci_indirect),
25979+ "r" (__PCIBIOS_DS));
25980 /*
25981 * Zero-extend the result beyond 8 bits, do not trust the
25982 * BIOS having done it:
25983@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
25984 *value &= 0xff;
25985 break;
25986 case 2:
25987- __asm__("lcall *(%%esi); cld\n\t"
25988+ __asm__("movw %w6, %%ds\n\t"
25989+ "lcall *%%ss:(%%esi); cld\n\t"
25990+ "push %%ss\n\t"
25991+ "pop %%ds\n\t"
25992 "jc 1f\n\t"
25993 "xor %%ah, %%ah\n"
25994 "1:"
25995@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
25996 : "1" (PCIBIOS_READ_CONFIG_WORD),
25997 "b" (bx),
25998 "D" ((long)reg),
25999- "S" (&pci_indirect));
26000+ "S" (&pci_indirect),
26001+ "r" (__PCIBIOS_DS));
26002 /*
26003 * Zero-extend the result beyond 16 bits, do not trust the
26004 * BIOS having done it:
26005@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26006 *value &= 0xffff;
26007 break;
26008 case 4:
26009- __asm__("lcall *(%%esi); cld\n\t"
26010+ __asm__("movw %w6, %%ds\n\t"
26011+ "lcall *%%ss:(%%esi); cld\n\t"
26012+ "push %%ss\n\t"
26013+ "pop %%ds\n\t"
26014 "jc 1f\n\t"
26015 "xor %%ah, %%ah\n"
26016 "1:"
26017@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26018 : "1" (PCIBIOS_READ_CONFIG_DWORD),
26019 "b" (bx),
26020 "D" ((long)reg),
26021- "S" (&pci_indirect));
26022+ "S" (&pci_indirect),
26023+ "r" (__PCIBIOS_DS));
26024 break;
26025 }
26026
26027@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26028
26029 switch (len) {
26030 case 1:
26031- __asm__("lcall *(%%esi); cld\n\t"
26032+ __asm__("movw %w6, %%ds\n\t"
26033+ "lcall *%%ss:(%%esi); cld\n\t"
26034+ "push %%ss\n\t"
26035+ "pop %%ds\n\t"
26036 "jc 1f\n\t"
26037 "xor %%ah, %%ah\n"
26038 "1:"
26039@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26040 "c" (value),
26041 "b" (bx),
26042 "D" ((long)reg),
26043- "S" (&pci_indirect));
26044+ "S" (&pci_indirect),
26045+ "r" (__PCIBIOS_DS));
26046 break;
26047 case 2:
26048- __asm__("lcall *(%%esi); cld\n\t"
26049+ __asm__("movw %w6, %%ds\n\t"
26050+ "lcall *%%ss:(%%esi); cld\n\t"
26051+ "push %%ss\n\t"
26052+ "pop %%ds\n\t"
26053 "jc 1f\n\t"
26054 "xor %%ah, %%ah\n"
26055 "1:"
26056@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26057 "c" (value),
26058 "b" (bx),
26059 "D" ((long)reg),
26060- "S" (&pci_indirect));
26061+ "S" (&pci_indirect),
26062+ "r" (__PCIBIOS_DS));
26063 break;
26064 case 4:
26065- __asm__("lcall *(%%esi); cld\n\t"
26066+ __asm__("movw %w6, %%ds\n\t"
26067+ "lcall *%%ss:(%%esi); cld\n\t"
26068+ "push %%ss\n\t"
26069+ "pop %%ds\n\t"
26070 "jc 1f\n\t"
26071 "xor %%ah, %%ah\n"
26072 "1:"
26073@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26074 "c" (value),
26075 "b" (bx),
26076 "D" ((long)reg),
26077- "S" (&pci_indirect));
26078+ "S" (&pci_indirect),
26079+ "r" (__PCIBIOS_DS));
26080 break;
26081 }
26082
26083@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26084
26085 DBG("PCI: Fetching IRQ routing table... ");
26086 __asm__("push %%es\n\t"
26087+ "movw %w8, %%ds\n\t"
26088 "push %%ds\n\t"
26089 "pop %%es\n\t"
26090- "lcall *(%%esi); cld\n\t"
26091+ "lcall *%%ss:(%%esi); cld\n\t"
26092 "pop %%es\n\t"
26093+ "push %%ss\n\t"
26094+ "pop %%ds\n"
26095 "jc 1f\n\t"
26096 "xor %%ah, %%ah\n"
26097 "1:"
26098@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26099 "1" (0),
26100 "D" ((long) &opt),
26101 "S" (&pci_indirect),
26102- "m" (opt)
26103+ "m" (opt),
26104+ "r" (__PCIBIOS_DS)
26105 : "memory");
26106 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
26107 if (ret & 0xff00)
26108@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26109 {
26110 int ret;
26111
26112- __asm__("lcall *(%%esi); cld\n\t"
26113+ __asm__("movw %w5, %%ds\n\t"
26114+ "lcall *%%ss:(%%esi); cld\n\t"
26115+ "push %%ss\n\t"
26116+ "pop %%ds\n"
26117 "jc 1f\n\t"
26118 "xor %%ah, %%ah\n"
26119 "1:"
26120@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26121 : "0" (PCIBIOS_SET_PCI_HW_INT),
26122 "b" ((dev->bus->number << 8) | dev->devfn),
26123 "c" ((irq << 8) | (pin + 10)),
26124- "S" (&pci_indirect));
26125+ "S" (&pci_indirect),
26126+ "r" (__PCIBIOS_DS));
26127 return !(ret & 0xff00);
26128 }
26129 EXPORT_SYMBOL(pcibios_set_irq_routing);
26130diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
26131index 40e4469..1ab536e 100644
26132--- a/arch/x86/platform/efi/efi_32.c
26133+++ b/arch/x86/platform/efi/efi_32.c
26134@@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
26135 {
26136 struct desc_ptr gdt_descr;
26137
26138+#ifdef CONFIG_PAX_KERNEXEC
26139+ struct desc_struct d;
26140+#endif
26141+
26142 local_irq_save(efi_rt_eflags);
26143
26144 load_cr3(initial_page_table);
26145 __flush_tlb_all();
26146
26147+#ifdef CONFIG_PAX_KERNEXEC
26148+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
26149+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26150+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
26151+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26152+#endif
26153+
26154 gdt_descr.address = __pa(get_cpu_gdt_table(0));
26155 gdt_descr.size = GDT_SIZE - 1;
26156 load_gdt(&gdt_descr);
26157@@ -58,6 +69,14 @@ void efi_call_phys_epilog(void)
26158 {
26159 struct desc_ptr gdt_descr;
26160
26161+#ifdef CONFIG_PAX_KERNEXEC
26162+ struct desc_struct d;
26163+
26164+ memset(&d, 0, sizeof d);
26165+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26166+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26167+#endif
26168+
26169 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
26170 gdt_descr.size = GDT_SIZE - 1;
26171 load_gdt(&gdt_descr);
26172diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
26173index fbe66e6..c5c0dd2 100644
26174--- a/arch/x86/platform/efi/efi_stub_32.S
26175+++ b/arch/x86/platform/efi/efi_stub_32.S
26176@@ -6,7 +6,9 @@
26177 */
26178
26179 #include <linux/linkage.h>
26180+#include <linux/init.h>
26181 #include <asm/page_types.h>
26182+#include <asm/segment.h>
26183
26184 /*
26185 * efi_call_phys(void *, ...) is a function with variable parameters.
26186@@ -20,7 +22,7 @@
26187 * service functions will comply with gcc calling convention, too.
26188 */
26189
26190-.text
26191+__INIT
26192 ENTRY(efi_call_phys)
26193 /*
26194 * 0. The function can only be called in Linux kernel. So CS has been
26195@@ -36,9 +38,11 @@ ENTRY(efi_call_phys)
26196 * The mapping of lower virtual memory has been created in prelog and
26197 * epilog.
26198 */
26199- movl $1f, %edx
26200- subl $__PAGE_OFFSET, %edx
26201- jmp *%edx
26202+ movl $(__KERNEXEC_EFI_DS), %edx
26203+ mov %edx, %ds
26204+ mov %edx, %es
26205+ mov %edx, %ss
26206+ ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
26207 1:
26208
26209 /*
26210@@ -47,14 +51,8 @@ ENTRY(efi_call_phys)
26211 * parameter 2, ..., param n. To make things easy, we save the return
26212 * address of efi_call_phys in a global variable.
26213 */
26214- popl %edx
26215- movl %edx, saved_return_addr
26216- /* get the function pointer into ECX*/
26217- popl %ecx
26218- movl %ecx, efi_rt_function_ptr
26219- movl $2f, %edx
26220- subl $__PAGE_OFFSET, %edx
26221- pushl %edx
26222+ popl (saved_return_addr)
26223+ popl (efi_rt_function_ptr)
26224
26225 /*
26226 * 3. Clear PG bit in %CR0.
26227@@ -73,9 +71,8 @@ ENTRY(efi_call_phys)
26228 /*
26229 * 5. Call the physical function.
26230 */
26231- jmp *%ecx
26232+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
26233
26234-2:
26235 /*
26236 * 6. After EFI runtime service returns, control will return to
26237 * following instruction. We'd better readjust stack pointer first.
26238@@ -88,35 +85,32 @@ ENTRY(efi_call_phys)
26239 movl %cr0, %edx
26240 orl $0x80000000, %edx
26241 movl %edx, %cr0
26242- jmp 1f
26243-1:
26244+
26245 /*
26246 * 8. Now restore the virtual mode from flat mode by
26247 * adding EIP with PAGE_OFFSET.
26248 */
26249- movl $1f, %edx
26250- jmp *%edx
26251+ ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
26252 1:
26253+ movl $(__KERNEL_DS), %edx
26254+ mov %edx, %ds
26255+ mov %edx, %es
26256+ mov %edx, %ss
26257
26258 /*
26259 * 9. Balance the stack. And because EAX contain the return value,
26260 * we'd better not clobber it.
26261 */
26262- leal efi_rt_function_ptr, %edx
26263- movl (%edx), %ecx
26264- pushl %ecx
26265+ pushl (efi_rt_function_ptr)
26266
26267 /*
26268- * 10. Push the saved return address onto the stack and return.
26269+ * 10. Return to the saved return address.
26270 */
26271- leal saved_return_addr, %edx
26272- movl (%edx), %ecx
26273- pushl %ecx
26274- ret
26275+ jmpl *(saved_return_addr)
26276 ENDPROC(efi_call_phys)
26277 .previous
26278
26279-.data
26280+__INITDATA
26281 saved_return_addr:
26282 .long 0
26283 efi_rt_function_ptr:
26284diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
26285index 4c07cca..2c8427d 100644
26286--- a/arch/x86/platform/efi/efi_stub_64.S
26287+++ b/arch/x86/platform/efi/efi_stub_64.S
26288@@ -7,6 +7,7 @@
26289 */
26290
26291 #include <linux/linkage.h>
26292+#include <asm/alternative-asm.h>
26293
26294 #define SAVE_XMM \
26295 mov %rsp, %rax; \
26296@@ -40,6 +41,7 @@ ENTRY(efi_call0)
26297 call *%rdi
26298 addq $32, %rsp
26299 RESTORE_XMM
26300+ pax_force_retaddr 0, 1
26301 ret
26302 ENDPROC(efi_call0)
26303
26304@@ -50,6 +52,7 @@ ENTRY(efi_call1)
26305 call *%rdi
26306 addq $32, %rsp
26307 RESTORE_XMM
26308+ pax_force_retaddr 0, 1
26309 ret
26310 ENDPROC(efi_call1)
26311
26312@@ -60,6 +63,7 @@ ENTRY(efi_call2)
26313 call *%rdi
26314 addq $32, %rsp
26315 RESTORE_XMM
26316+ pax_force_retaddr 0, 1
26317 ret
26318 ENDPROC(efi_call2)
26319
26320@@ -71,6 +75,7 @@ ENTRY(efi_call3)
26321 call *%rdi
26322 addq $32, %rsp
26323 RESTORE_XMM
26324+ pax_force_retaddr 0, 1
26325 ret
26326 ENDPROC(efi_call3)
26327
26328@@ -83,6 +88,7 @@ ENTRY(efi_call4)
26329 call *%rdi
26330 addq $32, %rsp
26331 RESTORE_XMM
26332+ pax_force_retaddr 0, 1
26333 ret
26334 ENDPROC(efi_call4)
26335
26336@@ -96,6 +102,7 @@ ENTRY(efi_call5)
26337 call *%rdi
26338 addq $48, %rsp
26339 RESTORE_XMM
26340+ pax_force_retaddr 0, 1
26341 ret
26342 ENDPROC(efi_call5)
26343
26344@@ -112,5 +119,6 @@ ENTRY(efi_call6)
26345 call *%rdi
26346 addq $48, %rsp
26347 RESTORE_XMM
26348+ pax_force_retaddr 0, 1
26349 ret
26350 ENDPROC(efi_call6)
26351diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
26352index 475e2cd..1b8e708 100644
26353--- a/arch/x86/platform/mrst/mrst.c
26354+++ b/arch/x86/platform/mrst/mrst.c
26355@@ -76,18 +76,20 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
26356 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
26357 int sfi_mrtc_num;
26358
26359-static void mrst_power_off(void)
26360+static __noreturn void mrst_power_off(void)
26361 {
26362 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
26363 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 1);
26364+ BUG();
26365 }
26366
26367-static void mrst_reboot(void)
26368+static __noreturn void mrst_reboot(void)
26369 {
26370 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
26371 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0);
26372 else
26373 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
26374+ BUG();
26375 }
26376
26377 /* parse all the mtimer info to a static mtimer array */
26378diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
26379index 3ae0e61..4202d86 100644
26380--- a/arch/x86/platform/uv/tlb_uv.c
26381+++ b/arch/x86/platform/uv/tlb_uv.c
26382@@ -1424,6 +1424,8 @@ static ssize_t tunables_read(struct file *file, char __user *userbuf,
26383 * 0: display meaning of the statistics
26384 */
26385 static ssize_t ptc_proc_write(struct file *file, const char __user *user,
26386+ size_t count, loff_t *data) __size_overflow(3);
26387+static ssize_t ptc_proc_write(struct file *file, const char __user *user,
26388 size_t count, loff_t *data)
26389 {
26390 int cpu;
26391@@ -1539,6 +1541,8 @@ static int parse_tunables_write(struct bau_control *bcp, char *instr,
26392 * Handle a write to debugfs. (/sys/kernel/debug/sgi_uv/bau_tunables)
26393 */
26394 static ssize_t tunables_write(struct file *file, const char __user *user,
26395+ size_t count, loff_t *data) __size_overflow(3);
26396+static ssize_t tunables_write(struct file *file, const char __user *user,
26397 size_t count, loff_t *data)
26398 {
26399 int cpu;
26400diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
26401index f10c0af..3ec1f95 100644
26402--- a/arch/x86/power/cpu.c
26403+++ b/arch/x86/power/cpu.c
26404@@ -131,7 +131,7 @@ static void do_fpu_end(void)
26405 static void fix_processor_context(void)
26406 {
26407 int cpu = smp_processor_id();
26408- struct tss_struct *t = &per_cpu(init_tss, cpu);
26409+ struct tss_struct *t = init_tss + cpu;
26410
26411 set_tss_desc(cpu, t); /*
26412 * This just modifies memory; should not be
26413@@ -141,7 +141,9 @@ static void fix_processor_context(void)
26414 */
26415
26416 #ifdef CONFIG_X86_64
26417+ pax_open_kernel();
26418 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
26419+ pax_close_kernel();
26420
26421 syscall_init(); /* This sets MSR_*STAR and related */
26422 #endif
26423diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
26424index 5d17950..2253fc9 100644
26425--- a/arch/x86/vdso/Makefile
26426+++ b/arch/x86/vdso/Makefile
26427@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO $@
26428 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
26429 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
26430
26431-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26432+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26433 GCOV_PROFILE := n
26434
26435 #
26436diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
26437index 468d591..8e80a0a 100644
26438--- a/arch/x86/vdso/vdso32-setup.c
26439+++ b/arch/x86/vdso/vdso32-setup.c
26440@@ -25,6 +25,7 @@
26441 #include <asm/tlbflush.h>
26442 #include <asm/vdso.h>
26443 #include <asm/proto.h>
26444+#include <asm/mman.h>
26445
26446 enum {
26447 VDSO_DISABLED = 0,
26448@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
26449 void enable_sep_cpu(void)
26450 {
26451 int cpu = get_cpu();
26452- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26453+ struct tss_struct *tss = init_tss + cpu;
26454
26455 if (!boot_cpu_has(X86_FEATURE_SEP)) {
26456 put_cpu();
26457@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
26458 gate_vma.vm_start = FIXADDR_USER_START;
26459 gate_vma.vm_end = FIXADDR_USER_END;
26460 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
26461- gate_vma.vm_page_prot = __P101;
26462+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
26463 /*
26464 * Make sure the vDSO gets into every core dump.
26465 * Dumping its contents makes post-mortem fully interpretable later
26466@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26467 if (compat)
26468 addr = VDSO_HIGH_BASE;
26469 else {
26470- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
26471+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
26472 if (IS_ERR_VALUE(addr)) {
26473 ret = addr;
26474 goto up_fail;
26475 }
26476 }
26477
26478- current->mm->context.vdso = (void *)addr;
26479+ current->mm->context.vdso = addr;
26480
26481 if (compat_uses_vma || !compat) {
26482 /*
26483@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26484 }
26485
26486 current_thread_info()->sysenter_return =
26487- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26488+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26489
26490 up_fail:
26491 if (ret)
26492- current->mm->context.vdso = NULL;
26493+ current->mm->context.vdso = 0;
26494
26495 up_write(&mm->mmap_sem);
26496
26497@@ -412,8 +413,14 @@ __initcall(ia32_binfmt_init);
26498
26499 const char *arch_vma_name(struct vm_area_struct *vma)
26500 {
26501- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
26502+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
26503 return "[vdso]";
26504+
26505+#ifdef CONFIG_PAX_SEGMEXEC
26506+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
26507+ return "[vdso]";
26508+#endif
26509+
26510 return NULL;
26511 }
26512
26513@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
26514 * Check to see if the corresponding task was created in compat vdso
26515 * mode.
26516 */
26517- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
26518+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
26519 return &gate_vma;
26520 return NULL;
26521 }
26522diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
26523index 153407c..611cba9 100644
26524--- a/arch/x86/vdso/vma.c
26525+++ b/arch/x86/vdso/vma.c
26526@@ -16,8 +16,6 @@
26527 #include <asm/vdso.h>
26528 #include <asm/page.h>
26529
26530-unsigned int __read_mostly vdso_enabled = 1;
26531-
26532 extern char vdso_start[], vdso_end[];
26533 extern unsigned short vdso_sync_cpuid;
26534
26535@@ -96,7 +94,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26536 * unaligned here as a result of stack start randomization.
26537 */
26538 addr = PAGE_ALIGN(addr);
26539- addr = align_addr(addr, NULL, ALIGN_VDSO);
26540
26541 return addr;
26542 }
26543@@ -106,40 +103,35 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26544 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26545 {
26546 struct mm_struct *mm = current->mm;
26547- unsigned long addr;
26548+ unsigned long addr = 0;
26549 int ret;
26550
26551- if (!vdso_enabled)
26552- return 0;
26553-
26554 down_write(&mm->mmap_sem);
26555+
26556+#ifdef CONFIG_PAX_RANDMMAP
26557+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26558+#endif
26559+
26560 addr = vdso_addr(mm->start_stack, vdso_size);
26561+ addr = align_addr(addr, NULL, ALIGN_VDSO);
26562 addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
26563 if (IS_ERR_VALUE(addr)) {
26564 ret = addr;
26565 goto up_fail;
26566 }
26567
26568- current->mm->context.vdso = (void *)addr;
26569+ mm->context.vdso = addr;
26570
26571 ret = install_special_mapping(mm, addr, vdso_size,
26572 VM_READ|VM_EXEC|
26573 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
26574 VM_ALWAYSDUMP,
26575 vdso_pages);
26576- if (ret) {
26577- current->mm->context.vdso = NULL;
26578- goto up_fail;
26579- }
26580+
26581+ if (ret)
26582+ mm->context.vdso = 0;
26583
26584 up_fail:
26585 up_write(&mm->mmap_sem);
26586 return ret;
26587 }
26588-
26589-static __init int vdso_setup(char *s)
26590-{
26591- vdso_enabled = simple_strtoul(s, NULL, 0);
26592- return 0;
26593-}
26594-__setup("vdso=", vdso_setup);
26595diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
26596index 4172af8..2c8ed7f 100644
26597--- a/arch/x86/xen/enlighten.c
26598+++ b/arch/x86/xen/enlighten.c
26599@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
26600
26601 struct shared_info xen_dummy_shared_info;
26602
26603-void *xen_initial_gdt;
26604-
26605 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
26606 __read_mostly int xen_have_vector_callback;
26607 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
26608@@ -1029,30 +1027,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
26609 #endif
26610 };
26611
26612-static void xen_reboot(int reason)
26613+static __noreturn void xen_reboot(int reason)
26614 {
26615 struct sched_shutdown r = { .reason = reason };
26616
26617- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
26618- BUG();
26619+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
26620+ BUG();
26621 }
26622
26623-static void xen_restart(char *msg)
26624+static __noreturn void xen_restart(char *msg)
26625 {
26626 xen_reboot(SHUTDOWN_reboot);
26627 }
26628
26629-static void xen_emergency_restart(void)
26630+static __noreturn void xen_emergency_restart(void)
26631 {
26632 xen_reboot(SHUTDOWN_reboot);
26633 }
26634
26635-static void xen_machine_halt(void)
26636+static __noreturn void xen_machine_halt(void)
26637 {
26638 xen_reboot(SHUTDOWN_poweroff);
26639 }
26640
26641-static void xen_machine_power_off(void)
26642+static __noreturn void xen_machine_power_off(void)
26643 {
26644 if (pm_power_off)
26645 pm_power_off();
26646@@ -1155,7 +1153,17 @@ asmlinkage void __init xen_start_kernel(void)
26647 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
26648
26649 /* Work out if we support NX */
26650- x86_configure_nx();
26651+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
26652+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
26653+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
26654+ unsigned l, h;
26655+
26656+ __supported_pte_mask |= _PAGE_NX;
26657+ rdmsr(MSR_EFER, l, h);
26658+ l |= EFER_NX;
26659+ wrmsr(MSR_EFER, l, h);
26660+ }
26661+#endif
26662
26663 xen_setup_features();
26664
26665@@ -1186,13 +1194,6 @@ asmlinkage void __init xen_start_kernel(void)
26666
26667 machine_ops = xen_machine_ops;
26668
26669- /*
26670- * The only reliable way to retain the initial address of the
26671- * percpu gdt_page is to remember it here, so we can go and
26672- * mark it RW later, when the initial percpu area is freed.
26673- */
26674- xen_initial_gdt = &per_cpu(gdt_page, 0);
26675-
26676 xen_smp_init();
26677
26678 #ifdef CONFIG_ACPI_NUMA
26679diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
26680index 95c1cf6..4bfa5be 100644
26681--- a/arch/x86/xen/mmu.c
26682+++ b/arch/x86/xen/mmu.c
26683@@ -1733,6 +1733,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
26684 convert_pfn_mfn(init_level4_pgt);
26685 convert_pfn_mfn(level3_ident_pgt);
26686 convert_pfn_mfn(level3_kernel_pgt);
26687+ convert_pfn_mfn(level3_vmalloc_start_pgt);
26688+ convert_pfn_mfn(level3_vmalloc_end_pgt);
26689+ convert_pfn_mfn(level3_vmemmap_pgt);
26690
26691 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
26692 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
26693@@ -1751,7 +1754,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
26694 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
26695 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
26696 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
26697+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
26698+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
26699+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
26700 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
26701+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
26702 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
26703 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
26704
26705@@ -1958,6 +1965,7 @@ static void __init xen_post_allocator_init(void)
26706 pv_mmu_ops.set_pud = xen_set_pud;
26707 #if PAGETABLE_LEVELS == 4
26708 pv_mmu_ops.set_pgd = xen_set_pgd;
26709+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
26710 #endif
26711
26712 /* This will work as long as patching hasn't happened yet
26713@@ -2039,6 +2047,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
26714 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
26715 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
26716 .set_pgd = xen_set_pgd_hyper,
26717+ .set_pgd_batched = xen_set_pgd_hyper,
26718
26719 .alloc_pud = xen_alloc_pmd_init,
26720 .release_pud = xen_release_pmd_init,
26721diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
26722index 501d4e0..e877605 100644
26723--- a/arch/x86/xen/smp.c
26724+++ b/arch/x86/xen/smp.c
26725@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
26726 {
26727 BUG_ON(smp_processor_id() != 0);
26728 native_smp_prepare_boot_cpu();
26729-
26730- /* We've switched to the "real" per-cpu gdt, so make sure the
26731- old memory can be recycled */
26732- make_lowmem_page_readwrite(xen_initial_gdt);
26733-
26734 xen_filter_cpu_maps();
26735 xen_setup_vcpu_info_placement();
26736 }
26737@@ -275,12 +270,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
26738 gdt = get_cpu_gdt_table(cpu);
26739
26740 ctxt->flags = VGCF_IN_KERNEL;
26741- ctxt->user_regs.ds = __USER_DS;
26742- ctxt->user_regs.es = __USER_DS;
26743+ ctxt->user_regs.ds = __KERNEL_DS;
26744+ ctxt->user_regs.es = __KERNEL_DS;
26745 ctxt->user_regs.ss = __KERNEL_DS;
26746 #ifdef CONFIG_X86_32
26747 ctxt->user_regs.fs = __KERNEL_PERCPU;
26748- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
26749+ savesegment(gs, ctxt->user_regs.gs);
26750 #else
26751 ctxt->gs_base_kernel = per_cpu_offset(cpu);
26752 #endif
26753@@ -331,13 +326,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
26754 int rc;
26755
26756 per_cpu(current_task, cpu) = idle;
26757+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
26758 #ifdef CONFIG_X86_32
26759 irq_ctx_init(cpu);
26760 #else
26761 clear_tsk_thread_flag(idle, TIF_FORK);
26762- per_cpu(kernel_stack, cpu) =
26763- (unsigned long)task_stack_page(idle) -
26764- KERNEL_STACK_OFFSET + THREAD_SIZE;
26765+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
26766 #endif
26767 xen_setup_runstate_info(cpu);
26768 xen_setup_timer(cpu);
26769diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
26770index b040b0e..8cc4fe0 100644
26771--- a/arch/x86/xen/xen-asm_32.S
26772+++ b/arch/x86/xen/xen-asm_32.S
26773@@ -83,14 +83,14 @@ ENTRY(xen_iret)
26774 ESP_OFFSET=4 # bytes pushed onto stack
26775
26776 /*
26777- * Store vcpu_info pointer for easy access. Do it this way to
26778- * avoid having to reload %fs
26779+ * Store vcpu_info pointer for easy access.
26780 */
26781 #ifdef CONFIG_SMP
26782- GET_THREAD_INFO(%eax)
26783- movl TI_cpu(%eax), %eax
26784- movl __per_cpu_offset(,%eax,4), %eax
26785- mov xen_vcpu(%eax), %eax
26786+ push %fs
26787+ mov $(__KERNEL_PERCPU), %eax
26788+ mov %eax, %fs
26789+ mov PER_CPU_VAR(xen_vcpu), %eax
26790+ pop %fs
26791 #else
26792 movl xen_vcpu, %eax
26793 #endif
26794diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
26795index aaa7291..3f77960 100644
26796--- a/arch/x86/xen/xen-head.S
26797+++ b/arch/x86/xen/xen-head.S
26798@@ -19,6 +19,17 @@ ENTRY(startup_xen)
26799 #ifdef CONFIG_X86_32
26800 mov %esi,xen_start_info
26801 mov $init_thread_union+THREAD_SIZE,%esp
26802+#ifdef CONFIG_SMP
26803+ movl $cpu_gdt_table,%edi
26804+ movl $__per_cpu_load,%eax
26805+ movw %ax,__KERNEL_PERCPU + 2(%edi)
26806+ rorl $16,%eax
26807+ movb %al,__KERNEL_PERCPU + 4(%edi)
26808+ movb %ah,__KERNEL_PERCPU + 7(%edi)
26809+ movl $__per_cpu_end - 1,%eax
26810+ subl $__per_cpu_start,%eax
26811+ movw %ax,__KERNEL_PERCPU + 0(%edi)
26812+#endif
26813 #else
26814 mov %rsi,xen_start_info
26815 mov $init_thread_union+THREAD_SIZE,%rsp
26816diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
26817index b095739..8c17bcd 100644
26818--- a/arch/x86/xen/xen-ops.h
26819+++ b/arch/x86/xen/xen-ops.h
26820@@ -10,8 +10,6 @@
26821 extern const char xen_hypervisor_callback[];
26822 extern const char xen_failsafe_callback[];
26823
26824-extern void *xen_initial_gdt;
26825-
26826 struct trap_info;
26827 void xen_copy_trap_info(struct trap_info *traps);
26828
26829diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
26830index 525bd3d..ef888b1 100644
26831--- a/arch/xtensa/variants/dc232b/include/variant/core.h
26832+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
26833@@ -119,9 +119,9 @@
26834 ----------------------------------------------------------------------*/
26835
26836 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
26837-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
26838 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
26839 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
26840+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26841
26842 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
26843 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
26844diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
26845index 2f33760..835e50a 100644
26846--- a/arch/xtensa/variants/fsf/include/variant/core.h
26847+++ b/arch/xtensa/variants/fsf/include/variant/core.h
26848@@ -11,6 +11,7 @@
26849 #ifndef _XTENSA_CORE_H
26850 #define _XTENSA_CORE_H
26851
26852+#include <linux/const.h>
26853
26854 /****************************************************************************
26855 Parameters Useful for Any Code, USER or PRIVILEGED
26856@@ -112,9 +113,9 @@
26857 ----------------------------------------------------------------------*/
26858
26859 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
26860-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
26861 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
26862 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
26863+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26864
26865 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
26866 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
26867diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
26868index af00795..2bb8105 100644
26869--- a/arch/xtensa/variants/s6000/include/variant/core.h
26870+++ b/arch/xtensa/variants/s6000/include/variant/core.h
26871@@ -11,6 +11,7 @@
26872 #ifndef _XTENSA_CORE_CONFIGURATION_H
26873 #define _XTENSA_CORE_CONFIGURATION_H
26874
26875+#include <linux/const.h>
26876
26877 /****************************************************************************
26878 Parameters Useful for Any Code, USER or PRIVILEGED
26879@@ -118,9 +119,9 @@
26880 ----------------------------------------------------------------------*/
26881
26882 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
26883-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
26884 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
26885 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
26886+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26887
26888 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
26889 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
26890diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
26891index 58916af..9cb880b 100644
26892--- a/block/blk-iopoll.c
26893+++ b/block/blk-iopoll.c
26894@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
26895 }
26896 EXPORT_SYMBOL(blk_iopoll_complete);
26897
26898-static void blk_iopoll_softirq(struct softirq_action *h)
26899+static void blk_iopoll_softirq(void)
26900 {
26901 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
26902 int rearm = 0, budget = blk_iopoll_budget;
26903diff --git a/block/blk-map.c b/block/blk-map.c
26904index 623e1cd..ca1e109 100644
26905--- a/block/blk-map.c
26906+++ b/block/blk-map.c
26907@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
26908 if (!len || !kbuf)
26909 return -EINVAL;
26910
26911- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
26912+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
26913 if (do_copy)
26914 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
26915 else
26916diff --git a/block/blk-softirq.c b/block/blk-softirq.c
26917index 1366a89..e17f54b 100644
26918--- a/block/blk-softirq.c
26919+++ b/block/blk-softirq.c
26920@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
26921 * Softirq action handler - move entries to local list and loop over them
26922 * while passing them to the queue registered handler.
26923 */
26924-static void blk_done_softirq(struct softirq_action *h)
26925+static void blk_done_softirq(void)
26926 {
26927 struct list_head *cpu_list, local_list;
26928
26929diff --git a/block/bsg.c b/block/bsg.c
26930index ff64ae3..593560c 100644
26931--- a/block/bsg.c
26932+++ b/block/bsg.c
26933@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
26934 struct sg_io_v4 *hdr, struct bsg_device *bd,
26935 fmode_t has_write_perm)
26936 {
26937+ unsigned char tmpcmd[sizeof(rq->__cmd)];
26938+ unsigned char *cmdptr;
26939+
26940 if (hdr->request_len > BLK_MAX_CDB) {
26941 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
26942 if (!rq->cmd)
26943 return -ENOMEM;
26944- }
26945+ cmdptr = rq->cmd;
26946+ } else
26947+ cmdptr = tmpcmd;
26948
26949- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
26950+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
26951 hdr->request_len))
26952 return -EFAULT;
26953
26954+ if (cmdptr != rq->cmd)
26955+ memcpy(rq->cmd, cmdptr, hdr->request_len);
26956+
26957 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
26958 if (blk_verify_command(rq->cmd, has_write_perm))
26959 return -EPERM;
26960diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
26961index 7c668c8..db3521c 100644
26962--- a/block/compat_ioctl.c
26963+++ b/block/compat_ioctl.c
26964@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
26965 err |= __get_user(f->spec1, &uf->spec1);
26966 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
26967 err |= __get_user(name, &uf->name);
26968- f->name = compat_ptr(name);
26969+ f->name = (void __force_kernel *)compat_ptr(name);
26970 if (err) {
26971 err = -EFAULT;
26972 goto out;
26973diff --git a/block/partitions/efi.c b/block/partitions/efi.c
26974index 6296b40..417c00f 100644
26975--- a/block/partitions/efi.c
26976+++ b/block/partitions/efi.c
26977@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
26978 if (!gpt)
26979 return NULL;
26980
26981+ if (!le32_to_cpu(gpt->num_partition_entries))
26982+ return NULL;
26983+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
26984+ if (!pte)
26985+ return NULL;
26986+
26987 count = le32_to_cpu(gpt->num_partition_entries) *
26988 le32_to_cpu(gpt->sizeof_partition_entry);
26989- if (!count)
26990- return NULL;
26991- pte = kzalloc(count, GFP_KERNEL);
26992- if (!pte)
26993- return NULL;
26994-
26995 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
26996 (u8 *) pte,
26997 count) < count) {
26998diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
26999index 260fa80..e8f3caf 100644
27000--- a/block/scsi_ioctl.c
27001+++ b/block/scsi_ioctl.c
27002@@ -223,8 +223,20 @@ EXPORT_SYMBOL(blk_verify_command);
27003 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
27004 struct sg_io_hdr *hdr, fmode_t mode)
27005 {
27006- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
27007+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27008+ unsigned char *cmdptr;
27009+
27010+ if (rq->cmd != rq->__cmd)
27011+ cmdptr = rq->cmd;
27012+ else
27013+ cmdptr = tmpcmd;
27014+
27015+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
27016 return -EFAULT;
27017+
27018+ if (cmdptr != rq->cmd)
27019+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
27020+
27021 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
27022 return -EPERM;
27023
27024@@ -433,6 +445,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27025 int err;
27026 unsigned int in_len, out_len, bytes, opcode, cmdlen;
27027 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
27028+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27029+ unsigned char *cmdptr;
27030
27031 if (!sic)
27032 return -EINVAL;
27033@@ -466,9 +480,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27034 */
27035 err = -EFAULT;
27036 rq->cmd_len = cmdlen;
27037- if (copy_from_user(rq->cmd, sic->data, cmdlen))
27038+
27039+ if (rq->cmd != rq->__cmd)
27040+ cmdptr = rq->cmd;
27041+ else
27042+ cmdptr = tmpcmd;
27043+
27044+ if (copy_from_user(cmdptr, sic->data, cmdlen))
27045 goto error;
27046
27047+ if (rq->cmd != cmdptr)
27048+ memcpy(rq->cmd, cmdptr, cmdlen);
27049+
27050 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
27051 goto error;
27052
27053diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
27054index a0f768c..1da9c73 100644
27055--- a/crypto/ablkcipher.c
27056+++ b/crypto/ablkcipher.c
27057@@ -307,6 +307,8 @@ int ablkcipher_walk_phys(struct ablkcipher_request *req,
27058 EXPORT_SYMBOL_GPL(ablkcipher_walk_phys);
27059
27060 static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27061+ unsigned int keylen) __size_overflow(3);
27062+static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27063 unsigned int keylen)
27064 {
27065 struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
27066@@ -329,6 +331,8 @@ static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27067 }
27068
27069 static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
27070+ unsigned int keylen) __size_overflow(3);
27071+static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
27072 unsigned int keylen)
27073 {
27074 struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
27075diff --git a/crypto/aead.c b/crypto/aead.c
27076index 04add3dc..983032f 100644
27077--- a/crypto/aead.c
27078+++ b/crypto/aead.c
27079@@ -27,6 +27,8 @@
27080 #include "internal.h"
27081
27082 static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27083+ unsigned int keylen) __size_overflow(3);
27084+static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27085 unsigned int keylen)
27086 {
27087 struct aead_alg *aead = crypto_aead_alg(tfm);
27088@@ -48,6 +50,7 @@ static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27089 return ret;
27090 }
27091
27092+static int setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27093 static int setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
27094 {
27095 struct aead_alg *aead = crypto_aead_alg(tfm);
27096diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
27097index 1e61d1a..cf06b86 100644
27098--- a/crypto/blkcipher.c
27099+++ b/crypto/blkcipher.c
27100@@ -359,6 +359,8 @@ int blkcipher_walk_virt_block(struct blkcipher_desc *desc,
27101 EXPORT_SYMBOL_GPL(blkcipher_walk_virt_block);
27102
27103 static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27104+ unsigned int keylen) __size_overflow(3);
27105+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27106 unsigned int keylen)
27107 {
27108 struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
27109@@ -380,6 +382,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27110 return ret;
27111 }
27112
27113+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27114 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
27115 {
27116 struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
27117diff --git a/crypto/cipher.c b/crypto/cipher.c
27118index 39541e0..802d956 100644
27119--- a/crypto/cipher.c
27120+++ b/crypto/cipher.c
27121@@ -21,6 +21,8 @@
27122 #include "internal.h"
27123
27124 static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27125+ unsigned int keylen) __size_overflow(3);
27126+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27127 unsigned int keylen)
27128 {
27129 struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
27130@@ -43,6 +45,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27131
27132 }
27133
27134+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27135 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
27136 {
27137 struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
27138diff --git a/crypto/cryptd.c b/crypto/cryptd.c
27139index 671d4d6..5f24030 100644
27140--- a/crypto/cryptd.c
27141+++ b/crypto/cryptd.c
27142@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
27143
27144 struct cryptd_blkcipher_request_ctx {
27145 crypto_completion_t complete;
27146-};
27147+} __no_const;
27148
27149 struct cryptd_hash_ctx {
27150 struct crypto_shash *child;
27151@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
27152
27153 struct cryptd_aead_request_ctx {
27154 crypto_completion_t complete;
27155-};
27156+} __no_const;
27157
27158 static void cryptd_queue_worker(struct work_struct *work);
27159
27160diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
27161index 5d41894..22021e4 100644
27162--- a/drivers/acpi/apei/cper.c
27163+++ b/drivers/acpi/apei/cper.c
27164@@ -38,12 +38,12 @@
27165 */
27166 u64 cper_next_record_id(void)
27167 {
27168- static atomic64_t seq;
27169+ static atomic64_unchecked_t seq;
27170
27171- if (!atomic64_read(&seq))
27172- atomic64_set(&seq, ((u64)get_seconds()) << 32);
27173+ if (!atomic64_read_unchecked(&seq))
27174+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
27175
27176- return atomic64_inc_return(&seq);
27177+ return atomic64_inc_return_unchecked(&seq);
27178 }
27179 EXPORT_SYMBOL_GPL(cper_next_record_id);
27180
27181diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
27182index 86933ca..5cb1a69 100644
27183--- a/drivers/acpi/battery.c
27184+++ b/drivers/acpi/battery.c
27185@@ -787,6 +787,9 @@ static int acpi_battery_print_alarm(struct seq_file *seq, int result)
27186
27187 static ssize_t acpi_battery_write_alarm(struct file *file,
27188 const char __user * buffer,
27189+ size_t count, loff_t * ppos) __size_overflow(3);
27190+static ssize_t acpi_battery_write_alarm(struct file *file,
27191+ const char __user * buffer,
27192 size_t count, loff_t * ppos)
27193 {
27194 int result = 0;
27195diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
27196index b258cab..3fb7da7 100644
27197--- a/drivers/acpi/ec_sys.c
27198+++ b/drivers/acpi/ec_sys.c
27199@@ -12,6 +12,7 @@
27200 #include <linux/acpi.h>
27201 #include <linux/debugfs.h>
27202 #include <linux/module.h>
27203+#include <linux/uaccess.h>
27204 #include "internal.h"
27205
27206 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
27207@@ -40,7 +41,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27208 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
27209 */
27210 unsigned int size = EC_SPACE_SIZE;
27211- u8 *data = (u8 *) buf;
27212+ u8 data;
27213 loff_t init_off = *off;
27214 int err = 0;
27215
27216@@ -53,9 +54,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27217 size = count;
27218
27219 while (size) {
27220- err = ec_read(*off, &data[*off - init_off]);
27221+ err = ec_read(*off, &data);
27222 if (err)
27223 return err;
27224+ if (put_user(data, &buf[*off - init_off]))
27225+ return -EFAULT;
27226 *off += 1;
27227 size--;
27228 }
27229@@ -71,7 +74,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27230
27231 unsigned int size = count;
27232 loff_t init_off = *off;
27233- u8 *data = (u8 *) buf;
27234 int err = 0;
27235
27236 if (*off >= EC_SPACE_SIZE)
27237@@ -82,7 +84,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27238 }
27239
27240 while (size) {
27241- u8 byte_write = data[*off - init_off];
27242+ u8 byte_write;
27243+ if (get_user(byte_write, &buf[*off - init_off]))
27244+ return -EFAULT;
27245 err = ec_write(*off, byte_write);
27246 if (err)
27247 return err;
27248diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
27249index 251c7b62..000462d 100644
27250--- a/drivers/acpi/proc.c
27251+++ b/drivers/acpi/proc.c
27252@@ -343,19 +343,13 @@ acpi_system_write_wakeup_device(struct file *file,
27253 size_t count, loff_t * ppos)
27254 {
27255 struct list_head *node, *next;
27256- char strbuf[5];
27257- char str[5] = "";
27258- unsigned int len = count;
27259+ char strbuf[5] = {0};
27260
27261- if (len > 4)
27262- len = 4;
27263- if (len < 0)
27264+ if (count > 4)
27265+ count = 4;
27266+ if (copy_from_user(strbuf, buffer, count))
27267 return -EFAULT;
27268-
27269- if (copy_from_user(strbuf, buffer, len))
27270- return -EFAULT;
27271- strbuf[len] = '\0';
27272- sscanf(strbuf, "%s", str);
27273+ strbuf[count] = '\0';
27274
27275 mutex_lock(&acpi_device_lock);
27276 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
27277@@ -364,7 +358,7 @@ acpi_system_write_wakeup_device(struct file *file,
27278 if (!dev->wakeup.flags.valid)
27279 continue;
27280
27281- if (!strncmp(dev->pnp.bus_id, str, 4)) {
27282+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
27283 if (device_can_wakeup(&dev->dev)) {
27284 bool enable = !device_may_wakeup(&dev->dev);
27285 device_set_wakeup_enable(&dev->dev, enable);
27286diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
27287index 8ae05ce..7dbbed9 100644
27288--- a/drivers/acpi/processor_driver.c
27289+++ b/drivers/acpi/processor_driver.c
27290@@ -555,7 +555,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
27291 return 0;
27292 #endif
27293
27294- BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
27295+ BUG_ON(pr->id >= nr_cpu_ids);
27296
27297 /*
27298 * Buggy BIOS check
27299diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
27300index 6e36d0c..f319944 100644
27301--- a/drivers/acpi/sbs.c
27302+++ b/drivers/acpi/sbs.c
27303@@ -655,6 +655,9 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
27304
27305 static ssize_t
27306 acpi_battery_write_alarm(struct file *file, const char __user * buffer,
27307+ size_t count, loff_t * ppos) __size_overflow(3);
27308+static ssize_t
27309+acpi_battery_write_alarm(struct file *file, const char __user * buffer,
27310 size_t count, loff_t * ppos)
27311 {
27312 struct seq_file *seq = file->private_data;
27313diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
27314index c06e0ec..a2c06ba 100644
27315--- a/drivers/ata/libata-core.c
27316+++ b/drivers/ata/libata-core.c
27317@@ -4736,7 +4736,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
27318 struct ata_port *ap;
27319 unsigned int tag;
27320
27321- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27322+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27323 ap = qc->ap;
27324
27325 qc->flags = 0;
27326@@ -4752,7 +4752,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
27327 struct ata_port *ap;
27328 struct ata_link *link;
27329
27330- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27331+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27332 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
27333 ap = qc->ap;
27334 link = qc->dev->link;
27335@@ -5816,6 +5816,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27336 return;
27337
27338 spin_lock(&lock);
27339+ pax_open_kernel();
27340
27341 for (cur = ops->inherits; cur; cur = cur->inherits) {
27342 void **inherit = (void **)cur;
27343@@ -5829,8 +5830,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27344 if (IS_ERR(*pp))
27345 *pp = NULL;
27346
27347- ops->inherits = NULL;
27348+ *(struct ata_port_operations **)&ops->inherits = NULL;
27349
27350+ pax_close_kernel();
27351 spin_unlock(&lock);
27352 }
27353
27354diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
27355index 048589f..4002b98 100644
27356--- a/drivers/ata/pata_arasan_cf.c
27357+++ b/drivers/ata/pata_arasan_cf.c
27358@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
27359 /* Handle platform specific quirks */
27360 if (pdata->quirk) {
27361 if (pdata->quirk & CF_BROKEN_PIO) {
27362- ap->ops->set_piomode = NULL;
27363+ pax_open_kernel();
27364+ *(void **)&ap->ops->set_piomode = NULL;
27365+ pax_close_kernel();
27366 ap->pio_mask = 0;
27367 }
27368 if (pdata->quirk & CF_BROKEN_MWDMA)
27369diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
27370index f9b983a..887b9d8 100644
27371--- a/drivers/atm/adummy.c
27372+++ b/drivers/atm/adummy.c
27373@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
27374 vcc->pop(vcc, skb);
27375 else
27376 dev_kfree_skb_any(skb);
27377- atomic_inc(&vcc->stats->tx);
27378+ atomic_inc_unchecked(&vcc->stats->tx);
27379
27380 return 0;
27381 }
27382diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
27383index f8f41e0..1f987dd 100644
27384--- a/drivers/atm/ambassador.c
27385+++ b/drivers/atm/ambassador.c
27386@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
27387 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
27388
27389 // VC layer stats
27390- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27391+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27392
27393 // free the descriptor
27394 kfree (tx_descr);
27395@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27396 dump_skb ("<<<", vc, skb);
27397
27398 // VC layer stats
27399- atomic_inc(&atm_vcc->stats->rx);
27400+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27401 __net_timestamp(skb);
27402 // end of our responsibility
27403 atm_vcc->push (atm_vcc, skb);
27404@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27405 } else {
27406 PRINTK (KERN_INFO, "dropped over-size frame");
27407 // should we count this?
27408- atomic_inc(&atm_vcc->stats->rx_drop);
27409+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27410 }
27411
27412 } else {
27413@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
27414 }
27415
27416 if (check_area (skb->data, skb->len)) {
27417- atomic_inc(&atm_vcc->stats->tx_err);
27418+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
27419 return -ENOMEM; // ?
27420 }
27421
27422diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
27423index b22d71c..d6e1049 100644
27424--- a/drivers/atm/atmtcp.c
27425+++ b/drivers/atm/atmtcp.c
27426@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27427 if (vcc->pop) vcc->pop(vcc,skb);
27428 else dev_kfree_skb(skb);
27429 if (dev_data) return 0;
27430- atomic_inc(&vcc->stats->tx_err);
27431+ atomic_inc_unchecked(&vcc->stats->tx_err);
27432 return -ENOLINK;
27433 }
27434 size = skb->len+sizeof(struct atmtcp_hdr);
27435@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27436 if (!new_skb) {
27437 if (vcc->pop) vcc->pop(vcc,skb);
27438 else dev_kfree_skb(skb);
27439- atomic_inc(&vcc->stats->tx_err);
27440+ atomic_inc_unchecked(&vcc->stats->tx_err);
27441 return -ENOBUFS;
27442 }
27443 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
27444@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27445 if (vcc->pop) vcc->pop(vcc,skb);
27446 else dev_kfree_skb(skb);
27447 out_vcc->push(out_vcc,new_skb);
27448- atomic_inc(&vcc->stats->tx);
27449- atomic_inc(&out_vcc->stats->rx);
27450+ atomic_inc_unchecked(&vcc->stats->tx);
27451+ atomic_inc_unchecked(&out_vcc->stats->rx);
27452 return 0;
27453 }
27454
27455@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27456 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
27457 read_unlock(&vcc_sklist_lock);
27458 if (!out_vcc) {
27459- atomic_inc(&vcc->stats->tx_err);
27460+ atomic_inc_unchecked(&vcc->stats->tx_err);
27461 goto done;
27462 }
27463 skb_pull(skb,sizeof(struct atmtcp_hdr));
27464@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27465 __net_timestamp(new_skb);
27466 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
27467 out_vcc->push(out_vcc,new_skb);
27468- atomic_inc(&vcc->stats->tx);
27469- atomic_inc(&out_vcc->stats->rx);
27470+ atomic_inc_unchecked(&vcc->stats->tx);
27471+ atomic_inc_unchecked(&out_vcc->stats->rx);
27472 done:
27473 if (vcc->pop) vcc->pop(vcc,skb);
27474 else dev_kfree_skb(skb);
27475diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
27476index 956e9ac..133516d 100644
27477--- a/drivers/atm/eni.c
27478+++ b/drivers/atm/eni.c
27479@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
27480 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
27481 vcc->dev->number);
27482 length = 0;
27483- atomic_inc(&vcc->stats->rx_err);
27484+ atomic_inc_unchecked(&vcc->stats->rx_err);
27485 }
27486 else {
27487 length = ATM_CELL_SIZE-1; /* no HEC */
27488@@ -581,7 +581,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27489 size);
27490 }
27491 eff = length = 0;
27492- atomic_inc(&vcc->stats->rx_err);
27493+ atomic_inc_unchecked(&vcc->stats->rx_err);
27494 }
27495 else {
27496 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
27497@@ -598,7 +598,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27498 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
27499 vcc->dev->number,vcc->vci,length,size << 2,descr);
27500 length = eff = 0;
27501- atomic_inc(&vcc->stats->rx_err);
27502+ atomic_inc_unchecked(&vcc->stats->rx_err);
27503 }
27504 }
27505 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
27506@@ -771,7 +771,7 @@ rx_dequeued++;
27507 vcc->push(vcc,skb);
27508 pushed++;
27509 }
27510- atomic_inc(&vcc->stats->rx);
27511+ atomic_inc_unchecked(&vcc->stats->rx);
27512 }
27513 wake_up(&eni_dev->rx_wait);
27514 }
27515@@ -1229,7 +1229,7 @@ static void dequeue_tx(struct atm_dev *dev)
27516 PCI_DMA_TODEVICE);
27517 if (vcc->pop) vcc->pop(vcc,skb);
27518 else dev_kfree_skb_irq(skb);
27519- atomic_inc(&vcc->stats->tx);
27520+ atomic_inc_unchecked(&vcc->stats->tx);
27521 wake_up(&eni_dev->tx_wait);
27522 dma_complete++;
27523 }
27524@@ -1569,7 +1569,7 @@ tx_complete++;
27525 /*--------------------------------- entries ---------------------------------*/
27526
27527
27528-static const char *media_name[] __devinitdata = {
27529+static const char *media_name[] __devinitconst = {
27530 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
27531 "UTP", "05?", "06?", "07?", /* 4- 7 */
27532 "TAXI","09?", "10?", "11?", /* 8-11 */
27533diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
27534index 5072f8a..fa52520d 100644
27535--- a/drivers/atm/firestream.c
27536+++ b/drivers/atm/firestream.c
27537@@ -750,7 +750,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
27538 }
27539 }
27540
27541- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27542+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27543
27544 fs_dprintk (FS_DEBUG_TXMEM, "i");
27545 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
27546@@ -817,7 +817,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27547 #endif
27548 skb_put (skb, qe->p1 & 0xffff);
27549 ATM_SKB(skb)->vcc = atm_vcc;
27550- atomic_inc(&atm_vcc->stats->rx);
27551+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27552 __net_timestamp(skb);
27553 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
27554 atm_vcc->push (atm_vcc, skb);
27555@@ -838,12 +838,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27556 kfree (pe);
27557 }
27558 if (atm_vcc)
27559- atomic_inc(&atm_vcc->stats->rx_drop);
27560+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27561 break;
27562 case 0x1f: /* Reassembly abort: no buffers. */
27563 /* Silently increment error counter. */
27564 if (atm_vcc)
27565- atomic_inc(&atm_vcc->stats->rx_drop);
27566+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27567 break;
27568 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
27569 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
27570diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
27571index 361f5ae..7fc552d 100644
27572--- a/drivers/atm/fore200e.c
27573+++ b/drivers/atm/fore200e.c
27574@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
27575 #endif
27576 /* check error condition */
27577 if (*entry->status & STATUS_ERROR)
27578- atomic_inc(&vcc->stats->tx_err);
27579+ atomic_inc_unchecked(&vcc->stats->tx_err);
27580 else
27581- atomic_inc(&vcc->stats->tx);
27582+ atomic_inc_unchecked(&vcc->stats->tx);
27583 }
27584 }
27585
27586@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27587 if (skb == NULL) {
27588 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
27589
27590- atomic_inc(&vcc->stats->rx_drop);
27591+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27592 return -ENOMEM;
27593 }
27594
27595@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27596
27597 dev_kfree_skb_any(skb);
27598
27599- atomic_inc(&vcc->stats->rx_drop);
27600+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27601 return -ENOMEM;
27602 }
27603
27604 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27605
27606 vcc->push(vcc, skb);
27607- atomic_inc(&vcc->stats->rx);
27608+ atomic_inc_unchecked(&vcc->stats->rx);
27609
27610 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27611
27612@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
27613 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
27614 fore200e->atm_dev->number,
27615 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
27616- atomic_inc(&vcc->stats->rx_err);
27617+ atomic_inc_unchecked(&vcc->stats->rx_err);
27618 }
27619 }
27620
27621@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
27622 goto retry_here;
27623 }
27624
27625- atomic_inc(&vcc->stats->tx_err);
27626+ atomic_inc_unchecked(&vcc->stats->tx_err);
27627
27628 fore200e->tx_sat++;
27629 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
27630diff --git a/drivers/atm/he.c b/drivers/atm/he.c
27631index b182c2f..1c6fa8a 100644
27632--- a/drivers/atm/he.c
27633+++ b/drivers/atm/he.c
27634@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27635
27636 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
27637 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
27638- atomic_inc(&vcc->stats->rx_drop);
27639+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27640 goto return_host_buffers;
27641 }
27642
27643@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27644 RBRQ_LEN_ERR(he_dev->rbrq_head)
27645 ? "LEN_ERR" : "",
27646 vcc->vpi, vcc->vci);
27647- atomic_inc(&vcc->stats->rx_err);
27648+ atomic_inc_unchecked(&vcc->stats->rx_err);
27649 goto return_host_buffers;
27650 }
27651
27652@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27653 vcc->push(vcc, skb);
27654 spin_lock(&he_dev->global_lock);
27655
27656- atomic_inc(&vcc->stats->rx);
27657+ atomic_inc_unchecked(&vcc->stats->rx);
27658
27659 return_host_buffers:
27660 ++pdus_assembled;
27661@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
27662 tpd->vcc->pop(tpd->vcc, tpd->skb);
27663 else
27664 dev_kfree_skb_any(tpd->skb);
27665- atomic_inc(&tpd->vcc->stats->tx_err);
27666+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
27667 }
27668 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
27669 return;
27670@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27671 vcc->pop(vcc, skb);
27672 else
27673 dev_kfree_skb_any(skb);
27674- atomic_inc(&vcc->stats->tx_err);
27675+ atomic_inc_unchecked(&vcc->stats->tx_err);
27676 return -EINVAL;
27677 }
27678
27679@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27680 vcc->pop(vcc, skb);
27681 else
27682 dev_kfree_skb_any(skb);
27683- atomic_inc(&vcc->stats->tx_err);
27684+ atomic_inc_unchecked(&vcc->stats->tx_err);
27685 return -EINVAL;
27686 }
27687 #endif
27688@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27689 vcc->pop(vcc, skb);
27690 else
27691 dev_kfree_skb_any(skb);
27692- atomic_inc(&vcc->stats->tx_err);
27693+ atomic_inc_unchecked(&vcc->stats->tx_err);
27694 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27695 return -ENOMEM;
27696 }
27697@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27698 vcc->pop(vcc, skb);
27699 else
27700 dev_kfree_skb_any(skb);
27701- atomic_inc(&vcc->stats->tx_err);
27702+ atomic_inc_unchecked(&vcc->stats->tx_err);
27703 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27704 return -ENOMEM;
27705 }
27706@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27707 __enqueue_tpd(he_dev, tpd, cid);
27708 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27709
27710- atomic_inc(&vcc->stats->tx);
27711+ atomic_inc_unchecked(&vcc->stats->tx);
27712
27713 return 0;
27714 }
27715diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
27716index b812103..e391a49 100644
27717--- a/drivers/atm/horizon.c
27718+++ b/drivers/atm/horizon.c
27719@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
27720 {
27721 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
27722 // VC layer stats
27723- atomic_inc(&vcc->stats->rx);
27724+ atomic_inc_unchecked(&vcc->stats->rx);
27725 __net_timestamp(skb);
27726 // end of our responsibility
27727 vcc->push (vcc, skb);
27728@@ -1187,7 +1187,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
27729 dev->tx_iovec = NULL;
27730
27731 // VC layer stats
27732- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27733+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27734
27735 // free the skb
27736 hrz_kfree_skb (skb);
27737diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
27738index 1c05212..c28e200 100644
27739--- a/drivers/atm/idt77252.c
27740+++ b/drivers/atm/idt77252.c
27741@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
27742 else
27743 dev_kfree_skb(skb);
27744
27745- atomic_inc(&vcc->stats->tx);
27746+ atomic_inc_unchecked(&vcc->stats->tx);
27747 }
27748
27749 atomic_dec(&scq->used);
27750@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27751 if ((sb = dev_alloc_skb(64)) == NULL) {
27752 printk("%s: Can't allocate buffers for aal0.\n",
27753 card->name);
27754- atomic_add(i, &vcc->stats->rx_drop);
27755+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
27756 break;
27757 }
27758 if (!atm_charge(vcc, sb->truesize)) {
27759 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
27760 card->name);
27761- atomic_add(i - 1, &vcc->stats->rx_drop);
27762+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
27763 dev_kfree_skb(sb);
27764 break;
27765 }
27766@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27767 ATM_SKB(sb)->vcc = vcc;
27768 __net_timestamp(sb);
27769 vcc->push(vcc, sb);
27770- atomic_inc(&vcc->stats->rx);
27771+ atomic_inc_unchecked(&vcc->stats->rx);
27772
27773 cell += ATM_CELL_PAYLOAD;
27774 }
27775@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27776 "(CDC: %08x)\n",
27777 card->name, len, rpp->len, readl(SAR_REG_CDC));
27778 recycle_rx_pool_skb(card, rpp);
27779- atomic_inc(&vcc->stats->rx_err);
27780+ atomic_inc_unchecked(&vcc->stats->rx_err);
27781 return;
27782 }
27783 if (stat & SAR_RSQE_CRC) {
27784 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
27785 recycle_rx_pool_skb(card, rpp);
27786- atomic_inc(&vcc->stats->rx_err);
27787+ atomic_inc_unchecked(&vcc->stats->rx_err);
27788 return;
27789 }
27790 if (skb_queue_len(&rpp->queue) > 1) {
27791@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27792 RXPRINTK("%s: Can't alloc RX skb.\n",
27793 card->name);
27794 recycle_rx_pool_skb(card, rpp);
27795- atomic_inc(&vcc->stats->rx_err);
27796+ atomic_inc_unchecked(&vcc->stats->rx_err);
27797 return;
27798 }
27799 if (!atm_charge(vcc, skb->truesize)) {
27800@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27801 __net_timestamp(skb);
27802
27803 vcc->push(vcc, skb);
27804- atomic_inc(&vcc->stats->rx);
27805+ atomic_inc_unchecked(&vcc->stats->rx);
27806
27807 return;
27808 }
27809@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27810 __net_timestamp(skb);
27811
27812 vcc->push(vcc, skb);
27813- atomic_inc(&vcc->stats->rx);
27814+ atomic_inc_unchecked(&vcc->stats->rx);
27815
27816 if (skb->truesize > SAR_FB_SIZE_3)
27817 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
27818@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
27819 if (vcc->qos.aal != ATM_AAL0) {
27820 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
27821 card->name, vpi, vci);
27822- atomic_inc(&vcc->stats->rx_drop);
27823+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27824 goto drop;
27825 }
27826
27827 if ((sb = dev_alloc_skb(64)) == NULL) {
27828 printk("%s: Can't allocate buffers for AAL0.\n",
27829 card->name);
27830- atomic_inc(&vcc->stats->rx_err);
27831+ atomic_inc_unchecked(&vcc->stats->rx_err);
27832 goto drop;
27833 }
27834
27835@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
27836 ATM_SKB(sb)->vcc = vcc;
27837 __net_timestamp(sb);
27838 vcc->push(vcc, sb);
27839- atomic_inc(&vcc->stats->rx);
27840+ atomic_inc_unchecked(&vcc->stats->rx);
27841
27842 drop:
27843 skb_pull(queue, 64);
27844@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27845
27846 if (vc == NULL) {
27847 printk("%s: NULL connection in send().\n", card->name);
27848- atomic_inc(&vcc->stats->tx_err);
27849+ atomic_inc_unchecked(&vcc->stats->tx_err);
27850 dev_kfree_skb(skb);
27851 return -EINVAL;
27852 }
27853 if (!test_bit(VCF_TX, &vc->flags)) {
27854 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
27855- atomic_inc(&vcc->stats->tx_err);
27856+ atomic_inc_unchecked(&vcc->stats->tx_err);
27857 dev_kfree_skb(skb);
27858 return -EINVAL;
27859 }
27860@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27861 break;
27862 default:
27863 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
27864- atomic_inc(&vcc->stats->tx_err);
27865+ atomic_inc_unchecked(&vcc->stats->tx_err);
27866 dev_kfree_skb(skb);
27867 return -EINVAL;
27868 }
27869
27870 if (skb_shinfo(skb)->nr_frags != 0) {
27871 printk("%s: No scatter-gather yet.\n", card->name);
27872- atomic_inc(&vcc->stats->tx_err);
27873+ atomic_inc_unchecked(&vcc->stats->tx_err);
27874 dev_kfree_skb(skb);
27875 return -EINVAL;
27876 }
27877@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27878
27879 err = queue_skb(card, vc, skb, oam);
27880 if (err) {
27881- atomic_inc(&vcc->stats->tx_err);
27882+ atomic_inc_unchecked(&vcc->stats->tx_err);
27883 dev_kfree_skb(skb);
27884 return err;
27885 }
27886@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
27887 skb = dev_alloc_skb(64);
27888 if (!skb) {
27889 printk("%s: Out of memory in send_oam().\n", card->name);
27890- atomic_inc(&vcc->stats->tx_err);
27891+ atomic_inc_unchecked(&vcc->stats->tx_err);
27892 return -ENOMEM;
27893 }
27894 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
27895diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
27896index 9e373ba..cf93727 100644
27897--- a/drivers/atm/iphase.c
27898+++ b/drivers/atm/iphase.c
27899@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
27900 status = (u_short) (buf_desc_ptr->desc_mode);
27901 if (status & (RX_CER | RX_PTE | RX_OFL))
27902 {
27903- atomic_inc(&vcc->stats->rx_err);
27904+ atomic_inc_unchecked(&vcc->stats->rx_err);
27905 IF_ERR(printk("IA: bad packet, dropping it");)
27906 if (status & RX_CER) {
27907 IF_ERR(printk(" cause: packet CRC error\n");)
27908@@ -1169,7 +1169,7 @@ static int rx_pkt(struct atm_dev *dev)
27909 len = dma_addr - buf_addr;
27910 if (len > iadev->rx_buf_sz) {
27911 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
27912- atomic_inc(&vcc->stats->rx_err);
27913+ atomic_inc_unchecked(&vcc->stats->rx_err);
27914 goto out_free_desc;
27915 }
27916
27917@@ -1319,7 +1319,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27918 ia_vcc = INPH_IA_VCC(vcc);
27919 if (ia_vcc == NULL)
27920 {
27921- atomic_inc(&vcc->stats->rx_err);
27922+ atomic_inc_unchecked(&vcc->stats->rx_err);
27923 atm_return(vcc, skb->truesize);
27924 dev_kfree_skb_any(skb);
27925 goto INCR_DLE;
27926@@ -1331,7 +1331,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27927 if ((length > iadev->rx_buf_sz) || (length >
27928 (skb->len - sizeof(struct cpcs_trailer))))
27929 {
27930- atomic_inc(&vcc->stats->rx_err);
27931+ atomic_inc_unchecked(&vcc->stats->rx_err);
27932 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
27933 length, skb->len);)
27934 atm_return(vcc, skb->truesize);
27935@@ -1347,7 +1347,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27936
27937 IF_RX(printk("rx_dle_intr: skb push");)
27938 vcc->push(vcc,skb);
27939- atomic_inc(&vcc->stats->rx);
27940+ atomic_inc_unchecked(&vcc->stats->rx);
27941 iadev->rx_pkt_cnt++;
27942 }
27943 INCR_DLE:
27944@@ -2827,15 +2827,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
27945 {
27946 struct k_sonet_stats *stats;
27947 stats = &PRIV(_ia_dev[board])->sonet_stats;
27948- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
27949- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
27950- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
27951- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
27952- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
27953- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
27954- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
27955- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
27956- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
27957+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
27958+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
27959+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
27960+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
27961+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
27962+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
27963+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
27964+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
27965+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
27966 }
27967 ia_cmds.status = 0;
27968 break;
27969@@ -2940,7 +2940,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
27970 if ((desc == 0) || (desc > iadev->num_tx_desc))
27971 {
27972 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
27973- atomic_inc(&vcc->stats->tx);
27974+ atomic_inc_unchecked(&vcc->stats->tx);
27975 if (vcc->pop)
27976 vcc->pop(vcc, skb);
27977 else
27978@@ -3045,14 +3045,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
27979 ATM_DESC(skb) = vcc->vci;
27980 skb_queue_tail(&iadev->tx_dma_q, skb);
27981
27982- atomic_inc(&vcc->stats->tx);
27983+ atomic_inc_unchecked(&vcc->stats->tx);
27984 iadev->tx_pkt_cnt++;
27985 /* Increment transaction counter */
27986 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
27987
27988 #if 0
27989 /* add flow control logic */
27990- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
27991+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
27992 if (iavcc->vc_desc_cnt > 10) {
27993 vcc->tx_quota = vcc->tx_quota * 3 / 4;
27994 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
27995diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
27996index f556969..0da15eb 100644
27997--- a/drivers/atm/lanai.c
27998+++ b/drivers/atm/lanai.c
27999@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
28000 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
28001 lanai_endtx(lanai, lvcc);
28002 lanai_free_skb(lvcc->tx.atmvcc, skb);
28003- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
28004+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
28005 }
28006
28007 /* Try to fill the buffer - don't call unless there is backlog */
28008@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
28009 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
28010 __net_timestamp(skb);
28011 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
28012- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
28013+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
28014 out:
28015 lvcc->rx.buf.ptr = end;
28016 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
28017@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28018 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
28019 "vcc %d\n", lanai->number, (unsigned int) s, vci);
28020 lanai->stats.service_rxnotaal5++;
28021- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28022+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28023 return 0;
28024 }
28025 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
28026@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28027 int bytes;
28028 read_unlock(&vcc_sklist_lock);
28029 DPRINTK("got trashed rx pdu on vci %d\n", vci);
28030- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28031+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28032 lvcc->stats.x.aal5.service_trash++;
28033 bytes = (SERVICE_GET_END(s) * 16) -
28034 (((unsigned long) lvcc->rx.buf.ptr) -
28035@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28036 }
28037 if (s & SERVICE_STREAM) {
28038 read_unlock(&vcc_sklist_lock);
28039- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28040+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28041 lvcc->stats.x.aal5.service_stream++;
28042 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
28043 "PDU on VCI %d!\n", lanai->number, vci);
28044@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28045 return 0;
28046 }
28047 DPRINTK("got rx crc error on vci %d\n", vci);
28048- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28049+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28050 lvcc->stats.x.aal5.service_rxcrc++;
28051 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
28052 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
28053diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
28054index 1c70c45..300718d 100644
28055--- a/drivers/atm/nicstar.c
28056+++ b/drivers/atm/nicstar.c
28057@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28058 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
28059 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
28060 card->index);
28061- atomic_inc(&vcc->stats->tx_err);
28062+ atomic_inc_unchecked(&vcc->stats->tx_err);
28063 dev_kfree_skb_any(skb);
28064 return -EINVAL;
28065 }
28066@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28067 if (!vc->tx) {
28068 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
28069 card->index);
28070- atomic_inc(&vcc->stats->tx_err);
28071+ atomic_inc_unchecked(&vcc->stats->tx_err);
28072 dev_kfree_skb_any(skb);
28073 return -EINVAL;
28074 }
28075@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28076 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
28077 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
28078 card->index);
28079- atomic_inc(&vcc->stats->tx_err);
28080+ atomic_inc_unchecked(&vcc->stats->tx_err);
28081 dev_kfree_skb_any(skb);
28082 return -EINVAL;
28083 }
28084
28085 if (skb_shinfo(skb)->nr_frags != 0) {
28086 printk("nicstar%d: No scatter-gather yet.\n", card->index);
28087- atomic_inc(&vcc->stats->tx_err);
28088+ atomic_inc_unchecked(&vcc->stats->tx_err);
28089 dev_kfree_skb_any(skb);
28090 return -EINVAL;
28091 }
28092@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28093 }
28094
28095 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
28096- atomic_inc(&vcc->stats->tx_err);
28097+ atomic_inc_unchecked(&vcc->stats->tx_err);
28098 dev_kfree_skb_any(skb);
28099 return -EIO;
28100 }
28101- atomic_inc(&vcc->stats->tx);
28102+ atomic_inc_unchecked(&vcc->stats->tx);
28103
28104 return 0;
28105 }
28106@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28107 printk
28108 ("nicstar%d: Can't allocate buffers for aal0.\n",
28109 card->index);
28110- atomic_add(i, &vcc->stats->rx_drop);
28111+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
28112 break;
28113 }
28114 if (!atm_charge(vcc, sb->truesize)) {
28115 RXPRINTK
28116 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
28117 card->index);
28118- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28119+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28120 dev_kfree_skb_any(sb);
28121 break;
28122 }
28123@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28124 ATM_SKB(sb)->vcc = vcc;
28125 __net_timestamp(sb);
28126 vcc->push(vcc, sb);
28127- atomic_inc(&vcc->stats->rx);
28128+ atomic_inc_unchecked(&vcc->stats->rx);
28129 cell += ATM_CELL_PAYLOAD;
28130 }
28131
28132@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28133 if (iovb == NULL) {
28134 printk("nicstar%d: Out of iovec buffers.\n",
28135 card->index);
28136- atomic_inc(&vcc->stats->rx_drop);
28137+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28138 recycle_rx_buf(card, skb);
28139 return;
28140 }
28141@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28142 small or large buffer itself. */
28143 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
28144 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
28145- atomic_inc(&vcc->stats->rx_err);
28146+ atomic_inc_unchecked(&vcc->stats->rx_err);
28147 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28148 NS_MAX_IOVECS);
28149 NS_PRV_IOVCNT(iovb) = 0;
28150@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28151 ("nicstar%d: Expected a small buffer, and this is not one.\n",
28152 card->index);
28153 which_list(card, skb);
28154- atomic_inc(&vcc->stats->rx_err);
28155+ atomic_inc_unchecked(&vcc->stats->rx_err);
28156 recycle_rx_buf(card, skb);
28157 vc->rx_iov = NULL;
28158 recycle_iov_buf(card, iovb);
28159@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28160 ("nicstar%d: Expected a large buffer, and this is not one.\n",
28161 card->index);
28162 which_list(card, skb);
28163- atomic_inc(&vcc->stats->rx_err);
28164+ atomic_inc_unchecked(&vcc->stats->rx_err);
28165 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28166 NS_PRV_IOVCNT(iovb));
28167 vc->rx_iov = NULL;
28168@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28169 printk(" - PDU size mismatch.\n");
28170 else
28171 printk(".\n");
28172- atomic_inc(&vcc->stats->rx_err);
28173+ atomic_inc_unchecked(&vcc->stats->rx_err);
28174 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28175 NS_PRV_IOVCNT(iovb));
28176 vc->rx_iov = NULL;
28177@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28178 /* skb points to a small buffer */
28179 if (!atm_charge(vcc, skb->truesize)) {
28180 push_rxbufs(card, skb);
28181- atomic_inc(&vcc->stats->rx_drop);
28182+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28183 } else {
28184 skb_put(skb, len);
28185 dequeue_sm_buf(card, skb);
28186@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28187 ATM_SKB(skb)->vcc = vcc;
28188 __net_timestamp(skb);
28189 vcc->push(vcc, skb);
28190- atomic_inc(&vcc->stats->rx);
28191+ atomic_inc_unchecked(&vcc->stats->rx);
28192 }
28193 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
28194 struct sk_buff *sb;
28195@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28196 if (len <= NS_SMBUFSIZE) {
28197 if (!atm_charge(vcc, sb->truesize)) {
28198 push_rxbufs(card, sb);
28199- atomic_inc(&vcc->stats->rx_drop);
28200+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28201 } else {
28202 skb_put(sb, len);
28203 dequeue_sm_buf(card, sb);
28204@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28205 ATM_SKB(sb)->vcc = vcc;
28206 __net_timestamp(sb);
28207 vcc->push(vcc, sb);
28208- atomic_inc(&vcc->stats->rx);
28209+ atomic_inc_unchecked(&vcc->stats->rx);
28210 }
28211
28212 push_rxbufs(card, skb);
28213@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28214
28215 if (!atm_charge(vcc, skb->truesize)) {
28216 push_rxbufs(card, skb);
28217- atomic_inc(&vcc->stats->rx_drop);
28218+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28219 } else {
28220 dequeue_lg_buf(card, skb);
28221 #ifdef NS_USE_DESTRUCTORS
28222@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28223 ATM_SKB(skb)->vcc = vcc;
28224 __net_timestamp(skb);
28225 vcc->push(vcc, skb);
28226- atomic_inc(&vcc->stats->rx);
28227+ atomic_inc_unchecked(&vcc->stats->rx);
28228 }
28229
28230 push_rxbufs(card, sb);
28231@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28232 printk
28233 ("nicstar%d: Out of huge buffers.\n",
28234 card->index);
28235- atomic_inc(&vcc->stats->rx_drop);
28236+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28237 recycle_iovec_rx_bufs(card,
28238 (struct iovec *)
28239 iovb->data,
28240@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28241 card->hbpool.count++;
28242 } else
28243 dev_kfree_skb_any(hb);
28244- atomic_inc(&vcc->stats->rx_drop);
28245+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28246 } else {
28247 /* Copy the small buffer to the huge buffer */
28248 sb = (struct sk_buff *)iov->iov_base;
28249@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28250 #endif /* NS_USE_DESTRUCTORS */
28251 __net_timestamp(hb);
28252 vcc->push(vcc, hb);
28253- atomic_inc(&vcc->stats->rx);
28254+ atomic_inc_unchecked(&vcc->stats->rx);
28255 }
28256 }
28257
28258diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
28259index e8cd652..bbbd1fc 100644
28260--- a/drivers/atm/solos-pci.c
28261+++ b/drivers/atm/solos-pci.c
28262@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
28263 }
28264 atm_charge(vcc, skb->truesize);
28265 vcc->push(vcc, skb);
28266- atomic_inc(&vcc->stats->rx);
28267+ atomic_inc_unchecked(&vcc->stats->rx);
28268 break;
28269
28270 case PKT_STATUS:
28271@@ -1008,7 +1008,7 @@ static uint32_t fpga_tx(struct solos_card *card)
28272 vcc = SKB_CB(oldskb)->vcc;
28273
28274 if (vcc) {
28275- atomic_inc(&vcc->stats->tx);
28276+ atomic_inc_unchecked(&vcc->stats->tx);
28277 solos_pop(vcc, oldskb);
28278 } else
28279 dev_kfree_skb_irq(oldskb);
28280diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
28281index 90f1ccc..04c4a1e 100644
28282--- a/drivers/atm/suni.c
28283+++ b/drivers/atm/suni.c
28284@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
28285
28286
28287 #define ADD_LIMITED(s,v) \
28288- atomic_add((v),&stats->s); \
28289- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
28290+ atomic_add_unchecked((v),&stats->s); \
28291+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
28292
28293
28294 static void suni_hz(unsigned long from_timer)
28295diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
28296index 5120a96..e2572bd 100644
28297--- a/drivers/atm/uPD98402.c
28298+++ b/drivers/atm/uPD98402.c
28299@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
28300 struct sonet_stats tmp;
28301 int error = 0;
28302
28303- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28304+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28305 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
28306 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
28307 if (zero && !error) {
28308@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
28309
28310
28311 #define ADD_LIMITED(s,v) \
28312- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
28313- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
28314- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28315+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
28316+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
28317+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28318
28319
28320 static void stat_event(struct atm_dev *dev)
28321@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
28322 if (reason & uPD98402_INT_PFM) stat_event(dev);
28323 if (reason & uPD98402_INT_PCO) {
28324 (void) GET(PCOCR); /* clear interrupt cause */
28325- atomic_add(GET(HECCT),
28326+ atomic_add_unchecked(GET(HECCT),
28327 &PRIV(dev)->sonet_stats.uncorr_hcs);
28328 }
28329 if ((reason & uPD98402_INT_RFO) &&
28330@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
28331 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
28332 uPD98402_INT_LOS),PIMR); /* enable them */
28333 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
28334- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28335- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
28336- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
28337+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28338+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
28339+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
28340 return 0;
28341 }
28342
28343diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
28344index d889f56..17eb71e 100644
28345--- a/drivers/atm/zatm.c
28346+++ b/drivers/atm/zatm.c
28347@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28348 }
28349 if (!size) {
28350 dev_kfree_skb_irq(skb);
28351- if (vcc) atomic_inc(&vcc->stats->rx_err);
28352+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
28353 continue;
28354 }
28355 if (!atm_charge(vcc,skb->truesize)) {
28356@@ -470,7 +470,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28357 skb->len = size;
28358 ATM_SKB(skb)->vcc = vcc;
28359 vcc->push(vcc,skb);
28360- atomic_inc(&vcc->stats->rx);
28361+ atomic_inc_unchecked(&vcc->stats->rx);
28362 }
28363 zout(pos & 0xffff,MTA(mbx));
28364 #if 0 /* probably a stupid idea */
28365@@ -734,7 +734,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
28366 skb_queue_head(&zatm_vcc->backlog,skb);
28367 break;
28368 }
28369- atomic_inc(&vcc->stats->tx);
28370+ atomic_inc_unchecked(&vcc->stats->tx);
28371 wake_up(&zatm_vcc->tx_wait);
28372 }
28373
28374diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
28375index 8493536..31adee0 100644
28376--- a/drivers/base/devtmpfs.c
28377+++ b/drivers/base/devtmpfs.c
28378@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
28379 if (!thread)
28380 return 0;
28381
28382- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
28383+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
28384 if (err)
28385 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
28386 else
28387diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
28388index caf995f..6f76697 100644
28389--- a/drivers/base/power/wakeup.c
28390+++ b/drivers/base/power/wakeup.c
28391@@ -30,14 +30,14 @@ bool events_check_enabled;
28392 * They need to be modified together atomically, so it's better to use one
28393 * atomic variable to hold them both.
28394 */
28395-static atomic_t combined_event_count = ATOMIC_INIT(0);
28396+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
28397
28398 #define IN_PROGRESS_BITS (sizeof(int) * 4)
28399 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
28400
28401 static void split_counters(unsigned int *cnt, unsigned int *inpr)
28402 {
28403- unsigned int comb = atomic_read(&combined_event_count);
28404+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
28405
28406 *cnt = (comb >> IN_PROGRESS_BITS);
28407 *inpr = comb & MAX_IN_PROGRESS;
28408@@ -353,7 +353,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
28409 ws->last_time = ktime_get();
28410
28411 /* Increment the counter of events in progress. */
28412- atomic_inc(&combined_event_count);
28413+ atomic_inc_unchecked(&combined_event_count);
28414 }
28415
28416 /**
28417@@ -443,7 +443,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
28418 * Increment the counter of registered wakeup events and decrement the
28419 * couter of wakeup events in progress simultaneously.
28420 */
28421- atomic_add(MAX_IN_PROGRESS, &combined_event_count);
28422+ atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count);
28423 }
28424
28425 /**
28426diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
28427index b0f553b..77b928b 100644
28428--- a/drivers/block/cciss.c
28429+++ b/drivers/block/cciss.c
28430@@ -1198,6 +1198,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
28431 int err;
28432 u32 cp;
28433
28434+ memset(&arg64, 0, sizeof(arg64));
28435+
28436 err = 0;
28437 err |=
28438 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
28439@@ -3007,7 +3009,7 @@ static void start_io(ctlr_info_t *h)
28440 while (!list_empty(&h->reqQ)) {
28441 c = list_entry(h->reqQ.next, CommandList_struct, list);
28442 /* can't do anything if fifo is full */
28443- if ((h->access.fifo_full(h))) {
28444+ if ((h->access->fifo_full(h))) {
28445 dev_warn(&h->pdev->dev, "fifo full\n");
28446 break;
28447 }
28448@@ -3017,7 +3019,7 @@ static void start_io(ctlr_info_t *h)
28449 h->Qdepth--;
28450
28451 /* Tell the controller execute command */
28452- h->access.submit_command(h, c);
28453+ h->access->submit_command(h, c);
28454
28455 /* Put job onto the completed Q */
28456 addQ(&h->cmpQ, c);
28457@@ -3443,17 +3445,17 @@ startio:
28458
28459 static inline unsigned long get_next_completion(ctlr_info_t *h)
28460 {
28461- return h->access.command_completed(h);
28462+ return h->access->command_completed(h);
28463 }
28464
28465 static inline int interrupt_pending(ctlr_info_t *h)
28466 {
28467- return h->access.intr_pending(h);
28468+ return h->access->intr_pending(h);
28469 }
28470
28471 static inline long interrupt_not_for_us(ctlr_info_t *h)
28472 {
28473- return ((h->access.intr_pending(h) == 0) ||
28474+ return ((h->access->intr_pending(h) == 0) ||
28475 (h->interrupts_enabled == 0));
28476 }
28477
28478@@ -3486,7 +3488,7 @@ static inline u32 next_command(ctlr_info_t *h)
28479 u32 a;
28480
28481 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
28482- return h->access.command_completed(h);
28483+ return h->access->command_completed(h);
28484
28485 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
28486 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
28487@@ -4044,7 +4046,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
28488 trans_support & CFGTBL_Trans_use_short_tags);
28489
28490 /* Change the access methods to the performant access methods */
28491- h->access = SA5_performant_access;
28492+ h->access = &SA5_performant_access;
28493 h->transMethod = CFGTBL_Trans_Performant;
28494
28495 return;
28496@@ -4316,7 +4318,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
28497 if (prod_index < 0)
28498 return -ENODEV;
28499 h->product_name = products[prod_index].product_name;
28500- h->access = *(products[prod_index].access);
28501+ h->access = products[prod_index].access;
28502
28503 if (cciss_board_disabled(h)) {
28504 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
28505@@ -5041,7 +5043,7 @@ reinit_after_soft_reset:
28506 }
28507
28508 /* make sure the board interrupts are off */
28509- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28510+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28511 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
28512 if (rc)
28513 goto clean2;
28514@@ -5093,7 +5095,7 @@ reinit_after_soft_reset:
28515 * fake ones to scoop up any residual completions.
28516 */
28517 spin_lock_irqsave(&h->lock, flags);
28518- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28519+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28520 spin_unlock_irqrestore(&h->lock, flags);
28521 free_irq(h->intr[h->intr_mode], h);
28522 rc = cciss_request_irq(h, cciss_msix_discard_completions,
28523@@ -5113,9 +5115,9 @@ reinit_after_soft_reset:
28524 dev_info(&h->pdev->dev, "Board READY.\n");
28525 dev_info(&h->pdev->dev,
28526 "Waiting for stale completions to drain.\n");
28527- h->access.set_intr_mask(h, CCISS_INTR_ON);
28528+ h->access->set_intr_mask(h, CCISS_INTR_ON);
28529 msleep(10000);
28530- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28531+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28532
28533 rc = controller_reset_failed(h->cfgtable);
28534 if (rc)
28535@@ -5138,7 +5140,7 @@ reinit_after_soft_reset:
28536 cciss_scsi_setup(h);
28537
28538 /* Turn the interrupts on so we can service requests */
28539- h->access.set_intr_mask(h, CCISS_INTR_ON);
28540+ h->access->set_intr_mask(h, CCISS_INTR_ON);
28541
28542 /* Get the firmware version */
28543 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
28544@@ -5211,7 +5213,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
28545 kfree(flush_buf);
28546 if (return_code != IO_OK)
28547 dev_warn(&h->pdev->dev, "Error flushing cache\n");
28548- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28549+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28550 free_irq(h->intr[h->intr_mode], h);
28551 }
28552
28553diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
28554index 7fda30e..eb5dfe0 100644
28555--- a/drivers/block/cciss.h
28556+++ b/drivers/block/cciss.h
28557@@ -101,7 +101,7 @@ struct ctlr_info
28558 /* information about each logical volume */
28559 drive_info_struct *drv[CISS_MAX_LUN];
28560
28561- struct access_method access;
28562+ struct access_method *access;
28563
28564 /* queue and queue Info */
28565 struct list_head reqQ;
28566diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
28567index 9125bbe..eede5c8 100644
28568--- a/drivers/block/cpqarray.c
28569+++ b/drivers/block/cpqarray.c
28570@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28571 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
28572 goto Enomem4;
28573 }
28574- hba[i]->access.set_intr_mask(hba[i], 0);
28575+ hba[i]->access->set_intr_mask(hba[i], 0);
28576 if (request_irq(hba[i]->intr, do_ida_intr,
28577 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
28578 {
28579@@ -459,7 +459,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28580 add_timer(&hba[i]->timer);
28581
28582 /* Enable IRQ now that spinlock and rate limit timer are set up */
28583- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28584+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28585
28586 for(j=0; j<NWD; j++) {
28587 struct gendisk *disk = ida_gendisk[i][j];
28588@@ -694,7 +694,7 @@ DBGINFO(
28589 for(i=0; i<NR_PRODUCTS; i++) {
28590 if (board_id == products[i].board_id) {
28591 c->product_name = products[i].product_name;
28592- c->access = *(products[i].access);
28593+ c->access = products[i].access;
28594 break;
28595 }
28596 }
28597@@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detect(void)
28598 hba[ctlr]->intr = intr;
28599 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
28600 hba[ctlr]->product_name = products[j].product_name;
28601- hba[ctlr]->access = *(products[j].access);
28602+ hba[ctlr]->access = products[j].access;
28603 hba[ctlr]->ctlr = ctlr;
28604 hba[ctlr]->board_id = board_id;
28605 hba[ctlr]->pci_dev = NULL; /* not PCI */
28606@@ -980,7 +980,7 @@ static void start_io(ctlr_info_t *h)
28607
28608 while((c = h->reqQ) != NULL) {
28609 /* Can't do anything if we're busy */
28610- if (h->access.fifo_full(h) == 0)
28611+ if (h->access->fifo_full(h) == 0)
28612 return;
28613
28614 /* Get the first entry from the request Q */
28615@@ -988,7 +988,7 @@ static void start_io(ctlr_info_t *h)
28616 h->Qdepth--;
28617
28618 /* Tell the controller to do our bidding */
28619- h->access.submit_command(h, c);
28620+ h->access->submit_command(h, c);
28621
28622 /* Get onto the completion Q */
28623 addQ(&h->cmpQ, c);
28624@@ -1050,7 +1050,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28625 unsigned long flags;
28626 __u32 a,a1;
28627
28628- istat = h->access.intr_pending(h);
28629+ istat = h->access->intr_pending(h);
28630 /* Is this interrupt for us? */
28631 if (istat == 0)
28632 return IRQ_NONE;
28633@@ -1061,7 +1061,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28634 */
28635 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
28636 if (istat & FIFO_NOT_EMPTY) {
28637- while((a = h->access.command_completed(h))) {
28638+ while((a = h->access->command_completed(h))) {
28639 a1 = a; a &= ~3;
28640 if ((c = h->cmpQ) == NULL)
28641 {
28642@@ -1449,11 +1449,11 @@ static int sendcmd(
28643 /*
28644 * Disable interrupt
28645 */
28646- info_p->access.set_intr_mask(info_p, 0);
28647+ info_p->access->set_intr_mask(info_p, 0);
28648 /* Make sure there is room in the command FIFO */
28649 /* Actually it should be completely empty at this time. */
28650 for (i = 200000; i > 0; i--) {
28651- temp = info_p->access.fifo_full(info_p);
28652+ temp = info_p->access->fifo_full(info_p);
28653 if (temp != 0) {
28654 break;
28655 }
28656@@ -1466,7 +1466,7 @@ DBG(
28657 /*
28658 * Send the cmd
28659 */
28660- info_p->access.submit_command(info_p, c);
28661+ info_p->access->submit_command(info_p, c);
28662 complete = pollcomplete(ctlr);
28663
28664 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
28665@@ -1549,9 +1549,9 @@ static int revalidate_allvol(ctlr_info_t *host)
28666 * we check the new geometry. Then turn interrupts back on when
28667 * we're done.
28668 */
28669- host->access.set_intr_mask(host, 0);
28670+ host->access->set_intr_mask(host, 0);
28671 getgeometry(ctlr);
28672- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
28673+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
28674
28675 for(i=0; i<NWD; i++) {
28676 struct gendisk *disk = ida_gendisk[ctlr][i];
28677@@ -1591,7 +1591,7 @@ static int pollcomplete(int ctlr)
28678 /* Wait (up to 2 seconds) for a command to complete */
28679
28680 for (i = 200000; i > 0; i--) {
28681- done = hba[ctlr]->access.command_completed(hba[ctlr]);
28682+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
28683 if (done == 0) {
28684 udelay(10); /* a short fixed delay */
28685 } else
28686diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
28687index be73e9d..7fbf140 100644
28688--- a/drivers/block/cpqarray.h
28689+++ b/drivers/block/cpqarray.h
28690@@ -99,7 +99,7 @@ struct ctlr_info {
28691 drv_info_t drv[NWD];
28692 struct proc_dir_entry *proc;
28693
28694- struct access_method access;
28695+ struct access_method *access;
28696
28697 cmdlist_t *reqQ;
28698 cmdlist_t *cmpQ;
28699diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
28700index 8d68056..e67050f 100644
28701--- a/drivers/block/drbd/drbd_int.h
28702+++ b/drivers/block/drbd/drbd_int.h
28703@@ -736,7 +736,7 @@ struct drbd_request;
28704 struct drbd_epoch {
28705 struct list_head list;
28706 unsigned int barrier_nr;
28707- atomic_t epoch_size; /* increased on every request added. */
28708+ atomic_unchecked_t epoch_size; /* increased on every request added. */
28709 atomic_t active; /* increased on every req. added, and dec on every finished. */
28710 unsigned long flags;
28711 };
28712@@ -1108,7 +1108,7 @@ struct drbd_conf {
28713 void *int_dig_in;
28714 void *int_dig_vv;
28715 wait_queue_head_t seq_wait;
28716- atomic_t packet_seq;
28717+ atomic_unchecked_t packet_seq;
28718 unsigned int peer_seq;
28719 spinlock_t peer_seq_lock;
28720 unsigned int minor;
28721@@ -1617,30 +1617,30 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
28722
28723 static inline void drbd_tcp_cork(struct socket *sock)
28724 {
28725- int __user val = 1;
28726+ int val = 1;
28727 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
28728- (char __user *)&val, sizeof(val));
28729+ (char __force_user *)&val, sizeof(val));
28730 }
28731
28732 static inline void drbd_tcp_uncork(struct socket *sock)
28733 {
28734- int __user val = 0;
28735+ int val = 0;
28736 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
28737- (char __user *)&val, sizeof(val));
28738+ (char __force_user *)&val, sizeof(val));
28739 }
28740
28741 static inline void drbd_tcp_nodelay(struct socket *sock)
28742 {
28743- int __user val = 1;
28744+ int val = 1;
28745 (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
28746- (char __user *)&val, sizeof(val));
28747+ (char __force_user *)&val, sizeof(val));
28748 }
28749
28750 static inline void drbd_tcp_quickack(struct socket *sock)
28751 {
28752- int __user val = 2;
28753+ int val = 2;
28754 (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
28755- (char __user *)&val, sizeof(val));
28756+ (char __force_user *)&val, sizeof(val));
28757 }
28758
28759 void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
28760diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
28761index 211fc44..c5116f1 100644
28762--- a/drivers/block/drbd/drbd_main.c
28763+++ b/drivers/block/drbd/drbd_main.c
28764@@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
28765 p.sector = sector;
28766 p.block_id = block_id;
28767 p.blksize = blksize;
28768- p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
28769+ p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
28770
28771 if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
28772 return false;
28773@@ -2696,7 +2696,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
28774 p.sector = cpu_to_be64(req->sector);
28775 p.block_id = (unsigned long)req;
28776 p.seq_num = cpu_to_be32(req->seq_num =
28777- atomic_add_return(1, &mdev->packet_seq));
28778+ atomic_add_return_unchecked(1, &mdev->packet_seq));
28779
28780 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
28781
28782@@ -2981,7 +2981,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
28783 atomic_set(&mdev->unacked_cnt, 0);
28784 atomic_set(&mdev->local_cnt, 0);
28785 atomic_set(&mdev->net_cnt, 0);
28786- atomic_set(&mdev->packet_seq, 0);
28787+ atomic_set_unchecked(&mdev->packet_seq, 0);
28788 atomic_set(&mdev->pp_in_use, 0);
28789 atomic_set(&mdev->pp_in_use_by_net, 0);
28790 atomic_set(&mdev->rs_sect_in, 0);
28791@@ -3063,8 +3063,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
28792 mdev->receiver.t_state);
28793
28794 /* no need to lock it, I'm the only thread alive */
28795- if (atomic_read(&mdev->current_epoch->epoch_size) != 0)
28796- dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size));
28797+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0)
28798+ dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size));
28799 mdev->al_writ_cnt =
28800 mdev->bm_writ_cnt =
28801 mdev->read_cnt =
28802diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
28803index af2a250..219c74b 100644
28804--- a/drivers/block/drbd/drbd_nl.c
28805+++ b/drivers/block/drbd/drbd_nl.c
28806@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
28807 module_put(THIS_MODULE);
28808 }
28809
28810-static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
28811+static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
28812
28813 static unsigned short *
28814 __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
28815@@ -2430,7 +2430,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
28816 cn_reply->id.idx = CN_IDX_DRBD;
28817 cn_reply->id.val = CN_VAL_DRBD;
28818
28819- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28820+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28821 cn_reply->ack = 0; /* not used here. */
28822 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28823 (int)((char *)tl - (char *)reply->tag_list);
28824@@ -2462,7 +2462,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
28825 cn_reply->id.idx = CN_IDX_DRBD;
28826 cn_reply->id.val = CN_VAL_DRBD;
28827
28828- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28829+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28830 cn_reply->ack = 0; /* not used here. */
28831 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28832 (int)((char *)tl - (char *)reply->tag_list);
28833@@ -2540,7 +2540,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
28834 cn_reply->id.idx = CN_IDX_DRBD;
28835 cn_reply->id.val = CN_VAL_DRBD;
28836
28837- cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
28838+ cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq);
28839 cn_reply->ack = 0; // not used here.
28840 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28841 (int)((char*)tl - (char*)reply->tag_list);
28842@@ -2579,7 +2579,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
28843 cn_reply->id.idx = CN_IDX_DRBD;
28844 cn_reply->id.val = CN_VAL_DRBD;
28845
28846- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28847+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28848 cn_reply->ack = 0; /* not used here. */
28849 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28850 (int)((char *)tl - (char *)reply->tag_list);
28851diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
28852index 43beaca..4a5b1dd 100644
28853--- a/drivers/block/drbd/drbd_receiver.c
28854+++ b/drivers/block/drbd/drbd_receiver.c
28855@@ -894,7 +894,7 @@ retry:
28856 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
28857 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
28858
28859- atomic_set(&mdev->packet_seq, 0);
28860+ atomic_set_unchecked(&mdev->packet_seq, 0);
28861 mdev->peer_seq = 0;
28862
28863 drbd_thread_start(&mdev->asender);
28864@@ -985,7 +985,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
28865 do {
28866 next_epoch = NULL;
28867
28868- epoch_size = atomic_read(&epoch->epoch_size);
28869+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
28870
28871 switch (ev & ~EV_CLEANUP) {
28872 case EV_PUT:
28873@@ -1020,7 +1020,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
28874 rv = FE_DESTROYED;
28875 } else {
28876 epoch->flags = 0;
28877- atomic_set(&epoch->epoch_size, 0);
28878+ atomic_set_unchecked(&epoch->epoch_size, 0);
28879 /* atomic_set(&epoch->active, 0); is already zero */
28880 if (rv == FE_STILL_LIVE)
28881 rv = FE_RECYCLED;
28882@@ -1191,14 +1191,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
28883 drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
28884 drbd_flush(mdev);
28885
28886- if (atomic_read(&mdev->current_epoch->epoch_size)) {
28887+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
28888 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
28889 if (epoch)
28890 break;
28891 }
28892
28893 epoch = mdev->current_epoch;
28894- wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0);
28895+ wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0);
28896
28897 D_ASSERT(atomic_read(&epoch->active) == 0);
28898 D_ASSERT(epoch->flags == 0);
28899@@ -1210,11 +1210,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
28900 }
28901
28902 epoch->flags = 0;
28903- atomic_set(&epoch->epoch_size, 0);
28904+ atomic_set_unchecked(&epoch->epoch_size, 0);
28905 atomic_set(&epoch->active, 0);
28906
28907 spin_lock(&mdev->epoch_lock);
28908- if (atomic_read(&mdev->current_epoch->epoch_size)) {
28909+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
28910 list_add(&epoch->list, &mdev->current_epoch->list);
28911 mdev->current_epoch = epoch;
28912 mdev->epochs++;
28913@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
28914 spin_unlock(&mdev->peer_seq_lock);
28915
28916 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
28917- atomic_inc(&mdev->current_epoch->epoch_size);
28918+ atomic_inc_unchecked(&mdev->current_epoch->epoch_size);
28919 return drbd_drain_block(mdev, data_size);
28920 }
28921
28922@@ -1689,7 +1689,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
28923
28924 spin_lock(&mdev->epoch_lock);
28925 e->epoch = mdev->current_epoch;
28926- atomic_inc(&e->epoch->epoch_size);
28927+ atomic_inc_unchecked(&e->epoch->epoch_size);
28928 atomic_inc(&e->epoch->active);
28929 spin_unlock(&mdev->epoch_lock);
28930
28931@@ -3885,7 +3885,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
28932 D_ASSERT(list_empty(&mdev->done_ee));
28933
28934 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
28935- atomic_set(&mdev->current_epoch->epoch_size, 0);
28936+ atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0);
28937 D_ASSERT(list_empty(&mdev->current_epoch->list));
28938 }
28939
28940diff --git a/drivers/block/loop.c b/drivers/block/loop.c
28941index cd50435..ba1ffb5 100644
28942--- a/drivers/block/loop.c
28943+++ b/drivers/block/loop.c
28944@@ -226,7 +226,7 @@ static int __do_lo_send_write(struct file *file,
28945 mm_segment_t old_fs = get_fs();
28946
28947 set_fs(get_ds());
28948- bw = file->f_op->write(file, buf, len, &pos);
28949+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
28950 set_fs(old_fs);
28951 if (likely(bw == len))
28952 return 0;
28953diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
28954index 4364303..9adf4ee 100644
28955--- a/drivers/char/Kconfig
28956+++ b/drivers/char/Kconfig
28957@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
28958
28959 config DEVKMEM
28960 bool "/dev/kmem virtual device support"
28961- default y
28962+ default n
28963+ depends on !GRKERNSEC_KMEM
28964 help
28965 Say Y here if you want to support the /dev/kmem device. The
28966 /dev/kmem device is rarely used, but can be used for certain
28967@@ -596,6 +597,7 @@ config DEVPORT
28968 bool
28969 depends on !M68K
28970 depends on ISA || PCI
28971+ depends on !GRKERNSEC_KMEM
28972 default y
28973
28974 source "drivers/s390/char/Kconfig"
28975diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
28976index 2e04433..22afc64 100644
28977--- a/drivers/char/agp/frontend.c
28978+++ b/drivers/char/agp/frontend.c
28979@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
28980 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
28981 return -EFAULT;
28982
28983- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
28984+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
28985 return -EFAULT;
28986
28987 client = agp_find_client_by_pid(reserve.pid);
28988diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
28989index 095ab90..afad0a4 100644
28990--- a/drivers/char/briq_panel.c
28991+++ b/drivers/char/briq_panel.c
28992@@ -9,6 +9,7 @@
28993 #include <linux/types.h>
28994 #include <linux/errno.h>
28995 #include <linux/tty.h>
28996+#include <linux/mutex.h>
28997 #include <linux/timer.h>
28998 #include <linux/kernel.h>
28999 #include <linux/wait.h>
29000@@ -34,6 +35,7 @@ static int vfd_is_open;
29001 static unsigned char vfd[40];
29002 static int vfd_cursor;
29003 static unsigned char ledpb, led;
29004+static DEFINE_MUTEX(vfd_mutex);
29005
29006 static void update_vfd(void)
29007 {
29008@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
29009 if (!vfd_is_open)
29010 return -EBUSY;
29011
29012+ mutex_lock(&vfd_mutex);
29013 for (;;) {
29014 char c;
29015 if (!indx)
29016 break;
29017- if (get_user(c, buf))
29018+ if (get_user(c, buf)) {
29019+ mutex_unlock(&vfd_mutex);
29020 return -EFAULT;
29021+ }
29022 if (esc) {
29023 set_led(c);
29024 esc = 0;
29025@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
29026 buf++;
29027 }
29028 update_vfd();
29029+ mutex_unlock(&vfd_mutex);
29030
29031 return len;
29032 }
29033diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
29034index f773a9d..65cd683 100644
29035--- a/drivers/char/genrtc.c
29036+++ b/drivers/char/genrtc.c
29037@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
29038 switch (cmd) {
29039
29040 case RTC_PLL_GET:
29041+ memset(&pll, 0, sizeof(pll));
29042 if (get_rtc_pll(&pll))
29043 return -EINVAL;
29044 else
29045diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
29046index 0833896..cccce52 100644
29047--- a/drivers/char/hpet.c
29048+++ b/drivers/char/hpet.c
29049@@ -572,7 +572,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
29050 }
29051
29052 static int
29053-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
29054+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
29055 struct hpet_info *info)
29056 {
29057 struct hpet_timer __iomem *timer;
29058diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
29059index 58c0e63..46c16bf 100644
29060--- a/drivers/char/ipmi/ipmi_msghandler.c
29061+++ b/drivers/char/ipmi/ipmi_msghandler.c
29062@@ -415,7 +415,7 @@ struct ipmi_smi {
29063 struct proc_dir_entry *proc_dir;
29064 char proc_dir_name[10];
29065
29066- atomic_t stats[IPMI_NUM_STATS];
29067+ atomic_unchecked_t stats[IPMI_NUM_STATS];
29068
29069 /*
29070 * run_to_completion duplicate of smb_info, smi_info
29071@@ -448,9 +448,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
29072
29073
29074 #define ipmi_inc_stat(intf, stat) \
29075- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
29076+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
29077 #define ipmi_get_stat(intf, stat) \
29078- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
29079+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
29080
29081 static int is_lan_addr(struct ipmi_addr *addr)
29082 {
29083@@ -2868,7 +2868,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
29084 INIT_LIST_HEAD(&intf->cmd_rcvrs);
29085 init_waitqueue_head(&intf->waitq);
29086 for (i = 0; i < IPMI_NUM_STATS; i++)
29087- atomic_set(&intf->stats[i], 0);
29088+ atomic_set_unchecked(&intf->stats[i], 0);
29089
29090 intf->proc_dir = NULL;
29091
29092diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
29093index 50fcf9c..91b5528 100644
29094--- a/drivers/char/ipmi/ipmi_si_intf.c
29095+++ b/drivers/char/ipmi/ipmi_si_intf.c
29096@@ -277,7 +277,7 @@ struct smi_info {
29097 unsigned char slave_addr;
29098
29099 /* Counters and things for the proc filesystem. */
29100- atomic_t stats[SI_NUM_STATS];
29101+ atomic_unchecked_t stats[SI_NUM_STATS];
29102
29103 struct task_struct *thread;
29104
29105@@ -286,9 +286,9 @@ struct smi_info {
29106 };
29107
29108 #define smi_inc_stat(smi, stat) \
29109- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
29110+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
29111 #define smi_get_stat(smi, stat) \
29112- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
29113+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
29114
29115 #define SI_MAX_PARMS 4
29116
29117@@ -3230,7 +3230,7 @@ static int try_smi_init(struct smi_info *new_smi)
29118 atomic_set(&new_smi->req_events, 0);
29119 new_smi->run_to_completion = 0;
29120 for (i = 0; i < SI_NUM_STATS; i++)
29121- atomic_set(&new_smi->stats[i], 0);
29122+ atomic_set_unchecked(&new_smi->stats[i], 0);
29123
29124 new_smi->interrupt_disabled = 1;
29125 atomic_set(&new_smi->stop_operation, 0);
29126diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
29127index 1aeaaba..e018570 100644
29128--- a/drivers/char/mbcs.c
29129+++ b/drivers/char/mbcs.c
29130@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *dev)
29131 return 0;
29132 }
29133
29134-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
29135+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
29136 {
29137 .part_num = MBCS_PART_NUM,
29138 .mfg_num = MBCS_MFG_NUM,
29139diff --git a/drivers/char/mem.c b/drivers/char/mem.c
29140index d6e9d08..4493e89 100644
29141--- a/drivers/char/mem.c
29142+++ b/drivers/char/mem.c
29143@@ -18,6 +18,7 @@
29144 #include <linux/raw.h>
29145 #include <linux/tty.h>
29146 #include <linux/capability.h>
29147+#include <linux/security.h>
29148 #include <linux/ptrace.h>
29149 #include <linux/device.h>
29150 #include <linux/highmem.h>
29151@@ -35,6 +36,10 @@
29152 # include <linux/efi.h>
29153 #endif
29154
29155+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29156+extern const struct file_operations grsec_fops;
29157+#endif
29158+
29159 static inline unsigned long size_inside_page(unsigned long start,
29160 unsigned long size)
29161 {
29162@@ -66,9 +71,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29163
29164 while (cursor < to) {
29165 if (!devmem_is_allowed(pfn)) {
29166+#ifdef CONFIG_GRKERNSEC_KMEM
29167+ gr_handle_mem_readwrite(from, to);
29168+#else
29169 printk(KERN_INFO
29170 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
29171 current->comm, from, to);
29172+#endif
29173 return 0;
29174 }
29175 cursor += PAGE_SIZE;
29176@@ -76,6 +85,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29177 }
29178 return 1;
29179 }
29180+#elif defined(CONFIG_GRKERNSEC_KMEM)
29181+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29182+{
29183+ return 0;
29184+}
29185 #else
29186 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29187 {
29188@@ -118,6 +132,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29189
29190 while (count > 0) {
29191 unsigned long remaining;
29192+ char *temp;
29193
29194 sz = size_inside_page(p, count);
29195
29196@@ -133,7 +148,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29197 if (!ptr)
29198 return -EFAULT;
29199
29200- remaining = copy_to_user(buf, ptr, sz);
29201+#ifdef CONFIG_PAX_USERCOPY
29202+ temp = kmalloc(sz, GFP_KERNEL);
29203+ if (!temp) {
29204+ unxlate_dev_mem_ptr(p, ptr);
29205+ return -ENOMEM;
29206+ }
29207+ memcpy(temp, ptr, sz);
29208+#else
29209+ temp = ptr;
29210+#endif
29211+
29212+ remaining = copy_to_user(buf, temp, sz);
29213+
29214+#ifdef CONFIG_PAX_USERCOPY
29215+ kfree(temp);
29216+#endif
29217+
29218 unxlate_dev_mem_ptr(p, ptr);
29219 if (remaining)
29220 return -EFAULT;
29221@@ -396,9 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29222 size_t count, loff_t *ppos)
29223 {
29224 unsigned long p = *ppos;
29225- ssize_t low_count, read, sz;
29226+ ssize_t low_count, read, sz, err = 0;
29227 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
29228- int err = 0;
29229
29230 read = 0;
29231 if (p < (unsigned long) high_memory) {
29232@@ -420,6 +450,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29233 }
29234 #endif
29235 while (low_count > 0) {
29236+ char *temp;
29237+
29238 sz = size_inside_page(p, low_count);
29239
29240 /*
29241@@ -429,7 +461,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29242 */
29243 kbuf = xlate_dev_kmem_ptr((char *)p);
29244
29245- if (copy_to_user(buf, kbuf, sz))
29246+#ifdef CONFIG_PAX_USERCOPY
29247+ temp = kmalloc(sz, GFP_KERNEL);
29248+ if (!temp)
29249+ return -ENOMEM;
29250+ memcpy(temp, kbuf, sz);
29251+#else
29252+ temp = kbuf;
29253+#endif
29254+
29255+ err = copy_to_user(buf, temp, sz);
29256+
29257+#ifdef CONFIG_PAX_USERCOPY
29258+ kfree(temp);
29259+#endif
29260+
29261+ if (err)
29262 return -EFAULT;
29263 buf += sz;
29264 p += sz;
29265@@ -867,6 +914,9 @@ static const struct memdev {
29266 #ifdef CONFIG_CRASH_DUMP
29267 [12] = { "oldmem", 0, &oldmem_fops, NULL },
29268 #endif
29269+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29270+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
29271+#endif
29272 };
29273
29274 static int memory_open(struct inode *inode, struct file *filp)
29275diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
29276index da3cfee..a5a6606 100644
29277--- a/drivers/char/nvram.c
29278+++ b/drivers/char/nvram.c
29279@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
29280
29281 spin_unlock_irq(&rtc_lock);
29282
29283- if (copy_to_user(buf, contents, tmp - contents))
29284+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
29285 return -EFAULT;
29286
29287 *ppos = i;
29288diff --git a/drivers/char/random.c b/drivers/char/random.c
29289index 54ca8b2..4a092ed 100644
29290--- a/drivers/char/random.c
29291+++ b/drivers/char/random.c
29292@@ -261,8 +261,13 @@
29293 /*
29294 * Configuration information
29295 */
29296+#ifdef CONFIG_GRKERNSEC_RANDNET
29297+#define INPUT_POOL_WORDS 512
29298+#define OUTPUT_POOL_WORDS 128
29299+#else
29300 #define INPUT_POOL_WORDS 128
29301 #define OUTPUT_POOL_WORDS 32
29302+#endif
29303 #define SEC_XFER_SIZE 512
29304 #define EXTRACT_SIZE 10
29305
29306@@ -300,10 +305,17 @@ static struct poolinfo {
29307 int poolwords;
29308 int tap1, tap2, tap3, tap4, tap5;
29309 } poolinfo_table[] = {
29310+#ifdef CONFIG_GRKERNSEC_RANDNET
29311+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
29312+ { 512, 411, 308, 208, 104, 1 },
29313+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
29314+ { 128, 103, 76, 51, 25, 1 },
29315+#else
29316 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
29317 { 128, 103, 76, 51, 25, 1 },
29318 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
29319 { 32, 26, 20, 14, 7, 1 },
29320+#endif
29321 #if 0
29322 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
29323 { 2048, 1638, 1231, 819, 411, 1 },
29324@@ -913,7 +925,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
29325
29326 extract_buf(r, tmp);
29327 i = min_t(int, nbytes, EXTRACT_SIZE);
29328- if (copy_to_user(buf, tmp, i)) {
29329+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
29330 ret = -EFAULT;
29331 break;
29332 }
29333@@ -1238,7 +1250,7 @@ EXPORT_SYMBOL(generate_random_uuid);
29334 #include <linux/sysctl.h>
29335
29336 static int min_read_thresh = 8, min_write_thresh;
29337-static int max_read_thresh = INPUT_POOL_WORDS * 32;
29338+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
29339 static int max_write_thresh = INPUT_POOL_WORDS * 32;
29340 static char sysctl_bootid[16];
29341
29342@@ -1260,10 +1272,15 @@ static int proc_do_uuid(ctl_table *table, int write,
29343 uuid = table->data;
29344 if (!uuid) {
29345 uuid = tmp_uuid;
29346- uuid[8] = 0;
29347- }
29348- if (uuid[8] == 0)
29349 generate_random_uuid(uuid);
29350+ } else {
29351+ static DEFINE_SPINLOCK(bootid_spinlock);
29352+
29353+ spin_lock(&bootid_spinlock);
29354+ if (!uuid[8])
29355+ generate_random_uuid(uuid);
29356+ spin_unlock(&bootid_spinlock);
29357+ }
29358
29359 sprintf(buf, "%pU", uuid);
29360
29361diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
29362index 1ee8ce7..b778bef 100644
29363--- a/drivers/char/sonypi.c
29364+++ b/drivers/char/sonypi.c
29365@@ -55,6 +55,7 @@
29366 #include <asm/uaccess.h>
29367 #include <asm/io.h>
29368 #include <asm/system.h>
29369+#include <asm/local.h>
29370
29371 #include <linux/sonypi.h>
29372
29373@@ -491,7 +492,7 @@ static struct sonypi_device {
29374 spinlock_t fifo_lock;
29375 wait_queue_head_t fifo_proc_list;
29376 struct fasync_struct *fifo_async;
29377- int open_count;
29378+ local_t open_count;
29379 int model;
29380 struct input_dev *input_jog_dev;
29381 struct input_dev *input_key_dev;
29382@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
29383 static int sonypi_misc_release(struct inode *inode, struct file *file)
29384 {
29385 mutex_lock(&sonypi_device.lock);
29386- sonypi_device.open_count--;
29387+ local_dec(&sonypi_device.open_count);
29388 mutex_unlock(&sonypi_device.lock);
29389 return 0;
29390 }
29391@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
29392 {
29393 mutex_lock(&sonypi_device.lock);
29394 /* Flush input queue on first open */
29395- if (!sonypi_device.open_count)
29396+ if (!local_read(&sonypi_device.open_count))
29397 kfifo_reset(&sonypi_device.fifo);
29398- sonypi_device.open_count++;
29399+ local_inc(&sonypi_device.open_count);
29400 mutex_unlock(&sonypi_device.lock);
29401
29402 return 0;
29403diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
29404index ad7c732..5aa8054 100644
29405--- a/drivers/char/tpm/tpm.c
29406+++ b/drivers/char/tpm/tpm.c
29407@@ -415,7 +415,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
29408 chip->vendor.req_complete_val)
29409 goto out_recv;
29410
29411- if ((status == chip->vendor.req_canceled)) {
29412+ if (status == chip->vendor.req_canceled) {
29413 dev_err(chip->dev, "Operation Canceled\n");
29414 rc = -ECANCELED;
29415 goto out;
29416diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
29417index 0636520..169c1d0 100644
29418--- a/drivers/char/tpm/tpm_bios.c
29419+++ b/drivers/char/tpm/tpm_bios.c
29420@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
29421 event = addr;
29422
29423 if ((event->event_type == 0 && event->event_size == 0) ||
29424- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
29425+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
29426 return NULL;
29427
29428 return addr;
29429@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
29430 return NULL;
29431
29432 if ((event->event_type == 0 && event->event_size == 0) ||
29433- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
29434+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
29435 return NULL;
29436
29437 (*pos)++;
29438@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
29439 int i;
29440
29441 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
29442- seq_putc(m, data[i]);
29443+ if (!seq_putc(m, data[i]))
29444+ return -EFAULT;
29445
29446 return 0;
29447 }
29448@@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log *log)
29449 log->bios_event_log_end = log->bios_event_log + len;
29450
29451 virt = acpi_os_map_memory(start, len);
29452+ if (!virt) {
29453+ kfree(log->bios_event_log);
29454+ log->bios_event_log = NULL;
29455+ return -EFAULT;
29456+ }
29457
29458- memcpy(log->bios_event_log, virt, len);
29459+ memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
29460
29461 acpi_os_unmap_memory(virt, len);
29462 return 0;
29463diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
29464index b58b561..c9088c8 100644
29465--- a/drivers/char/virtio_console.c
29466+++ b/drivers/char/virtio_console.c
29467@@ -563,7 +563,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
29468 if (to_user) {
29469 ssize_t ret;
29470
29471- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
29472+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
29473 if (ret)
29474 return -EFAULT;
29475 } else {
29476@@ -662,7 +662,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
29477 if (!port_has_data(port) && !port->host_connected)
29478 return 0;
29479
29480- return fill_readbuf(port, ubuf, count, true);
29481+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
29482 }
29483
29484 static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
29485diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
29486index c9eee6d..f9d5280 100644
29487--- a/drivers/edac/amd64_edac.c
29488+++ b/drivers/edac/amd64_edac.c
29489@@ -2685,7 +2685,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
29490 * PCI core identifies what devices are on a system during boot, and then
29491 * inquiry this table to see if this driver is for a given device found.
29492 */
29493-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
29494+static const struct pci_device_id amd64_pci_table[] __devinitconst = {
29495 {
29496 .vendor = PCI_VENDOR_ID_AMD,
29497 .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
29498diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
29499index e47e73b..348e0bd 100644
29500--- a/drivers/edac/amd76x_edac.c
29501+++ b/drivers/edac/amd76x_edac.c
29502@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
29503 edac_mc_free(mci);
29504 }
29505
29506-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
29507+static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
29508 {
29509 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29510 AMD762},
29511diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
29512index 1af531a..3a8ff27 100644
29513--- a/drivers/edac/e752x_edac.c
29514+++ b/drivers/edac/e752x_edac.c
29515@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
29516 edac_mc_free(mci);
29517 }
29518
29519-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
29520+static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
29521 {
29522 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29523 E7520},
29524diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
29525index 6ffb6d2..383d8d7 100644
29526--- a/drivers/edac/e7xxx_edac.c
29527+++ b/drivers/edac/e7xxx_edac.c
29528@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
29529 edac_mc_free(mci);
29530 }
29531
29532-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
29533+static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
29534 {
29535 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29536 E7205},
29537diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
29538index 97f5064..202b6e6 100644
29539--- a/drivers/edac/edac_pci_sysfs.c
29540+++ b/drivers/edac/edac_pci_sysfs.c
29541@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
29542 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
29543 static int edac_pci_poll_msec = 1000; /* one second workq period */
29544
29545-static atomic_t pci_parity_count = ATOMIC_INIT(0);
29546-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
29547+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
29548+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
29549
29550 static struct kobject *edac_pci_top_main_kobj;
29551 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
29552@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29553 edac_printk(KERN_CRIT, EDAC_PCI,
29554 "Signaled System Error on %s\n",
29555 pci_name(dev));
29556- atomic_inc(&pci_nonparity_count);
29557+ atomic_inc_unchecked(&pci_nonparity_count);
29558 }
29559
29560 if (status & (PCI_STATUS_PARITY)) {
29561@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29562 "Master Data Parity Error on %s\n",
29563 pci_name(dev));
29564
29565- atomic_inc(&pci_parity_count);
29566+ atomic_inc_unchecked(&pci_parity_count);
29567 }
29568
29569 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29570@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29571 "Detected Parity Error on %s\n",
29572 pci_name(dev));
29573
29574- atomic_inc(&pci_parity_count);
29575+ atomic_inc_unchecked(&pci_parity_count);
29576 }
29577 }
29578
29579@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29580 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
29581 "Signaled System Error on %s\n",
29582 pci_name(dev));
29583- atomic_inc(&pci_nonparity_count);
29584+ atomic_inc_unchecked(&pci_nonparity_count);
29585 }
29586
29587 if (status & (PCI_STATUS_PARITY)) {
29588@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29589 "Master Data Parity Error on "
29590 "%s\n", pci_name(dev));
29591
29592- atomic_inc(&pci_parity_count);
29593+ atomic_inc_unchecked(&pci_parity_count);
29594 }
29595
29596 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29597@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29598 "Detected Parity Error on %s\n",
29599 pci_name(dev));
29600
29601- atomic_inc(&pci_parity_count);
29602+ atomic_inc_unchecked(&pci_parity_count);
29603 }
29604 }
29605 }
29606@@ -677,7 +677,7 @@ void edac_pci_do_parity_check(void)
29607 if (!check_pci_errors)
29608 return;
29609
29610- before_count = atomic_read(&pci_parity_count);
29611+ before_count = atomic_read_unchecked(&pci_parity_count);
29612
29613 /* scan all PCI devices looking for a Parity Error on devices and
29614 * bridges.
29615@@ -689,7 +689,7 @@ void edac_pci_do_parity_check(void)
29616 /* Only if operator has selected panic on PCI Error */
29617 if (edac_pci_get_panic_on_pe()) {
29618 /* If the count is different 'after' from 'before' */
29619- if (before_count != atomic_read(&pci_parity_count))
29620+ if (before_count != atomic_read_unchecked(&pci_parity_count))
29621 panic("EDAC: PCI Parity Error");
29622 }
29623 }
29624diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
29625index c0510b3..6e2a954 100644
29626--- a/drivers/edac/i3000_edac.c
29627+++ b/drivers/edac/i3000_edac.c
29628@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
29629 edac_mc_free(mci);
29630 }
29631
29632-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
29633+static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
29634 {
29635 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29636 I3000},
29637diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
29638index 73f55e200..5faaf59 100644
29639--- a/drivers/edac/i3200_edac.c
29640+++ b/drivers/edac/i3200_edac.c
29641@@ -445,7 +445,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
29642 edac_mc_free(mci);
29643 }
29644
29645-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
29646+static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
29647 {
29648 PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29649 I3200},
29650diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
29651index 4dc3ac2..67d05a6 100644
29652--- a/drivers/edac/i5000_edac.c
29653+++ b/drivers/edac/i5000_edac.c
29654@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
29655 *
29656 * The "E500P" device is the first device supported.
29657 */
29658-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
29659+static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
29660 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
29661 .driver_data = I5000P},
29662
29663diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
29664index bcbdeec..9886d16 100644
29665--- a/drivers/edac/i5100_edac.c
29666+++ b/drivers/edac/i5100_edac.c
29667@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
29668 edac_mc_free(mci);
29669 }
29670
29671-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
29672+static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
29673 /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
29674 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
29675 { 0, }
29676diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
29677index 74d6ec34..baff517 100644
29678--- a/drivers/edac/i5400_edac.c
29679+++ b/drivers/edac/i5400_edac.c
29680@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
29681 *
29682 * The "E500P" device is the first device supported.
29683 */
29684-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
29685+static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
29686 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
29687 {0,} /* 0 terminated list. */
29688 };
29689diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
29690index 6104dba..e7ea8e1 100644
29691--- a/drivers/edac/i7300_edac.c
29692+++ b/drivers/edac/i7300_edac.c
29693@@ -1192,7 +1192,7 @@ static void __devexit i7300_remove_one(struct pci_dev *pdev)
29694 *
29695 * Has only 8086:360c PCI ID
29696 */
29697-static const struct pci_device_id i7300_pci_tbl[] __devinitdata = {
29698+static const struct pci_device_id i7300_pci_tbl[] __devinitconst = {
29699 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
29700 {0,} /* 0 terminated list. */
29701 };
29702diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
29703index 8568d9b..42b2fa8 100644
29704--- a/drivers/edac/i7core_edac.c
29705+++ b/drivers/edac/i7core_edac.c
29706@@ -391,7 +391,7 @@ static const struct pci_id_table pci_dev_table[] = {
29707 /*
29708 * pci_device_id table for which devices we are looking for
29709 */
29710-static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
29711+static const struct pci_device_id i7core_pci_tbl[] __devinitconst = {
29712 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
29713 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
29714 {0,} /* 0 terminated list. */
29715diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
29716index 4329d39..f3022ef 100644
29717--- a/drivers/edac/i82443bxgx_edac.c
29718+++ b/drivers/edac/i82443bxgx_edac.c
29719@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
29720
29721 EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
29722
29723-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
29724+static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
29725 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
29726 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
29727 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
29728diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
29729index 931a057..fd28340 100644
29730--- a/drivers/edac/i82860_edac.c
29731+++ b/drivers/edac/i82860_edac.c
29732@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
29733 edac_mc_free(mci);
29734 }
29735
29736-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
29737+static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
29738 {
29739 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29740 I82860},
29741diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
29742index 33864c6..01edc61 100644
29743--- a/drivers/edac/i82875p_edac.c
29744+++ b/drivers/edac/i82875p_edac.c
29745@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
29746 edac_mc_free(mci);
29747 }
29748
29749-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
29750+static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
29751 {
29752 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29753 I82875P},
29754diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
29755index 4184e01..dcb2cd3 100644
29756--- a/drivers/edac/i82975x_edac.c
29757+++ b/drivers/edac/i82975x_edac.c
29758@@ -612,7 +612,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
29759 edac_mc_free(mci);
29760 }
29761
29762-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
29763+static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
29764 {
29765 PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29766 I82975X
29767diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
29768index 0106747..0b40417 100644
29769--- a/drivers/edac/mce_amd.h
29770+++ b/drivers/edac/mce_amd.h
29771@@ -83,7 +83,7 @@ struct amd_decoder_ops {
29772 bool (*dc_mce)(u16, u8);
29773 bool (*ic_mce)(u16, u8);
29774 bool (*nb_mce)(u16, u8);
29775-};
29776+} __no_const;
29777
29778 void amd_report_gart_errors(bool);
29779 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
29780diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
29781index e294e1b..a41b05b 100644
29782--- a/drivers/edac/r82600_edac.c
29783+++ b/drivers/edac/r82600_edac.c
29784@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
29785 edac_mc_free(mci);
29786 }
29787
29788-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
29789+static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
29790 {
29791 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
29792 },
29793diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
29794index 1dc118d..8c68af9 100644
29795--- a/drivers/edac/sb_edac.c
29796+++ b/drivers/edac/sb_edac.c
29797@@ -367,7 +367,7 @@ static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
29798 /*
29799 * pci_device_id table for which devices we are looking for
29800 */
29801-static const struct pci_device_id sbridge_pci_tbl[] __devinitdata = {
29802+static const struct pci_device_id sbridge_pci_tbl[] __devinitconst = {
29803 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
29804 {0,} /* 0 terminated list. */
29805 };
29806diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
29807index b6f47de..c5acf3a 100644
29808--- a/drivers/edac/x38_edac.c
29809+++ b/drivers/edac/x38_edac.c
29810@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
29811 edac_mc_free(mci);
29812 }
29813
29814-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
29815+static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
29816 {
29817 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29818 X38},
29819diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
29820index 85661b0..c784559a 100644
29821--- a/drivers/firewire/core-card.c
29822+++ b/drivers/firewire/core-card.c
29823@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
29824
29825 void fw_core_remove_card(struct fw_card *card)
29826 {
29827- struct fw_card_driver dummy_driver = dummy_driver_template;
29828+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
29829
29830 card->driver->update_phy_reg(card, 4,
29831 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
29832diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
29833index 4799393..37bd3ab 100644
29834--- a/drivers/firewire/core-cdev.c
29835+++ b/drivers/firewire/core-cdev.c
29836@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct client *client,
29837 int ret;
29838
29839 if ((request->channels == 0 && request->bandwidth == 0) ||
29840- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
29841- request->bandwidth < 0)
29842+ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
29843 return -EINVAL;
29844
29845 r = kmalloc(sizeof(*r), GFP_KERNEL);
29846diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
29847index 855ab3f..11f4bbd 100644
29848--- a/drivers/firewire/core-transaction.c
29849+++ b/drivers/firewire/core-transaction.c
29850@@ -37,6 +37,7 @@
29851 #include <linux/timer.h>
29852 #include <linux/types.h>
29853 #include <linux/workqueue.h>
29854+#include <linux/sched.h>
29855
29856 #include <asm/byteorder.h>
29857
29858diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
29859index b45be57..5fad18b 100644
29860--- a/drivers/firewire/core.h
29861+++ b/drivers/firewire/core.h
29862@@ -101,6 +101,7 @@ struct fw_card_driver {
29863
29864 int (*stop_iso)(struct fw_iso_context *ctx);
29865 };
29866+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
29867
29868 void fw_card_initialize(struct fw_card *card,
29869 const struct fw_card_driver *driver, struct device *device);
29870diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
29871index 153980b..4b4d046 100644
29872--- a/drivers/firmware/dmi_scan.c
29873+++ b/drivers/firmware/dmi_scan.c
29874@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
29875 }
29876 }
29877 else {
29878- /*
29879- * no iounmap() for that ioremap(); it would be a no-op, but
29880- * it's so early in setup that sucker gets confused into doing
29881- * what it shouldn't if we actually call it.
29882- */
29883 p = dmi_ioremap(0xF0000, 0x10000);
29884 if (p == NULL)
29885 goto error;
29886@@ -723,7 +718,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
29887 if (buf == NULL)
29888 return -1;
29889
29890- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
29891+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
29892
29893 iounmap(buf);
29894 return 0;
29895diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
29896index 82d5c20..44a7177 100644
29897--- a/drivers/gpio/gpio-vr41xx.c
29898+++ b/drivers/gpio/gpio-vr41xx.c
29899@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
29900 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
29901 maskl, pendl, maskh, pendh);
29902
29903- atomic_inc(&irq_err_count);
29904+ atomic_inc_unchecked(&irq_err_count);
29905
29906 return -EINVAL;
29907 }
29908diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
29909index 84a4a80..ce0306e 100644
29910--- a/drivers/gpu/drm/drm_crtc_helper.c
29911+++ b/drivers/gpu/drm/drm_crtc_helper.c
29912@@ -280,7 +280,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
29913 struct drm_crtc *tmp;
29914 int crtc_mask = 1;
29915
29916- WARN(!crtc, "checking null crtc?\n");
29917+ BUG_ON(!crtc);
29918
29919 dev = crtc->dev;
29920
29921diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
29922index ebf7d3f..d64c436 100644
29923--- a/drivers/gpu/drm/drm_drv.c
29924+++ b/drivers/gpu/drm/drm_drv.c
29925@@ -312,7 +312,7 @@ module_exit(drm_core_exit);
29926 /**
29927 * Copy and IOCTL return string to user space
29928 */
29929-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
29930+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
29931 {
29932 int len;
29933
29934@@ -391,7 +391,7 @@ long drm_ioctl(struct file *filp,
29935
29936 dev = file_priv->minor->dev;
29937 atomic_inc(&dev->ioctl_count);
29938- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
29939+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
29940 ++file_priv->ioctl_count;
29941
29942 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
29943diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
29944index 6263b01..7987f55 100644
29945--- a/drivers/gpu/drm/drm_fops.c
29946+++ b/drivers/gpu/drm/drm_fops.c
29947@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
29948 }
29949
29950 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
29951- atomic_set(&dev->counts[i], 0);
29952+ atomic_set_unchecked(&dev->counts[i], 0);
29953
29954 dev->sigdata.lock = NULL;
29955
29956@@ -135,8 +135,8 @@ int drm_open(struct inode *inode, struct file *filp)
29957
29958 retcode = drm_open_helper(inode, filp, dev);
29959 if (!retcode) {
29960- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
29961- if (!dev->open_count++)
29962+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
29963+ if (local_inc_return(&dev->open_count) == 1)
29964 retcode = drm_setup(dev);
29965 }
29966 if (!retcode) {
29967@@ -473,7 +473,7 @@ int drm_release(struct inode *inode, struct file *filp)
29968
29969 mutex_lock(&drm_global_mutex);
29970
29971- DRM_DEBUG("open_count = %d\n", dev->open_count);
29972+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
29973
29974 if (dev->driver->preclose)
29975 dev->driver->preclose(dev, file_priv);
29976@@ -482,10 +482,10 @@ int drm_release(struct inode *inode, struct file *filp)
29977 * Begin inline drm_release
29978 */
29979
29980- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
29981+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
29982 task_pid_nr(current),
29983 (long)old_encode_dev(file_priv->minor->device),
29984- dev->open_count);
29985+ local_read(&dev->open_count));
29986
29987 /* Release any auth tokens that might point to this file_priv,
29988 (do that under the drm_global_mutex) */
29989@@ -571,8 +571,8 @@ int drm_release(struct inode *inode, struct file *filp)
29990 * End inline drm_release
29991 */
29992
29993- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
29994- if (!--dev->open_count) {
29995+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
29996+ if (local_dec_and_test(&dev->open_count)) {
29997 if (atomic_read(&dev->ioctl_count)) {
29998 DRM_ERROR("Device busy: %d\n",
29999 atomic_read(&dev->ioctl_count));
30000diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
30001index c87dc96..326055d 100644
30002--- a/drivers/gpu/drm/drm_global.c
30003+++ b/drivers/gpu/drm/drm_global.c
30004@@ -36,7 +36,7 @@
30005 struct drm_global_item {
30006 struct mutex mutex;
30007 void *object;
30008- int refcount;
30009+ atomic_t refcount;
30010 };
30011
30012 static struct drm_global_item glob[DRM_GLOBAL_NUM];
30013@@ -49,7 +49,7 @@ void drm_global_init(void)
30014 struct drm_global_item *item = &glob[i];
30015 mutex_init(&item->mutex);
30016 item->object = NULL;
30017- item->refcount = 0;
30018+ atomic_set(&item->refcount, 0);
30019 }
30020 }
30021
30022@@ -59,7 +59,7 @@ void drm_global_release(void)
30023 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
30024 struct drm_global_item *item = &glob[i];
30025 BUG_ON(item->object != NULL);
30026- BUG_ON(item->refcount != 0);
30027+ BUG_ON(atomic_read(&item->refcount) != 0);
30028 }
30029 }
30030
30031@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30032 void *object;
30033
30034 mutex_lock(&item->mutex);
30035- if (item->refcount == 0) {
30036+ if (atomic_read(&item->refcount) == 0) {
30037 item->object = kzalloc(ref->size, GFP_KERNEL);
30038 if (unlikely(item->object == NULL)) {
30039 ret = -ENOMEM;
30040@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30041 goto out_err;
30042
30043 }
30044- ++item->refcount;
30045+ atomic_inc(&item->refcount);
30046 ref->object = item->object;
30047 object = item->object;
30048 mutex_unlock(&item->mutex);
30049@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
30050 struct drm_global_item *item = &glob[ref->global_type];
30051
30052 mutex_lock(&item->mutex);
30053- BUG_ON(item->refcount == 0);
30054+ BUG_ON(atomic_read(&item->refcount) == 0);
30055 BUG_ON(ref->object != item->object);
30056- if (--item->refcount == 0) {
30057+ if (atomic_dec_and_test(&item->refcount)) {
30058 ref->release(ref);
30059 item->object = NULL;
30060 }
30061diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
30062index ab1162d..42587b2 100644
30063--- a/drivers/gpu/drm/drm_info.c
30064+++ b/drivers/gpu/drm/drm_info.c
30065@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
30066 struct drm_local_map *map;
30067 struct drm_map_list *r_list;
30068
30069- /* Hardcoded from _DRM_FRAME_BUFFER,
30070- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
30071- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
30072- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
30073+ static const char * const types[] = {
30074+ [_DRM_FRAME_BUFFER] = "FB",
30075+ [_DRM_REGISTERS] = "REG",
30076+ [_DRM_SHM] = "SHM",
30077+ [_DRM_AGP] = "AGP",
30078+ [_DRM_SCATTER_GATHER] = "SG",
30079+ [_DRM_CONSISTENT] = "PCI",
30080+ [_DRM_GEM] = "GEM" };
30081 const char *type;
30082 int i;
30083
30084@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
30085 map = r_list->map;
30086 if (!map)
30087 continue;
30088- if (map->type < 0 || map->type > 5)
30089+ if (map->type >= ARRAY_SIZE(types))
30090 type = "??";
30091 else
30092 type = types[map->type];
30093@@ -290,7 +294,11 @@ int drm_vma_info(struct seq_file *m, void *data)
30094 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
30095 vma->vm_flags & VM_LOCKED ? 'l' : '-',
30096 vma->vm_flags & VM_IO ? 'i' : '-',
30097+#ifdef CONFIG_GRKERNSEC_HIDESYM
30098+ 0);
30099+#else
30100 vma->vm_pgoff);
30101+#endif
30102
30103 #if defined(__i386__)
30104 pgprot = pgprot_val(vma->vm_page_prot);
30105diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
30106index 637fcc3..e890b33 100644
30107--- a/drivers/gpu/drm/drm_ioc32.c
30108+++ b/drivers/gpu/drm/drm_ioc32.c
30109@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
30110 request = compat_alloc_user_space(nbytes);
30111 if (!access_ok(VERIFY_WRITE, request, nbytes))
30112 return -EFAULT;
30113- list = (struct drm_buf_desc *) (request + 1);
30114+ list = (struct drm_buf_desc __user *) (request + 1);
30115
30116 if (__put_user(count, &request->count)
30117 || __put_user(list, &request->list))
30118@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
30119 request = compat_alloc_user_space(nbytes);
30120 if (!access_ok(VERIFY_WRITE, request, nbytes))
30121 return -EFAULT;
30122- list = (struct drm_buf_pub *) (request + 1);
30123+ list = (struct drm_buf_pub __user *) (request + 1);
30124
30125 if (__put_user(count, &request->count)
30126 || __put_user(list, &request->list))
30127diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
30128index 956fd38..e52167a 100644
30129--- a/drivers/gpu/drm/drm_ioctl.c
30130+++ b/drivers/gpu/drm/drm_ioctl.c
30131@@ -251,7 +251,7 @@ int drm_getstats(struct drm_device *dev, void *data,
30132 stats->data[i].value =
30133 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
30134 else
30135- stats->data[i].value = atomic_read(&dev->counts[i]);
30136+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
30137 stats->data[i].type = dev->types[i];
30138 }
30139
30140diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
30141index c79c713..2048588 100644
30142--- a/drivers/gpu/drm/drm_lock.c
30143+++ b/drivers/gpu/drm/drm_lock.c
30144@@ -90,7 +90,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30145 if (drm_lock_take(&master->lock, lock->context)) {
30146 master->lock.file_priv = file_priv;
30147 master->lock.lock_time = jiffies;
30148- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
30149+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
30150 break; /* Got lock */
30151 }
30152
30153@@ -161,7 +161,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30154 return -EINVAL;
30155 }
30156
30157- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
30158+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
30159
30160 if (drm_lock_free(&master->lock, lock->context)) {
30161 /* FIXME: Should really bail out here. */
30162diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
30163index 7f4b4e1..bf4def2 100644
30164--- a/drivers/gpu/drm/i810/i810_dma.c
30165+++ b/drivers/gpu/drm/i810/i810_dma.c
30166@@ -948,8 +948,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
30167 dma->buflist[vertex->idx],
30168 vertex->discard, vertex->used);
30169
30170- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30171- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30172+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30173+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30174 sarea_priv->last_enqueue = dev_priv->counter - 1;
30175 sarea_priv->last_dispatch = (int)hw_status[5];
30176
30177@@ -1109,8 +1109,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
30178 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
30179 mc->last_render);
30180
30181- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30182- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30183+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30184+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30185 sarea_priv->last_enqueue = dev_priv->counter - 1;
30186 sarea_priv->last_dispatch = (int)hw_status[5];
30187
30188diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
30189index c9339f4..f5e1b9d 100644
30190--- a/drivers/gpu/drm/i810/i810_drv.h
30191+++ b/drivers/gpu/drm/i810/i810_drv.h
30192@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
30193 int page_flipping;
30194
30195 wait_queue_head_t irq_queue;
30196- atomic_t irq_received;
30197- atomic_t irq_emitted;
30198+ atomic_unchecked_t irq_received;
30199+ atomic_unchecked_t irq_emitted;
30200
30201 int front_offset;
30202 } drm_i810_private_t;
30203diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
30204index deaa657..e0fd296 100644
30205--- a/drivers/gpu/drm/i915/i915_debugfs.c
30206+++ b/drivers/gpu/drm/i915/i915_debugfs.c
30207@@ -499,7 +499,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
30208 I915_READ(GTIMR));
30209 }
30210 seq_printf(m, "Interrupts received: %d\n",
30211- atomic_read(&dev_priv->irq_received));
30212+ atomic_read_unchecked(&dev_priv->irq_received));
30213 for (i = 0; i < I915_NUM_RINGS; i++) {
30214 if (IS_GEN6(dev) || IS_GEN7(dev)) {
30215 seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
30216@@ -1321,7 +1321,7 @@ static int i915_opregion(struct seq_file *m, void *unused)
30217 return ret;
30218
30219 if (opregion->header)
30220- seq_write(m, opregion->header, OPREGION_SIZE);
30221+ seq_write(m, (const void __force_kernel *)opregion->header, OPREGION_SIZE);
30222
30223 mutex_unlock(&dev->struct_mutex);
30224
30225diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
30226index ddfe3d9..f6e6b21 100644
30227--- a/drivers/gpu/drm/i915/i915_dma.c
30228+++ b/drivers/gpu/drm/i915/i915_dma.c
30229@@ -1175,7 +1175,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
30230 bool can_switch;
30231
30232 spin_lock(&dev->count_lock);
30233- can_switch = (dev->open_count == 0);
30234+ can_switch = (local_read(&dev->open_count) == 0);
30235 spin_unlock(&dev->count_lock);
30236 return can_switch;
30237 }
30238diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
30239index 9689ca3..294f9c1 100644
30240--- a/drivers/gpu/drm/i915/i915_drv.h
30241+++ b/drivers/gpu/drm/i915/i915_drv.h
30242@@ -231,7 +231,7 @@ struct drm_i915_display_funcs {
30243 /* render clock increase/decrease */
30244 /* display clock increase/decrease */
30245 /* pll clock increase/decrease */
30246-};
30247+} __no_const;
30248
30249 struct intel_device_info {
30250 u8 gen;
30251@@ -320,7 +320,7 @@ typedef struct drm_i915_private {
30252 int current_page;
30253 int page_flipping;
30254
30255- atomic_t irq_received;
30256+ atomic_unchecked_t irq_received;
30257
30258 /* protects the irq masks */
30259 spinlock_t irq_lock;
30260@@ -896,7 +896,7 @@ struct drm_i915_gem_object {
30261 * will be page flipped away on the next vblank. When it
30262 * reaches 0, dev_priv->pending_flip_queue will be woken up.
30263 */
30264- atomic_t pending_flip;
30265+ atomic_unchecked_t pending_flip;
30266 };
30267
30268 #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
30269@@ -1276,7 +1276,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
30270 extern void intel_teardown_gmbus(struct drm_device *dev);
30271 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
30272 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
30273-extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30274+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30275 {
30276 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
30277 }
30278diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30279index 65e1f00..a30ef00 100644
30280--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30281+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30282@@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
30283 i915_gem_clflush_object(obj);
30284
30285 if (obj->base.pending_write_domain)
30286- cd->flips |= atomic_read(&obj->pending_flip);
30287+ cd->flips |= atomic_read_unchecked(&obj->pending_flip);
30288
30289 /* The actual obj->write_domain will be updated with
30290 * pending_write_domain after we emit the accumulated flush for all
30291@@ -882,9 +882,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
30292
30293 static int
30294 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
30295- int count)
30296+ unsigned int count)
30297 {
30298- int i;
30299+ unsigned int i;
30300
30301 for (i = 0; i < count; i++) {
30302 char __user *ptr = (char __user *)(uintptr_t)exec[i].relocs_ptr;
30303diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
30304index 5bd4361..0241a42 100644
30305--- a/drivers/gpu/drm/i915/i915_irq.c
30306+++ b/drivers/gpu/drm/i915/i915_irq.c
30307@@ -475,7 +475,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
30308 u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
30309 struct drm_i915_master_private *master_priv;
30310
30311- atomic_inc(&dev_priv->irq_received);
30312+ atomic_inc_unchecked(&dev_priv->irq_received);
30313
30314 /* disable master interrupt before clearing iir */
30315 de_ier = I915_READ(DEIER);
30316@@ -566,7 +566,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
30317 struct drm_i915_master_private *master_priv;
30318 u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
30319
30320- atomic_inc(&dev_priv->irq_received);
30321+ atomic_inc_unchecked(&dev_priv->irq_received);
30322
30323 if (IS_GEN6(dev))
30324 bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
30325@@ -1231,7 +1231,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
30326 int ret = IRQ_NONE, pipe;
30327 bool blc_event = false;
30328
30329- atomic_inc(&dev_priv->irq_received);
30330+ atomic_inc_unchecked(&dev_priv->irq_received);
30331
30332 iir = I915_READ(IIR);
30333
30334@@ -1743,7 +1743,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
30335 {
30336 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30337
30338- atomic_set(&dev_priv->irq_received, 0);
30339+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30340
30341 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30342 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30343@@ -1932,7 +1932,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
30344 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30345 int pipe;
30346
30347- atomic_set(&dev_priv->irq_received, 0);
30348+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30349
30350 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30351 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30352diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
30353index 2163818..cede019 100644
30354--- a/drivers/gpu/drm/i915/intel_display.c
30355+++ b/drivers/gpu/drm/i915/intel_display.c
30356@@ -2238,7 +2238,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
30357
30358 wait_event(dev_priv->pending_flip_queue,
30359 atomic_read(&dev_priv->mm.wedged) ||
30360- atomic_read(&obj->pending_flip) == 0);
30361+ atomic_read_unchecked(&obj->pending_flip) == 0);
30362
30363 /* Big Hammer, we also need to ensure that any pending
30364 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
30365@@ -2859,7 +2859,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
30366 obj = to_intel_framebuffer(crtc->fb)->obj;
30367 dev_priv = crtc->dev->dev_private;
30368 wait_event(dev_priv->pending_flip_queue,
30369- atomic_read(&obj->pending_flip) == 0);
30370+ atomic_read_unchecked(&obj->pending_flip) == 0);
30371 }
30372
30373 static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
30374@@ -7171,7 +7171,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
30375
30376 atomic_clear_mask(1 << intel_crtc->plane,
30377 &obj->pending_flip.counter);
30378- if (atomic_read(&obj->pending_flip) == 0)
30379+ if (atomic_read_unchecked(&obj->pending_flip) == 0)
30380 wake_up(&dev_priv->pending_flip_queue);
30381
30382 schedule_work(&work->work);
30383@@ -7354,7 +7354,13 @@ static int intel_gen6_queue_flip(struct drm_device *dev,
30384 OUT_RING(fb->pitches[0] | obj->tiling_mode);
30385 OUT_RING(obj->gtt_offset);
30386
30387- pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;
30388+ /* Contrary to the suggestions in the documentation,
30389+ * "Enable Panel Fitter" does not seem to be required when page
30390+ * flipping with a non-native mode, and worse causes a normal
30391+ * modeset to fail.
30392+ * pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;
30393+ */
30394+ pf = 0;
30395 pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff;
30396 OUT_RING(pf | pipesrc);
30397 ADVANCE_LP_RING();
30398@@ -7461,7 +7467,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30399 /* Block clients from rendering to the new back buffer until
30400 * the flip occurs and the object is no longer visible.
30401 */
30402- atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30403+ atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30404
30405 ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
30406 if (ret)
30407@@ -7475,7 +7481,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30408 return 0;
30409
30410 cleanup_pending:
30411- atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30412+ atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30413 drm_gem_object_unreference(&work->old_fb_obj->base);
30414 drm_gem_object_unreference(&obj->base);
30415 mutex_unlock(&dev->struct_mutex);
30416diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
30417index 54558a0..2d97005 100644
30418--- a/drivers/gpu/drm/mga/mga_drv.h
30419+++ b/drivers/gpu/drm/mga/mga_drv.h
30420@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
30421 u32 clear_cmd;
30422 u32 maccess;
30423
30424- atomic_t vbl_received; /**< Number of vblanks received. */
30425+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
30426 wait_queue_head_t fence_queue;
30427- atomic_t last_fence_retired;
30428+ atomic_unchecked_t last_fence_retired;
30429 u32 next_fence_to_post;
30430
30431 unsigned int fb_cpp;
30432diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
30433index 2581202..f230a8d9 100644
30434--- a/drivers/gpu/drm/mga/mga_irq.c
30435+++ b/drivers/gpu/drm/mga/mga_irq.c
30436@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
30437 if (crtc != 0)
30438 return 0;
30439
30440- return atomic_read(&dev_priv->vbl_received);
30441+ return atomic_read_unchecked(&dev_priv->vbl_received);
30442 }
30443
30444
30445@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30446 /* VBLANK interrupt */
30447 if (status & MGA_VLINEPEN) {
30448 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
30449- atomic_inc(&dev_priv->vbl_received);
30450+ atomic_inc_unchecked(&dev_priv->vbl_received);
30451 drm_handle_vblank(dev, 0);
30452 handled = 1;
30453 }
30454@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30455 if ((prim_start & ~0x03) != (prim_end & ~0x03))
30456 MGA_WRITE(MGA_PRIMEND, prim_end);
30457
30458- atomic_inc(&dev_priv->last_fence_retired);
30459+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
30460 DRM_WAKEUP(&dev_priv->fence_queue);
30461 handled = 1;
30462 }
30463@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
30464 * using fences.
30465 */
30466 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
30467- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
30468+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
30469 - *sequence) <= (1 << 23)));
30470
30471 *sequence = cur_fence;
30472diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
30473index e5cbead..6c354a3 100644
30474--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
30475+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
30476@@ -199,7 +199,7 @@ struct methods {
30477 const char desc[8];
30478 void (*loadbios)(struct drm_device *, uint8_t *);
30479 const bool rw;
30480-};
30481+} __do_const;
30482
30483 static struct methods shadow_methods[] = {
30484 { "PRAMIN", load_vbios_pramin, true },
30485@@ -5290,7 +5290,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
30486 struct bit_table {
30487 const char id;
30488 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
30489-};
30490+} __no_const;
30491
30492 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
30493
30494diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
30495index b827098..c31a797 100644
30496--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
30497+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
30498@@ -242,7 +242,7 @@ struct nouveau_channel {
30499 struct list_head pending;
30500 uint32_t sequence;
30501 uint32_t sequence_ack;
30502- atomic_t last_sequence_irq;
30503+ atomic_unchecked_t last_sequence_irq;
30504 struct nouveau_vma vma;
30505 } fence;
30506
30507@@ -323,7 +323,7 @@ struct nouveau_exec_engine {
30508 u32 handle, u16 class);
30509 void (*set_tile_region)(struct drm_device *dev, int i);
30510 void (*tlb_flush)(struct drm_device *, int engine);
30511-};
30512+} __no_const;
30513
30514 struct nouveau_instmem_engine {
30515 void *priv;
30516@@ -345,13 +345,13 @@ struct nouveau_instmem_engine {
30517 struct nouveau_mc_engine {
30518 int (*init)(struct drm_device *dev);
30519 void (*takedown)(struct drm_device *dev);
30520-};
30521+} __no_const;
30522
30523 struct nouveau_timer_engine {
30524 int (*init)(struct drm_device *dev);
30525 void (*takedown)(struct drm_device *dev);
30526 uint64_t (*read)(struct drm_device *dev);
30527-};
30528+} __no_const;
30529
30530 struct nouveau_fb_engine {
30531 int num_tiles;
30532@@ -566,7 +566,7 @@ struct nouveau_vram_engine {
30533 void (*put)(struct drm_device *, struct nouveau_mem **);
30534
30535 bool (*flags_valid)(struct drm_device *, u32 tile_flags);
30536-};
30537+} __no_const;
30538
30539 struct nouveau_engine {
30540 struct nouveau_instmem_engine instmem;
30541@@ -714,7 +714,7 @@ struct drm_nouveau_private {
30542 struct drm_global_reference mem_global_ref;
30543 struct ttm_bo_global_ref bo_global_ref;
30544 struct ttm_bo_device bdev;
30545- atomic_t validate_sequence;
30546+ atomic_unchecked_t validate_sequence;
30547 } ttm;
30548
30549 struct {
30550diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
30551index 2f6daae..c9d7b9e 100644
30552--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
30553+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
30554@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_channel *chan)
30555 if (USE_REFCNT(dev))
30556 sequence = nvchan_rd32(chan, 0x48);
30557 else
30558- sequence = atomic_read(&chan->fence.last_sequence_irq);
30559+ sequence = atomic_read_unchecked(&chan->fence.last_sequence_irq);
30560
30561 if (chan->fence.sequence_ack == sequence)
30562 goto out;
30563@@ -539,7 +539,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)
30564 return ret;
30565 }
30566
30567- atomic_set(&chan->fence.last_sequence_irq, 0);
30568+ atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
30569 return 0;
30570 }
30571
30572diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
30573index 7ce3fde..cb3ea04 100644
30574--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
30575+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
30576@@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
30577 int trycnt = 0;
30578 int ret, i;
30579
30580- sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
30581+ sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence);
30582 retry:
30583 if (++trycnt > 100000) {
30584 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
30585diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
30586index f80c5e0..936baa7 100644
30587--- a/drivers/gpu/drm/nouveau/nouveau_state.c
30588+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
30589@@ -543,7 +543,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
30590 bool can_switch;
30591
30592 spin_lock(&dev->count_lock);
30593- can_switch = (dev->open_count == 0);
30594+ can_switch = (local_read(&dev->open_count) == 0);
30595 spin_unlock(&dev->count_lock);
30596 return can_switch;
30597 }
30598diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
30599index dbdea8e..cd6eeeb 100644
30600--- a/drivers/gpu/drm/nouveau/nv04_graph.c
30601+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
30602@@ -554,7 +554,7 @@ static int
30603 nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
30604 u32 class, u32 mthd, u32 data)
30605 {
30606- atomic_set(&chan->fence.last_sequence_irq, data);
30607+ atomic_set_unchecked(&chan->fence.last_sequence_irq, data);
30608 return 0;
30609 }
30610
30611diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
30612index bcac90b..53bfc76 100644
30613--- a/drivers/gpu/drm/r128/r128_cce.c
30614+++ b/drivers/gpu/drm/r128/r128_cce.c
30615@@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
30616
30617 /* GH: Simple idle check.
30618 */
30619- atomic_set(&dev_priv->idle_count, 0);
30620+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30621
30622 /* We don't support anything other than bus-mastering ring mode,
30623 * but the ring can be in either AGP or PCI space for the ring
30624diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
30625index 930c71b..499aded 100644
30626--- a/drivers/gpu/drm/r128/r128_drv.h
30627+++ b/drivers/gpu/drm/r128/r128_drv.h
30628@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
30629 int is_pci;
30630 unsigned long cce_buffers_offset;
30631
30632- atomic_t idle_count;
30633+ atomic_unchecked_t idle_count;
30634
30635 int page_flipping;
30636 int current_page;
30637 u32 crtc_offset;
30638 u32 crtc_offset_cntl;
30639
30640- atomic_t vbl_received;
30641+ atomic_unchecked_t vbl_received;
30642
30643 u32 color_fmt;
30644 unsigned int front_offset;
30645diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
30646index 429d5a0..7e899ed 100644
30647--- a/drivers/gpu/drm/r128/r128_irq.c
30648+++ b/drivers/gpu/drm/r128/r128_irq.c
30649@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
30650 if (crtc != 0)
30651 return 0;
30652
30653- return atomic_read(&dev_priv->vbl_received);
30654+ return atomic_read_unchecked(&dev_priv->vbl_received);
30655 }
30656
30657 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30658@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30659 /* VBLANK interrupt */
30660 if (status & R128_CRTC_VBLANK_INT) {
30661 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
30662- atomic_inc(&dev_priv->vbl_received);
30663+ atomic_inc_unchecked(&dev_priv->vbl_received);
30664 drm_handle_vblank(dev, 0);
30665 return IRQ_HANDLED;
30666 }
30667diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
30668index a9e33ce..09edd4b 100644
30669--- a/drivers/gpu/drm/r128/r128_state.c
30670+++ b/drivers/gpu/drm/r128/r128_state.c
30671@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
30672
30673 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
30674 {
30675- if (atomic_read(&dev_priv->idle_count) == 0)
30676+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
30677 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
30678 else
30679- atomic_set(&dev_priv->idle_count, 0);
30680+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30681 }
30682
30683 #endif
30684diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
30685index 5a82b6b..9e69c73 100644
30686--- a/drivers/gpu/drm/radeon/mkregtable.c
30687+++ b/drivers/gpu/drm/radeon/mkregtable.c
30688@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
30689 regex_t mask_rex;
30690 regmatch_t match[4];
30691 char buf[1024];
30692- size_t end;
30693+ long end;
30694 int len;
30695 int done = 0;
30696 int r;
30697 unsigned o;
30698 struct offset *offset;
30699 char last_reg_s[10];
30700- int last_reg;
30701+ unsigned long last_reg;
30702
30703 if (regcomp
30704 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
30705diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
30706index 1668ec1..30ebdab 100644
30707--- a/drivers/gpu/drm/radeon/radeon.h
30708+++ b/drivers/gpu/drm/radeon/radeon.h
30709@@ -250,7 +250,7 @@ struct radeon_fence_driver {
30710 uint32_t scratch_reg;
30711 uint64_t gpu_addr;
30712 volatile uint32_t *cpu_addr;
30713- atomic_t seq;
30714+ atomic_unchecked_t seq;
30715 uint32_t last_seq;
30716 unsigned long last_jiffies;
30717 unsigned long last_timeout;
30718@@ -752,7 +752,7 @@ struct r600_blit_cp_primitives {
30719 int x2, int y2);
30720 void (*draw_auto)(struct radeon_device *rdev);
30721 void (*set_default_state)(struct radeon_device *rdev);
30722-};
30723+} __no_const;
30724
30725 struct r600_blit {
30726 struct mutex mutex;
30727@@ -1201,7 +1201,7 @@ struct radeon_asic {
30728 void (*pre_page_flip)(struct radeon_device *rdev, int crtc);
30729 u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
30730 void (*post_page_flip)(struct radeon_device *rdev, int crtc);
30731-};
30732+} __no_const;
30733
30734 /*
30735 * Asic structures
30736diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
30737index 49f7cb7..2fcb48f 100644
30738--- a/drivers/gpu/drm/radeon/radeon_device.c
30739+++ b/drivers/gpu/drm/radeon/radeon_device.c
30740@@ -687,7 +687,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
30741 bool can_switch;
30742
30743 spin_lock(&dev->count_lock);
30744- can_switch = (dev->open_count == 0);
30745+ can_switch = (local_read(&dev->open_count) == 0);
30746 spin_unlock(&dev->count_lock);
30747 return can_switch;
30748 }
30749diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
30750index a1b59ca..86f2d44 100644
30751--- a/drivers/gpu/drm/radeon/radeon_drv.h
30752+++ b/drivers/gpu/drm/radeon/radeon_drv.h
30753@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
30754
30755 /* SW interrupt */
30756 wait_queue_head_t swi_queue;
30757- atomic_t swi_emitted;
30758+ atomic_unchecked_t swi_emitted;
30759 int vblank_crtc;
30760 uint32_t irq_enable_reg;
30761 uint32_t r500_disp_irq_reg;
30762diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
30763index 4bd36a3..e66fe9c 100644
30764--- a/drivers/gpu/drm/radeon/radeon_fence.c
30765+++ b/drivers/gpu/drm/radeon/radeon_fence.c
30766@@ -70,7 +70,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
30767 write_unlock_irqrestore(&rdev->fence_lock, irq_flags);
30768 return 0;
30769 }
30770- fence->seq = atomic_add_return(1, &rdev->fence_drv[fence->ring].seq);
30771+ fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv[fence->ring].seq);
30772 if (!rdev->ring[fence->ring].ready)
30773 /* FIXME: cp is not running assume everythings is done right
30774 * away
30775@@ -405,7 +405,7 @@ int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring)
30776 }
30777 rdev->fence_drv[ring].cpu_addr = &rdev->wb.wb[index/4];
30778 rdev->fence_drv[ring].gpu_addr = rdev->wb.gpu_addr + index;
30779- radeon_fence_write(rdev, atomic_read(&rdev->fence_drv[ring].seq), ring);
30780+ radeon_fence_write(rdev, atomic_read_unchecked(&rdev->fence_drv[ring].seq), ring);
30781 rdev->fence_drv[ring].initialized = true;
30782 DRM_INFO("fence driver on ring %d use gpu addr 0x%08Lx and cpu addr 0x%p\n",
30783 ring, rdev->fence_drv[ring].gpu_addr, rdev->fence_drv[ring].cpu_addr);
30784@@ -418,7 +418,7 @@ static void radeon_fence_driver_init_ring(struct radeon_device *rdev, int ring)
30785 rdev->fence_drv[ring].scratch_reg = -1;
30786 rdev->fence_drv[ring].cpu_addr = NULL;
30787 rdev->fence_drv[ring].gpu_addr = 0;
30788- atomic_set(&rdev->fence_drv[ring].seq, 0);
30789+ atomic_set_unchecked(&rdev->fence_drv[ring].seq, 0);
30790 INIT_LIST_HEAD(&rdev->fence_drv[ring].created);
30791 INIT_LIST_HEAD(&rdev->fence_drv[ring].emitted);
30792 INIT_LIST_HEAD(&rdev->fence_drv[ring].signaled);
30793diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
30794index 48b7cea..342236f 100644
30795--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
30796+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
30797@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
30798 request = compat_alloc_user_space(sizeof(*request));
30799 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
30800 || __put_user(req32.param, &request->param)
30801- || __put_user((void __user *)(unsigned long)req32.value,
30802+ || __put_user((unsigned long)req32.value,
30803 &request->value))
30804 return -EFAULT;
30805
30806diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
30807index 00da384..32f972d 100644
30808--- a/drivers/gpu/drm/radeon/radeon_irq.c
30809+++ b/drivers/gpu/drm/radeon/radeon_irq.c
30810@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
30811 unsigned int ret;
30812 RING_LOCALS;
30813
30814- atomic_inc(&dev_priv->swi_emitted);
30815- ret = atomic_read(&dev_priv->swi_emitted);
30816+ atomic_inc_unchecked(&dev_priv->swi_emitted);
30817+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
30818
30819 BEGIN_RING(4);
30820 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
30821@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
30822 drm_radeon_private_t *dev_priv =
30823 (drm_radeon_private_t *) dev->dev_private;
30824
30825- atomic_set(&dev_priv->swi_emitted, 0);
30826+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
30827 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
30828
30829 dev->max_vblank_count = 0x001fffff;
30830diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
30831index e8422ae..d22d4a8 100644
30832--- a/drivers/gpu/drm/radeon/radeon_state.c
30833+++ b/drivers/gpu/drm/radeon/radeon_state.c
30834@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
30835 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
30836 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
30837
30838- if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
30839+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
30840 sarea_priv->nbox * sizeof(depth_boxes[0])))
30841 return -EFAULT;
30842
30843@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
30844 {
30845 drm_radeon_private_t *dev_priv = dev->dev_private;
30846 drm_radeon_getparam_t *param = data;
30847- int value;
30848+ int value = 0;
30849
30850 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
30851
30852diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
30853index c421e77..e6bf2e8 100644
30854--- a/drivers/gpu/drm/radeon/radeon_ttm.c
30855+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
30856@@ -842,8 +842,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
30857 }
30858 if (unlikely(ttm_vm_ops == NULL)) {
30859 ttm_vm_ops = vma->vm_ops;
30860- radeon_ttm_vm_ops = *ttm_vm_ops;
30861- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
30862+ pax_open_kernel();
30863+ memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
30864+ *(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
30865+ pax_close_kernel();
30866 }
30867 vma->vm_ops = &radeon_ttm_vm_ops;
30868 return 0;
30869diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
30870index f68dff2..8df955c 100644
30871--- a/drivers/gpu/drm/radeon/rs690.c
30872+++ b/drivers/gpu/drm/radeon/rs690.c
30873@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
30874 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
30875 rdev->pm.sideport_bandwidth.full)
30876 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
30877- read_delay_latency.full = dfixed_const(370 * 800 * 1000);
30878+ read_delay_latency.full = dfixed_const(800 * 1000);
30879 read_delay_latency.full = dfixed_div(read_delay_latency,
30880 rdev->pm.igp_sideport_mclk);
30881+ a.full = dfixed_const(370);
30882+ read_delay_latency.full = dfixed_mul(read_delay_latency, a);
30883 } else {
30884 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
30885 rdev->pm.k8_bandwidth.full)
30886diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
30887index 499debd..66fce72 100644
30888--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
30889+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
30890@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages(void)
30891 static int ttm_pool_mm_shrink(struct shrinker *shrink,
30892 struct shrink_control *sc)
30893 {
30894- static atomic_t start_pool = ATOMIC_INIT(0);
30895+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
30896 unsigned i;
30897- unsigned pool_offset = atomic_add_return(1, &start_pool);
30898+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
30899 struct ttm_page_pool *pool;
30900 int shrink_pages = sc->nr_to_scan;
30901
30902diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
30903index 88edacc..1e5412b 100644
30904--- a/drivers/gpu/drm/via/via_drv.h
30905+++ b/drivers/gpu/drm/via/via_drv.h
30906@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
30907 typedef uint32_t maskarray_t[5];
30908
30909 typedef struct drm_via_irq {
30910- atomic_t irq_received;
30911+ atomic_unchecked_t irq_received;
30912 uint32_t pending_mask;
30913 uint32_t enable_mask;
30914 wait_queue_head_t irq_queue;
30915@@ -75,7 +75,7 @@ typedef struct drm_via_private {
30916 struct timeval last_vblank;
30917 int last_vblank_valid;
30918 unsigned usec_per_vblank;
30919- atomic_t vbl_received;
30920+ atomic_unchecked_t vbl_received;
30921 drm_via_state_t hc_state;
30922 char pci_buf[VIA_PCI_BUF_SIZE];
30923 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
30924diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
30925index d391f48..10c8ca3 100644
30926--- a/drivers/gpu/drm/via/via_irq.c
30927+++ b/drivers/gpu/drm/via/via_irq.c
30928@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
30929 if (crtc != 0)
30930 return 0;
30931
30932- return atomic_read(&dev_priv->vbl_received);
30933+ return atomic_read_unchecked(&dev_priv->vbl_received);
30934 }
30935
30936 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
30937@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
30938
30939 status = VIA_READ(VIA_REG_INTERRUPT);
30940 if (status & VIA_IRQ_VBLANK_PENDING) {
30941- atomic_inc(&dev_priv->vbl_received);
30942- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
30943+ atomic_inc_unchecked(&dev_priv->vbl_received);
30944+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
30945 do_gettimeofday(&cur_vblank);
30946 if (dev_priv->last_vblank_valid) {
30947 dev_priv->usec_per_vblank =
30948@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
30949 dev_priv->last_vblank = cur_vblank;
30950 dev_priv->last_vblank_valid = 1;
30951 }
30952- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
30953+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
30954 DRM_DEBUG("US per vblank is: %u\n",
30955 dev_priv->usec_per_vblank);
30956 }
30957@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
30958
30959 for (i = 0; i < dev_priv->num_irqs; ++i) {
30960 if (status & cur_irq->pending_mask) {
30961- atomic_inc(&cur_irq->irq_received);
30962+ atomic_inc_unchecked(&cur_irq->irq_received);
30963 DRM_WAKEUP(&cur_irq->irq_queue);
30964 handled = 1;
30965 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
30966@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
30967 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
30968 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
30969 masks[irq][4]));
30970- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
30971+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
30972 } else {
30973 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
30974 (((cur_irq_sequence =
30975- atomic_read(&cur_irq->irq_received)) -
30976+ atomic_read_unchecked(&cur_irq->irq_received)) -
30977 *sequence) <= (1 << 23)));
30978 }
30979 *sequence = cur_irq_sequence;
30980@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
30981 }
30982
30983 for (i = 0; i < dev_priv->num_irqs; ++i) {
30984- atomic_set(&cur_irq->irq_received, 0);
30985+ atomic_set_unchecked(&cur_irq->irq_received, 0);
30986 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
30987 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
30988 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
30989@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
30990 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
30991 case VIA_IRQ_RELATIVE:
30992 irqwait->request.sequence +=
30993- atomic_read(&cur_irq->irq_received);
30994+ atomic_read_unchecked(&cur_irq->irq_received);
30995 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
30996 case VIA_IRQ_ABSOLUTE:
30997 break;
30998diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
30999index dc27970..f18b008 100644
31000--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31001+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31002@@ -260,7 +260,7 @@ struct vmw_private {
31003 * Fencing and IRQs.
31004 */
31005
31006- atomic_t marker_seq;
31007+ atomic_unchecked_t marker_seq;
31008 wait_queue_head_t fence_queue;
31009 wait_queue_head_t fifo_queue;
31010 int fence_queue_waiters; /* Protected by hw_mutex */
31011diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31012index a0c2f12..68ae6cb 100644
31013--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31014+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31015@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
31016 (unsigned int) min,
31017 (unsigned int) fifo->capabilities);
31018
31019- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31020+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31021 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
31022 vmw_marker_queue_init(&fifo->marker_queue);
31023 return vmw_fifo_send_fence(dev_priv, &dummy);
31024@@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
31025 if (reserveable)
31026 iowrite32(bytes, fifo_mem +
31027 SVGA_FIFO_RESERVED);
31028- return fifo_mem + (next_cmd >> 2);
31029+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
31030 } else {
31031 need_bounce = true;
31032 }
31033@@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31034
31035 fm = vmw_fifo_reserve(dev_priv, bytes);
31036 if (unlikely(fm == NULL)) {
31037- *seqno = atomic_read(&dev_priv->marker_seq);
31038+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31039 ret = -ENOMEM;
31040 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
31041 false, 3*HZ);
31042@@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31043 }
31044
31045 do {
31046- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
31047+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
31048 } while (*seqno == 0);
31049
31050 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
31051diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31052index cabc95f..14b3d77 100644
31053--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31054+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31055@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
31056 * emitted. Then the fence is stale and signaled.
31057 */
31058
31059- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
31060+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
31061 > VMW_FENCE_WRAP);
31062
31063 return ret;
31064@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
31065
31066 if (fifo_idle)
31067 down_read(&fifo_state->rwsem);
31068- signal_seq = atomic_read(&dev_priv->marker_seq);
31069+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
31070 ret = 0;
31071
31072 for (;;) {
31073diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31074index 8a8725c..afed796 100644
31075--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31076+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31077@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
31078 while (!vmw_lag_lt(queue, us)) {
31079 spin_lock(&queue->lock);
31080 if (list_empty(&queue->head))
31081- seqno = atomic_read(&dev_priv->marker_seq);
31082+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31083 else {
31084 marker = list_first_entry(&queue->head,
31085 struct vmw_marker, head);
31086diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
31087index 75dbe34..f9204a8 100644
31088--- a/drivers/hid/hid-core.c
31089+++ b/drivers/hid/hid-core.c
31090@@ -2021,7 +2021,7 @@ static bool hid_ignore(struct hid_device *hdev)
31091
31092 int hid_add_device(struct hid_device *hdev)
31093 {
31094- static atomic_t id = ATOMIC_INIT(0);
31095+ static atomic_unchecked_t id = ATOMIC_INIT(0);
31096 int ret;
31097
31098 if (WARN_ON(hdev->status & HID_STAT_ADDED))
31099@@ -2036,7 +2036,7 @@ int hid_add_device(struct hid_device *hdev)
31100 /* XXX hack, any other cleaner solution after the driver core
31101 * is converted to allow more than 20 bytes as the device name? */
31102 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
31103- hdev->vendor, hdev->product, atomic_inc_return(&id));
31104+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
31105
31106 hid_debug_register(hdev, dev_name(&hdev->dev));
31107 ret = device_add(&hdev->dev);
31108diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
31109index b1ec0e2..c295a61 100644
31110--- a/drivers/hid/usbhid/hiddev.c
31111+++ b/drivers/hid/usbhid/hiddev.c
31112@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
31113 break;
31114
31115 case HIDIOCAPPLICATION:
31116- if (arg < 0 || arg >= hid->maxapplication)
31117+ if (arg >= hid->maxapplication)
31118 break;
31119
31120 for (i = 0; i < hid->maxcollection; i++)
31121diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
31122index 4065374..10ed7dc 100644
31123--- a/drivers/hv/channel.c
31124+++ b/drivers/hv/channel.c
31125@@ -400,8 +400,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
31126 int ret = 0;
31127 int t;
31128
31129- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
31130- atomic_inc(&vmbus_connection.next_gpadl_handle);
31131+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
31132+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
31133
31134 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
31135 if (ret)
31136diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
31137index 12aa97f..c0679f7 100644
31138--- a/drivers/hv/hv.c
31139+++ b/drivers/hv/hv.c
31140@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
31141 u64 output_address = (output) ? virt_to_phys(output) : 0;
31142 u32 output_address_hi = output_address >> 32;
31143 u32 output_address_lo = output_address & 0xFFFFFFFF;
31144- void *hypercall_page = hv_context.hypercall_page;
31145+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
31146
31147 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
31148 "=a"(hv_status_lo) : "d" (control_hi),
31149diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
31150index 6d7d286..92b0873 100644
31151--- a/drivers/hv/hyperv_vmbus.h
31152+++ b/drivers/hv/hyperv_vmbus.h
31153@@ -556,7 +556,7 @@ enum vmbus_connect_state {
31154 struct vmbus_connection {
31155 enum vmbus_connect_state conn_state;
31156
31157- atomic_t next_gpadl_handle;
31158+ atomic_unchecked_t next_gpadl_handle;
31159
31160 /*
31161 * Represents channel interrupts. Each bit position represents a
31162diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
31163index a220e57..428f54d 100644
31164--- a/drivers/hv/vmbus_drv.c
31165+++ b/drivers/hv/vmbus_drv.c
31166@@ -663,10 +663,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
31167 {
31168 int ret = 0;
31169
31170- static atomic_t device_num = ATOMIC_INIT(0);
31171+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
31172
31173 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
31174- atomic_inc_return(&device_num));
31175+ atomic_inc_return_unchecked(&device_num));
31176
31177 child_device_obj->device.bus = &hv_bus;
31178 child_device_obj->device.parent = &hv_acpi_dev->dev;
31179diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
31180index 554f046..f8b4729 100644
31181--- a/drivers/hwmon/acpi_power_meter.c
31182+++ b/drivers/hwmon/acpi_power_meter.c
31183@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
31184 return res;
31185
31186 temp /= 1000;
31187- if (temp < 0)
31188- return -EINVAL;
31189
31190 mutex_lock(&resource->lock);
31191 resource->trip[attr->index - 7] = temp;
31192diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
31193index 91fdd1f..b66a686 100644
31194--- a/drivers/hwmon/sht15.c
31195+++ b/drivers/hwmon/sht15.c
31196@@ -166,7 +166,7 @@ struct sht15_data {
31197 int supply_uV;
31198 bool supply_uV_valid;
31199 struct work_struct update_supply_work;
31200- atomic_t interrupt_handled;
31201+ atomic_unchecked_t interrupt_handled;
31202 };
31203
31204 /**
31205@@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
31206 return ret;
31207
31208 gpio_direction_input(data->pdata->gpio_data);
31209- atomic_set(&data->interrupt_handled, 0);
31210+ atomic_set_unchecked(&data->interrupt_handled, 0);
31211
31212 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31213 if (gpio_get_value(data->pdata->gpio_data) == 0) {
31214 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
31215 /* Only relevant if the interrupt hasn't occurred. */
31216- if (!atomic_read(&data->interrupt_handled))
31217+ if (!atomic_read_unchecked(&data->interrupt_handled))
31218 schedule_work(&data->read_work);
31219 }
31220 ret = wait_event_timeout(data->wait_queue,
31221@@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
31222
31223 /* First disable the interrupt */
31224 disable_irq_nosync(irq);
31225- atomic_inc(&data->interrupt_handled);
31226+ atomic_inc_unchecked(&data->interrupt_handled);
31227 /* Then schedule a reading work struct */
31228 if (data->state != SHT15_READING_NOTHING)
31229 schedule_work(&data->read_work);
31230@@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
31231 * If not, then start the interrupt again - care here as could
31232 * have gone low in meantime so verify it hasn't!
31233 */
31234- atomic_set(&data->interrupt_handled, 0);
31235+ atomic_set_unchecked(&data->interrupt_handled, 0);
31236 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31237 /* If still not occurred or another handler has been scheduled */
31238 if (gpio_get_value(data->pdata->gpio_data)
31239- || atomic_read(&data->interrupt_handled))
31240+ || atomic_read_unchecked(&data->interrupt_handled))
31241 return;
31242 }
31243
31244diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
31245index 378fcb5..5e91fa8 100644
31246--- a/drivers/i2c/busses/i2c-amd756-s4882.c
31247+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
31248@@ -43,7 +43,7 @@
31249 extern struct i2c_adapter amd756_smbus;
31250
31251 static struct i2c_adapter *s4882_adapter;
31252-static struct i2c_algorithm *s4882_algo;
31253+static i2c_algorithm_no_const *s4882_algo;
31254
31255 /* Wrapper access functions for multiplexed SMBus */
31256 static DEFINE_MUTEX(amd756_lock);
31257diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
31258index 29015eb..af2d8e9 100644
31259--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
31260+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
31261@@ -41,7 +41,7 @@
31262 extern struct i2c_adapter *nforce2_smbus;
31263
31264 static struct i2c_adapter *s4985_adapter;
31265-static struct i2c_algorithm *s4985_algo;
31266+static i2c_algorithm_no_const *s4985_algo;
31267
31268 /* Wrapper access functions for multiplexed SMBus */
31269 static DEFINE_MUTEX(nforce2_lock);
31270diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
31271index d7a4833..7fae376 100644
31272--- a/drivers/i2c/i2c-mux.c
31273+++ b/drivers/i2c/i2c-mux.c
31274@@ -28,7 +28,7 @@
31275 /* multiplexer per channel data */
31276 struct i2c_mux_priv {
31277 struct i2c_adapter adap;
31278- struct i2c_algorithm algo;
31279+ i2c_algorithm_no_const algo;
31280
31281 struct i2c_adapter *parent;
31282 void *mux_dev; /* the mux chip/device */
31283diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
31284index 57d00ca..0145194 100644
31285--- a/drivers/ide/aec62xx.c
31286+++ b/drivers/ide/aec62xx.c
31287@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
31288 .cable_detect = atp86x_cable_detect,
31289 };
31290
31291-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
31292+static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
31293 { /* 0: AEC6210 */
31294 .name = DRV_NAME,
31295 .init_chipset = init_chipset_aec62xx,
31296diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
31297index 2c8016a..911a27c 100644
31298--- a/drivers/ide/alim15x3.c
31299+++ b/drivers/ide/alim15x3.c
31300@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
31301 .dma_sff_read_status = ide_dma_sff_read_status,
31302 };
31303
31304-static const struct ide_port_info ali15x3_chipset __devinitdata = {
31305+static const struct ide_port_info ali15x3_chipset __devinitconst = {
31306 .name = DRV_NAME,
31307 .init_chipset = init_chipset_ali15x3,
31308 .init_hwif = init_hwif_ali15x3,
31309diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
31310index 3747b25..56fc995 100644
31311--- a/drivers/ide/amd74xx.c
31312+++ b/drivers/ide/amd74xx.c
31313@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
31314 .udma_mask = udma, \
31315 }
31316
31317-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
31318+static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
31319 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
31320 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
31321 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
31322diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
31323index 15f0ead..cb43480 100644
31324--- a/drivers/ide/atiixp.c
31325+++ b/drivers/ide/atiixp.c
31326@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
31327 .cable_detect = atiixp_cable_detect,
31328 };
31329
31330-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
31331+static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
31332 { /* 0: IXP200/300/400/700 */
31333 .name = DRV_NAME,
31334 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
31335diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
31336index 5f80312..d1fc438 100644
31337--- a/drivers/ide/cmd64x.c
31338+++ b/drivers/ide/cmd64x.c
31339@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
31340 .dma_sff_read_status = ide_dma_sff_read_status,
31341 };
31342
31343-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
31344+static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
31345 { /* 0: CMD643 */
31346 .name = DRV_NAME,
31347 .init_chipset = init_chipset_cmd64x,
31348diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
31349index 2c1e5f7..1444762 100644
31350--- a/drivers/ide/cs5520.c
31351+++ b/drivers/ide/cs5520.c
31352@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
31353 .set_dma_mode = cs5520_set_dma_mode,
31354 };
31355
31356-static const struct ide_port_info cyrix_chipset __devinitdata = {
31357+static const struct ide_port_info cyrix_chipset __devinitconst = {
31358 .name = DRV_NAME,
31359 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
31360 .port_ops = &cs5520_port_ops,
31361diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
31362index 4dc4eb9..49b40ad 100644
31363--- a/drivers/ide/cs5530.c
31364+++ b/drivers/ide/cs5530.c
31365@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
31366 .udma_filter = cs5530_udma_filter,
31367 };
31368
31369-static const struct ide_port_info cs5530_chipset __devinitdata = {
31370+static const struct ide_port_info cs5530_chipset __devinitconst = {
31371 .name = DRV_NAME,
31372 .init_chipset = init_chipset_cs5530,
31373 .init_hwif = init_hwif_cs5530,
31374diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
31375index 5059faf..18d4c85 100644
31376--- a/drivers/ide/cs5535.c
31377+++ b/drivers/ide/cs5535.c
31378@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
31379 .cable_detect = cs5535_cable_detect,
31380 };
31381
31382-static const struct ide_port_info cs5535_chipset __devinitdata = {
31383+static const struct ide_port_info cs5535_chipset __devinitconst = {
31384 .name = DRV_NAME,
31385 .port_ops = &cs5535_port_ops,
31386 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
31387diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
31388index 847553f..3ffb49d 100644
31389--- a/drivers/ide/cy82c693.c
31390+++ b/drivers/ide/cy82c693.c
31391@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
31392 .set_dma_mode = cy82c693_set_dma_mode,
31393 };
31394
31395-static const struct ide_port_info cy82c693_chipset __devinitdata = {
31396+static const struct ide_port_info cy82c693_chipset __devinitconst = {
31397 .name = DRV_NAME,
31398 .init_iops = init_iops_cy82c693,
31399 .port_ops = &cy82c693_port_ops,
31400diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
31401index 58c51cd..4aec3b8 100644
31402--- a/drivers/ide/hpt366.c
31403+++ b/drivers/ide/hpt366.c
31404@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
31405 }
31406 };
31407
31408-static const struct hpt_info hpt36x __devinitdata = {
31409+static const struct hpt_info hpt36x __devinitconst = {
31410 .chip_name = "HPT36x",
31411 .chip_type = HPT36x,
31412 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
31413@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
31414 .timings = &hpt36x_timings
31415 };
31416
31417-static const struct hpt_info hpt370 __devinitdata = {
31418+static const struct hpt_info hpt370 __devinitconst = {
31419 .chip_name = "HPT370",
31420 .chip_type = HPT370,
31421 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31422@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
31423 .timings = &hpt37x_timings
31424 };
31425
31426-static const struct hpt_info hpt370a __devinitdata = {
31427+static const struct hpt_info hpt370a __devinitconst = {
31428 .chip_name = "HPT370A",
31429 .chip_type = HPT370A,
31430 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31431@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
31432 .timings = &hpt37x_timings
31433 };
31434
31435-static const struct hpt_info hpt374 __devinitdata = {
31436+static const struct hpt_info hpt374 __devinitconst = {
31437 .chip_name = "HPT374",
31438 .chip_type = HPT374,
31439 .udma_mask = ATA_UDMA5,
31440@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
31441 .timings = &hpt37x_timings
31442 };
31443
31444-static const struct hpt_info hpt372 __devinitdata = {
31445+static const struct hpt_info hpt372 __devinitconst = {
31446 .chip_name = "HPT372",
31447 .chip_type = HPT372,
31448 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31449@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
31450 .timings = &hpt37x_timings
31451 };
31452
31453-static const struct hpt_info hpt372a __devinitdata = {
31454+static const struct hpt_info hpt372a __devinitconst = {
31455 .chip_name = "HPT372A",
31456 .chip_type = HPT372A,
31457 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31458@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
31459 .timings = &hpt37x_timings
31460 };
31461
31462-static const struct hpt_info hpt302 __devinitdata = {
31463+static const struct hpt_info hpt302 __devinitconst = {
31464 .chip_name = "HPT302",
31465 .chip_type = HPT302,
31466 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31467@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
31468 .timings = &hpt37x_timings
31469 };
31470
31471-static const struct hpt_info hpt371 __devinitdata = {
31472+static const struct hpt_info hpt371 __devinitconst = {
31473 .chip_name = "HPT371",
31474 .chip_type = HPT371,
31475 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31476@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
31477 .timings = &hpt37x_timings
31478 };
31479
31480-static const struct hpt_info hpt372n __devinitdata = {
31481+static const struct hpt_info hpt372n __devinitconst = {
31482 .chip_name = "HPT372N",
31483 .chip_type = HPT372N,
31484 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31485@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
31486 .timings = &hpt37x_timings
31487 };
31488
31489-static const struct hpt_info hpt302n __devinitdata = {
31490+static const struct hpt_info hpt302n __devinitconst = {
31491 .chip_name = "HPT302N",
31492 .chip_type = HPT302N,
31493 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31494@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
31495 .timings = &hpt37x_timings
31496 };
31497
31498-static const struct hpt_info hpt371n __devinitdata = {
31499+static const struct hpt_info hpt371n __devinitconst = {
31500 .chip_name = "HPT371N",
31501 .chip_type = HPT371N,
31502 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31503@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
31504 .dma_sff_read_status = ide_dma_sff_read_status,
31505 };
31506
31507-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
31508+static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
31509 { /* 0: HPT36x */
31510 .name = DRV_NAME,
31511 .init_chipset = init_chipset_hpt366,
31512diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
31513index 8126824..55a2798 100644
31514--- a/drivers/ide/ide-cd.c
31515+++ b/drivers/ide/ide-cd.c
31516@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
31517 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
31518 if ((unsigned long)buf & alignment
31519 || blk_rq_bytes(rq) & q->dma_pad_mask
31520- || object_is_on_stack(buf))
31521+ || object_starts_on_stack(buf))
31522 drive->dma = 0;
31523 }
31524 }
31525diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
31526index 7f56b73..dab5b67 100644
31527--- a/drivers/ide/ide-pci-generic.c
31528+++ b/drivers/ide/ide-pci-generic.c
31529@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
31530 .udma_mask = ATA_UDMA6, \
31531 }
31532
31533-static const struct ide_port_info generic_chipsets[] __devinitdata = {
31534+static const struct ide_port_info generic_chipsets[] __devinitconst = {
31535 /* 0: Unknown */
31536 DECLARE_GENERIC_PCI_DEV(0),
31537
31538diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
31539index 560e66d..d5dd180 100644
31540--- a/drivers/ide/it8172.c
31541+++ b/drivers/ide/it8172.c
31542@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
31543 .set_dma_mode = it8172_set_dma_mode,
31544 };
31545
31546-static const struct ide_port_info it8172_port_info __devinitdata = {
31547+static const struct ide_port_info it8172_port_info __devinitconst = {
31548 .name = DRV_NAME,
31549 .port_ops = &it8172_port_ops,
31550 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
31551diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
31552index 46816ba..1847aeb 100644
31553--- a/drivers/ide/it8213.c
31554+++ b/drivers/ide/it8213.c
31555@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
31556 .cable_detect = it8213_cable_detect,
31557 };
31558
31559-static const struct ide_port_info it8213_chipset __devinitdata = {
31560+static const struct ide_port_info it8213_chipset __devinitconst = {
31561 .name = DRV_NAME,
31562 .enablebits = { {0x41, 0x80, 0x80} },
31563 .port_ops = &it8213_port_ops,
31564diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
31565index 2e3169f..c5611db 100644
31566--- a/drivers/ide/it821x.c
31567+++ b/drivers/ide/it821x.c
31568@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
31569 .cable_detect = it821x_cable_detect,
31570 };
31571
31572-static const struct ide_port_info it821x_chipset __devinitdata = {
31573+static const struct ide_port_info it821x_chipset __devinitconst = {
31574 .name = DRV_NAME,
31575 .init_chipset = init_chipset_it821x,
31576 .init_hwif = init_hwif_it821x,
31577diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
31578index 74c2c4a..efddd7d 100644
31579--- a/drivers/ide/jmicron.c
31580+++ b/drivers/ide/jmicron.c
31581@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
31582 .cable_detect = jmicron_cable_detect,
31583 };
31584
31585-static const struct ide_port_info jmicron_chipset __devinitdata = {
31586+static const struct ide_port_info jmicron_chipset __devinitconst = {
31587 .name = DRV_NAME,
31588 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
31589 .port_ops = &jmicron_port_ops,
31590diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
31591index 95327a2..73f78d8 100644
31592--- a/drivers/ide/ns87415.c
31593+++ b/drivers/ide/ns87415.c
31594@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
31595 .dma_sff_read_status = superio_dma_sff_read_status,
31596 };
31597
31598-static const struct ide_port_info ns87415_chipset __devinitdata = {
31599+static const struct ide_port_info ns87415_chipset __devinitconst = {
31600 .name = DRV_NAME,
31601 .init_hwif = init_hwif_ns87415,
31602 .tp_ops = &ns87415_tp_ops,
31603diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
31604index 1a53a4c..39edc66 100644
31605--- a/drivers/ide/opti621.c
31606+++ b/drivers/ide/opti621.c
31607@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
31608 .set_pio_mode = opti621_set_pio_mode,
31609 };
31610
31611-static const struct ide_port_info opti621_chipset __devinitdata = {
31612+static const struct ide_port_info opti621_chipset __devinitconst = {
31613 .name = DRV_NAME,
31614 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
31615 .port_ops = &opti621_port_ops,
31616diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
31617index 9546fe2..2e5ceb6 100644
31618--- a/drivers/ide/pdc202xx_new.c
31619+++ b/drivers/ide/pdc202xx_new.c
31620@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
31621 .udma_mask = udma, \
31622 }
31623
31624-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
31625+static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
31626 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
31627 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
31628 };
31629diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
31630index 3a35ec6..5634510 100644
31631--- a/drivers/ide/pdc202xx_old.c
31632+++ b/drivers/ide/pdc202xx_old.c
31633@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
31634 .max_sectors = sectors, \
31635 }
31636
31637-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
31638+static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
31639 { /* 0: PDC20246 */
31640 .name = DRV_NAME,
31641 .init_chipset = init_chipset_pdc202xx,
31642diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
31643index 1892e81..fe0fd60 100644
31644--- a/drivers/ide/piix.c
31645+++ b/drivers/ide/piix.c
31646@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
31647 .udma_mask = udma, \
31648 }
31649
31650-static const struct ide_port_info piix_pci_info[] __devinitdata = {
31651+static const struct ide_port_info piix_pci_info[] __devinitconst = {
31652 /* 0: MPIIX */
31653 { /*
31654 * MPIIX actually has only a single IDE channel mapped to
31655diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
31656index a6414a8..c04173e 100644
31657--- a/drivers/ide/rz1000.c
31658+++ b/drivers/ide/rz1000.c
31659@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
31660 }
31661 }
31662
31663-static const struct ide_port_info rz1000_chipset __devinitdata = {
31664+static const struct ide_port_info rz1000_chipset __devinitconst = {
31665 .name = DRV_NAME,
31666 .host_flags = IDE_HFLAG_NO_DMA,
31667 };
31668diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
31669index 356b9b5..d4758eb 100644
31670--- a/drivers/ide/sc1200.c
31671+++ b/drivers/ide/sc1200.c
31672@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
31673 .dma_sff_read_status = ide_dma_sff_read_status,
31674 };
31675
31676-static const struct ide_port_info sc1200_chipset __devinitdata = {
31677+static const struct ide_port_info sc1200_chipset __devinitconst = {
31678 .name = DRV_NAME,
31679 .port_ops = &sc1200_port_ops,
31680 .dma_ops = &sc1200_dma_ops,
31681diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
31682index b7f5b0c..9701038 100644
31683--- a/drivers/ide/scc_pata.c
31684+++ b/drivers/ide/scc_pata.c
31685@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
31686 .dma_sff_read_status = scc_dma_sff_read_status,
31687 };
31688
31689-static const struct ide_port_info scc_chipset __devinitdata = {
31690+static const struct ide_port_info scc_chipset __devinitconst = {
31691 .name = "sccIDE",
31692 .init_iops = init_iops_scc,
31693 .init_dma = scc_init_dma,
31694diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
31695index 35fb8da..24d72ef 100644
31696--- a/drivers/ide/serverworks.c
31697+++ b/drivers/ide/serverworks.c
31698@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
31699 .cable_detect = svwks_cable_detect,
31700 };
31701
31702-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
31703+static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
31704 { /* 0: OSB4 */
31705 .name = DRV_NAME,
31706 .init_chipset = init_chipset_svwks,
31707diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
31708index ddeda44..46f7e30 100644
31709--- a/drivers/ide/siimage.c
31710+++ b/drivers/ide/siimage.c
31711@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
31712 .udma_mask = ATA_UDMA6, \
31713 }
31714
31715-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
31716+static const struct ide_port_info siimage_chipsets[] __devinitconst = {
31717 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
31718 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
31719 };
31720diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
31721index 4a00225..09e61b4 100644
31722--- a/drivers/ide/sis5513.c
31723+++ b/drivers/ide/sis5513.c
31724@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
31725 .cable_detect = sis_cable_detect,
31726 };
31727
31728-static const struct ide_port_info sis5513_chipset __devinitdata = {
31729+static const struct ide_port_info sis5513_chipset __devinitconst = {
31730 .name = DRV_NAME,
31731 .init_chipset = init_chipset_sis5513,
31732 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
31733diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
31734index f21dc2a..d051cd2 100644
31735--- a/drivers/ide/sl82c105.c
31736+++ b/drivers/ide/sl82c105.c
31737@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
31738 .dma_sff_read_status = ide_dma_sff_read_status,
31739 };
31740
31741-static const struct ide_port_info sl82c105_chipset __devinitdata = {
31742+static const struct ide_port_info sl82c105_chipset __devinitconst = {
31743 .name = DRV_NAME,
31744 .init_chipset = init_chipset_sl82c105,
31745 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
31746diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
31747index 864ffe0..863a5e9 100644
31748--- a/drivers/ide/slc90e66.c
31749+++ b/drivers/ide/slc90e66.c
31750@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
31751 .cable_detect = slc90e66_cable_detect,
31752 };
31753
31754-static const struct ide_port_info slc90e66_chipset __devinitdata = {
31755+static const struct ide_port_info slc90e66_chipset __devinitconst = {
31756 .name = DRV_NAME,
31757 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
31758 .port_ops = &slc90e66_port_ops,
31759diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
31760index 4799d5c..1794678 100644
31761--- a/drivers/ide/tc86c001.c
31762+++ b/drivers/ide/tc86c001.c
31763@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
31764 .dma_sff_read_status = ide_dma_sff_read_status,
31765 };
31766
31767-static const struct ide_port_info tc86c001_chipset __devinitdata = {
31768+static const struct ide_port_info tc86c001_chipset __devinitconst = {
31769 .name = DRV_NAME,
31770 .init_hwif = init_hwif_tc86c001,
31771 .port_ops = &tc86c001_port_ops,
31772diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
31773index 281c914..55ce1b8 100644
31774--- a/drivers/ide/triflex.c
31775+++ b/drivers/ide/triflex.c
31776@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
31777 .set_dma_mode = triflex_set_mode,
31778 };
31779
31780-static const struct ide_port_info triflex_device __devinitdata = {
31781+static const struct ide_port_info triflex_device __devinitconst = {
31782 .name = DRV_NAME,
31783 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
31784 .port_ops = &triflex_port_ops,
31785diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
31786index 4b42ca0..e494a98 100644
31787--- a/drivers/ide/trm290.c
31788+++ b/drivers/ide/trm290.c
31789@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
31790 .dma_check = trm290_dma_check,
31791 };
31792
31793-static const struct ide_port_info trm290_chipset __devinitdata = {
31794+static const struct ide_port_info trm290_chipset __devinitconst = {
31795 .name = DRV_NAME,
31796 .init_hwif = init_hwif_trm290,
31797 .tp_ops = &trm290_tp_ops,
31798diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
31799index f46f49c..eb77678 100644
31800--- a/drivers/ide/via82cxxx.c
31801+++ b/drivers/ide/via82cxxx.c
31802@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
31803 .cable_detect = via82cxxx_cable_detect,
31804 };
31805
31806-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
31807+static const struct ide_port_info via82cxxx_chipset __devinitconst = {
31808 .name = DRV_NAME,
31809 .init_chipset = init_chipset_via82cxxx,
31810 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
31811diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
31812index 73d4531..c90cd2d 100644
31813--- a/drivers/ieee802154/fakehard.c
31814+++ b/drivers/ieee802154/fakehard.c
31815@@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
31816 phy->transmit_power = 0xbf;
31817
31818 dev->netdev_ops = &fake_ops;
31819- dev->ml_priv = &fake_mlme;
31820+ dev->ml_priv = (void *)&fake_mlme;
31821
31822 priv = netdev_priv(dev);
31823 priv->phy = phy;
31824diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
31825index c889aae..6cf5aa7 100644
31826--- a/drivers/infiniband/core/cm.c
31827+++ b/drivers/infiniband/core/cm.c
31828@@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
31829
31830 struct cm_counter_group {
31831 struct kobject obj;
31832- atomic_long_t counter[CM_ATTR_COUNT];
31833+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
31834 };
31835
31836 struct cm_counter_attribute {
31837@@ -1394,7 +1394,7 @@ static void cm_dup_req_handler(struct cm_work *work,
31838 struct ib_mad_send_buf *msg = NULL;
31839 int ret;
31840
31841- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31842+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31843 counter[CM_REQ_COUNTER]);
31844
31845 /* Quick state check to discard duplicate REQs. */
31846@@ -1778,7 +1778,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
31847 if (!cm_id_priv)
31848 return;
31849
31850- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31851+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31852 counter[CM_REP_COUNTER]);
31853 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
31854 if (ret)
31855@@ -1945,7 +1945,7 @@ static int cm_rtu_handler(struct cm_work *work)
31856 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
31857 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
31858 spin_unlock_irq(&cm_id_priv->lock);
31859- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31860+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31861 counter[CM_RTU_COUNTER]);
31862 goto out;
31863 }
31864@@ -2128,7 +2128,7 @@ static int cm_dreq_handler(struct cm_work *work)
31865 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
31866 dreq_msg->local_comm_id);
31867 if (!cm_id_priv) {
31868- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31869+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31870 counter[CM_DREQ_COUNTER]);
31871 cm_issue_drep(work->port, work->mad_recv_wc);
31872 return -EINVAL;
31873@@ -2153,7 +2153,7 @@ static int cm_dreq_handler(struct cm_work *work)
31874 case IB_CM_MRA_REP_RCVD:
31875 break;
31876 case IB_CM_TIMEWAIT:
31877- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31878+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31879 counter[CM_DREQ_COUNTER]);
31880 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
31881 goto unlock;
31882@@ -2167,7 +2167,7 @@ static int cm_dreq_handler(struct cm_work *work)
31883 cm_free_msg(msg);
31884 goto deref;
31885 case IB_CM_DREQ_RCVD:
31886- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31887+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31888 counter[CM_DREQ_COUNTER]);
31889 goto unlock;
31890 default:
31891@@ -2534,7 +2534,7 @@ static int cm_mra_handler(struct cm_work *work)
31892 ib_modify_mad(cm_id_priv->av.port->mad_agent,
31893 cm_id_priv->msg, timeout)) {
31894 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
31895- atomic_long_inc(&work->port->
31896+ atomic_long_inc_unchecked(&work->port->
31897 counter_group[CM_RECV_DUPLICATES].
31898 counter[CM_MRA_COUNTER]);
31899 goto out;
31900@@ -2543,7 +2543,7 @@ static int cm_mra_handler(struct cm_work *work)
31901 break;
31902 case IB_CM_MRA_REQ_RCVD:
31903 case IB_CM_MRA_REP_RCVD:
31904- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31905+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31906 counter[CM_MRA_COUNTER]);
31907 /* fall through */
31908 default:
31909@@ -2705,7 +2705,7 @@ static int cm_lap_handler(struct cm_work *work)
31910 case IB_CM_LAP_IDLE:
31911 break;
31912 case IB_CM_MRA_LAP_SENT:
31913- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31914+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31915 counter[CM_LAP_COUNTER]);
31916 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
31917 goto unlock;
31918@@ -2721,7 +2721,7 @@ static int cm_lap_handler(struct cm_work *work)
31919 cm_free_msg(msg);
31920 goto deref;
31921 case IB_CM_LAP_RCVD:
31922- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31923+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31924 counter[CM_LAP_COUNTER]);
31925 goto unlock;
31926 default:
31927@@ -3005,7 +3005,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
31928 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
31929 if (cur_cm_id_priv) {
31930 spin_unlock_irq(&cm.lock);
31931- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31932+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31933 counter[CM_SIDR_REQ_COUNTER]);
31934 goto out; /* Duplicate message. */
31935 }
31936@@ -3217,10 +3217,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
31937 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
31938 msg->retries = 1;
31939
31940- atomic_long_add(1 + msg->retries,
31941+ atomic_long_add_unchecked(1 + msg->retries,
31942 &port->counter_group[CM_XMIT].counter[attr_index]);
31943 if (msg->retries)
31944- atomic_long_add(msg->retries,
31945+ atomic_long_add_unchecked(msg->retries,
31946 &port->counter_group[CM_XMIT_RETRIES].
31947 counter[attr_index]);
31948
31949@@ -3430,7 +3430,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
31950 }
31951
31952 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
31953- atomic_long_inc(&port->counter_group[CM_RECV].
31954+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
31955 counter[attr_id - CM_ATTR_ID_OFFSET]);
31956
31957 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
31958@@ -3635,7 +3635,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
31959 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
31960
31961 return sprintf(buf, "%ld\n",
31962- atomic_long_read(&group->counter[cm_attr->index]));
31963+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
31964 }
31965
31966 static const struct sysfs_ops cm_counter_ops = {
31967diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
31968index 176c8f9..2627b62 100644
31969--- a/drivers/infiniband/core/fmr_pool.c
31970+++ b/drivers/infiniband/core/fmr_pool.c
31971@@ -98,8 +98,8 @@ struct ib_fmr_pool {
31972
31973 struct task_struct *thread;
31974
31975- atomic_t req_ser;
31976- atomic_t flush_ser;
31977+ atomic_unchecked_t req_ser;
31978+ atomic_unchecked_t flush_ser;
31979
31980 wait_queue_head_t force_wait;
31981 };
31982@@ -180,10 +180,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
31983 struct ib_fmr_pool *pool = pool_ptr;
31984
31985 do {
31986- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
31987+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
31988 ib_fmr_batch_release(pool);
31989
31990- atomic_inc(&pool->flush_ser);
31991+ atomic_inc_unchecked(&pool->flush_ser);
31992 wake_up_interruptible(&pool->force_wait);
31993
31994 if (pool->flush_function)
31995@@ -191,7 +191,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
31996 }
31997
31998 set_current_state(TASK_INTERRUPTIBLE);
31999- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
32000+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
32001 !kthread_should_stop())
32002 schedule();
32003 __set_current_state(TASK_RUNNING);
32004@@ -283,8 +283,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
32005 pool->dirty_watermark = params->dirty_watermark;
32006 pool->dirty_len = 0;
32007 spin_lock_init(&pool->pool_lock);
32008- atomic_set(&pool->req_ser, 0);
32009- atomic_set(&pool->flush_ser, 0);
32010+ atomic_set_unchecked(&pool->req_ser, 0);
32011+ atomic_set_unchecked(&pool->flush_ser, 0);
32012 init_waitqueue_head(&pool->force_wait);
32013
32014 pool->thread = kthread_run(ib_fmr_cleanup_thread,
32015@@ -412,11 +412,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
32016 }
32017 spin_unlock_irq(&pool->pool_lock);
32018
32019- serial = atomic_inc_return(&pool->req_ser);
32020+ serial = atomic_inc_return_unchecked(&pool->req_ser);
32021 wake_up_process(pool->thread);
32022
32023 if (wait_event_interruptible(pool->force_wait,
32024- atomic_read(&pool->flush_ser) - serial >= 0))
32025+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
32026 return -EINTR;
32027
32028 return 0;
32029@@ -526,7 +526,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
32030 } else {
32031 list_add_tail(&fmr->list, &pool->dirty_list);
32032 if (++pool->dirty_len >= pool->dirty_watermark) {
32033- atomic_inc(&pool->req_ser);
32034+ atomic_inc_unchecked(&pool->req_ser);
32035 wake_up_process(pool->thread);
32036 }
32037 }
32038diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
32039index 40c8353..946b0e4 100644
32040--- a/drivers/infiniband/hw/cxgb4/mem.c
32041+++ b/drivers/infiniband/hw/cxgb4/mem.c
32042@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32043 int err;
32044 struct fw_ri_tpte tpt;
32045 u32 stag_idx;
32046- static atomic_t key;
32047+ static atomic_unchecked_t key;
32048
32049 if (c4iw_fatal_error(rdev))
32050 return -EIO;
32051@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32052 &rdev->resource.tpt_fifo_lock);
32053 if (!stag_idx)
32054 return -ENOMEM;
32055- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
32056+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
32057 }
32058 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
32059 __func__, stag_state, type, pdid, stag_idx);
32060diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
32061index a4de9d5..5fa20c3 100644
32062--- a/drivers/infiniband/hw/ipath/ipath_fs.c
32063+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
32064@@ -126,6 +126,8 @@ static const struct file_operations atomic_counters_ops = {
32065 };
32066
32067 static ssize_t flash_read(struct file *file, char __user *buf,
32068+ size_t count, loff_t *ppos) __size_overflow(3);
32069+static ssize_t flash_read(struct file *file, char __user *buf,
32070 size_t count, loff_t *ppos)
32071 {
32072 struct ipath_devdata *dd;
32073@@ -177,6 +179,8 @@ bail:
32074 }
32075
32076 static ssize_t flash_write(struct file *file, const char __user *buf,
32077+ size_t count, loff_t *ppos) __size_overflow(3);
32078+static ssize_t flash_write(struct file *file, const char __user *buf,
32079 size_t count, loff_t *ppos)
32080 {
32081 struct ipath_devdata *dd;
32082diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
32083index 79b3dbc..96e5fcc 100644
32084--- a/drivers/infiniband/hw/ipath/ipath_rc.c
32085+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
32086@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32087 struct ib_atomic_eth *ateth;
32088 struct ipath_ack_entry *e;
32089 u64 vaddr;
32090- atomic64_t *maddr;
32091+ atomic64_unchecked_t *maddr;
32092 u64 sdata;
32093 u32 rkey;
32094 u8 next;
32095@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32096 IB_ACCESS_REMOTE_ATOMIC)))
32097 goto nack_acc_unlck;
32098 /* Perform atomic OP and save result. */
32099- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32100+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32101 sdata = be64_to_cpu(ateth->swap_data);
32102 e = &qp->s_ack_queue[qp->r_head_ack_queue];
32103 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
32104- (u64) atomic64_add_return(sdata, maddr) - sdata :
32105+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32106 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32107 be64_to_cpu(ateth->compare_data),
32108 sdata);
32109diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
32110index 1f95bba..9530f87 100644
32111--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
32112+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
32113@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
32114 unsigned long flags;
32115 struct ib_wc wc;
32116 u64 sdata;
32117- atomic64_t *maddr;
32118+ atomic64_unchecked_t *maddr;
32119 enum ib_wc_status send_status;
32120
32121 /*
32122@@ -382,11 +382,11 @@ again:
32123 IB_ACCESS_REMOTE_ATOMIC)))
32124 goto acc_err;
32125 /* Perform atomic OP and save result. */
32126- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32127+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32128 sdata = wqe->wr.wr.atomic.compare_add;
32129 *(u64 *) sqp->s_sge.sge.vaddr =
32130 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
32131- (u64) atomic64_add_return(sdata, maddr) - sdata :
32132+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32133 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32134 sdata, wqe->wr.wr.atomic.swap);
32135 goto send_comp;
32136diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
32137index 7140199..da60063 100644
32138--- a/drivers/infiniband/hw/nes/nes.c
32139+++ b/drivers/infiniband/hw/nes/nes.c
32140@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
32141 LIST_HEAD(nes_adapter_list);
32142 static LIST_HEAD(nes_dev_list);
32143
32144-atomic_t qps_destroyed;
32145+atomic_unchecked_t qps_destroyed;
32146
32147 static unsigned int ee_flsh_adapter;
32148 static unsigned int sysfs_nonidx_addr;
32149@@ -272,7 +272,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
32150 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
32151 struct nes_adapter *nesadapter = nesdev->nesadapter;
32152
32153- atomic_inc(&qps_destroyed);
32154+ atomic_inc_unchecked(&qps_destroyed);
32155
32156 /* Free the control structures */
32157
32158diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
32159index c438e46..ca30356 100644
32160--- a/drivers/infiniband/hw/nes/nes.h
32161+++ b/drivers/infiniband/hw/nes/nes.h
32162@@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
32163 extern unsigned int wqm_quanta;
32164 extern struct list_head nes_adapter_list;
32165
32166-extern atomic_t cm_connects;
32167-extern atomic_t cm_accepts;
32168-extern atomic_t cm_disconnects;
32169-extern atomic_t cm_closes;
32170-extern atomic_t cm_connecteds;
32171-extern atomic_t cm_connect_reqs;
32172-extern atomic_t cm_rejects;
32173-extern atomic_t mod_qp_timouts;
32174-extern atomic_t qps_created;
32175-extern atomic_t qps_destroyed;
32176-extern atomic_t sw_qps_destroyed;
32177+extern atomic_unchecked_t cm_connects;
32178+extern atomic_unchecked_t cm_accepts;
32179+extern atomic_unchecked_t cm_disconnects;
32180+extern atomic_unchecked_t cm_closes;
32181+extern atomic_unchecked_t cm_connecteds;
32182+extern atomic_unchecked_t cm_connect_reqs;
32183+extern atomic_unchecked_t cm_rejects;
32184+extern atomic_unchecked_t mod_qp_timouts;
32185+extern atomic_unchecked_t qps_created;
32186+extern atomic_unchecked_t qps_destroyed;
32187+extern atomic_unchecked_t sw_qps_destroyed;
32188 extern u32 mh_detected;
32189 extern u32 mh_pauses_sent;
32190 extern u32 cm_packets_sent;
32191@@ -197,16 +197,16 @@ extern u32 cm_packets_created;
32192 extern u32 cm_packets_received;
32193 extern u32 cm_packets_dropped;
32194 extern u32 cm_packets_retrans;
32195-extern atomic_t cm_listens_created;
32196-extern atomic_t cm_listens_destroyed;
32197+extern atomic_unchecked_t cm_listens_created;
32198+extern atomic_unchecked_t cm_listens_destroyed;
32199 extern u32 cm_backlog_drops;
32200-extern atomic_t cm_loopbacks;
32201-extern atomic_t cm_nodes_created;
32202-extern atomic_t cm_nodes_destroyed;
32203-extern atomic_t cm_accel_dropped_pkts;
32204-extern atomic_t cm_resets_recvd;
32205-extern atomic_t pau_qps_created;
32206-extern atomic_t pau_qps_destroyed;
32207+extern atomic_unchecked_t cm_loopbacks;
32208+extern atomic_unchecked_t cm_nodes_created;
32209+extern atomic_unchecked_t cm_nodes_destroyed;
32210+extern atomic_unchecked_t cm_accel_dropped_pkts;
32211+extern atomic_unchecked_t cm_resets_recvd;
32212+extern atomic_unchecked_t pau_qps_created;
32213+extern atomic_unchecked_t pau_qps_destroyed;
32214
32215 extern u32 int_mod_timer_init;
32216 extern u32 int_mod_cq_depth_256;
32217diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
32218index a4972ab..1bcfc31 100644
32219--- a/drivers/infiniband/hw/nes/nes_cm.c
32220+++ b/drivers/infiniband/hw/nes/nes_cm.c
32221@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
32222 u32 cm_packets_retrans;
32223 u32 cm_packets_created;
32224 u32 cm_packets_received;
32225-atomic_t cm_listens_created;
32226-atomic_t cm_listens_destroyed;
32227+atomic_unchecked_t cm_listens_created;
32228+atomic_unchecked_t cm_listens_destroyed;
32229 u32 cm_backlog_drops;
32230-atomic_t cm_loopbacks;
32231-atomic_t cm_nodes_created;
32232-atomic_t cm_nodes_destroyed;
32233-atomic_t cm_accel_dropped_pkts;
32234-atomic_t cm_resets_recvd;
32235+atomic_unchecked_t cm_loopbacks;
32236+atomic_unchecked_t cm_nodes_created;
32237+atomic_unchecked_t cm_nodes_destroyed;
32238+atomic_unchecked_t cm_accel_dropped_pkts;
32239+atomic_unchecked_t cm_resets_recvd;
32240
32241 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
32242 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
32243@@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
32244
32245 static struct nes_cm_core *g_cm_core;
32246
32247-atomic_t cm_connects;
32248-atomic_t cm_accepts;
32249-atomic_t cm_disconnects;
32250-atomic_t cm_closes;
32251-atomic_t cm_connecteds;
32252-atomic_t cm_connect_reqs;
32253-atomic_t cm_rejects;
32254+atomic_unchecked_t cm_connects;
32255+atomic_unchecked_t cm_accepts;
32256+atomic_unchecked_t cm_disconnects;
32257+atomic_unchecked_t cm_closes;
32258+atomic_unchecked_t cm_connecteds;
32259+atomic_unchecked_t cm_connect_reqs;
32260+atomic_unchecked_t cm_rejects;
32261
32262 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
32263 {
32264@@ -1274,7 +1274,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
32265 kfree(listener);
32266 listener = NULL;
32267 ret = 0;
32268- atomic_inc(&cm_listens_destroyed);
32269+ atomic_inc_unchecked(&cm_listens_destroyed);
32270 } else {
32271 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
32272 }
32273@@ -1473,7 +1473,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
32274 cm_node->rem_mac);
32275
32276 add_hte_node(cm_core, cm_node);
32277- atomic_inc(&cm_nodes_created);
32278+ atomic_inc_unchecked(&cm_nodes_created);
32279
32280 return cm_node;
32281 }
32282@@ -1531,7 +1531,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
32283 }
32284
32285 atomic_dec(&cm_core->node_cnt);
32286- atomic_inc(&cm_nodes_destroyed);
32287+ atomic_inc_unchecked(&cm_nodes_destroyed);
32288 nesqp = cm_node->nesqp;
32289 if (nesqp) {
32290 nesqp->cm_node = NULL;
32291@@ -1595,7 +1595,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
32292
32293 static void drop_packet(struct sk_buff *skb)
32294 {
32295- atomic_inc(&cm_accel_dropped_pkts);
32296+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
32297 dev_kfree_skb_any(skb);
32298 }
32299
32300@@ -1658,7 +1658,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
32301 {
32302
32303 int reset = 0; /* whether to send reset in case of err.. */
32304- atomic_inc(&cm_resets_recvd);
32305+ atomic_inc_unchecked(&cm_resets_recvd);
32306 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
32307 " refcnt=%d\n", cm_node, cm_node->state,
32308 atomic_read(&cm_node->ref_count));
32309@@ -2299,7 +2299,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
32310 rem_ref_cm_node(cm_node->cm_core, cm_node);
32311 return NULL;
32312 }
32313- atomic_inc(&cm_loopbacks);
32314+ atomic_inc_unchecked(&cm_loopbacks);
32315 loopbackremotenode->loopbackpartner = cm_node;
32316 loopbackremotenode->tcp_cntxt.rcv_wscale =
32317 NES_CM_DEFAULT_RCV_WND_SCALE;
32318@@ -2574,7 +2574,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
32319 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
32320 else {
32321 rem_ref_cm_node(cm_core, cm_node);
32322- atomic_inc(&cm_accel_dropped_pkts);
32323+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
32324 dev_kfree_skb_any(skb);
32325 }
32326 break;
32327@@ -2881,7 +2881,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32328
32329 if ((cm_id) && (cm_id->event_handler)) {
32330 if (issue_disconn) {
32331- atomic_inc(&cm_disconnects);
32332+ atomic_inc_unchecked(&cm_disconnects);
32333 cm_event.event = IW_CM_EVENT_DISCONNECT;
32334 cm_event.status = disconn_status;
32335 cm_event.local_addr = cm_id->local_addr;
32336@@ -2903,7 +2903,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32337 }
32338
32339 if (issue_close) {
32340- atomic_inc(&cm_closes);
32341+ atomic_inc_unchecked(&cm_closes);
32342 nes_disconnect(nesqp, 1);
32343
32344 cm_id->provider_data = nesqp;
32345@@ -3039,7 +3039,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32346
32347 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
32348 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
32349- atomic_inc(&cm_accepts);
32350+ atomic_inc_unchecked(&cm_accepts);
32351
32352 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
32353 netdev_refcnt_read(nesvnic->netdev));
32354@@ -3241,7 +3241,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
32355 struct nes_cm_core *cm_core;
32356 u8 *start_buff;
32357
32358- atomic_inc(&cm_rejects);
32359+ atomic_inc_unchecked(&cm_rejects);
32360 cm_node = (struct nes_cm_node *)cm_id->provider_data;
32361 loopback = cm_node->loopbackpartner;
32362 cm_core = cm_node->cm_core;
32363@@ -3301,7 +3301,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32364 ntohl(cm_id->local_addr.sin_addr.s_addr),
32365 ntohs(cm_id->local_addr.sin_port));
32366
32367- atomic_inc(&cm_connects);
32368+ atomic_inc_unchecked(&cm_connects);
32369 nesqp->active_conn = 1;
32370
32371 /* cache the cm_id in the qp */
32372@@ -3407,7 +3407,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
32373 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
32374 return err;
32375 }
32376- atomic_inc(&cm_listens_created);
32377+ atomic_inc_unchecked(&cm_listens_created);
32378 }
32379
32380 cm_id->add_ref(cm_id);
32381@@ -3508,7 +3508,7 @@ static void cm_event_connected(struct nes_cm_event *event)
32382
32383 if (nesqp->destroyed)
32384 return;
32385- atomic_inc(&cm_connecteds);
32386+ atomic_inc_unchecked(&cm_connecteds);
32387 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
32388 " local port 0x%04X. jiffies = %lu.\n",
32389 nesqp->hwqp.qp_id,
32390@@ -3695,7 +3695,7 @@ static void cm_event_reset(struct nes_cm_event *event)
32391
32392 cm_id->add_ref(cm_id);
32393 ret = cm_id->event_handler(cm_id, &cm_event);
32394- atomic_inc(&cm_closes);
32395+ atomic_inc_unchecked(&cm_closes);
32396 cm_event.event = IW_CM_EVENT_CLOSE;
32397 cm_event.status = 0;
32398 cm_event.provider_data = cm_id->provider_data;
32399@@ -3731,7 +3731,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
32400 return;
32401 cm_id = cm_node->cm_id;
32402
32403- atomic_inc(&cm_connect_reqs);
32404+ atomic_inc_unchecked(&cm_connect_reqs);
32405 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32406 cm_node, cm_id, jiffies);
32407
32408@@ -3771,7 +3771,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
32409 return;
32410 cm_id = cm_node->cm_id;
32411
32412- atomic_inc(&cm_connect_reqs);
32413+ atomic_inc_unchecked(&cm_connect_reqs);
32414 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32415 cm_node, cm_id, jiffies);
32416
32417diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
32418index 3ba7be3..c81f6ff 100644
32419--- a/drivers/infiniband/hw/nes/nes_mgt.c
32420+++ b/drivers/infiniband/hw/nes/nes_mgt.c
32421@@ -40,8 +40,8 @@
32422 #include "nes.h"
32423 #include "nes_mgt.h"
32424
32425-atomic_t pau_qps_created;
32426-atomic_t pau_qps_destroyed;
32427+atomic_unchecked_t pau_qps_created;
32428+atomic_unchecked_t pau_qps_destroyed;
32429
32430 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
32431 {
32432@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
32433 {
32434 struct sk_buff *skb;
32435 unsigned long flags;
32436- atomic_inc(&pau_qps_destroyed);
32437+ atomic_inc_unchecked(&pau_qps_destroyed);
32438
32439 /* Free packets that have not yet been forwarded */
32440 /* Lock is acquired by skb_dequeue when removing the skb */
32441@@ -812,7 +812,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
32442 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
32443 skb_queue_head_init(&nesqp->pau_list);
32444 spin_lock_init(&nesqp->pau_lock);
32445- atomic_inc(&pau_qps_created);
32446+ atomic_inc_unchecked(&pau_qps_created);
32447 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
32448 }
32449
32450diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
32451index f3a3ecf..57d311d 100644
32452--- a/drivers/infiniband/hw/nes/nes_nic.c
32453+++ b/drivers/infiniband/hw/nes/nes_nic.c
32454@@ -1277,39 +1277,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
32455 target_stat_values[++index] = mh_detected;
32456 target_stat_values[++index] = mh_pauses_sent;
32457 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
32458- target_stat_values[++index] = atomic_read(&cm_connects);
32459- target_stat_values[++index] = atomic_read(&cm_accepts);
32460- target_stat_values[++index] = atomic_read(&cm_disconnects);
32461- target_stat_values[++index] = atomic_read(&cm_connecteds);
32462- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
32463- target_stat_values[++index] = atomic_read(&cm_rejects);
32464- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
32465- target_stat_values[++index] = atomic_read(&qps_created);
32466- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
32467- target_stat_values[++index] = atomic_read(&qps_destroyed);
32468- target_stat_values[++index] = atomic_read(&cm_closes);
32469+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
32470+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
32471+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
32472+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
32473+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
32474+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
32475+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
32476+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
32477+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
32478+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
32479+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
32480 target_stat_values[++index] = cm_packets_sent;
32481 target_stat_values[++index] = cm_packets_bounced;
32482 target_stat_values[++index] = cm_packets_created;
32483 target_stat_values[++index] = cm_packets_received;
32484 target_stat_values[++index] = cm_packets_dropped;
32485 target_stat_values[++index] = cm_packets_retrans;
32486- target_stat_values[++index] = atomic_read(&cm_listens_created);
32487- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
32488+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
32489+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
32490 target_stat_values[++index] = cm_backlog_drops;
32491- target_stat_values[++index] = atomic_read(&cm_loopbacks);
32492- target_stat_values[++index] = atomic_read(&cm_nodes_created);
32493- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
32494- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
32495- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
32496+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
32497+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
32498+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
32499+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
32500+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
32501 target_stat_values[++index] = nesadapter->free_4kpbl;
32502 target_stat_values[++index] = nesadapter->free_256pbl;
32503 target_stat_values[++index] = int_mod_timer_init;
32504 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
32505 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
32506 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
32507- target_stat_values[++index] = atomic_read(&pau_qps_created);
32508- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
32509+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
32510+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
32511 }
32512
32513 /**
32514diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
32515index 0927b5c..ed67986 100644
32516--- a/drivers/infiniband/hw/nes/nes_verbs.c
32517+++ b/drivers/infiniband/hw/nes/nes_verbs.c
32518@@ -46,9 +46,9 @@
32519
32520 #include <rdma/ib_umem.h>
32521
32522-atomic_t mod_qp_timouts;
32523-atomic_t qps_created;
32524-atomic_t sw_qps_destroyed;
32525+atomic_unchecked_t mod_qp_timouts;
32526+atomic_unchecked_t qps_created;
32527+atomic_unchecked_t sw_qps_destroyed;
32528
32529 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
32530
32531@@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
32532 if (init_attr->create_flags)
32533 return ERR_PTR(-EINVAL);
32534
32535- atomic_inc(&qps_created);
32536+ atomic_inc_unchecked(&qps_created);
32537 switch (init_attr->qp_type) {
32538 case IB_QPT_RC:
32539 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
32540@@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
32541 struct iw_cm_event cm_event;
32542 int ret = 0;
32543
32544- atomic_inc(&sw_qps_destroyed);
32545+ atomic_inc_unchecked(&sw_qps_destroyed);
32546 nesqp->destroyed = 1;
32547
32548 /* Blow away the connection if it exists. */
32549diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
32550index b881bdc..c2e360c 100644
32551--- a/drivers/infiniband/hw/qib/qib.h
32552+++ b/drivers/infiniband/hw/qib/qib.h
32553@@ -51,6 +51,7 @@
32554 #include <linux/completion.h>
32555 #include <linux/kref.h>
32556 #include <linux/sched.h>
32557+#include <linux/slab.h>
32558
32559 #include "qib_common.h"
32560 #include "qib_verbs.h"
32561diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
32562index 05e0f17..0275789 100644
32563--- a/drivers/infiniband/hw/qib/qib_fs.c
32564+++ b/drivers/infiniband/hw/qib/qib_fs.c
32565@@ -267,6 +267,8 @@ static const struct file_operations qsfp_ops[] = {
32566 };
32567
32568 static ssize_t flash_read(struct file *file, char __user *buf,
32569+ size_t count, loff_t *ppos) __size_overflow(3);
32570+static ssize_t flash_read(struct file *file, char __user *buf,
32571 size_t count, loff_t *ppos)
32572 {
32573 struct qib_devdata *dd;
32574@@ -318,6 +320,8 @@ bail:
32575 }
32576
32577 static ssize_t flash_write(struct file *file, const char __user *buf,
32578+ size_t count, loff_t *ppos) __size_overflow(3);
32579+static ssize_t flash_write(struct file *file, const char __user *buf,
32580 size_t count, loff_t *ppos)
32581 {
32582 struct qib_devdata *dd;
32583diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
32584index c351aa4..e6967c2 100644
32585--- a/drivers/input/gameport/gameport.c
32586+++ b/drivers/input/gameport/gameport.c
32587@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
32588 */
32589 static void gameport_init_port(struct gameport *gameport)
32590 {
32591- static atomic_t gameport_no = ATOMIC_INIT(0);
32592+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
32593
32594 __module_get(THIS_MODULE);
32595
32596 mutex_init(&gameport->drv_mutex);
32597 device_initialize(&gameport->dev);
32598 dev_set_name(&gameport->dev, "gameport%lu",
32599- (unsigned long)atomic_inc_return(&gameport_no) - 1);
32600+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
32601 gameport->dev.bus = &gameport_bus;
32602 gameport->dev.release = gameport_release_port;
32603 if (gameport->parent)
32604diff --git a/drivers/input/input.c b/drivers/input/input.c
32605index 1f78c95..3cddc6c 100644
32606--- a/drivers/input/input.c
32607+++ b/drivers/input/input.c
32608@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
32609 */
32610 int input_register_device(struct input_dev *dev)
32611 {
32612- static atomic_t input_no = ATOMIC_INIT(0);
32613+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
32614 struct input_handler *handler;
32615 const char *path;
32616 int error;
32617@@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
32618 dev->setkeycode = input_default_setkeycode;
32619
32620 dev_set_name(&dev->dev, "input%ld",
32621- (unsigned long) atomic_inc_return(&input_no) - 1);
32622+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
32623
32624 error = device_add(&dev->dev);
32625 if (error)
32626diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
32627index b8d8611..7a4a04b 100644
32628--- a/drivers/input/joystick/sidewinder.c
32629+++ b/drivers/input/joystick/sidewinder.c
32630@@ -30,6 +30,7 @@
32631 #include <linux/kernel.h>
32632 #include <linux/module.h>
32633 #include <linux/slab.h>
32634+#include <linux/sched.h>
32635 #include <linux/init.h>
32636 #include <linux/input.h>
32637 #include <linux/gameport.h>
32638diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
32639index fd7a0d5..a4af10c 100644
32640--- a/drivers/input/joystick/xpad.c
32641+++ b/drivers/input/joystick/xpad.c
32642@@ -710,7 +710,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
32643
32644 static int xpad_led_probe(struct usb_xpad *xpad)
32645 {
32646- static atomic_t led_seq = ATOMIC_INIT(0);
32647+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
32648 long led_no;
32649 struct xpad_led *led;
32650 struct led_classdev *led_cdev;
32651@@ -723,7 +723,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
32652 if (!led)
32653 return -ENOMEM;
32654
32655- led_no = (long)atomic_inc_return(&led_seq) - 1;
32656+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
32657
32658 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
32659 led->xpad = xpad;
32660diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
32661index 0110b5a..d3ad144 100644
32662--- a/drivers/input/mousedev.c
32663+++ b/drivers/input/mousedev.c
32664@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
32665
32666 spin_unlock_irq(&client->packet_lock);
32667
32668- if (copy_to_user(buffer, data, count))
32669+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
32670 return -EFAULT;
32671
32672 return count;
32673diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
32674index ba70058..571d25d 100644
32675--- a/drivers/input/serio/serio.c
32676+++ b/drivers/input/serio/serio.c
32677@@ -497,7 +497,7 @@ static void serio_release_port(struct device *dev)
32678 */
32679 static void serio_init_port(struct serio *serio)
32680 {
32681- static atomic_t serio_no = ATOMIC_INIT(0);
32682+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
32683
32684 __module_get(THIS_MODULE);
32685
32686@@ -508,7 +508,7 @@ static void serio_init_port(struct serio *serio)
32687 mutex_init(&serio->drv_mutex);
32688 device_initialize(&serio->dev);
32689 dev_set_name(&serio->dev, "serio%ld",
32690- (long)atomic_inc_return(&serio_no) - 1);
32691+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
32692 serio->dev.bus = &serio_bus;
32693 serio->dev.release = serio_release_port;
32694 serio->dev.groups = serio_device_attr_groups;
32695diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
32696index e44933d..9ba484a 100644
32697--- a/drivers/isdn/capi/capi.c
32698+++ b/drivers/isdn/capi/capi.c
32699@@ -83,8 +83,8 @@ struct capiminor {
32700
32701 struct capi20_appl *ap;
32702 u32 ncci;
32703- atomic_t datahandle;
32704- atomic_t msgid;
32705+ atomic_unchecked_t datahandle;
32706+ atomic_unchecked_t msgid;
32707
32708 struct tty_port port;
32709 int ttyinstop;
32710@@ -397,7 +397,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
32711 capimsg_setu16(s, 2, mp->ap->applid);
32712 capimsg_setu8 (s, 4, CAPI_DATA_B3);
32713 capimsg_setu8 (s, 5, CAPI_RESP);
32714- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
32715+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
32716 capimsg_setu32(s, 8, mp->ncci);
32717 capimsg_setu16(s, 12, datahandle);
32718 }
32719@@ -518,14 +518,14 @@ static void handle_minor_send(struct capiminor *mp)
32720 mp->outbytes -= len;
32721 spin_unlock_bh(&mp->outlock);
32722
32723- datahandle = atomic_inc_return(&mp->datahandle);
32724+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
32725 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
32726 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32727 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32728 capimsg_setu16(skb->data, 2, mp->ap->applid);
32729 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
32730 capimsg_setu8 (skb->data, 5, CAPI_REQ);
32731- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
32732+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
32733 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
32734 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
32735 capimsg_setu16(skb->data, 16, len); /* Data length */
32736diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
32737index db621db..825ea1a 100644
32738--- a/drivers/isdn/gigaset/common.c
32739+++ b/drivers/isdn/gigaset/common.c
32740@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
32741 cs->commands_pending = 0;
32742 cs->cur_at_seq = 0;
32743 cs->gotfwver = -1;
32744- cs->open_count = 0;
32745+ local_set(&cs->open_count, 0);
32746 cs->dev = NULL;
32747 cs->tty = NULL;
32748 cs->tty_dev = NULL;
32749diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
32750index 212efaf..f187c6b 100644
32751--- a/drivers/isdn/gigaset/gigaset.h
32752+++ b/drivers/isdn/gigaset/gigaset.h
32753@@ -35,6 +35,7 @@
32754 #include <linux/tty_driver.h>
32755 #include <linux/list.h>
32756 #include <linux/atomic.h>
32757+#include <asm/local.h>
32758
32759 #define GIG_VERSION {0, 5, 0, 0}
32760 #define GIG_COMPAT {0, 4, 0, 0}
32761@@ -433,7 +434,7 @@ struct cardstate {
32762 spinlock_t cmdlock;
32763 unsigned curlen, cmdbytes;
32764
32765- unsigned open_count;
32766+ local_t open_count;
32767 struct tty_struct *tty;
32768 struct tasklet_struct if_wake_tasklet;
32769 unsigned control_state;
32770diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
32771index ee0a549..a7c9798 100644
32772--- a/drivers/isdn/gigaset/interface.c
32773+++ b/drivers/isdn/gigaset/interface.c
32774@@ -163,9 +163,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
32775 }
32776 tty->driver_data = cs;
32777
32778- ++cs->open_count;
32779-
32780- if (cs->open_count == 1) {
32781+ if (local_inc_return(&cs->open_count) == 1) {
32782 spin_lock_irqsave(&cs->lock, flags);
32783 cs->tty = tty;
32784 spin_unlock_irqrestore(&cs->lock, flags);
32785@@ -193,10 +191,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
32786
32787 if (!cs->connected)
32788 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32789- else if (!cs->open_count)
32790+ else if (!local_read(&cs->open_count))
32791 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32792 else {
32793- if (!--cs->open_count) {
32794+ if (!local_dec_return(&cs->open_count)) {
32795 spin_lock_irqsave(&cs->lock, flags);
32796 cs->tty = NULL;
32797 spin_unlock_irqrestore(&cs->lock, flags);
32798@@ -231,7 +229,7 @@ static int if_ioctl(struct tty_struct *tty,
32799 if (!cs->connected) {
32800 gig_dbg(DEBUG_IF, "not connected");
32801 retval = -ENODEV;
32802- } else if (!cs->open_count)
32803+ } else if (!local_read(&cs->open_count))
32804 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32805 else {
32806 retval = 0;
32807@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
32808 retval = -ENODEV;
32809 goto done;
32810 }
32811- if (!cs->open_count) {
32812+ if (!local_read(&cs->open_count)) {
32813 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32814 retval = -ENODEV;
32815 goto done;
32816@@ -414,7 +412,7 @@ static int if_write_room(struct tty_struct *tty)
32817 if (!cs->connected) {
32818 gig_dbg(DEBUG_IF, "not connected");
32819 retval = -ENODEV;
32820- } else if (!cs->open_count)
32821+ } else if (!local_read(&cs->open_count))
32822 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32823 else if (cs->mstate != MS_LOCKED) {
32824 dev_warn(cs->dev, "can't write to unlocked device\n");
32825@@ -444,7 +442,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
32826
32827 if (!cs->connected)
32828 gig_dbg(DEBUG_IF, "not connected");
32829- else if (!cs->open_count)
32830+ else if (!local_read(&cs->open_count))
32831 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32832 else if (cs->mstate != MS_LOCKED)
32833 dev_warn(cs->dev, "can't write to unlocked device\n");
32834@@ -472,7 +470,7 @@ static void if_throttle(struct tty_struct *tty)
32835
32836 if (!cs->connected)
32837 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32838- else if (!cs->open_count)
32839+ else if (!local_read(&cs->open_count))
32840 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32841 else
32842 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
32843@@ -496,7 +494,7 @@ static void if_unthrottle(struct tty_struct *tty)
32844
32845 if (!cs->connected)
32846 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32847- else if (!cs->open_count)
32848+ else if (!local_read(&cs->open_count))
32849 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32850 else
32851 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
32852@@ -527,7 +525,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
32853 goto out;
32854 }
32855
32856- if (!cs->open_count) {
32857+ if (!local_read(&cs->open_count)) {
32858 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32859 goto out;
32860 }
32861diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
32862index 2a57da59..e7a12ed 100644
32863--- a/drivers/isdn/hardware/avm/b1.c
32864+++ b/drivers/isdn/hardware/avm/b1.c
32865@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
32866 }
32867 if (left) {
32868 if (t4file->user) {
32869- if (copy_from_user(buf, dp, left))
32870+ if (left > sizeof buf || copy_from_user(buf, dp, left))
32871 return -EFAULT;
32872 } else {
32873 memcpy(buf, dp, left);
32874@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
32875 }
32876 if (left) {
32877 if (config->user) {
32878- if (copy_from_user(buf, dp, left))
32879+ if (left > sizeof buf || copy_from_user(buf, dp, left))
32880 return -EFAULT;
32881 } else {
32882 memcpy(buf, dp, left);
32883diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
32884index 85784a7..a19ca98 100644
32885--- a/drivers/isdn/hardware/eicon/divasync.h
32886+++ b/drivers/isdn/hardware/eicon/divasync.h
32887@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
32888 } diva_didd_add_adapter_t;
32889 typedef struct _diva_didd_remove_adapter {
32890 IDI_CALL p_request;
32891-} diva_didd_remove_adapter_t;
32892+} __no_const diva_didd_remove_adapter_t;
32893 typedef struct _diva_didd_read_adapter_array {
32894 void * buffer;
32895 dword length;
32896diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
32897index a3bd163..8956575 100644
32898--- a/drivers/isdn/hardware/eicon/xdi_adapter.h
32899+++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
32900@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
32901 typedef struct _diva_os_idi_adapter_interface {
32902 diva_init_card_proc_t cleanup_adapter_proc;
32903 diva_cmd_card_proc_t cmd_proc;
32904-} diva_os_idi_adapter_interface_t;
32905+} __no_const diva_os_idi_adapter_interface_t;
32906
32907 typedef struct _diva_os_xdi_adapter {
32908 struct list_head link;
32909diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
32910index 1f355bb..43f1fea 100644
32911--- a/drivers/isdn/icn/icn.c
32912+++ b/drivers/isdn/icn/icn.c
32913@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
32914 if (count > len)
32915 count = len;
32916 if (user) {
32917- if (copy_from_user(msg, buf, count))
32918+ if (count > sizeof msg || copy_from_user(msg, buf, count))
32919 return -EFAULT;
32920 } else
32921 memcpy(msg, buf, count);
32922diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
32923index b5fdcb7..5b6c59f 100644
32924--- a/drivers/lguest/core.c
32925+++ b/drivers/lguest/core.c
32926@@ -92,9 +92,17 @@ static __init int map_switcher(void)
32927 * it's worked so far. The end address needs +1 because __get_vm_area
32928 * allocates an extra guard page, so we need space for that.
32929 */
32930+
32931+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
32932+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
32933+ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
32934+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
32935+#else
32936 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
32937 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
32938 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
32939+#endif
32940+
32941 if (!switcher_vma) {
32942 err = -ENOMEM;
32943 printk("lguest: could not map switcher pages high\n");
32944@@ -119,7 +127,7 @@ static __init int map_switcher(void)
32945 * Now the Switcher is mapped at the right address, we can't fail!
32946 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
32947 */
32948- memcpy(switcher_vma->addr, start_switcher_text,
32949+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
32950 end_switcher_text - start_switcher_text);
32951
32952 printk(KERN_INFO "lguest: mapped switcher at %p\n",
32953diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
32954index ff4a0bc..f5fdd9c 100644
32955--- a/drivers/lguest/lguest_user.c
32956+++ b/drivers/lguest/lguest_user.c
32957@@ -198,6 +198,7 @@ static int user_send_irq(struct lg_cpu *cpu, const unsigned long __user *input)
32958 * Once our Guest is initialized, the Launcher makes it run by reading
32959 * from /dev/lguest.
32960 */
32961+static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o) __size_overflow(3);
32962 static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
32963 {
32964 struct lguest *lg = file->private_data;
32965diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
32966index 3980903..ce25c5e 100644
32967--- a/drivers/lguest/x86/core.c
32968+++ b/drivers/lguest/x86/core.c
32969@@ -59,7 +59,7 @@ static struct {
32970 /* Offset from where switcher.S was compiled to where we've copied it */
32971 static unsigned long switcher_offset(void)
32972 {
32973- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
32974+ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
32975 }
32976
32977 /* This cpu's struct lguest_pages. */
32978@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
32979 * These copies are pretty cheap, so we do them unconditionally: */
32980 /* Save the current Host top-level page directory.
32981 */
32982+
32983+#ifdef CONFIG_PAX_PER_CPU_PGD
32984+ pages->state.host_cr3 = read_cr3();
32985+#else
32986 pages->state.host_cr3 = __pa(current->mm->pgd);
32987+#endif
32988+
32989 /*
32990 * Set up the Guest's page tables to see this CPU's pages (and no
32991 * other CPU's pages).
32992@@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
32993 * compiled-in switcher code and the high-mapped copy we just made.
32994 */
32995 for (i = 0; i < IDT_ENTRIES; i++)
32996- default_idt_entries[i] += switcher_offset();
32997+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
32998
32999 /*
33000 * Set up the Switcher's per-cpu areas.
33001@@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
33002 * it will be undisturbed when we switch. To change %cs and jump we
33003 * need this structure to feed to Intel's "lcall" instruction.
33004 */
33005- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
33006+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
33007 lguest_entry.segment = LGUEST_CS;
33008
33009 /*
33010diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
33011index 40634b0..4f5855e 100644
33012--- a/drivers/lguest/x86/switcher_32.S
33013+++ b/drivers/lguest/x86/switcher_32.S
33014@@ -87,6 +87,7 @@
33015 #include <asm/page.h>
33016 #include <asm/segment.h>
33017 #include <asm/lguest.h>
33018+#include <asm/processor-flags.h>
33019
33020 // We mark the start of the code to copy
33021 // It's placed in .text tho it's never run here
33022@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
33023 // Changes type when we load it: damn Intel!
33024 // For after we switch over our page tables
33025 // That entry will be read-only: we'd crash.
33026+
33027+#ifdef CONFIG_PAX_KERNEXEC
33028+ mov %cr0, %edx
33029+ xor $X86_CR0_WP, %edx
33030+ mov %edx, %cr0
33031+#endif
33032+
33033 movl $(GDT_ENTRY_TSS*8), %edx
33034 ltr %dx
33035
33036@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
33037 // Let's clear it again for our return.
33038 // The GDT descriptor of the Host
33039 // Points to the table after two "size" bytes
33040- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
33041+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
33042 // Clear "used" from type field (byte 5, bit 2)
33043- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
33044+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
33045+
33046+#ifdef CONFIG_PAX_KERNEXEC
33047+ mov %cr0, %eax
33048+ xor $X86_CR0_WP, %eax
33049+ mov %eax, %cr0
33050+#endif
33051
33052 // Once our page table's switched, the Guest is live!
33053 // The Host fades as we run this final step.
33054@@ -295,13 +309,12 @@ deliver_to_host:
33055 // I consulted gcc, and it gave
33056 // These instructions, which I gladly credit:
33057 leal (%edx,%ebx,8), %eax
33058- movzwl (%eax),%edx
33059- movl 4(%eax), %eax
33060- xorw %ax, %ax
33061- orl %eax, %edx
33062+ movl 4(%eax), %edx
33063+ movw (%eax), %dx
33064 // Now the address of the handler's in %edx
33065 // We call it now: its "iret" drops us home.
33066- jmp *%edx
33067+ ljmp $__KERNEL_CS, $1f
33068+1: jmp *%edx
33069
33070 // Every interrupt can come to us here
33071 // But we must truly tell each apart.
33072diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
33073index 4daf9e5..b8d1d0f 100644
33074--- a/drivers/macintosh/macio_asic.c
33075+++ b/drivers/macintosh/macio_asic.c
33076@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
33077 * MacIO is matched against any Apple ID, it's probe() function
33078 * will then decide wether it applies or not
33079 */
33080-static const struct pci_device_id __devinitdata pci_ids [] = { {
33081+static const struct pci_device_id __devinitconst pci_ids [] = { {
33082 .vendor = PCI_VENDOR_ID_APPLE,
33083 .device = PCI_ANY_ID,
33084 .subvendor = PCI_ANY_ID,
33085diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
33086index 1ce84ed..0fdd40a 100644
33087--- a/drivers/md/dm-ioctl.c
33088+++ b/drivers/md/dm-ioctl.c
33089@@ -1589,7 +1589,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
33090 cmd == DM_LIST_VERSIONS_CMD)
33091 return 0;
33092
33093- if ((cmd == DM_DEV_CREATE_CMD)) {
33094+ if (cmd == DM_DEV_CREATE_CMD) {
33095 if (!*param->name) {
33096 DMWARN("name not supplied when creating device");
33097 return -EINVAL;
33098diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
33099index 9bfd057..5373ff3 100644
33100--- a/drivers/md/dm-raid1.c
33101+++ b/drivers/md/dm-raid1.c
33102@@ -40,7 +40,7 @@ enum dm_raid1_error {
33103
33104 struct mirror {
33105 struct mirror_set *ms;
33106- atomic_t error_count;
33107+ atomic_unchecked_t error_count;
33108 unsigned long error_type;
33109 struct dm_dev *dev;
33110 sector_t offset;
33111@@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
33112 struct mirror *m;
33113
33114 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
33115- if (!atomic_read(&m->error_count))
33116+ if (!atomic_read_unchecked(&m->error_count))
33117 return m;
33118
33119 return NULL;
33120@@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
33121 * simple way to tell if a device has encountered
33122 * errors.
33123 */
33124- atomic_inc(&m->error_count);
33125+ atomic_inc_unchecked(&m->error_count);
33126
33127 if (test_and_set_bit(error_type, &m->error_type))
33128 return;
33129@@ -408,7 +408,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
33130 struct mirror *m = get_default_mirror(ms);
33131
33132 do {
33133- if (likely(!atomic_read(&m->error_count)))
33134+ if (likely(!atomic_read_unchecked(&m->error_count)))
33135 return m;
33136
33137 if (m-- == ms->mirror)
33138@@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
33139 {
33140 struct mirror *default_mirror = get_default_mirror(m->ms);
33141
33142- return !atomic_read(&default_mirror->error_count);
33143+ return !atomic_read_unchecked(&default_mirror->error_count);
33144 }
33145
33146 static int mirror_available(struct mirror_set *ms, struct bio *bio)
33147@@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
33148 */
33149 if (likely(region_in_sync(ms, region, 1)))
33150 m = choose_mirror(ms, bio->bi_sector);
33151- else if (m && atomic_read(&m->error_count))
33152+ else if (m && atomic_read_unchecked(&m->error_count))
33153 m = NULL;
33154
33155 if (likely(m))
33156@@ -848,6 +848,10 @@ static void do_mirror(struct work_struct *work)
33157 static struct mirror_set *alloc_context(unsigned int nr_mirrors,
33158 uint32_t region_size,
33159 struct dm_target *ti,
33160+ struct dm_dirty_log *dl) __size_overflow(1);
33161+static struct mirror_set *alloc_context(unsigned int nr_mirrors,
33162+ uint32_t region_size,
33163+ struct dm_target *ti,
33164 struct dm_dirty_log *dl)
33165 {
33166 size_t len;
33167@@ -937,7 +941,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
33168 }
33169
33170 ms->mirror[mirror].ms = ms;
33171- atomic_set(&(ms->mirror[mirror].error_count), 0);
33172+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
33173 ms->mirror[mirror].error_type = 0;
33174 ms->mirror[mirror].offset = offset;
33175
33176@@ -1347,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
33177 */
33178 static char device_status_char(struct mirror *m)
33179 {
33180- if (!atomic_read(&(m->error_count)))
33181+ if (!atomic_read_unchecked(&(m->error_count)))
33182 return 'A';
33183
33184 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
33185diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
33186index 3d80cf0..7d98e1a 100644
33187--- a/drivers/md/dm-stripe.c
33188+++ b/drivers/md/dm-stripe.c
33189@@ -20,7 +20,7 @@ struct stripe {
33190 struct dm_dev *dev;
33191 sector_t physical_start;
33192
33193- atomic_t error_count;
33194+ atomic_unchecked_t error_count;
33195 };
33196
33197 struct stripe_c {
33198@@ -55,6 +55,7 @@ static void trigger_event(struct work_struct *work)
33199 dm_table_event(sc->ti->table);
33200 }
33201
33202+static inline struct stripe_c *alloc_context(unsigned int stripes) __size_overflow(1);
33203 static inline struct stripe_c *alloc_context(unsigned int stripes)
33204 {
33205 size_t len;
33206@@ -192,7 +193,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
33207 kfree(sc);
33208 return r;
33209 }
33210- atomic_set(&(sc->stripe[i].error_count), 0);
33211+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
33212 }
33213
33214 ti->private = sc;
33215@@ -314,7 +315,7 @@ static int stripe_status(struct dm_target *ti,
33216 DMEMIT("%d ", sc->stripes);
33217 for (i = 0; i < sc->stripes; i++) {
33218 DMEMIT("%s ", sc->stripe[i].dev->name);
33219- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
33220+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
33221 'D' : 'A';
33222 }
33223 buffer[i] = '\0';
33224@@ -361,8 +362,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
33225 */
33226 for (i = 0; i < sc->stripes; i++)
33227 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
33228- atomic_inc(&(sc->stripe[i].error_count));
33229- if (atomic_read(&(sc->stripe[i].error_count)) <
33230+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
33231+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
33232 DM_IO_ERROR_THRESHOLD)
33233 schedule_work(&sc->trigger_event);
33234 }
33235diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
33236index 63cc542..8d45caf3 100644
33237--- a/drivers/md/dm-table.c
33238+++ b/drivers/md/dm-table.c
33239@@ -391,7 +391,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
33240 if (!dev_size)
33241 return 0;
33242
33243- if ((start >= dev_size) || (start + len > dev_size)) {
33244+ if ((start >= dev_size) || (len > dev_size - start)) {
33245 DMWARN("%s: %s too small for target: "
33246 "start=%llu, len=%llu, dev_size=%llu",
33247 dm_device_name(ti->table->md), bdevname(bdev, b),
33248diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
33249index 237571a..fb6d19b 100644
33250--- a/drivers/md/dm-thin-metadata.c
33251+++ b/drivers/md/dm-thin-metadata.c
33252@@ -432,7 +432,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33253
33254 pmd->info.tm = tm;
33255 pmd->info.levels = 2;
33256- pmd->info.value_type.context = pmd->data_sm;
33257+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33258 pmd->info.value_type.size = sizeof(__le64);
33259 pmd->info.value_type.inc = data_block_inc;
33260 pmd->info.value_type.dec = data_block_dec;
33261@@ -451,7 +451,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33262
33263 pmd->bl_info.tm = tm;
33264 pmd->bl_info.levels = 1;
33265- pmd->bl_info.value_type.context = pmd->data_sm;
33266+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33267 pmd->bl_info.value_type.size = sizeof(__le64);
33268 pmd->bl_info.value_type.inc = data_block_inc;
33269 pmd->bl_info.value_type.dec = data_block_dec;
33270diff --git a/drivers/md/dm.c b/drivers/md/dm.c
33271index b89c548..2af3ce4 100644
33272--- a/drivers/md/dm.c
33273+++ b/drivers/md/dm.c
33274@@ -176,9 +176,9 @@ struct mapped_device {
33275 /*
33276 * Event handling.
33277 */
33278- atomic_t event_nr;
33279+ atomic_unchecked_t event_nr;
33280 wait_queue_head_t eventq;
33281- atomic_t uevent_seq;
33282+ atomic_unchecked_t uevent_seq;
33283 struct list_head uevent_list;
33284 spinlock_t uevent_lock; /* Protect access to uevent_list */
33285
33286@@ -1844,8 +1844,8 @@ static struct mapped_device *alloc_dev(int minor)
33287 rwlock_init(&md->map_lock);
33288 atomic_set(&md->holders, 1);
33289 atomic_set(&md->open_count, 0);
33290- atomic_set(&md->event_nr, 0);
33291- atomic_set(&md->uevent_seq, 0);
33292+ atomic_set_unchecked(&md->event_nr, 0);
33293+ atomic_set_unchecked(&md->uevent_seq, 0);
33294 INIT_LIST_HEAD(&md->uevent_list);
33295 spin_lock_init(&md->uevent_lock);
33296
33297@@ -1979,7 +1979,7 @@ static void event_callback(void *context)
33298
33299 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
33300
33301- atomic_inc(&md->event_nr);
33302+ atomic_inc_unchecked(&md->event_nr);
33303 wake_up(&md->eventq);
33304 }
33305
33306@@ -2621,18 +2621,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
33307
33308 uint32_t dm_next_uevent_seq(struct mapped_device *md)
33309 {
33310- return atomic_add_return(1, &md->uevent_seq);
33311+ return atomic_add_return_unchecked(1, &md->uevent_seq);
33312 }
33313
33314 uint32_t dm_get_event_nr(struct mapped_device *md)
33315 {
33316- return atomic_read(&md->event_nr);
33317+ return atomic_read_unchecked(&md->event_nr);
33318 }
33319
33320 int dm_wait_event(struct mapped_device *md, int event_nr)
33321 {
33322 return wait_event_interruptible(md->eventq,
33323- (event_nr != atomic_read(&md->event_nr)));
33324+ (event_nr != atomic_read_unchecked(&md->event_nr)));
33325 }
33326
33327 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
33328diff --git a/drivers/md/md.c b/drivers/md/md.c
33329index 58027d8..d9cddcd 100644
33330--- a/drivers/md/md.c
33331+++ b/drivers/md/md.c
33332@@ -277,10 +277,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
33333 * start build, activate spare
33334 */
33335 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
33336-static atomic_t md_event_count;
33337+static atomic_unchecked_t md_event_count;
33338 void md_new_event(struct mddev *mddev)
33339 {
33340- atomic_inc(&md_event_count);
33341+ atomic_inc_unchecked(&md_event_count);
33342 wake_up(&md_event_waiters);
33343 }
33344 EXPORT_SYMBOL_GPL(md_new_event);
33345@@ -290,7 +290,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
33346 */
33347 static void md_new_event_inintr(struct mddev *mddev)
33348 {
33349- atomic_inc(&md_event_count);
33350+ atomic_inc_unchecked(&md_event_count);
33351 wake_up(&md_event_waiters);
33352 }
33353
33354@@ -1524,7 +1524,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
33355
33356 rdev->preferred_minor = 0xffff;
33357 rdev->data_offset = le64_to_cpu(sb->data_offset);
33358- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33359+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33360
33361 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
33362 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
33363@@ -1743,7 +1743,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
33364 else
33365 sb->resync_offset = cpu_to_le64(0);
33366
33367- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
33368+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
33369
33370 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
33371 sb->size = cpu_to_le64(mddev->dev_sectors);
33372@@ -2689,7 +2689,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
33373 static ssize_t
33374 errors_show(struct md_rdev *rdev, char *page)
33375 {
33376- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
33377+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
33378 }
33379
33380 static ssize_t
33381@@ -2698,7 +2698,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
33382 char *e;
33383 unsigned long n = simple_strtoul(buf, &e, 10);
33384 if (*buf && (*e == 0 || *e == '\n')) {
33385- atomic_set(&rdev->corrected_errors, n);
33386+ atomic_set_unchecked(&rdev->corrected_errors, n);
33387 return len;
33388 }
33389 return -EINVAL;
33390@@ -3084,8 +3084,8 @@ int md_rdev_init(struct md_rdev *rdev)
33391 rdev->sb_loaded = 0;
33392 rdev->bb_page = NULL;
33393 atomic_set(&rdev->nr_pending, 0);
33394- atomic_set(&rdev->read_errors, 0);
33395- atomic_set(&rdev->corrected_errors, 0);
33396+ atomic_set_unchecked(&rdev->read_errors, 0);
33397+ atomic_set_unchecked(&rdev->corrected_errors, 0);
33398
33399 INIT_LIST_HEAD(&rdev->same_set);
33400 init_waitqueue_head(&rdev->blocked_wait);
33401@@ -6736,7 +6736,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33402
33403 spin_unlock(&pers_lock);
33404 seq_printf(seq, "\n");
33405- seq->poll_event = atomic_read(&md_event_count);
33406+ seq->poll_event = atomic_read_unchecked(&md_event_count);
33407 return 0;
33408 }
33409 if (v == (void*)2) {
33410@@ -6828,7 +6828,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33411 chunk_kb ? "KB" : "B");
33412 if (bitmap->file) {
33413 seq_printf(seq, ", file: ");
33414- seq_path(seq, &bitmap->file->f_path, " \t\n");
33415+ seq_path(seq, &bitmap->file->f_path, " \t\n\\");
33416 }
33417
33418 seq_printf(seq, "\n");
33419@@ -6859,7 +6859,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
33420 return error;
33421
33422 seq = file->private_data;
33423- seq->poll_event = atomic_read(&md_event_count);
33424+ seq->poll_event = atomic_read_unchecked(&md_event_count);
33425 return error;
33426 }
33427
33428@@ -6873,7 +6873,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
33429 /* always allow read */
33430 mask = POLLIN | POLLRDNORM;
33431
33432- if (seq->poll_event != atomic_read(&md_event_count))
33433+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
33434 mask |= POLLERR | POLLPRI;
33435 return mask;
33436 }
33437@@ -6917,7 +6917,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
33438 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
33439 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
33440 (int)part_stat_read(&disk->part0, sectors[1]) -
33441- atomic_read(&disk->sync_io);
33442+ atomic_read_unchecked(&disk->sync_io);
33443 /* sync IO will cause sync_io to increase before the disk_stats
33444 * as sync_io is counted when a request starts, and
33445 * disk_stats is counted when it completes.
33446diff --git a/drivers/md/md.h b/drivers/md/md.h
33447index 44c63df..b795d1a 100644
33448--- a/drivers/md/md.h
33449+++ b/drivers/md/md.h
33450@@ -93,13 +93,13 @@ struct md_rdev {
33451 * only maintained for arrays that
33452 * support hot removal
33453 */
33454- atomic_t read_errors; /* number of consecutive read errors that
33455+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
33456 * we have tried to ignore.
33457 */
33458 struct timespec last_read_error; /* monotonic time since our
33459 * last read error
33460 */
33461- atomic_t corrected_errors; /* number of corrected read errors,
33462+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
33463 * for reporting to userspace and storing
33464 * in superblock.
33465 */
33466@@ -421,7 +421,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
33467
33468 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
33469 {
33470- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33471+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33472 }
33473
33474 struct md_personality
33475diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
33476index 50ed53b..4f29d7d 100644
33477--- a/drivers/md/persistent-data/dm-space-map-checker.c
33478+++ b/drivers/md/persistent-data/dm-space-map-checker.c
33479@@ -159,7 +159,7 @@ static void ca_destroy(struct count_array *ca)
33480 /*----------------------------------------------------------------*/
33481
33482 struct sm_checker {
33483- struct dm_space_map sm;
33484+ dm_space_map_no_const sm;
33485
33486 struct count_array old_counts;
33487 struct count_array counts;
33488diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
33489index fc469ba..2d91555 100644
33490--- a/drivers/md/persistent-data/dm-space-map-disk.c
33491+++ b/drivers/md/persistent-data/dm-space-map-disk.c
33492@@ -23,7 +23,7 @@
33493 * Space map interface.
33494 */
33495 struct sm_disk {
33496- struct dm_space_map sm;
33497+ dm_space_map_no_const sm;
33498
33499 struct ll_disk ll;
33500 struct ll_disk old_ll;
33501diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
33502index e89ae5e..062e4c2 100644
33503--- a/drivers/md/persistent-data/dm-space-map-metadata.c
33504+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
33505@@ -43,7 +43,7 @@ struct block_op {
33506 };
33507
33508 struct sm_metadata {
33509- struct dm_space_map sm;
33510+ dm_space_map_no_const sm;
33511
33512 struct ll_disk ll;
33513 struct ll_disk old_ll;
33514diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
33515index 1cbfc6b..56e1dbb 100644
33516--- a/drivers/md/persistent-data/dm-space-map.h
33517+++ b/drivers/md/persistent-data/dm-space-map.h
33518@@ -60,6 +60,7 @@ struct dm_space_map {
33519 int (*root_size)(struct dm_space_map *sm, size_t *result);
33520 int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
33521 };
33522+typedef struct dm_space_map __no_const dm_space_map_no_const;
33523
33524 /*----------------------------------------------------------------*/
33525
33526diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
33527index edc735a..e9b97f1 100644
33528--- a/drivers/md/raid1.c
33529+++ b/drivers/md/raid1.c
33530@@ -1645,7 +1645,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
33531 if (r1_sync_page_io(rdev, sect, s,
33532 bio->bi_io_vec[idx].bv_page,
33533 READ) != 0)
33534- atomic_add(s, &rdev->corrected_errors);
33535+ atomic_add_unchecked(s, &rdev->corrected_errors);
33536 }
33537 sectors -= s;
33538 sect += s;
33539@@ -1859,7 +1859,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
33540 test_bit(In_sync, &rdev->flags)) {
33541 if (r1_sync_page_io(rdev, sect, s,
33542 conf->tmppage, READ)) {
33543- atomic_add(s, &rdev->corrected_errors);
33544+ atomic_add_unchecked(s, &rdev->corrected_errors);
33545 printk(KERN_INFO
33546 "md/raid1:%s: read error corrected "
33547 "(%d sectors at %llu on %s)\n",
33548diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
33549index 1898389..a3aa617 100644
33550--- a/drivers/md/raid10.c
33551+++ b/drivers/md/raid10.c
33552@@ -1636,7 +1636,7 @@ static void end_sync_read(struct bio *bio, int error)
33553 /* The write handler will notice the lack of
33554 * R10BIO_Uptodate and record any errors etc
33555 */
33556- atomic_add(r10_bio->sectors,
33557+ atomic_add_unchecked(r10_bio->sectors,
33558 &conf->mirrors[d].rdev->corrected_errors);
33559
33560 /* for reconstruct, we always reschedule after a read.
33561@@ -1987,7 +1987,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33562 {
33563 struct timespec cur_time_mon;
33564 unsigned long hours_since_last;
33565- unsigned int read_errors = atomic_read(&rdev->read_errors);
33566+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
33567
33568 ktime_get_ts(&cur_time_mon);
33569
33570@@ -2009,9 +2009,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33571 * overflowing the shift of read_errors by hours_since_last.
33572 */
33573 if (hours_since_last >= 8 * sizeof(read_errors))
33574- atomic_set(&rdev->read_errors, 0);
33575+ atomic_set_unchecked(&rdev->read_errors, 0);
33576 else
33577- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
33578+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
33579 }
33580
33581 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
33582@@ -2065,8 +2065,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33583 return;
33584
33585 check_decay_read_errors(mddev, rdev);
33586- atomic_inc(&rdev->read_errors);
33587- if (atomic_read(&rdev->read_errors) > max_read_errors) {
33588+ atomic_inc_unchecked(&rdev->read_errors);
33589+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
33590 char b[BDEVNAME_SIZE];
33591 bdevname(rdev->bdev, b);
33592
33593@@ -2074,7 +2074,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33594 "md/raid10:%s: %s: Raid device exceeded "
33595 "read_error threshold [cur %d:max %d]\n",
33596 mdname(mddev), b,
33597- atomic_read(&rdev->read_errors), max_read_errors);
33598+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
33599 printk(KERN_NOTICE
33600 "md/raid10:%s: %s: Failing raid device\n",
33601 mdname(mddev), b);
33602@@ -2223,7 +2223,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33603 (unsigned long long)(
33604 sect + rdev->data_offset),
33605 bdevname(rdev->bdev, b));
33606- atomic_add(s, &rdev->corrected_errors);
33607+ atomic_add_unchecked(s, &rdev->corrected_errors);
33608 }
33609
33610 rdev_dec_pending(rdev, mddev);
33611diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
33612index 360f2b9..08b5382 100644
33613--- a/drivers/md/raid5.c
33614+++ b/drivers/md/raid5.c
33615@@ -1687,18 +1687,18 @@ static void raid5_end_read_request(struct bio * bi, int error)
33616 (unsigned long long)(sh->sector
33617 + rdev->data_offset),
33618 bdevname(rdev->bdev, b));
33619- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
33620+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
33621 clear_bit(R5_ReadError, &sh->dev[i].flags);
33622 clear_bit(R5_ReWrite, &sh->dev[i].flags);
33623 }
33624- if (atomic_read(&rdev->read_errors))
33625- atomic_set(&rdev->read_errors, 0);
33626+ if (atomic_read_unchecked(&rdev->read_errors))
33627+ atomic_set_unchecked(&rdev->read_errors, 0);
33628 } else {
33629 const char *bdn = bdevname(rdev->bdev, b);
33630 int retry = 0;
33631
33632 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
33633- atomic_inc(&rdev->read_errors);
33634+ atomic_inc_unchecked(&rdev->read_errors);
33635 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
33636 printk_ratelimited(
33637 KERN_WARNING
33638@@ -1727,7 +1727,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
33639 (unsigned long long)(sh->sector
33640 + rdev->data_offset),
33641 bdn);
33642- else if (atomic_read(&rdev->read_errors)
33643+ else if (atomic_read_unchecked(&rdev->read_errors)
33644 > conf->max_nr_stripes)
33645 printk(KERN_WARNING
33646 "md/raid:%s: Too many read errors, failing device %s.\n",
33647diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
33648index ce4f858..7bcfb46 100644
33649--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
33650+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
33651@@ -1678,7 +1678,7 @@ static struct ddb_info ddb_v6 = {
33652 .subvendor = _subvend, .subdevice = _subdev, \
33653 .driver_data = (unsigned long)&_driverdata }
33654
33655-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
33656+static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
33657 DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
33658 DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
33659 DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
33660diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
33661index a7d876f..8c21b61 100644
33662--- a/drivers/media/dvb/dvb-core/dvb_demux.h
33663+++ b/drivers/media/dvb/dvb-core/dvb_demux.h
33664@@ -73,7 +73,7 @@ struct dvb_demux_feed {
33665 union {
33666 dmx_ts_cb ts;
33667 dmx_section_cb sec;
33668- } cb;
33669+ } __no_const cb;
33670
33671 struct dvb_demux *demux;
33672 void *priv;
33673diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
33674index 00a6732..70a682e 100644
33675--- a/drivers/media/dvb/dvb-core/dvbdev.c
33676+++ b/drivers/media/dvb/dvb-core/dvbdev.c
33677@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
33678 const struct dvb_device *template, void *priv, int type)
33679 {
33680 struct dvb_device *dvbdev;
33681- struct file_operations *dvbdevfops;
33682+ file_operations_no_const *dvbdevfops;
33683 struct device *clsdev;
33684 int minor;
33685 int id;
33686diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
33687index 3940bb0..fb3952a 100644
33688--- a/drivers/media/dvb/dvb-usb/cxusb.c
33689+++ b/drivers/media/dvb/dvb-usb/cxusb.c
33690@@ -1068,7 +1068,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
33691
33692 struct dib0700_adapter_state {
33693 int (*set_param_save) (struct dvb_frontend *);
33694-};
33695+} __no_const;
33696
33697 static int dib7070_set_param_override(struct dvb_frontend *fe)
33698 {
33699diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
33700index 451c5a7..649f711 100644
33701--- a/drivers/media/dvb/dvb-usb/dw2102.c
33702+++ b/drivers/media/dvb/dvb-usb/dw2102.c
33703@@ -95,7 +95,7 @@ struct su3000_state {
33704
33705 struct s6x0_state {
33706 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
33707-};
33708+} __no_const;
33709
33710 /* debug */
33711 static int dvb_usb_dw2102_debug;
33712diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
33713index 404f63a..4796533 100644
33714--- a/drivers/media/dvb/frontends/dib3000.h
33715+++ b/drivers/media/dvb/frontends/dib3000.h
33716@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
33717 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
33718 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
33719 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
33720-};
33721+} __no_const;
33722
33723 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
33724 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
33725diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
33726index 8418c02..8555013 100644
33727--- a/drivers/media/dvb/ngene/ngene-cards.c
33728+++ b/drivers/media/dvb/ngene/ngene-cards.c
33729@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780 = {
33730
33731 /****************************************************************************/
33732
33733-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
33734+static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
33735 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
33736 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
33737 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
33738diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
33739index 16a089f..ab1667d 100644
33740--- a/drivers/media/radio/radio-cadet.c
33741+++ b/drivers/media/radio/radio-cadet.c
33742@@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
33743 unsigned char readbuf[RDS_BUFFER];
33744 int i = 0;
33745
33746+ if (count > RDS_BUFFER)
33747+ return -EFAULT;
33748 mutex_lock(&dev->lock);
33749 if (dev->rdsstat == 0) {
33750 dev->rdsstat = 1;
33751diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
33752index 9cde353..8c6a1c3 100644
33753--- a/drivers/media/video/au0828/au0828.h
33754+++ b/drivers/media/video/au0828/au0828.h
33755@@ -191,7 +191,7 @@ struct au0828_dev {
33756
33757 /* I2C */
33758 struct i2c_adapter i2c_adap;
33759- struct i2c_algorithm i2c_algo;
33760+ i2c_algorithm_no_const i2c_algo;
33761 struct i2c_client i2c_client;
33762 u32 i2c_rc;
33763
33764diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
33765index ee91e295..04ad048 100644
33766--- a/drivers/media/video/cpia2/cpia2_core.c
33767+++ b/drivers/media/video/cpia2/cpia2_core.c
33768@@ -86,6 +86,7 @@ static inline unsigned long kvirt_to_pa(unsigned long adr)
33769 return ret;
33770 }
33771
33772+static void *rvmalloc(unsigned long size) __size_overflow(1);
33773 static void *rvmalloc(unsigned long size)
33774 {
33775 void *mem;
33776diff --git a/drivers/media/video/cx18/cx18-alsa-pcm.c b/drivers/media/video/cx18/cx18-alsa-pcm.c
33777index 82d195b..181103c 100644
33778--- a/drivers/media/video/cx18/cx18-alsa-pcm.c
33779+++ b/drivers/media/video/cx18/cx18-alsa-pcm.c
33780@@ -229,6 +229,8 @@ static int snd_cx18_pcm_ioctl(struct snd_pcm_substream *substream,
33781
33782
33783 static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
33784+ size_t size) __size_overflow(2);
33785+static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
33786 size_t size)
33787 {
33788 struct snd_pcm_runtime *runtime = subs->runtime;
33789diff --git a/drivers/media/video/cx231xx/cx231xx-audio.c b/drivers/media/video/cx231xx/cx231xx-audio.c
33790index a2c2b7d..8f1bec7 100644
33791--- a/drivers/media/video/cx231xx/cx231xx-audio.c
33792+++ b/drivers/media/video/cx231xx/cx231xx-audio.c
33793@@ -389,6 +389,8 @@ static int cx231xx_init_audio_bulk(struct cx231xx *dev)
33794 }
33795
33796 static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
33797+ size_t size) __size_overflow(2);
33798+static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
33799 size_t size)
33800 {
33801 struct snd_pcm_runtime *runtime = subs->runtime;
33802diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
33803index 04bf662..e0ac026 100644
33804--- a/drivers/media/video/cx88/cx88-alsa.c
33805+++ b/drivers/media/video/cx88/cx88-alsa.c
33806@@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
33807 * Only boards with eeprom and byte 1 at eeprom=1 have it
33808 */
33809
33810-static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
33811+static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
33812 {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
33813 {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
33814 {0, }
33815diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
33816index e2a7b77..753d0ee 100644
33817--- a/drivers/media/video/em28xx/em28xx-audio.c
33818+++ b/drivers/media/video/em28xx/em28xx-audio.c
33819@@ -225,6 +225,8 @@ static int em28xx_init_audio_isoc(struct em28xx *dev)
33820 }
33821
33822 static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
33823+ size_t size) __size_overflow(2);
33824+static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
33825 size_t size)
33826 {
33827 struct snd_pcm_runtime *runtime = subs->runtime;
33828diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
33829index b09a3c8..6dcba0a 100644
33830--- a/drivers/media/video/meye.c
33831+++ b/drivers/media/video/meye.c
33832@@ -72,6 +72,7 @@ static struct meye meye;
33833 /****************************************************************************/
33834 /* Memory allocation routines (stolen from bttv-driver.c) */
33835 /****************************************************************************/
33836+static void *rvmalloc(unsigned long size) __size_overflow(1);
33837 static void *rvmalloc(unsigned long size)
33838 {
33839 void *mem;
33840diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
33841index 1fb7d5b..3901e77 100644
33842--- a/drivers/media/video/omap/omap_vout.c
33843+++ b/drivers/media/video/omap/omap_vout.c
33844@@ -64,7 +64,6 @@ enum omap_vout_channels {
33845 OMAP_VIDEO2,
33846 };
33847
33848-static struct videobuf_queue_ops video_vbq_ops;
33849 /* Variables configurable through module params*/
33850 static u32 video1_numbuffers = 3;
33851 static u32 video2_numbuffers = 3;
33852@@ -1000,6 +999,12 @@ static int omap_vout_open(struct file *file)
33853 {
33854 struct videobuf_queue *q;
33855 struct omap_vout_device *vout = NULL;
33856+ static struct videobuf_queue_ops video_vbq_ops = {
33857+ .buf_setup = omap_vout_buffer_setup,
33858+ .buf_prepare = omap_vout_buffer_prepare,
33859+ .buf_release = omap_vout_buffer_release,
33860+ .buf_queue = omap_vout_buffer_queue,
33861+ };
33862
33863 vout = video_drvdata(file);
33864 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
33865@@ -1017,10 +1022,6 @@ static int omap_vout_open(struct file *file)
33866 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
33867
33868 q = &vout->vbq;
33869- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
33870- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
33871- video_vbq_ops.buf_release = omap_vout_buffer_release;
33872- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
33873 spin_lock_init(&vout->vbq_lock);
33874
33875 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
33876diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33877index 305e6aa..0143317 100644
33878--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33879+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33880@@ -196,7 +196,7 @@ struct pvr2_hdw {
33881
33882 /* I2C stuff */
33883 struct i2c_adapter i2c_adap;
33884- struct i2c_algorithm i2c_algo;
33885+ i2c_algorithm_no_const i2c_algo;
33886 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
33887 int i2c_cx25840_hack_state;
33888 int i2c_linked;
33889diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
33890index 2fd38a0..ddec3c4 100644
33891--- a/drivers/media/video/saa7164/saa7164-encoder.c
33892+++ b/drivers/media/video/saa7164/saa7164-encoder.c
33893@@ -1136,6 +1136,8 @@ struct saa7164_user_buffer *saa7164_enc_next_buf(struct saa7164_port *port)
33894 }
33895
33896 static ssize_t fops_read(struct file *file, char __user *buffer,
33897+ size_t count, loff_t *pos) __size_overflow(3);
33898+static ssize_t fops_read(struct file *file, char __user *buffer,
33899 size_t count, loff_t *pos)
33900 {
33901 struct saa7164_encoder_fh *fh = file->private_data;
33902diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
33903index e2e0341..b80056c 100644
33904--- a/drivers/media/video/saa7164/saa7164-vbi.c
33905+++ b/drivers/media/video/saa7164/saa7164-vbi.c
33906@@ -1081,6 +1081,8 @@ struct saa7164_user_buffer *saa7164_vbi_next_buf(struct saa7164_port *port)
33907 }
33908
33909 static ssize_t fops_read(struct file *file, char __user *buffer,
33910+ size_t count, loff_t *pos) __size_overflow(3);
33911+static ssize_t fops_read(struct file *file, char __user *buffer,
33912 size_t count, loff_t *pos)
33913 {
33914 struct saa7164_vbi_fh *fh = file->private_data;
33915diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
33916index 4ed1c7c2..8f15e13 100644
33917--- a/drivers/media/video/timblogiw.c
33918+++ b/drivers/media/video/timblogiw.c
33919@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
33920
33921 /* Platform device functions */
33922
33923-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
33924+static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
33925 .vidioc_querycap = timblogiw_querycap,
33926 .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
33927 .vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
33928@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
33929 .vidioc_enum_framesizes = timblogiw_enum_framesizes,
33930 };
33931
33932-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
33933+static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
33934 .owner = THIS_MODULE,
33935 .open = timblogiw_open,
33936 .release = timblogiw_close,
33937diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c
33938index c969111..a7910f4 100644
33939--- a/drivers/media/video/videobuf-dma-contig.c
33940+++ b/drivers/media/video/videobuf-dma-contig.c
33941@@ -184,6 +184,7 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
33942 return ret;
33943 }
33944
33945+static struct videobuf_buffer *__videobuf_alloc_vb(size_t size) __size_overflow(1);
33946 static struct videobuf_buffer *__videobuf_alloc_vb(size_t size)
33947 {
33948 struct videobuf_dma_contig_memory *mem;
33949diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
33950index f300dea..5fc9c4a 100644
33951--- a/drivers/media/video/videobuf-dma-sg.c
33952+++ b/drivers/media/video/videobuf-dma-sg.c
33953@@ -419,6 +419,7 @@ static const struct vm_operations_struct videobuf_vm_ops = {
33954 struct videobuf_dma_sg_memory
33955 */
33956
33957+static struct videobuf_buffer *__videobuf_alloc_vb(size_t size) __size_overflow(1);
33958 static struct videobuf_buffer *__videobuf_alloc_vb(size_t size)
33959 {
33960 struct videobuf_dma_sg_memory *mem;
33961diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
33962index df14258..12cc7a3 100644
33963--- a/drivers/media/video/videobuf-vmalloc.c
33964+++ b/drivers/media/video/videobuf-vmalloc.c
33965@@ -135,6 +135,7 @@ static const struct vm_operations_struct videobuf_vm_ops = {
33966 struct videobuf_dma_sg_memory
33967 */
33968
33969+static struct videobuf_buffer *__videobuf_alloc_vb(size_t size) __size_overflow(1);
33970 static struct videobuf_buffer *__videobuf_alloc_vb(size_t size)
33971 {
33972 struct videobuf_vmalloc_memory *mem;
33973diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
33974index a7dc467..a55c423 100644
33975--- a/drivers/message/fusion/mptbase.c
33976+++ b/drivers/message/fusion/mptbase.c
33977@@ -6754,8 +6754,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
33978 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
33979 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
33980
33981+#ifdef CONFIG_GRKERNSEC_HIDESYM
33982+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
33983+#else
33984 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
33985 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
33986+#endif
33987+
33988 /*
33989 * Rounding UP to nearest 4-kB boundary here...
33990 */
33991diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
33992index 551262e..7551198 100644
33993--- a/drivers/message/fusion/mptsas.c
33994+++ b/drivers/message/fusion/mptsas.c
33995@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
33996 return 0;
33997 }
33998
33999+static inline void
34000+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
34001+{
34002+ if (phy_info->port_details) {
34003+ phy_info->port_details->rphy = rphy;
34004+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
34005+ ioc->name, rphy));
34006+ }
34007+
34008+ if (rphy) {
34009+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
34010+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
34011+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
34012+ ioc->name, rphy, rphy->dev.release));
34013+ }
34014+}
34015+
34016 /* no mutex */
34017 static void
34018 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
34019@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
34020 return NULL;
34021 }
34022
34023-static inline void
34024-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
34025-{
34026- if (phy_info->port_details) {
34027- phy_info->port_details->rphy = rphy;
34028- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
34029- ioc->name, rphy));
34030- }
34031-
34032- if (rphy) {
34033- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
34034- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
34035- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
34036- ioc->name, rphy, rphy->dev.release));
34037- }
34038-}
34039-
34040 static inline struct sas_port *
34041 mptsas_get_port(struct mptsas_phyinfo *phy_info)
34042 {
34043diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
34044index 0c3ced7..1fe34ec 100644
34045--- a/drivers/message/fusion/mptscsih.c
34046+++ b/drivers/message/fusion/mptscsih.c
34047@@ -1270,15 +1270,16 @@ mptscsih_info(struct Scsi_Host *SChost)
34048
34049 h = shost_priv(SChost);
34050
34051- if (h) {
34052- if (h->info_kbuf == NULL)
34053- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34054- return h->info_kbuf;
34055- h->info_kbuf[0] = '\0';
34056+ if (!h)
34057+ return NULL;
34058
34059- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34060- h->info_kbuf[size-1] = '\0';
34061- }
34062+ if (h->info_kbuf == NULL)
34063+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34064+ return h->info_kbuf;
34065+ h->info_kbuf[0] = '\0';
34066+
34067+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34068+ h->info_kbuf[size-1] = '\0';
34069
34070 return h->info_kbuf;
34071 }
34072diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
34073index 6d115c7..58ff7fd 100644
34074--- a/drivers/message/i2o/i2o_proc.c
34075+++ b/drivers/message/i2o/i2o_proc.c
34076@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
34077 "Array Controller Device"
34078 };
34079
34080-static char *chtostr(u8 * chars, int n)
34081-{
34082- char tmp[256];
34083- tmp[0] = 0;
34084- return strncat(tmp, (char *)chars, n);
34085-}
34086-
34087 static int i2o_report_query_status(struct seq_file *seq, int block_status,
34088 char *group)
34089 {
34090@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
34091
34092 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
34093 seq_printf(seq, "%-#8x", ddm_table.module_id);
34094- seq_printf(seq, "%-29s",
34095- chtostr(ddm_table.module_name_version, 28));
34096+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
34097 seq_printf(seq, "%9d ", ddm_table.data_size);
34098 seq_printf(seq, "%8d", ddm_table.code_size);
34099
34100@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
34101
34102 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
34103 seq_printf(seq, "%-#8x", dst->module_id);
34104- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
34105- seq_printf(seq, "%-9s", chtostr(dst->date, 8));
34106+ seq_printf(seq, "%-.28s", dst->module_name_version);
34107+ seq_printf(seq, "%-.8s", dst->date);
34108 seq_printf(seq, "%8d ", dst->module_size);
34109 seq_printf(seq, "%8d ", dst->mpb_size);
34110 seq_printf(seq, "0x%04x", dst->module_flags);
34111@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
34112 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
34113 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
34114 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
34115- seq_printf(seq, "Vendor info : %s\n",
34116- chtostr((u8 *) (work32 + 2), 16));
34117- seq_printf(seq, "Product info : %s\n",
34118- chtostr((u8 *) (work32 + 6), 16));
34119- seq_printf(seq, "Description : %s\n",
34120- chtostr((u8 *) (work32 + 10), 16));
34121- seq_printf(seq, "Product rev. : %s\n",
34122- chtostr((u8 *) (work32 + 14), 8));
34123+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
34124+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
34125+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
34126+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
34127
34128 seq_printf(seq, "Serial number : ");
34129 print_serial_number(seq, (u8 *) (work32 + 16),
34130@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
34131 }
34132
34133 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
34134- seq_printf(seq, "Module name : %s\n",
34135- chtostr(result.module_name, 24));
34136- seq_printf(seq, "Module revision : %s\n",
34137- chtostr(result.module_rev, 8));
34138+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
34139+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
34140
34141 seq_printf(seq, "Serial number : ");
34142 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
34143@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
34144 return 0;
34145 }
34146
34147- seq_printf(seq, "Device name : %s\n",
34148- chtostr(result.device_name, 64));
34149- seq_printf(seq, "Service name : %s\n",
34150- chtostr(result.service_name, 64));
34151- seq_printf(seq, "Physical name : %s\n",
34152- chtostr(result.physical_location, 64));
34153- seq_printf(seq, "Instance number : %s\n",
34154- chtostr(result.instance_number, 4));
34155+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
34156+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
34157+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
34158+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
34159
34160 return 0;
34161 }
34162diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
34163index a8c08f3..155fe3d 100644
34164--- a/drivers/message/i2o/iop.c
34165+++ b/drivers/message/i2o/iop.c
34166@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
34167
34168 spin_lock_irqsave(&c->context_list_lock, flags);
34169
34170- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
34171- atomic_inc(&c->context_list_counter);
34172+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
34173+ atomic_inc_unchecked(&c->context_list_counter);
34174
34175- entry->context = atomic_read(&c->context_list_counter);
34176+ entry->context = atomic_read_unchecked(&c->context_list_counter);
34177
34178 list_add(&entry->list, &c->context_list);
34179
34180@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
34181
34182 #if BITS_PER_LONG == 64
34183 spin_lock_init(&c->context_list_lock);
34184- atomic_set(&c->context_list_counter, 0);
34185+ atomic_set_unchecked(&c->context_list_counter, 0);
34186 INIT_LIST_HEAD(&c->context_list);
34187 #endif
34188
34189diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
34190index 7ce65f4..e66e9bc 100644
34191--- a/drivers/mfd/abx500-core.c
34192+++ b/drivers/mfd/abx500-core.c
34193@@ -15,7 +15,7 @@ static LIST_HEAD(abx500_list);
34194
34195 struct abx500_device_entry {
34196 struct list_head list;
34197- struct abx500_ops ops;
34198+ abx500_ops_no_const ops;
34199 struct device *dev;
34200 };
34201
34202diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
34203index a9223ed..4127b13 100644
34204--- a/drivers/mfd/janz-cmodio.c
34205+++ b/drivers/mfd/janz-cmodio.c
34206@@ -13,6 +13,7 @@
34207
34208 #include <linux/kernel.h>
34209 #include <linux/module.h>
34210+#include <linux/slab.h>
34211 #include <linux/init.h>
34212 #include <linux/pci.h>
34213 #include <linux/interrupt.h>
34214diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
34215index a981e2a..5ca0c8b 100644
34216--- a/drivers/misc/lis3lv02d/lis3lv02d.c
34217+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
34218@@ -466,7 +466,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
34219 * the lid is closed. This leads to interrupts as soon as a little move
34220 * is done.
34221 */
34222- atomic_inc(&lis3->count);
34223+ atomic_inc_unchecked(&lis3->count);
34224
34225 wake_up_interruptible(&lis3->misc_wait);
34226 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
34227@@ -552,7 +552,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
34228 if (lis3->pm_dev)
34229 pm_runtime_get_sync(lis3->pm_dev);
34230
34231- atomic_set(&lis3->count, 0);
34232+ atomic_set_unchecked(&lis3->count, 0);
34233 return 0;
34234 }
34235
34236@@ -585,7 +585,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
34237 add_wait_queue(&lis3->misc_wait, &wait);
34238 while (true) {
34239 set_current_state(TASK_INTERRUPTIBLE);
34240- data = atomic_xchg(&lis3->count, 0);
34241+ data = atomic_xchg_unchecked(&lis3->count, 0);
34242 if (data)
34243 break;
34244
34245@@ -626,7 +626,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
34246 struct lis3lv02d, miscdev);
34247
34248 poll_wait(file, &lis3->misc_wait, wait);
34249- if (atomic_read(&lis3->count))
34250+ if (atomic_read_unchecked(&lis3->count))
34251 return POLLIN | POLLRDNORM;
34252 return 0;
34253 }
34254diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
34255index 2b1482a..5d33616 100644
34256--- a/drivers/misc/lis3lv02d/lis3lv02d.h
34257+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
34258@@ -266,7 +266,7 @@ struct lis3lv02d {
34259 struct input_polled_dev *idev; /* input device */
34260 struct platform_device *pdev; /* platform device */
34261 struct regulator_bulk_data regulators[2];
34262- atomic_t count; /* interrupt count after last read */
34263+ atomic_unchecked_t count; /* interrupt count after last read */
34264 union axis_conversion ac; /* hw -> logical axis */
34265 int mapped_btns[3];
34266
34267diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
34268index 2f30bad..c4c13d0 100644
34269--- a/drivers/misc/sgi-gru/gruhandles.c
34270+++ b/drivers/misc/sgi-gru/gruhandles.c
34271@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
34272 unsigned long nsec;
34273
34274 nsec = CLKS2NSEC(clks);
34275- atomic_long_inc(&mcs_op_statistics[op].count);
34276- atomic_long_add(nsec, &mcs_op_statistics[op].total);
34277+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
34278+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
34279 if (mcs_op_statistics[op].max < nsec)
34280 mcs_op_statistics[op].max = nsec;
34281 }
34282diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
34283index 950dbe9..eeef0f8 100644
34284--- a/drivers/misc/sgi-gru/gruprocfs.c
34285+++ b/drivers/misc/sgi-gru/gruprocfs.c
34286@@ -32,9 +32,9 @@
34287
34288 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
34289
34290-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
34291+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
34292 {
34293- unsigned long val = atomic_long_read(v);
34294+ unsigned long val = atomic_long_read_unchecked(v);
34295
34296 seq_printf(s, "%16lu %s\n", val, id);
34297 }
34298@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
34299
34300 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
34301 for (op = 0; op < mcsop_last; op++) {
34302- count = atomic_long_read(&mcs_op_statistics[op].count);
34303- total = atomic_long_read(&mcs_op_statistics[op].total);
34304+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
34305+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
34306 max = mcs_op_statistics[op].max;
34307 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
34308 count ? total / count : 0, max);
34309diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
34310index 5c3ce24..4915ccb 100644
34311--- a/drivers/misc/sgi-gru/grutables.h
34312+++ b/drivers/misc/sgi-gru/grutables.h
34313@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
34314 * GRU statistics.
34315 */
34316 struct gru_stats_s {
34317- atomic_long_t vdata_alloc;
34318- atomic_long_t vdata_free;
34319- atomic_long_t gts_alloc;
34320- atomic_long_t gts_free;
34321- atomic_long_t gms_alloc;
34322- atomic_long_t gms_free;
34323- atomic_long_t gts_double_allocate;
34324- atomic_long_t assign_context;
34325- atomic_long_t assign_context_failed;
34326- atomic_long_t free_context;
34327- atomic_long_t load_user_context;
34328- atomic_long_t load_kernel_context;
34329- atomic_long_t lock_kernel_context;
34330- atomic_long_t unlock_kernel_context;
34331- atomic_long_t steal_user_context;
34332- atomic_long_t steal_kernel_context;
34333- atomic_long_t steal_context_failed;
34334- atomic_long_t nopfn;
34335- atomic_long_t asid_new;
34336- atomic_long_t asid_next;
34337- atomic_long_t asid_wrap;
34338- atomic_long_t asid_reuse;
34339- atomic_long_t intr;
34340- atomic_long_t intr_cbr;
34341- atomic_long_t intr_tfh;
34342- atomic_long_t intr_spurious;
34343- atomic_long_t intr_mm_lock_failed;
34344- atomic_long_t call_os;
34345- atomic_long_t call_os_wait_queue;
34346- atomic_long_t user_flush_tlb;
34347- atomic_long_t user_unload_context;
34348- atomic_long_t user_exception;
34349- atomic_long_t set_context_option;
34350- atomic_long_t check_context_retarget_intr;
34351- atomic_long_t check_context_unload;
34352- atomic_long_t tlb_dropin;
34353- atomic_long_t tlb_preload_page;
34354- atomic_long_t tlb_dropin_fail_no_asid;
34355- atomic_long_t tlb_dropin_fail_upm;
34356- atomic_long_t tlb_dropin_fail_invalid;
34357- atomic_long_t tlb_dropin_fail_range_active;
34358- atomic_long_t tlb_dropin_fail_idle;
34359- atomic_long_t tlb_dropin_fail_fmm;
34360- atomic_long_t tlb_dropin_fail_no_exception;
34361- atomic_long_t tfh_stale_on_fault;
34362- atomic_long_t mmu_invalidate_range;
34363- atomic_long_t mmu_invalidate_page;
34364- atomic_long_t flush_tlb;
34365- atomic_long_t flush_tlb_gru;
34366- atomic_long_t flush_tlb_gru_tgh;
34367- atomic_long_t flush_tlb_gru_zero_asid;
34368+ atomic_long_unchecked_t vdata_alloc;
34369+ atomic_long_unchecked_t vdata_free;
34370+ atomic_long_unchecked_t gts_alloc;
34371+ atomic_long_unchecked_t gts_free;
34372+ atomic_long_unchecked_t gms_alloc;
34373+ atomic_long_unchecked_t gms_free;
34374+ atomic_long_unchecked_t gts_double_allocate;
34375+ atomic_long_unchecked_t assign_context;
34376+ atomic_long_unchecked_t assign_context_failed;
34377+ atomic_long_unchecked_t free_context;
34378+ atomic_long_unchecked_t load_user_context;
34379+ atomic_long_unchecked_t load_kernel_context;
34380+ atomic_long_unchecked_t lock_kernel_context;
34381+ atomic_long_unchecked_t unlock_kernel_context;
34382+ atomic_long_unchecked_t steal_user_context;
34383+ atomic_long_unchecked_t steal_kernel_context;
34384+ atomic_long_unchecked_t steal_context_failed;
34385+ atomic_long_unchecked_t nopfn;
34386+ atomic_long_unchecked_t asid_new;
34387+ atomic_long_unchecked_t asid_next;
34388+ atomic_long_unchecked_t asid_wrap;
34389+ atomic_long_unchecked_t asid_reuse;
34390+ atomic_long_unchecked_t intr;
34391+ atomic_long_unchecked_t intr_cbr;
34392+ atomic_long_unchecked_t intr_tfh;
34393+ atomic_long_unchecked_t intr_spurious;
34394+ atomic_long_unchecked_t intr_mm_lock_failed;
34395+ atomic_long_unchecked_t call_os;
34396+ atomic_long_unchecked_t call_os_wait_queue;
34397+ atomic_long_unchecked_t user_flush_tlb;
34398+ atomic_long_unchecked_t user_unload_context;
34399+ atomic_long_unchecked_t user_exception;
34400+ atomic_long_unchecked_t set_context_option;
34401+ atomic_long_unchecked_t check_context_retarget_intr;
34402+ atomic_long_unchecked_t check_context_unload;
34403+ atomic_long_unchecked_t tlb_dropin;
34404+ atomic_long_unchecked_t tlb_preload_page;
34405+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
34406+ atomic_long_unchecked_t tlb_dropin_fail_upm;
34407+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
34408+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
34409+ atomic_long_unchecked_t tlb_dropin_fail_idle;
34410+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
34411+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
34412+ atomic_long_unchecked_t tfh_stale_on_fault;
34413+ atomic_long_unchecked_t mmu_invalidate_range;
34414+ atomic_long_unchecked_t mmu_invalidate_page;
34415+ atomic_long_unchecked_t flush_tlb;
34416+ atomic_long_unchecked_t flush_tlb_gru;
34417+ atomic_long_unchecked_t flush_tlb_gru_tgh;
34418+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
34419
34420- atomic_long_t copy_gpa;
34421- atomic_long_t read_gpa;
34422+ atomic_long_unchecked_t copy_gpa;
34423+ atomic_long_unchecked_t read_gpa;
34424
34425- atomic_long_t mesq_receive;
34426- atomic_long_t mesq_receive_none;
34427- atomic_long_t mesq_send;
34428- atomic_long_t mesq_send_failed;
34429- atomic_long_t mesq_noop;
34430- atomic_long_t mesq_send_unexpected_error;
34431- atomic_long_t mesq_send_lb_overflow;
34432- atomic_long_t mesq_send_qlimit_reached;
34433- atomic_long_t mesq_send_amo_nacked;
34434- atomic_long_t mesq_send_put_nacked;
34435- atomic_long_t mesq_page_overflow;
34436- atomic_long_t mesq_qf_locked;
34437- atomic_long_t mesq_qf_noop_not_full;
34438- atomic_long_t mesq_qf_switch_head_failed;
34439- atomic_long_t mesq_qf_unexpected_error;
34440- atomic_long_t mesq_noop_unexpected_error;
34441- atomic_long_t mesq_noop_lb_overflow;
34442- atomic_long_t mesq_noop_qlimit_reached;
34443- atomic_long_t mesq_noop_amo_nacked;
34444- atomic_long_t mesq_noop_put_nacked;
34445- atomic_long_t mesq_noop_page_overflow;
34446+ atomic_long_unchecked_t mesq_receive;
34447+ atomic_long_unchecked_t mesq_receive_none;
34448+ atomic_long_unchecked_t mesq_send;
34449+ atomic_long_unchecked_t mesq_send_failed;
34450+ atomic_long_unchecked_t mesq_noop;
34451+ atomic_long_unchecked_t mesq_send_unexpected_error;
34452+ atomic_long_unchecked_t mesq_send_lb_overflow;
34453+ atomic_long_unchecked_t mesq_send_qlimit_reached;
34454+ atomic_long_unchecked_t mesq_send_amo_nacked;
34455+ atomic_long_unchecked_t mesq_send_put_nacked;
34456+ atomic_long_unchecked_t mesq_page_overflow;
34457+ atomic_long_unchecked_t mesq_qf_locked;
34458+ atomic_long_unchecked_t mesq_qf_noop_not_full;
34459+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
34460+ atomic_long_unchecked_t mesq_qf_unexpected_error;
34461+ atomic_long_unchecked_t mesq_noop_unexpected_error;
34462+ atomic_long_unchecked_t mesq_noop_lb_overflow;
34463+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
34464+ atomic_long_unchecked_t mesq_noop_amo_nacked;
34465+ atomic_long_unchecked_t mesq_noop_put_nacked;
34466+ atomic_long_unchecked_t mesq_noop_page_overflow;
34467
34468 };
34469
34470@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
34471 tghop_invalidate, mcsop_last};
34472
34473 struct mcs_op_statistic {
34474- atomic_long_t count;
34475- atomic_long_t total;
34476+ atomic_long_unchecked_t count;
34477+ atomic_long_unchecked_t total;
34478 unsigned long max;
34479 };
34480
34481@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
34482
34483 #define STAT(id) do { \
34484 if (gru_options & OPT_STATS) \
34485- atomic_long_inc(&gru_stats.id); \
34486+ atomic_long_inc_unchecked(&gru_stats.id); \
34487 } while (0)
34488
34489 #ifdef CONFIG_SGI_GRU_DEBUG
34490diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
34491index 851b2f2..a4ec097 100644
34492--- a/drivers/misc/sgi-xp/xp.h
34493+++ b/drivers/misc/sgi-xp/xp.h
34494@@ -289,7 +289,7 @@ struct xpc_interface {
34495 xpc_notify_func, void *);
34496 void (*received) (short, int, void *);
34497 enum xp_retval (*partid_to_nasids) (short, void *);
34498-};
34499+} __no_const;
34500
34501 extern struct xpc_interface xpc_interface;
34502
34503diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
34504index b94d5f7..7f494c5 100644
34505--- a/drivers/misc/sgi-xp/xpc.h
34506+++ b/drivers/misc/sgi-xp/xpc.h
34507@@ -835,6 +835,7 @@ struct xpc_arch_operations {
34508 void (*received_payload) (struct xpc_channel *, void *);
34509 void (*notify_senders_of_disconnect) (struct xpc_channel *);
34510 };
34511+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
34512
34513 /* struct xpc_partition act_state values (for XPC HB) */
34514
34515@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
34516 /* found in xpc_main.c */
34517 extern struct device *xpc_part;
34518 extern struct device *xpc_chan;
34519-extern struct xpc_arch_operations xpc_arch_ops;
34520+extern xpc_arch_operations_no_const xpc_arch_ops;
34521 extern int xpc_disengage_timelimit;
34522 extern int xpc_disengage_timedout;
34523 extern int xpc_activate_IRQ_rcvd;
34524diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
34525index 8d082b4..aa749ae 100644
34526--- a/drivers/misc/sgi-xp/xpc_main.c
34527+++ b/drivers/misc/sgi-xp/xpc_main.c
34528@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_notifier = {
34529 .notifier_call = xpc_system_die,
34530 };
34531
34532-struct xpc_arch_operations xpc_arch_ops;
34533+xpc_arch_operations_no_const xpc_arch_ops;
34534
34535 /*
34536 * Timer function to enforce the timelimit on the partition disengage.
34537diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
34538index 6ebdc40..9edf5d8 100644
34539--- a/drivers/mmc/host/sdhci-pci.c
34540+++ b/drivers/mmc/host/sdhci-pci.c
34541@@ -631,7 +631,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
34542 .probe = via_probe,
34543 };
34544
34545-static const struct pci_device_id pci_ids[] __devinitdata = {
34546+static const struct pci_device_id pci_ids[] __devinitconst = {
34547 {
34548 .vendor = PCI_VENDOR_ID_RICOH,
34549 .device = PCI_DEVICE_ID_RICOH_R5C822,
34550diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
34551index 87a431c..4959b43 100644
34552--- a/drivers/mtd/devices/doc2000.c
34553+++ b/drivers/mtd/devices/doc2000.c
34554@@ -764,7 +764,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
34555
34556 /* The ECC will not be calculated correctly if less than 512 is written */
34557 /* DBB-
34558- if (len != 0x200 && eccbuf)
34559+ if (len != 0x200)
34560 printk(KERN_WARNING
34561 "ECC needs a full sector write (adr: %lx size %lx)\n",
34562 (long) to, (long) len);
34563diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
34564index 9eacf67..4534b5b 100644
34565--- a/drivers/mtd/devices/doc2001.c
34566+++ b/drivers/mtd/devices/doc2001.c
34567@@ -384,7 +384,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
34568 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
34569
34570 /* Don't allow read past end of device */
34571- if (from >= this->totlen)
34572+ if (from >= this->totlen || !len)
34573 return -EINVAL;
34574
34575 /* Don't allow a single read to cross a 512-byte block boundary */
34576diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
34577index 3984d48..28aa897 100644
34578--- a/drivers/mtd/nand/denali.c
34579+++ b/drivers/mtd/nand/denali.c
34580@@ -26,6 +26,7 @@
34581 #include <linux/pci.h>
34582 #include <linux/mtd/mtd.h>
34583 #include <linux/module.h>
34584+#include <linux/slab.h>
34585
34586 #include "denali.h"
34587
34588diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
34589index 51b9d6a..52af9a7 100644
34590--- a/drivers/mtd/nftlmount.c
34591+++ b/drivers/mtd/nftlmount.c
34592@@ -24,6 +24,7 @@
34593 #include <asm/errno.h>
34594 #include <linux/delay.h>
34595 #include <linux/slab.h>
34596+#include <linux/sched.h>
34597 #include <linux/mtd/mtd.h>
34598 #include <linux/mtd/nand.h>
34599 #include <linux/mtd/nftl.h>
34600diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
34601index e2cdebf..d48183a 100644
34602--- a/drivers/mtd/ubi/debug.c
34603+++ b/drivers/mtd/ubi/debug.c
34604@@ -338,6 +338,8 @@ out:
34605
34606 /* Write an UBI debugfs file */
34607 static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
34608+ size_t count, loff_t *ppos) __size_overflow(3);
34609+static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
34610 size_t count, loff_t *ppos)
34611 {
34612 unsigned long ubi_num = (unsigned long)file->private_data;
34613diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
34614index 071f4c8..440862e 100644
34615--- a/drivers/net/ethernet/atheros/atlx/atl2.c
34616+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
34617@@ -2862,7 +2862,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
34618 */
34619
34620 #define ATL2_PARAM(X, desc) \
34621- static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34622+ static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34623 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
34624 MODULE_PARM_DESC(X, desc);
34625 #else
34626diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34627index 66da39f..5dc436d 100644
34628--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34629+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34630@@ -473,7 +473,7 @@ struct bnx2x_rx_mode_obj {
34631
34632 int (*wait_comp)(struct bnx2x *bp,
34633 struct bnx2x_rx_mode_ramrod_params *p);
34634-};
34635+} __no_const;
34636
34637 /********************** Set multicast group ***********************************/
34638
34639diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
34640index aea8f72..fcebf75 100644
34641--- a/drivers/net/ethernet/broadcom/tg3.h
34642+++ b/drivers/net/ethernet/broadcom/tg3.h
34643@@ -140,6 +140,7 @@
34644 #define CHIPREV_ID_5750_A0 0x4000
34645 #define CHIPREV_ID_5750_A1 0x4001
34646 #define CHIPREV_ID_5750_A3 0x4003
34647+#define CHIPREV_ID_5750_C1 0x4201
34648 #define CHIPREV_ID_5750_C2 0x4202
34649 #define CHIPREV_ID_5752_A0_HW 0x5000
34650 #define CHIPREV_ID_5752_A0 0x6000
34651diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
34652index 47a8435..248e4b3 100644
34653--- a/drivers/net/ethernet/chelsio/cxgb/sge.c
34654+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
34655@@ -1052,6 +1052,8 @@ MODULE_PARM_DESC(copybreak, "Receive copy threshold");
34656 * be copied but there is no memory for the copy.
34657 */
34658 static inline struct sk_buff *get_packet(struct pci_dev *pdev,
34659+ struct freelQ *fl, unsigned int len) __size_overflow(3);
34660+static inline struct sk_buff *get_packet(struct pci_dev *pdev,
34661 struct freelQ *fl, unsigned int len)
34662 {
34663 struct sk_buff *skb;
34664diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34665index c4e8643..0979484 100644
34666--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34667+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34668@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
34669 */
34670 struct l2t_skb_cb {
34671 arp_failure_handler_func arp_failure_handler;
34672-};
34673+} __no_const;
34674
34675 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
34676
34677diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
34678index cfb60e1..94af340 100644
34679--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
34680+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
34681@@ -611,6 +611,8 @@ static void recycle_rx_buf(struct adapter *adap, struct sge_fl *q,
34682 * of the SW ring.
34683 */
34684 static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
34685+ size_t sw_size, dma_addr_t * phys, void *metadata) __size_overflow(2,4);
34686+static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
34687 size_t sw_size, dma_addr_t * phys, void *metadata)
34688 {
34689 size_t len = nelem * elem_size;
34690@@ -777,6 +779,8 @@ static inline unsigned int flits_to_desc(unsigned int n)
34691 * be copied but there is no memory for the copy.
34692 */
34693 static struct sk_buff *get_packet(struct adapter *adap, struct sge_fl *fl,
34694+ unsigned int len, unsigned int drop_thres) __size_overflow(3);
34695+static struct sk_buff *get_packet(struct adapter *adap, struct sge_fl *fl,
34696 unsigned int len, unsigned int drop_thres)
34697 {
34698 struct sk_buff *skb = NULL;
34699diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
34700index 2dae795..73037d2 100644
34701--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
34702+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
34703@@ -593,6 +593,9 @@ static inline void __refill_fl(struct adapter *adap, struct sge_fl *fl)
34704 */
34705 static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
34706 size_t sw_size, dma_addr_t *phys, void *metadata,
34707+ size_t stat_size, int node) __size_overflow(2,4);
34708+static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
34709+ size_t sw_size, dma_addr_t *phys, void *metadata,
34710 size_t stat_size, int node)
34711 {
34712 size_t len = nelem * elem_size + stat_size;
34713diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34714index 0bd585b..d954ca5 100644
34715--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34716+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34717@@ -729,6 +729,9 @@ static inline void __refill_fl(struct adapter *adapter, struct sge_fl *fl)
34718 */
34719 static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
34720 size_t swsize, dma_addr_t *busaddrp, void *swringp,
34721+ size_t stat_size) __size_overflow(2,4);
34722+static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
34723+ size_t swsize, dma_addr_t *busaddrp, void *swringp,
34724 size_t stat_size)
34725 {
34726 /*
34727diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
34728index 4d71f5a..8004440 100644
34729--- a/drivers/net/ethernet/dec/tulip/de4x5.c
34730+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
34731@@ -5392,7 +5392,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34732 for (i=0; i<ETH_ALEN; i++) {
34733 tmp.addr[i] = dev->dev_addr[i];
34734 }
34735- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34736+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34737 break;
34738
34739 case DE4X5_SET_HWADDR: /* Set the hardware address */
34740@@ -5432,7 +5432,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34741 spin_lock_irqsave(&lp->lock, flags);
34742 memcpy(&statbuf, &lp->pktStats, ioc->len);
34743 spin_unlock_irqrestore(&lp->lock, flags);
34744- if (copy_to_user(ioc->data, &statbuf, ioc->len))
34745+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
34746 return -EFAULT;
34747 break;
34748 }
34749diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
34750index 14d5b61..1398636 100644
34751--- a/drivers/net/ethernet/dec/tulip/eeprom.c
34752+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
34753@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
34754 {NULL}};
34755
34756
34757-static const char *block_name[] __devinitdata = {
34758+static const char *block_name[] __devinitconst = {
34759 "21140 non-MII",
34760 "21140 MII PHY",
34761 "21142 Serial PHY",
34762diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
34763index 52da7b2..4ddfe1c 100644
34764--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
34765+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
34766@@ -236,7 +236,7 @@ struct pci_id_info {
34767 int drv_flags; /* Driver use, intended as capability flags. */
34768 };
34769
34770-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
34771+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
34772 { /* Sometime a Level-One switch card. */
34773 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
34774 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
34775diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
34776index 28a3a9b..d96cb63 100644
34777--- a/drivers/net/ethernet/dlink/sundance.c
34778+++ b/drivers/net/ethernet/dlink/sundance.c
34779@@ -218,7 +218,7 @@ enum {
34780 struct pci_id_info {
34781 const char *name;
34782 };
34783-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
34784+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
34785 {"D-Link DFE-550TX FAST Ethernet Adapter"},
34786 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
34787 {"D-Link DFE-580TX 4 port Server Adapter"},
34788diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
34789index e703d64..d62ecf9 100644
34790--- a/drivers/net/ethernet/emulex/benet/be_main.c
34791+++ b/drivers/net/ethernet/emulex/benet/be_main.c
34792@@ -402,7 +402,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
34793
34794 if (wrapped)
34795 newacc += 65536;
34796- ACCESS_ONCE(*acc) = newacc;
34797+ ACCESS_ONCE_RW(*acc) = newacc;
34798 }
34799
34800 void be_parse_stats(struct be_adapter *adapter)
34801diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
34802index 47f85c3..82ab6c4 100644
34803--- a/drivers/net/ethernet/faraday/ftgmac100.c
34804+++ b/drivers/net/ethernet/faraday/ftgmac100.c
34805@@ -31,6 +31,8 @@
34806 #include <linux/netdevice.h>
34807 #include <linux/phy.h>
34808 #include <linux/platform_device.h>
34809+#include <linux/interrupt.h>
34810+#include <linux/irqreturn.h>
34811 #include <net/ip.h>
34812
34813 #include "ftgmac100.h"
34814diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
34815index bb336a0..4b472da 100644
34816--- a/drivers/net/ethernet/faraday/ftmac100.c
34817+++ b/drivers/net/ethernet/faraday/ftmac100.c
34818@@ -31,6 +31,8 @@
34819 #include <linux/module.h>
34820 #include <linux/netdevice.h>
34821 #include <linux/platform_device.h>
34822+#include <linux/interrupt.h>
34823+#include <linux/irqreturn.h>
34824
34825 #include "ftmac100.h"
34826
34827diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
34828index c82d444..0007fb4 100644
34829--- a/drivers/net/ethernet/fealnx.c
34830+++ b/drivers/net/ethernet/fealnx.c
34831@@ -150,7 +150,7 @@ struct chip_info {
34832 int flags;
34833 };
34834
34835-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
34836+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
34837 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
34838 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
34839 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
34840diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34841index e1159e5..e18684d 100644
34842--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34843+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34844@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
34845 {
34846 struct e1000_hw *hw = &adapter->hw;
34847 struct e1000_mac_info *mac = &hw->mac;
34848- struct e1000_mac_operations *func = &mac->ops;
34849+ e1000_mac_operations_no_const *func = &mac->ops;
34850
34851 /* Set media type */
34852 switch (adapter->pdev->device) {
34853diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
34854index a3e65fd..f451444 100644
34855--- a/drivers/net/ethernet/intel/e1000e/82571.c
34856+++ b/drivers/net/ethernet/intel/e1000e/82571.c
34857@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
34858 {
34859 struct e1000_hw *hw = &adapter->hw;
34860 struct e1000_mac_info *mac = &hw->mac;
34861- struct e1000_mac_operations *func = &mac->ops;
34862+ e1000_mac_operations_no_const *func = &mac->ops;
34863 u32 swsm = 0;
34864 u32 swsm2 = 0;
34865 bool force_clear_smbi = false;
34866diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
34867index 2967039..ca8c40c 100644
34868--- a/drivers/net/ethernet/intel/e1000e/hw.h
34869+++ b/drivers/net/ethernet/intel/e1000e/hw.h
34870@@ -778,6 +778,7 @@ struct e1000_mac_operations {
34871 void (*write_vfta)(struct e1000_hw *, u32, u32);
34872 s32 (*read_mac_addr)(struct e1000_hw *);
34873 };
34874+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34875
34876 /*
34877 * When to use various PHY register access functions:
34878@@ -818,6 +819,7 @@ struct e1000_phy_operations {
34879 void (*power_up)(struct e1000_hw *);
34880 void (*power_down)(struct e1000_hw *);
34881 };
34882+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34883
34884 /* Function pointers for the NVM. */
34885 struct e1000_nvm_operations {
34886@@ -829,9 +831,10 @@ struct e1000_nvm_operations {
34887 s32 (*validate)(struct e1000_hw *);
34888 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
34889 };
34890+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34891
34892 struct e1000_mac_info {
34893- struct e1000_mac_operations ops;
34894+ e1000_mac_operations_no_const ops;
34895 u8 addr[ETH_ALEN];
34896 u8 perm_addr[ETH_ALEN];
34897
34898@@ -872,7 +875,7 @@ struct e1000_mac_info {
34899 };
34900
34901 struct e1000_phy_info {
34902- struct e1000_phy_operations ops;
34903+ e1000_phy_operations_no_const ops;
34904
34905 enum e1000_phy_type type;
34906
34907@@ -906,7 +909,7 @@ struct e1000_phy_info {
34908 };
34909
34910 struct e1000_nvm_info {
34911- struct e1000_nvm_operations ops;
34912+ e1000_nvm_operations_no_const ops;
34913
34914 enum e1000_nvm_type type;
34915 enum e1000_nvm_override override;
34916diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
34917index f67cbd3..cef9e3d 100644
34918--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
34919+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
34920@@ -314,6 +314,7 @@ struct e1000_mac_operations {
34921 s32 (*read_mac_addr)(struct e1000_hw *);
34922 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
34923 };
34924+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34925
34926 struct e1000_phy_operations {
34927 s32 (*acquire)(struct e1000_hw *);
34928@@ -330,6 +331,7 @@ struct e1000_phy_operations {
34929 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
34930 s32 (*write_reg)(struct e1000_hw *, u32, u16);
34931 };
34932+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34933
34934 struct e1000_nvm_operations {
34935 s32 (*acquire)(struct e1000_hw *);
34936@@ -339,6 +341,7 @@ struct e1000_nvm_operations {
34937 s32 (*update)(struct e1000_hw *);
34938 s32 (*validate)(struct e1000_hw *);
34939 };
34940+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34941
34942 struct e1000_info {
34943 s32 (*get_invariants)(struct e1000_hw *);
34944@@ -350,7 +353,7 @@ struct e1000_info {
34945 extern const struct e1000_info e1000_82575_info;
34946
34947 struct e1000_mac_info {
34948- struct e1000_mac_operations ops;
34949+ e1000_mac_operations_no_const ops;
34950
34951 u8 addr[6];
34952 u8 perm_addr[6];
34953@@ -388,7 +391,7 @@ struct e1000_mac_info {
34954 };
34955
34956 struct e1000_phy_info {
34957- struct e1000_phy_operations ops;
34958+ e1000_phy_operations_no_const ops;
34959
34960 enum e1000_phy_type type;
34961
34962@@ -423,7 +426,7 @@ struct e1000_phy_info {
34963 };
34964
34965 struct e1000_nvm_info {
34966- struct e1000_nvm_operations ops;
34967+ e1000_nvm_operations_no_const ops;
34968 enum e1000_nvm_type type;
34969 enum e1000_nvm_override override;
34970
34971@@ -468,6 +471,7 @@ struct e1000_mbx_operations {
34972 s32 (*check_for_ack)(struct e1000_hw *, u16);
34973 s32 (*check_for_rst)(struct e1000_hw *, u16);
34974 };
34975+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
34976
34977 struct e1000_mbx_stats {
34978 u32 msgs_tx;
34979@@ -479,7 +483,7 @@ struct e1000_mbx_stats {
34980 };
34981
34982 struct e1000_mbx_info {
34983- struct e1000_mbx_operations ops;
34984+ e1000_mbx_operations_no_const ops;
34985 struct e1000_mbx_stats stats;
34986 u32 timeout;
34987 u32 usec_delay;
34988diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
34989index 57db3c6..aa825fc 100644
34990--- a/drivers/net/ethernet/intel/igbvf/vf.h
34991+++ b/drivers/net/ethernet/intel/igbvf/vf.h
34992@@ -189,9 +189,10 @@ struct e1000_mac_operations {
34993 s32 (*read_mac_addr)(struct e1000_hw *);
34994 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
34995 };
34996+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34997
34998 struct e1000_mac_info {
34999- struct e1000_mac_operations ops;
35000+ e1000_mac_operations_no_const ops;
35001 u8 addr[6];
35002 u8 perm_addr[6];
35003
35004@@ -213,6 +214,7 @@ struct e1000_mbx_operations {
35005 s32 (*check_for_ack)(struct e1000_hw *);
35006 s32 (*check_for_rst)(struct e1000_hw *);
35007 };
35008+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
35009
35010 struct e1000_mbx_stats {
35011 u32 msgs_tx;
35012@@ -224,7 +226,7 @@ struct e1000_mbx_stats {
35013 };
35014
35015 struct e1000_mbx_info {
35016- struct e1000_mbx_operations ops;
35017+ e1000_mbx_operations_no_const ops;
35018 struct e1000_mbx_stats stats;
35019 u32 timeout;
35020 u32 usec_delay;
35021diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35022index 9b95bef..7e254ee 100644
35023--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35024+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35025@@ -2708,6 +2708,7 @@ struct ixgbe_eeprom_operations {
35026 s32 (*update_checksum)(struct ixgbe_hw *);
35027 u16 (*calc_checksum)(struct ixgbe_hw *);
35028 };
35029+typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
35030
35031 struct ixgbe_mac_operations {
35032 s32 (*init_hw)(struct ixgbe_hw *);
35033@@ -2769,6 +2770,7 @@ struct ixgbe_mac_operations {
35034 /* Manageability interface */
35035 s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
35036 };
35037+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35038
35039 struct ixgbe_phy_operations {
35040 s32 (*identify)(struct ixgbe_hw *);
35041@@ -2788,9 +2790,10 @@ struct ixgbe_phy_operations {
35042 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
35043 s32 (*check_overtemp)(struct ixgbe_hw *);
35044 };
35045+typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
35046
35047 struct ixgbe_eeprom_info {
35048- struct ixgbe_eeprom_operations ops;
35049+ ixgbe_eeprom_operations_no_const ops;
35050 enum ixgbe_eeprom_type type;
35051 u32 semaphore_delay;
35052 u16 word_size;
35053@@ -2800,7 +2803,7 @@ struct ixgbe_eeprom_info {
35054
35055 #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
35056 struct ixgbe_mac_info {
35057- struct ixgbe_mac_operations ops;
35058+ ixgbe_mac_operations_no_const ops;
35059 enum ixgbe_mac_type type;
35060 u8 addr[ETH_ALEN];
35061 u8 perm_addr[ETH_ALEN];
35062@@ -2828,7 +2831,7 @@ struct ixgbe_mac_info {
35063 };
35064
35065 struct ixgbe_phy_info {
35066- struct ixgbe_phy_operations ops;
35067+ ixgbe_phy_operations_no_const ops;
35068 struct mdio_if_info mdio;
35069 enum ixgbe_phy_type type;
35070 u32 id;
35071@@ -2856,6 +2859,7 @@ struct ixgbe_mbx_operations {
35072 s32 (*check_for_ack)(struct ixgbe_hw *, u16);
35073 s32 (*check_for_rst)(struct ixgbe_hw *, u16);
35074 };
35075+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35076
35077 struct ixgbe_mbx_stats {
35078 u32 msgs_tx;
35079@@ -2867,7 +2871,7 @@ struct ixgbe_mbx_stats {
35080 };
35081
35082 struct ixgbe_mbx_info {
35083- struct ixgbe_mbx_operations ops;
35084+ ixgbe_mbx_operations_no_const ops;
35085 struct ixgbe_mbx_stats stats;
35086 u32 timeout;
35087 u32 usec_delay;
35088diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
35089index 25c951d..cc7cf33 100644
35090--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
35091+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
35092@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
35093 s32 (*clear_vfta)(struct ixgbe_hw *);
35094 s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
35095 };
35096+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35097
35098 enum ixgbe_mac_type {
35099 ixgbe_mac_unknown = 0,
35100@@ -79,7 +80,7 @@ enum ixgbe_mac_type {
35101 };
35102
35103 struct ixgbe_mac_info {
35104- struct ixgbe_mac_operations ops;
35105+ ixgbe_mac_operations_no_const ops;
35106 u8 addr[6];
35107 u8 perm_addr[6];
35108
35109@@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
35110 s32 (*check_for_ack)(struct ixgbe_hw *);
35111 s32 (*check_for_rst)(struct ixgbe_hw *);
35112 };
35113+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35114
35115 struct ixgbe_mbx_stats {
35116 u32 msgs_tx;
35117@@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
35118 };
35119
35120 struct ixgbe_mbx_info {
35121- struct ixgbe_mbx_operations ops;
35122+ ixgbe_mbx_operations_no_const ops;
35123 struct ixgbe_mbx_stats stats;
35124 u32 timeout;
35125 u32 udelay;
35126diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
35127index 8bf22b6..7f5baaa 100644
35128--- a/drivers/net/ethernet/mellanox/mlx4/main.c
35129+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
35130@@ -41,6 +41,7 @@
35131 #include <linux/slab.h>
35132 #include <linux/io-mapping.h>
35133 #include <linux/delay.h>
35134+#include <linux/sched.h>
35135
35136 #include <linux/mlx4/device.h>
35137 #include <linux/mlx4/doorbell.h>
35138diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35139index 5046a64..71ca936 100644
35140--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
35141+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35142@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
35143 void (*link_down)(struct __vxge_hw_device *devh);
35144 void (*crit_err)(struct __vxge_hw_device *devh,
35145 enum vxge_hw_event type, u64 ext_data);
35146-};
35147+} __no_const;
35148
35149 /*
35150 * struct __vxge_hw_blockpool_entry - Block private data structure
35151diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35152index 4a518a3..936b334 100644
35153--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35154+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35155@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
35156 struct vxge_hw_mempool_dma *dma_object,
35157 u32 index,
35158 u32 is_last);
35159-};
35160+} __no_const;
35161
35162 #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
35163 ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
35164diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
35165index bbacb37..d60887d 100644
35166--- a/drivers/net/ethernet/realtek/r8169.c
35167+++ b/drivers/net/ethernet/realtek/r8169.c
35168@@ -695,17 +695,17 @@ struct rtl8169_private {
35169 struct mdio_ops {
35170 void (*write)(void __iomem *, int, int);
35171 int (*read)(void __iomem *, int);
35172- } mdio_ops;
35173+ } __no_const mdio_ops;
35174
35175 struct pll_power_ops {
35176 void (*down)(struct rtl8169_private *);
35177 void (*up)(struct rtl8169_private *);
35178- } pll_power_ops;
35179+ } __no_const pll_power_ops;
35180
35181 struct jumbo_ops {
35182 void (*enable)(struct rtl8169_private *);
35183 void (*disable)(struct rtl8169_private *);
35184- } jumbo_ops;
35185+ } __no_const jumbo_ops;
35186
35187 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
35188 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
35189diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
35190index 5b118cd..858b523 100644
35191--- a/drivers/net/ethernet/sis/sis190.c
35192+++ b/drivers/net/ethernet/sis/sis190.c
35193@@ -1622,7 +1622,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
35194 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
35195 struct net_device *dev)
35196 {
35197- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
35198+ static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
35199 struct sis190_private *tp = netdev_priv(dev);
35200 struct pci_dev *isa_bridge;
35201 u8 reg, tmp8;
35202diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35203index c07cfe9..81cbf7e 100644
35204--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35205+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35206@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
35207
35208 writel(value, ioaddr + MMC_CNTRL);
35209
35210- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35211- MMC_CNTRL, value);
35212+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35213+// MMC_CNTRL, value);
35214 }
35215
35216 /* To mask all all interrupts.*/
35217diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
35218index dec5836..6d4db7d 100644
35219--- a/drivers/net/hyperv/hyperv_net.h
35220+++ b/drivers/net/hyperv/hyperv_net.h
35221@@ -97,7 +97,7 @@ struct rndis_device {
35222
35223 enum rndis_device_state state;
35224 bool link_state;
35225- atomic_t new_req_id;
35226+ atomic_unchecked_t new_req_id;
35227
35228 spinlock_t request_lock;
35229 struct list_head req_list;
35230diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
35231index 133b7fb..d58c559 100644
35232--- a/drivers/net/hyperv/rndis_filter.c
35233+++ b/drivers/net/hyperv/rndis_filter.c
35234@@ -96,7 +96,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
35235 * template
35236 */
35237 set = &rndis_msg->msg.set_req;
35238- set->req_id = atomic_inc_return(&dev->new_req_id);
35239+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
35240
35241 /* Add to the request list */
35242 spin_lock_irqsave(&dev->request_lock, flags);
35243@@ -627,7 +627,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
35244
35245 /* Setup the rndis set */
35246 halt = &request->request_msg.msg.halt_req;
35247- halt->req_id = atomic_inc_return(&dev->new_req_id);
35248+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
35249
35250 /* Ignore return since this msg is optional. */
35251 rndis_filter_send_request(dev, request);
35252diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
35253index 58dc117..f140c77 100644
35254--- a/drivers/net/macvtap.c
35255+++ b/drivers/net/macvtap.c
35256@@ -526,6 +526,8 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
35257 }
35258 base = (unsigned long)from->iov_base + offset1;
35259 size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
35260+ if (i + size >= MAX_SKB_FRAGS)
35261+ return -EFAULT;
35262 num_pages = get_user_pages_fast(base, size, 0, &page[i]);
35263 if ((num_pages != size) ||
35264 (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags))
35265diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
35266index 3ed983c..a1bb418 100644
35267--- a/drivers/net/ppp/ppp_generic.c
35268+++ b/drivers/net/ppp/ppp_generic.c
35269@@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35270 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
35271 struct ppp_stats stats;
35272 struct ppp_comp_stats cstats;
35273- char *vers;
35274
35275 switch (cmd) {
35276 case SIOCGPPPSTATS:
35277@@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35278 break;
35279
35280 case SIOCGPPPVER:
35281- vers = PPP_VERSION;
35282- if (copy_to_user(addr, vers, strlen(vers) + 1))
35283+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
35284 break;
35285 err = 0;
35286 break;
35287diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
35288index 515f122..41dd273 100644
35289--- a/drivers/net/tokenring/abyss.c
35290+++ b/drivers/net/tokenring/abyss.c
35291@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = {
35292
35293 static int __init abyss_init (void)
35294 {
35295- abyss_netdev_ops = tms380tr_netdev_ops;
35296+ pax_open_kernel();
35297+ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35298
35299- abyss_netdev_ops.ndo_open = abyss_open;
35300- abyss_netdev_ops.ndo_stop = abyss_close;
35301+ *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
35302+ *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
35303+ pax_close_kernel();
35304
35305 return pci_register_driver(&abyss_driver);
35306 }
35307diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
35308index 6153cfd..cf69c1c 100644
35309--- a/drivers/net/tokenring/madgemc.c
35310+++ b/drivers/net/tokenring/madgemc.c
35311@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver = {
35312
35313 static int __init madgemc_init (void)
35314 {
35315- madgemc_netdev_ops = tms380tr_netdev_ops;
35316- madgemc_netdev_ops.ndo_open = madgemc_open;
35317- madgemc_netdev_ops.ndo_stop = madgemc_close;
35318+ pax_open_kernel();
35319+ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35320+ *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
35321+ *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
35322+ pax_close_kernel();
35323
35324 return mca_register_driver (&madgemc_driver);
35325 }
35326diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
35327index 8d362e6..f91cc52 100644
35328--- a/drivers/net/tokenring/proteon.c
35329+++ b/drivers/net/tokenring/proteon.c
35330@@ -353,9 +353,11 @@ static int __init proteon_init(void)
35331 struct platform_device *pdev;
35332 int i, num = 0, err = 0;
35333
35334- proteon_netdev_ops = tms380tr_netdev_ops;
35335- proteon_netdev_ops.ndo_open = proteon_open;
35336- proteon_netdev_ops.ndo_stop = tms380tr_close;
35337+ pax_open_kernel();
35338+ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35339+ *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
35340+ *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
35341+ pax_close_kernel();
35342
35343 err = platform_driver_register(&proteon_driver);
35344 if (err)
35345diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
35346index 46db5c5..37c1536 100644
35347--- a/drivers/net/tokenring/skisa.c
35348+++ b/drivers/net/tokenring/skisa.c
35349@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
35350 struct platform_device *pdev;
35351 int i, num = 0, err = 0;
35352
35353- sk_isa_netdev_ops = tms380tr_netdev_ops;
35354- sk_isa_netdev_ops.ndo_open = sk_isa_open;
35355- sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35356+ pax_open_kernel();
35357+ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35358+ *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
35359+ *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35360+ pax_close_kernel();
35361
35362 err = platform_driver_register(&sk_isa_driver);
35363 if (err)
35364diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
35365index e1324b4..e1b0041 100644
35366--- a/drivers/net/usb/hso.c
35367+++ b/drivers/net/usb/hso.c
35368@@ -71,7 +71,7 @@
35369 #include <asm/byteorder.h>
35370 #include <linux/serial_core.h>
35371 #include <linux/serial.h>
35372-
35373+#include <asm/local.h>
35374
35375 #define MOD_AUTHOR "Option Wireless"
35376 #define MOD_DESCRIPTION "USB High Speed Option driver"
35377@@ -257,7 +257,7 @@ struct hso_serial {
35378
35379 /* from usb_serial_port */
35380 struct tty_struct *tty;
35381- int open_count;
35382+ local_t open_count;
35383 spinlock_t serial_lock;
35384
35385 int (*write_data) (struct hso_serial *serial);
35386@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
35387 struct urb *urb;
35388
35389 urb = serial->rx_urb[0];
35390- if (serial->open_count > 0) {
35391+ if (local_read(&serial->open_count) > 0) {
35392 count = put_rxbuf_data(urb, serial);
35393 if (count == -1)
35394 return;
35395@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
35396 DUMP1(urb->transfer_buffer, urb->actual_length);
35397
35398 /* Anyone listening? */
35399- if (serial->open_count == 0)
35400+ if (local_read(&serial->open_count) == 0)
35401 return;
35402
35403 if (status == 0) {
35404@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35405 spin_unlock_irq(&serial->serial_lock);
35406
35407 /* check for port already opened, if not set the termios */
35408- serial->open_count++;
35409- if (serial->open_count == 1) {
35410+ if (local_inc_return(&serial->open_count) == 1) {
35411 serial->rx_state = RX_IDLE;
35412 /* Force default termio settings */
35413 _hso_serial_set_termios(tty, NULL);
35414@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35415 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
35416 if (result) {
35417 hso_stop_serial_device(serial->parent);
35418- serial->open_count--;
35419+ local_dec(&serial->open_count);
35420 kref_put(&serial->parent->ref, hso_serial_ref_free);
35421 }
35422 } else {
35423@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
35424
35425 /* reset the rts and dtr */
35426 /* do the actual close */
35427- serial->open_count--;
35428+ local_dec(&serial->open_count);
35429
35430- if (serial->open_count <= 0) {
35431- serial->open_count = 0;
35432+ if (local_read(&serial->open_count) <= 0) {
35433+ local_set(&serial->open_count, 0);
35434 spin_lock_irq(&serial->serial_lock);
35435 if (serial->tty == tty) {
35436 serial->tty->driver_data = NULL;
35437@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
35438
35439 /* the actual setup */
35440 spin_lock_irqsave(&serial->serial_lock, flags);
35441- if (serial->open_count)
35442+ if (local_read(&serial->open_count))
35443 _hso_serial_set_termios(tty, old);
35444 else
35445 tty->termios = old;
35446@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *urb)
35447 D1("Pending read interrupt on port %d\n", i);
35448 spin_lock(&serial->serial_lock);
35449 if (serial->rx_state == RX_IDLE &&
35450- serial->open_count > 0) {
35451+ local_read(&serial->open_count) > 0) {
35452 /* Setup and send a ctrl req read on
35453 * port i */
35454 if (!serial->rx_urb_filled[0]) {
35455@@ -3098,7 +3097,7 @@ static int hso_resume(struct usb_interface *iface)
35456 /* Start all serial ports */
35457 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
35458 if (serial_table[i] && (serial_table[i]->interface == iface)) {
35459- if (dev2ser(serial_table[i])->open_count) {
35460+ if (local_read(&dev2ser(serial_table[i])->open_count)) {
35461 result =
35462 hso_start_serial_device(serial_table[i], GFP_NOIO);
35463 hso_kick_transmit(dev2ser(serial_table[i]));
35464diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
35465index efc0111..79c8f5b 100644
35466--- a/drivers/net/wireless/ath/ath.h
35467+++ b/drivers/net/wireless/ath/ath.h
35468@@ -119,6 +119,7 @@ struct ath_ops {
35469 void (*write_flush) (void *);
35470 u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
35471 };
35472+typedef struct ath_ops __no_const ath_ops_no_const;
35473
35474 struct ath_common;
35475 struct ath_bus_ops;
35476diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
35477index 8c5ce8b..abf101b 100644
35478--- a/drivers/net/wireless/ath/ath5k/debug.c
35479+++ b/drivers/net/wireless/ath/ath5k/debug.c
35480@@ -343,6 +343,9 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35481
35482 static ssize_t write_file_debug(struct file *file,
35483 const char __user *userbuf,
35484+ size_t count, loff_t *ppos) __size_overflow(3);
35485+static ssize_t write_file_debug(struct file *file,
35486+ const char __user *userbuf,
35487 size_t count, loff_t *ppos)
35488 {
35489 struct ath5k_hw *ah = file->private_data;
35490diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35491index 7b6417b..ab5db98 100644
35492--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35493+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35494@@ -183,8 +183,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35495 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
35496 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
35497
35498- ACCESS_ONCE(ads->ds_link) = i->link;
35499- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
35500+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
35501+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
35502
35503 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
35504 ctl6 = SM(i->keytype, AR_EncrType);
35505@@ -198,26 +198,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35506
35507 if ((i->is_first || i->is_last) &&
35508 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
35509- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
35510+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
35511 | set11nTries(i->rates, 1)
35512 | set11nTries(i->rates, 2)
35513 | set11nTries(i->rates, 3)
35514 | (i->dur_update ? AR_DurUpdateEna : 0)
35515 | SM(0, AR_BurstDur);
35516
35517- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
35518+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
35519 | set11nRate(i->rates, 1)
35520 | set11nRate(i->rates, 2)
35521 | set11nRate(i->rates, 3);
35522 } else {
35523- ACCESS_ONCE(ads->ds_ctl2) = 0;
35524- ACCESS_ONCE(ads->ds_ctl3) = 0;
35525+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
35526+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
35527 }
35528
35529 if (!i->is_first) {
35530- ACCESS_ONCE(ads->ds_ctl0) = 0;
35531- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35532- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35533+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
35534+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35535+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35536 return;
35537 }
35538
35539@@ -242,7 +242,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35540 break;
35541 }
35542
35543- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35544+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35545 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35546 | SM(i->txpower, AR_XmitPower)
35547 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35548@@ -252,19 +252,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35549 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
35550 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
35551
35552- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35553- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35554+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35555+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35556
35557 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
35558 return;
35559
35560- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35561+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35562 | set11nPktDurRTSCTS(i->rates, 1);
35563
35564- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35565+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35566 | set11nPktDurRTSCTS(i->rates, 3);
35567
35568- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35569+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35570 | set11nRateFlags(i->rates, 1)
35571 | set11nRateFlags(i->rates, 2)
35572 | set11nRateFlags(i->rates, 3)
35573diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35574index 09b8c9d..905339e 100644
35575--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35576+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35577@@ -35,47 +35,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35578 (i->qcu << AR_TxQcuNum_S) | 0x17;
35579
35580 checksum += val;
35581- ACCESS_ONCE(ads->info) = val;
35582+ ACCESS_ONCE_RW(ads->info) = val;
35583
35584 checksum += i->link;
35585- ACCESS_ONCE(ads->link) = i->link;
35586+ ACCESS_ONCE_RW(ads->link) = i->link;
35587
35588 checksum += i->buf_addr[0];
35589- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
35590+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
35591 checksum += i->buf_addr[1];
35592- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
35593+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
35594 checksum += i->buf_addr[2];
35595- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
35596+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
35597 checksum += i->buf_addr[3];
35598- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
35599+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
35600
35601 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
35602- ACCESS_ONCE(ads->ctl3) = val;
35603+ ACCESS_ONCE_RW(ads->ctl3) = val;
35604 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
35605- ACCESS_ONCE(ads->ctl5) = val;
35606+ ACCESS_ONCE_RW(ads->ctl5) = val;
35607 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
35608- ACCESS_ONCE(ads->ctl7) = val;
35609+ ACCESS_ONCE_RW(ads->ctl7) = val;
35610 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
35611- ACCESS_ONCE(ads->ctl9) = val;
35612+ ACCESS_ONCE_RW(ads->ctl9) = val;
35613
35614 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
35615- ACCESS_ONCE(ads->ctl10) = checksum;
35616+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
35617
35618 if (i->is_first || i->is_last) {
35619- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
35620+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
35621 | set11nTries(i->rates, 1)
35622 | set11nTries(i->rates, 2)
35623 | set11nTries(i->rates, 3)
35624 | (i->dur_update ? AR_DurUpdateEna : 0)
35625 | SM(0, AR_BurstDur);
35626
35627- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
35628+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
35629 | set11nRate(i->rates, 1)
35630 | set11nRate(i->rates, 2)
35631 | set11nRate(i->rates, 3);
35632 } else {
35633- ACCESS_ONCE(ads->ctl13) = 0;
35634- ACCESS_ONCE(ads->ctl14) = 0;
35635+ ACCESS_ONCE_RW(ads->ctl13) = 0;
35636+ ACCESS_ONCE_RW(ads->ctl14) = 0;
35637 }
35638
35639 ads->ctl20 = 0;
35640@@ -84,17 +84,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35641
35642 ctl17 = SM(i->keytype, AR_EncrType);
35643 if (!i->is_first) {
35644- ACCESS_ONCE(ads->ctl11) = 0;
35645- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35646- ACCESS_ONCE(ads->ctl15) = 0;
35647- ACCESS_ONCE(ads->ctl16) = 0;
35648- ACCESS_ONCE(ads->ctl17) = ctl17;
35649- ACCESS_ONCE(ads->ctl18) = 0;
35650- ACCESS_ONCE(ads->ctl19) = 0;
35651+ ACCESS_ONCE_RW(ads->ctl11) = 0;
35652+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35653+ ACCESS_ONCE_RW(ads->ctl15) = 0;
35654+ ACCESS_ONCE_RW(ads->ctl16) = 0;
35655+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35656+ ACCESS_ONCE_RW(ads->ctl18) = 0;
35657+ ACCESS_ONCE_RW(ads->ctl19) = 0;
35658 return;
35659 }
35660
35661- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35662+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35663 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35664 | SM(i->txpower, AR_XmitPower)
35665 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35666@@ -130,22 +130,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35667 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
35668 ctl12 |= SM(val, AR_PAPRDChainMask);
35669
35670- ACCESS_ONCE(ads->ctl12) = ctl12;
35671- ACCESS_ONCE(ads->ctl17) = ctl17;
35672+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
35673+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35674
35675- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
35676+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
35677 | set11nPktDurRTSCTS(i->rates, 1);
35678
35679- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
35680+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
35681 | set11nPktDurRTSCTS(i->rates, 3);
35682
35683- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
35684+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
35685 | set11nRateFlags(i->rates, 1)
35686 | set11nRateFlags(i->rates, 2)
35687 | set11nRateFlags(i->rates, 3)
35688 | SM(i->rtscts_rate, AR_RTSCTSRate);
35689
35690- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
35691+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
35692 }
35693
35694 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
35695diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
35696index 68d972b..1d9205b 100644
35697--- a/drivers/net/wireless/ath/ath9k/debug.c
35698+++ b/drivers/net/wireless/ath/ath9k/debug.c
35699@@ -60,6 +60,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35700 }
35701
35702 static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35703+ size_t count, loff_t *ppos) __size_overflow(3);
35704+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35705 size_t count, loff_t *ppos)
35706 {
35707 struct ath_softc *sc = file->private_data;
35708diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35709index d3ff33c..c98bcda 100644
35710--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35711+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35712@@ -464,6 +464,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35713 }
35714
35715 static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35716+ size_t count, loff_t *ppos) __size_overflow(3);
35717+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35718 size_t count, loff_t *ppos)
35719 {
35720 struct ath9k_htc_priv *priv = file->private_data;
35721diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
35722index c8261d4..8d88929 100644
35723--- a/drivers/net/wireless/ath/ath9k/hw.h
35724+++ b/drivers/net/wireless/ath/ath9k/hw.h
35725@@ -773,7 +773,7 @@ struct ath_hw_private_ops {
35726
35727 /* ANI */
35728 void (*ani_cache_ini_regs)(struct ath_hw *ah);
35729-};
35730+} __no_const;
35731
35732 /**
35733 * struct ath_hw_ops - callbacks used by hardware code and driver code
35734@@ -803,7 +803,7 @@ struct ath_hw_ops {
35735 void (*antdiv_comb_conf_set)(struct ath_hw *ah,
35736 struct ath_hw_antcomb_conf *antconf);
35737
35738-};
35739+} __no_const;
35740
35741 struct ath_nf_limits {
35742 s16 max;
35743@@ -823,7 +823,7 @@ enum ath_cal_list {
35744 #define AH_FASTCC 0x4
35745
35746 struct ath_hw {
35747- struct ath_ops reg_ops;
35748+ ath_ops_no_const reg_ops;
35749
35750 struct ieee80211_hw *hw;
35751 struct ath_common common;
35752diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35753index af00e2c..ab04d34 100644
35754--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35755+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35756@@ -545,7 +545,7 @@ struct phy_func_ptr {
35757 void (*carrsuppr)(struct brcms_phy *);
35758 s32 (*rxsigpwr)(struct brcms_phy *, s32);
35759 void (*detach)(struct brcms_phy *);
35760-};
35761+} __no_const;
35762
35763 struct brcms_phy {
35764 struct brcms_phy_pub pubpi_ro;
35765diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
35766index a2ec369..36fdf14 100644
35767--- a/drivers/net/wireless/iwlegacy/3945-mac.c
35768+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
35769@@ -3646,7 +3646,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
35770 */
35771 if (il3945_mod_params.disable_hw_scan) {
35772 D_INFO("Disabling hw_scan\n");
35773- il3945_hw_ops.hw_scan = NULL;
35774+ pax_open_kernel();
35775+ *(void **)&il3945_hw_ops.hw_scan = NULL;
35776+ pax_close_kernel();
35777 }
35778
35779 D_INFO("*** LOAD DRIVER ***\n");
35780diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
35781index f8fc239..8cade22 100644
35782--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
35783+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
35784@@ -86,8 +86,8 @@ do { \
35785 } while (0)
35786
35787 #else
35788-#define IWL_DEBUG(m, level, fmt, args...)
35789-#define IWL_DEBUG_LIMIT(m, level, fmt, args...)
35790+#define IWL_DEBUG(m, level, fmt, args...) do {} while (0)
35791+#define IWL_DEBUG_LIMIT(m, level, fmt, args...) do {} while (0)
35792 #define iwl_print_hex_dump(m, level, p, len)
35793 #define IWL_DEBUG_QUIET_RFKILL(p, fmt, args...) \
35794 do { \
35795diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
35796index 4b9e730..7603659 100644
35797--- a/drivers/net/wireless/mac80211_hwsim.c
35798+++ b/drivers/net/wireless/mac80211_hwsim.c
35799@@ -1677,9 +1677,11 @@ static int __init init_mac80211_hwsim(void)
35800 return -EINVAL;
35801
35802 if (fake_hw_scan) {
35803- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
35804- mac80211_hwsim_ops.sw_scan_start = NULL;
35805- mac80211_hwsim_ops.sw_scan_complete = NULL;
35806+ pax_open_kernel();
35807+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
35808+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
35809+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
35810+ pax_close_kernel();
35811 }
35812
35813 spin_lock_init(&hwsim_radio_lock);
35814diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
35815index 3186aa4..b35b09f 100644
35816--- a/drivers/net/wireless/mwifiex/main.h
35817+++ b/drivers/net/wireless/mwifiex/main.h
35818@@ -536,7 +536,7 @@ struct mwifiex_if_ops {
35819 void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
35820 int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);
35821 int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
35822-};
35823+} __no_const;
35824
35825 struct mwifiex_adapter {
35826 u8 iface_type;
35827diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
35828index a330c69..a81540f 100644
35829--- a/drivers/net/wireless/rndis_wlan.c
35830+++ b/drivers/net/wireless/rndis_wlan.c
35831@@ -1278,7 +1278,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
35832
35833 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
35834
35835- if (rts_threshold < 0 || rts_threshold > 2347)
35836+ if (rts_threshold > 2347)
35837 rts_threshold = 2347;
35838
35839 tmp = cpu_to_le32(rts_threshold);
35840diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h
35841index a77f1bb..c608b2b 100644
35842--- a/drivers/net/wireless/wl1251/wl1251.h
35843+++ b/drivers/net/wireless/wl1251/wl1251.h
35844@@ -266,7 +266,7 @@ struct wl1251_if_operations {
35845 void (*reset)(struct wl1251 *wl);
35846 void (*enable_irq)(struct wl1251 *wl);
35847 void (*disable_irq)(struct wl1251 *wl);
35848-};
35849+} __no_const;
35850
35851 struct wl1251 {
35852 struct ieee80211_hw *hw;
35853diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
35854index f34b5b2..b5abb9f 100644
35855--- a/drivers/oprofile/buffer_sync.c
35856+++ b/drivers/oprofile/buffer_sync.c
35857@@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
35858 if (cookie == NO_COOKIE)
35859 offset = pc;
35860 if (cookie == INVALID_COOKIE) {
35861- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
35862+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
35863 offset = pc;
35864 }
35865 if (cookie != last_cookie) {
35866@@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
35867 /* add userspace sample */
35868
35869 if (!mm) {
35870- atomic_inc(&oprofile_stats.sample_lost_no_mm);
35871+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
35872 return 0;
35873 }
35874
35875 cookie = lookup_dcookie(mm, s->eip, &offset);
35876
35877 if (cookie == INVALID_COOKIE) {
35878- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
35879+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
35880 return 0;
35881 }
35882
35883@@ -563,7 +563,7 @@ void sync_buffer(int cpu)
35884 /* ignore backtraces if failed to add a sample */
35885 if (state == sb_bt_start) {
35886 state = sb_bt_ignore;
35887- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
35888+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
35889 }
35890 }
35891 release_mm(mm);
35892diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
35893index c0cc4e7..44d4e54 100644
35894--- a/drivers/oprofile/event_buffer.c
35895+++ b/drivers/oprofile/event_buffer.c
35896@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
35897 }
35898
35899 if (buffer_pos == buffer_size) {
35900- atomic_inc(&oprofile_stats.event_lost_overflow);
35901+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
35902 return;
35903 }
35904
35905diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
35906index ed2c3ec..deda85a 100644
35907--- a/drivers/oprofile/oprof.c
35908+++ b/drivers/oprofile/oprof.c
35909@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
35910 if (oprofile_ops.switch_events())
35911 return;
35912
35913- atomic_inc(&oprofile_stats.multiplex_counter);
35914+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
35915 start_switch_worker();
35916 }
35917
35918diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
35919index 84a208d..f07d177 100644
35920--- a/drivers/oprofile/oprofile_files.c
35921+++ b/drivers/oprofile/oprofile_files.c
35922@@ -36,6 +36,8 @@ static ssize_t timeout_read(struct file *file, char __user *buf,
35923
35924
35925 static ssize_t timeout_write(struct file *file, char const __user *buf,
35926+ size_t count, loff_t *offset) __size_overflow(3);
35927+static ssize_t timeout_write(struct file *file, char const __user *buf,
35928 size_t count, loff_t *offset)
35929 {
35930 unsigned long val;
35931@@ -72,6 +74,7 @@ static ssize_t depth_read(struct file *file, char __user *buf, size_t count, lof
35932 }
35933
35934
35935+static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
35936 static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
35937 {
35938 unsigned long val;
35939@@ -126,12 +129,14 @@ static const struct file_operations cpu_type_fops = {
35940 };
35941
35942
35943+static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset) __size_overflow(3);
35944 static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
35945 {
35946 return oprofilefs_ulong_to_user(oprofile_started, buf, count, offset);
35947 }
35948
35949
35950+static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
35951 static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
35952 {
35953 unsigned long val;
35954diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
35955index 917d28e..d62d981 100644
35956--- a/drivers/oprofile/oprofile_stats.c
35957+++ b/drivers/oprofile/oprofile_stats.c
35958@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
35959 cpu_buf->sample_invalid_eip = 0;
35960 }
35961
35962- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
35963- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
35964- atomic_set(&oprofile_stats.event_lost_overflow, 0);
35965- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
35966- atomic_set(&oprofile_stats.multiplex_counter, 0);
35967+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
35968+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
35969+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
35970+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
35971+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
35972 }
35973
35974
35975diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
35976index 38b6fc0..b5cbfce 100644
35977--- a/drivers/oprofile/oprofile_stats.h
35978+++ b/drivers/oprofile/oprofile_stats.h
35979@@ -13,11 +13,11 @@
35980 #include <linux/atomic.h>
35981
35982 struct oprofile_stat_struct {
35983- atomic_t sample_lost_no_mm;
35984- atomic_t sample_lost_no_mapping;
35985- atomic_t bt_lost_no_mapping;
35986- atomic_t event_lost_overflow;
35987- atomic_t multiplex_counter;
35988+ atomic_unchecked_t sample_lost_no_mm;
35989+ atomic_unchecked_t sample_lost_no_mapping;
35990+ atomic_unchecked_t bt_lost_no_mapping;
35991+ atomic_unchecked_t event_lost_overflow;
35992+ atomic_unchecked_t multiplex_counter;
35993 };
35994
35995 extern struct oprofile_stat_struct oprofile_stats;
35996diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
35997index 2f0aa0f..d5246c3 100644
35998--- a/drivers/oprofile/oprofilefs.c
35999+++ b/drivers/oprofile/oprofilefs.c
36000@@ -97,6 +97,7 @@ static ssize_t ulong_read_file(struct file *file, char __user *buf, size_t count
36001 }
36002
36003
36004+static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
36005 static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset)
36006 {
36007 unsigned long value;
36008@@ -193,7 +194,7 @@ static const struct file_operations atomic_ro_fops = {
36009
36010
36011 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
36012- char const *name, atomic_t *val)
36013+ char const *name, atomic_unchecked_t *val)
36014 {
36015 return __oprofilefs_create_file(sb, root, name,
36016 &atomic_ro_fops, 0444, val);
36017diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
36018index 3f56bc0..707d642 100644
36019--- a/drivers/parport/procfs.c
36020+++ b/drivers/parport/procfs.c
36021@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
36022
36023 *ppos += len;
36024
36025- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
36026+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
36027 }
36028
36029 #ifdef CONFIG_PARPORT_1284
36030@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
36031
36032 *ppos += len;
36033
36034- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
36035+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
36036 }
36037 #endif /* IEEE1284.3 support. */
36038
36039diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
36040index 9fff878..ad0ad53 100644
36041--- a/drivers/pci/hotplug/cpci_hotplug.h
36042+++ b/drivers/pci/hotplug/cpci_hotplug.h
36043@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
36044 int (*hardware_test) (struct slot* slot, u32 value);
36045 u8 (*get_power) (struct slot* slot);
36046 int (*set_power) (struct slot* slot, int value);
36047-};
36048+} __no_const;
36049
36050 struct cpci_hp_controller {
36051 unsigned int irq;
36052diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
36053index 76ba8a1..20ca857 100644
36054--- a/drivers/pci/hotplug/cpqphp_nvram.c
36055+++ b/drivers/pci/hotplug/cpqphp_nvram.c
36056@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
36057
36058 void compaq_nvram_init (void __iomem *rom_start)
36059 {
36060+
36061+#ifndef CONFIG_PAX_KERNEXEC
36062 if (rom_start) {
36063 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
36064 }
36065+#endif
36066+
36067 dbg("int15 entry = %p\n", compaq_int15_entry_point);
36068
36069 /* initialize our int15 lock */
36070diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
36071index 2275162..95f1a92 100644
36072--- a/drivers/pci/pcie/aspm.c
36073+++ b/drivers/pci/pcie/aspm.c
36074@@ -27,9 +27,9 @@
36075 #define MODULE_PARAM_PREFIX "pcie_aspm."
36076
36077 /* Note: those are not register definitions */
36078-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
36079-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
36080-#define ASPM_STATE_L1 (4) /* L1 state */
36081+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
36082+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
36083+#define ASPM_STATE_L1 (4U) /* L1 state */
36084 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
36085 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
36086
36087diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
36088index 71eac9c..2de27ef 100644
36089--- a/drivers/pci/probe.c
36090+++ b/drivers/pci/probe.c
36091@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
36092 u32 l, sz, mask;
36093 u16 orig_cmd;
36094
36095- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
36096+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
36097
36098 if (!dev->mmio_always_on) {
36099 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
36100diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
36101index 27911b5..5b6db88 100644
36102--- a/drivers/pci/proc.c
36103+++ b/drivers/pci/proc.c
36104@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
36105 static int __init pci_proc_init(void)
36106 {
36107 struct pci_dev *dev = NULL;
36108+
36109+#ifdef CONFIG_GRKERNSEC_PROC_ADD
36110+#ifdef CONFIG_GRKERNSEC_PROC_USER
36111+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
36112+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
36113+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
36114+#endif
36115+#else
36116 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
36117+#endif
36118 proc_create("devices", 0, proc_bus_pci_dir,
36119 &proc_bus_pci_dev_operations);
36120 proc_initialized = 1;
36121diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
36122index 6f966d6..68e18ed 100644
36123--- a/drivers/platform/x86/asus_acpi.c
36124+++ b/drivers/platform/x86/asus_acpi.c
36125@@ -887,6 +887,8 @@ static int lcd_proc_open(struct inode *inode, struct file *file)
36126 }
36127
36128 static ssize_t lcd_proc_write(struct file *file, const char __user *buffer,
36129+ size_t count, loff_t *pos) __size_overflow(3);
36130+static ssize_t lcd_proc_write(struct file *file, const char __user *buffer,
36131 size_t count, loff_t *pos)
36132 {
36133 int rv, value;
36134diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
36135index ea0c607..58c4628 100644
36136--- a/drivers/platform/x86/thinkpad_acpi.c
36137+++ b/drivers/platform/x86/thinkpad_acpi.c
36138@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
36139 return 0;
36140 }
36141
36142-void static hotkey_mask_warn_incomplete_mask(void)
36143+static void hotkey_mask_warn_incomplete_mask(void)
36144 {
36145 /* log only what the user can fix... */
36146 const u32 wantedmask = hotkey_driver_mask &
36147@@ -2325,11 +2325,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
36148 }
36149 }
36150
36151-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36152- struct tp_nvram_state *newn,
36153- const u32 event_mask)
36154-{
36155-
36156 #define TPACPI_COMPARE_KEY(__scancode, __member) \
36157 do { \
36158 if ((event_mask & (1 << __scancode)) && \
36159@@ -2343,36 +2338,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36160 tpacpi_hotkey_send_key(__scancode); \
36161 } while (0)
36162
36163- void issue_volchange(const unsigned int oldvol,
36164- const unsigned int newvol)
36165- {
36166- unsigned int i = oldvol;
36167+static void issue_volchange(const unsigned int oldvol,
36168+ const unsigned int newvol,
36169+ const u32 event_mask)
36170+{
36171+ unsigned int i = oldvol;
36172
36173- while (i > newvol) {
36174- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36175- i--;
36176- }
36177- while (i < newvol) {
36178- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36179- i++;
36180- }
36181+ while (i > newvol) {
36182+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36183+ i--;
36184 }
36185+ while (i < newvol) {
36186+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36187+ i++;
36188+ }
36189+}
36190
36191- void issue_brightnesschange(const unsigned int oldbrt,
36192- const unsigned int newbrt)
36193- {
36194- unsigned int i = oldbrt;
36195+static void issue_brightnesschange(const unsigned int oldbrt,
36196+ const unsigned int newbrt,
36197+ const u32 event_mask)
36198+{
36199+ unsigned int i = oldbrt;
36200
36201- while (i > newbrt) {
36202- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36203- i--;
36204- }
36205- while (i < newbrt) {
36206- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36207- i++;
36208- }
36209+ while (i > newbrt) {
36210+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36211+ i--;
36212+ }
36213+ while (i < newbrt) {
36214+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36215+ i++;
36216 }
36217+}
36218
36219+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36220+ struct tp_nvram_state *newn,
36221+ const u32 event_mask)
36222+{
36223 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
36224 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
36225 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
36226@@ -2406,7 +2407,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36227 oldn->volume_level != newn->volume_level) {
36228 /* recently muted, or repeated mute keypress, or
36229 * multiple presses ending in mute */
36230- issue_volchange(oldn->volume_level, newn->volume_level);
36231+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36232 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
36233 }
36234 } else {
36235@@ -2416,7 +2417,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36236 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36237 }
36238 if (oldn->volume_level != newn->volume_level) {
36239- issue_volchange(oldn->volume_level, newn->volume_level);
36240+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36241 } else if (oldn->volume_toggle != newn->volume_toggle) {
36242 /* repeated vol up/down keypress at end of scale ? */
36243 if (newn->volume_level == 0)
36244@@ -2429,7 +2430,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36245 /* handle brightness */
36246 if (oldn->brightness_level != newn->brightness_level) {
36247 issue_brightnesschange(oldn->brightness_level,
36248- newn->brightness_level);
36249+ newn->brightness_level,
36250+ event_mask);
36251 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
36252 /* repeated key presses that didn't change state */
36253 if (newn->brightness_level == 0)
36254@@ -2438,10 +2440,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36255 && !tp_features.bright_unkfw)
36256 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36257 }
36258+}
36259
36260 #undef TPACPI_COMPARE_KEY
36261 #undef TPACPI_MAY_SEND_KEY
36262-}
36263
36264 /*
36265 * Polling driver
36266diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
36267index dcdc1f4..85cee16 100644
36268--- a/drivers/platform/x86/toshiba_acpi.c
36269+++ b/drivers/platform/x86/toshiba_acpi.c
36270@@ -517,6 +517,8 @@ static int set_lcd_status(struct backlight_device *bd)
36271 }
36272
36273 static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
36274+ size_t count, loff_t *pos) __size_overflow(3);
36275+static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
36276 size_t count, loff_t *pos)
36277 {
36278 struct toshiba_acpi_dev *dev = PDE(file->f_path.dentry->d_inode)->data;
36279diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
36280index b859d16..5cc6b1a 100644
36281--- a/drivers/pnp/pnpbios/bioscalls.c
36282+++ b/drivers/pnp/pnpbios/bioscalls.c
36283@@ -59,7 +59,7 @@ do { \
36284 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
36285 } while(0)
36286
36287-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
36288+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
36289 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
36290
36291 /*
36292@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36293
36294 cpu = get_cpu();
36295 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
36296+
36297+ pax_open_kernel();
36298 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
36299+ pax_close_kernel();
36300
36301 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
36302 spin_lock_irqsave(&pnp_bios_lock, flags);
36303@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36304 :"memory");
36305 spin_unlock_irqrestore(&pnp_bios_lock, flags);
36306
36307+ pax_open_kernel();
36308 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
36309+ pax_close_kernel();
36310+
36311 put_cpu();
36312
36313 /* If we get here and this is set then the PnP BIOS faulted on us. */
36314@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
36315 return status;
36316 }
36317
36318-void pnpbios_calls_init(union pnp_bios_install_struct *header)
36319+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
36320 {
36321 int i;
36322
36323@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36324 pnp_bios_callpoint.offset = header->fields.pm16offset;
36325 pnp_bios_callpoint.segment = PNP_CS16;
36326
36327+ pax_open_kernel();
36328+
36329 for_each_possible_cpu(i) {
36330 struct desc_struct *gdt = get_cpu_gdt_table(i);
36331 if (!gdt)
36332@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36333 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
36334 (unsigned long)__va(header->fields.pm16dseg));
36335 }
36336+
36337+ pax_close_kernel();
36338 }
36339diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
36340index b0ecacb..7c9da2e 100644
36341--- a/drivers/pnp/resource.c
36342+++ b/drivers/pnp/resource.c
36343@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
36344 return 1;
36345
36346 /* check if the resource is valid */
36347- if (*irq < 0 || *irq > 15)
36348+ if (*irq > 15)
36349 return 0;
36350
36351 /* check if the resource is reserved */
36352@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
36353 return 1;
36354
36355 /* check if the resource is valid */
36356- if (*dma < 0 || *dma == 4 || *dma > 7)
36357+ if (*dma == 4 || *dma > 7)
36358 return 0;
36359
36360 /* check if the resource is reserved */
36361diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
36362index 1ed6ea0..77c0bd2 100644
36363--- a/drivers/power/bq27x00_battery.c
36364+++ b/drivers/power/bq27x00_battery.c
36365@@ -72,7 +72,7 @@
36366 struct bq27x00_device_info;
36367 struct bq27x00_access_methods {
36368 int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
36369-};
36370+} __no_const;
36371
36372 enum bq27x00_chip { BQ27000, BQ27500 };
36373
36374diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
36375index a838e66..a9e1665 100644
36376--- a/drivers/regulator/max8660.c
36377+++ b/drivers/regulator/max8660.c
36378@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struct i2c_client *client,
36379 max8660->shadow_regs[MAX8660_OVER1] = 5;
36380 } else {
36381 /* Otherwise devices can be toggled via software */
36382- max8660_dcdc_ops.enable = max8660_dcdc_enable;
36383- max8660_dcdc_ops.disable = max8660_dcdc_disable;
36384+ pax_open_kernel();
36385+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
36386+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
36387+ pax_close_kernel();
36388 }
36389
36390 /*
36391diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
36392index e8cfc99..072aee2 100644
36393--- a/drivers/regulator/mc13892-regulator.c
36394+++ b/drivers/regulator/mc13892-regulator.c
36395@@ -574,10 +574,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
36396 }
36397 mc13xxx_unlock(mc13892);
36398
36399- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36400+ pax_open_kernel();
36401+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36402 = mc13892_vcam_set_mode;
36403- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36404+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36405 = mc13892_vcam_get_mode;
36406+ pax_close_kernel();
36407
36408 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
36409 ARRAY_SIZE(mc13892_regulators));
36410diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
36411index cace6d3..f623fda 100644
36412--- a/drivers/rtc/rtc-dev.c
36413+++ b/drivers/rtc/rtc-dev.c
36414@@ -14,6 +14,7 @@
36415 #include <linux/module.h>
36416 #include <linux/rtc.h>
36417 #include <linux/sched.h>
36418+#include <linux/grsecurity.h>
36419 #include "rtc-core.h"
36420
36421 static dev_t rtc_devt;
36422@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
36423 if (copy_from_user(&tm, uarg, sizeof(tm)))
36424 return -EFAULT;
36425
36426+ gr_log_timechange();
36427+
36428 return rtc_set_time(rtc, &tm);
36429
36430 case RTC_PIE_ON:
36431diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
36432index ffb5878..e6d785c 100644
36433--- a/drivers/scsi/aacraid/aacraid.h
36434+++ b/drivers/scsi/aacraid/aacraid.h
36435@@ -492,7 +492,7 @@ struct adapter_ops
36436 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
36437 /* Administrative operations */
36438 int (*adapter_comm)(struct aac_dev * dev, int comm);
36439-};
36440+} __no_const;
36441
36442 /*
36443 * Define which interrupt handler needs to be installed
36444diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
36445index 705e13e..91c873c 100644
36446--- a/drivers/scsi/aacraid/linit.c
36447+++ b/drivers/scsi/aacraid/linit.c
36448@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
36449 #elif defined(__devinitconst)
36450 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36451 #else
36452-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
36453+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36454 #endif
36455 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
36456 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
36457diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
36458index d5ff142..49c0ebb 100644
36459--- a/drivers/scsi/aic94xx/aic94xx_init.c
36460+++ b/drivers/scsi/aic94xx/aic94xx_init.c
36461@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
36462 .lldd_control_phy = asd_control_phy,
36463 };
36464
36465-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
36466+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
36467 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
36468 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
36469 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
36470diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h
36471index a796de9..1ef20e1 100644
36472--- a/drivers/scsi/bfa/bfa.h
36473+++ b/drivers/scsi/bfa/bfa.h
36474@@ -196,7 +196,7 @@ struct bfa_hwif_s {
36475 u32 *end);
36476 int cpe_vec_q0;
36477 int rme_vec_q0;
36478-};
36479+} __no_const;
36480 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
36481
36482 struct bfa_faa_cbfn_s {
36483diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c
36484index f0f80e2..8ec946b 100644
36485--- a/drivers/scsi/bfa/bfa_fcpim.c
36486+++ b/drivers/scsi/bfa/bfa_fcpim.c
36487@@ -3715,7 +3715,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
36488
36489 bfa_iotag_attach(fcp);
36490
36491- fcp->itn_arr = (struct bfa_itn_s *) bfa_mem_kva_curp(fcp);
36492+ fcp->itn_arr = (bfa_itn_s_no_const *) bfa_mem_kva_curp(fcp);
36493 bfa_mem_kva_curp(fcp) = (u8 *)fcp->itn_arr +
36494 (fcp->num_itns * sizeof(struct bfa_itn_s));
36495 memset(fcp->itn_arr, 0,
36496@@ -3773,7 +3773,7 @@ bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36497 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
36498 {
36499 struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
36500- struct bfa_itn_s *itn;
36501+ bfa_itn_s_no_const *itn;
36502
36503 itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
36504 itn->isr = isr;
36505diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
36506index 36f26da..38a34a8 100644
36507--- a/drivers/scsi/bfa/bfa_fcpim.h
36508+++ b/drivers/scsi/bfa/bfa_fcpim.h
36509@@ -37,6 +37,7 @@ struct bfa_iotag_s {
36510 struct bfa_itn_s {
36511 bfa_isr_func_t isr;
36512 };
36513+typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
36514
36515 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36516 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
36517@@ -147,7 +148,7 @@ struct bfa_fcp_mod_s {
36518 struct list_head iotag_tio_free_q; /* free IO resources */
36519 struct list_head iotag_unused_q; /* unused IO resources*/
36520 struct bfa_iotag_s *iotag_arr;
36521- struct bfa_itn_s *itn_arr;
36522+ bfa_itn_s_no_const *itn_arr;
36523 int num_ioim_reqs;
36524 int num_fwtio_reqs;
36525 int num_itns;
36526diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
36527index 546d46b..642fa5b 100644
36528--- a/drivers/scsi/bfa/bfa_ioc.h
36529+++ b/drivers/scsi/bfa/bfa_ioc.h
36530@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
36531 bfa_ioc_disable_cbfn_t disable_cbfn;
36532 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
36533 bfa_ioc_reset_cbfn_t reset_cbfn;
36534-};
36535+} __no_const;
36536
36537 /*
36538 * IOC event notification mechanism.
36539@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
36540 void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
36541 bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
36542 bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
36543-};
36544+} __no_const;
36545
36546 /*
36547 * Queue element to wait for room in request queue. FIFO order is
36548diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
36549index 351dc0b..951dc32 100644
36550--- a/drivers/scsi/hosts.c
36551+++ b/drivers/scsi/hosts.c
36552@@ -42,7 +42,7 @@
36553 #include "scsi_logging.h"
36554
36555
36556-static atomic_t scsi_host_next_hn; /* host_no for next new host */
36557+static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
36558
36559
36560 static void scsi_host_cls_release(struct device *dev)
36561@@ -357,7 +357,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
36562 * subtract one because we increment first then return, but we need to
36563 * know what the next host number was before increment
36564 */
36565- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
36566+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
36567 shost->dma_channel = 0xff;
36568
36569 /* These three are default values which can be overridden */
36570diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
36571index b96962c..0c82ec2 100644
36572--- a/drivers/scsi/hpsa.c
36573+++ b/drivers/scsi/hpsa.c
36574@@ -507,7 +507,7 @@ static inline u32 next_command(struct ctlr_info *h)
36575 u32 a;
36576
36577 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
36578- return h->access.command_completed(h);
36579+ return h->access->command_completed(h);
36580
36581 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
36582 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
36583@@ -2991,7 +2991,7 @@ static void start_io(struct ctlr_info *h)
36584 while (!list_empty(&h->reqQ)) {
36585 c = list_entry(h->reqQ.next, struct CommandList, list);
36586 /* can't do anything if fifo is full */
36587- if ((h->access.fifo_full(h))) {
36588+ if ((h->access->fifo_full(h))) {
36589 dev_warn(&h->pdev->dev, "fifo full\n");
36590 break;
36591 }
36592@@ -3001,7 +3001,7 @@ static void start_io(struct ctlr_info *h)
36593 h->Qdepth--;
36594
36595 /* Tell the controller execute command */
36596- h->access.submit_command(h, c);
36597+ h->access->submit_command(h, c);
36598
36599 /* Put job onto the completed Q */
36600 addQ(&h->cmpQ, c);
36601@@ -3010,17 +3010,17 @@ static void start_io(struct ctlr_info *h)
36602
36603 static inline unsigned long get_next_completion(struct ctlr_info *h)
36604 {
36605- return h->access.command_completed(h);
36606+ return h->access->command_completed(h);
36607 }
36608
36609 static inline bool interrupt_pending(struct ctlr_info *h)
36610 {
36611- return h->access.intr_pending(h);
36612+ return h->access->intr_pending(h);
36613 }
36614
36615 static inline long interrupt_not_for_us(struct ctlr_info *h)
36616 {
36617- return (h->access.intr_pending(h) == 0) ||
36618+ return (h->access->intr_pending(h) == 0) ||
36619 (h->interrupts_enabled == 0);
36620 }
36621
36622@@ -3919,7 +3919,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
36623 if (prod_index < 0)
36624 return -ENODEV;
36625 h->product_name = products[prod_index].product_name;
36626- h->access = *(products[prod_index].access);
36627+ h->access = products[prod_index].access;
36628
36629 if (hpsa_board_disabled(h->pdev)) {
36630 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
36631@@ -4164,7 +4164,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
36632
36633 assert_spin_locked(&lockup_detector_lock);
36634 remove_ctlr_from_lockup_detector_list(h);
36635- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36636+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36637 spin_lock_irqsave(&h->lock, flags);
36638 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
36639 spin_unlock_irqrestore(&h->lock, flags);
36640@@ -4344,7 +4344,7 @@ reinit_after_soft_reset:
36641 }
36642
36643 /* make sure the board interrupts are off */
36644- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36645+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36646
36647 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
36648 goto clean2;
36649@@ -4378,7 +4378,7 @@ reinit_after_soft_reset:
36650 * fake ones to scoop up any residual completions.
36651 */
36652 spin_lock_irqsave(&h->lock, flags);
36653- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36654+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36655 spin_unlock_irqrestore(&h->lock, flags);
36656 free_irq(h->intr[h->intr_mode], h);
36657 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
36658@@ -4397,9 +4397,9 @@ reinit_after_soft_reset:
36659 dev_info(&h->pdev->dev, "Board READY.\n");
36660 dev_info(&h->pdev->dev,
36661 "Waiting for stale completions to drain.\n");
36662- h->access.set_intr_mask(h, HPSA_INTR_ON);
36663+ h->access->set_intr_mask(h, HPSA_INTR_ON);
36664 msleep(10000);
36665- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36666+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36667
36668 rc = controller_reset_failed(h->cfgtable);
36669 if (rc)
36670@@ -4420,7 +4420,7 @@ reinit_after_soft_reset:
36671 }
36672
36673 /* Turn the interrupts on so we can service requests */
36674- h->access.set_intr_mask(h, HPSA_INTR_ON);
36675+ h->access->set_intr_mask(h, HPSA_INTR_ON);
36676
36677 hpsa_hba_inquiry(h);
36678 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
36679@@ -4472,7 +4472,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
36680 * To write all data in the battery backed cache to disks
36681 */
36682 hpsa_flush_cache(h);
36683- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36684+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36685 free_irq(h->intr[h->intr_mode], h);
36686 #ifdef CONFIG_PCI_MSI
36687 if (h->msix_vector)
36688@@ -4636,7 +4636,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
36689 return;
36690 }
36691 /* Change the access methods to the performant access methods */
36692- h->access = SA5_performant_access;
36693+ h->access = &SA5_performant_access;
36694 h->transMethod = CFGTBL_Trans_Performant;
36695 }
36696
36697diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
36698index 91edafb..a9b88ec 100644
36699--- a/drivers/scsi/hpsa.h
36700+++ b/drivers/scsi/hpsa.h
36701@@ -73,7 +73,7 @@ struct ctlr_info {
36702 unsigned int msix_vector;
36703 unsigned int msi_vector;
36704 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
36705- struct access_method access;
36706+ struct access_method *access;
36707
36708 /* queue and queue Info */
36709 struct list_head reqQ;
36710diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
36711index f2df059..a3a9930 100644
36712--- a/drivers/scsi/ips.h
36713+++ b/drivers/scsi/ips.h
36714@@ -1027,7 +1027,7 @@ typedef struct {
36715 int (*intr)(struct ips_ha *);
36716 void (*enableint)(struct ips_ha *);
36717 uint32_t (*statupd)(struct ips_ha *);
36718-} ips_hw_func_t;
36719+} __no_const ips_hw_func_t;
36720
36721 typedef struct ips_ha {
36722 uint8_t ha_id[IPS_MAX_CHANNELS+1];
36723diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
36724index 4d70d96..84d0573 100644
36725--- a/drivers/scsi/libfc/fc_exch.c
36726+++ b/drivers/scsi/libfc/fc_exch.c
36727@@ -105,12 +105,12 @@ struct fc_exch_mgr {
36728 * all together if not used XXX
36729 */
36730 struct {
36731- atomic_t no_free_exch;
36732- atomic_t no_free_exch_xid;
36733- atomic_t xid_not_found;
36734- atomic_t xid_busy;
36735- atomic_t seq_not_found;
36736- atomic_t non_bls_resp;
36737+ atomic_unchecked_t no_free_exch;
36738+ atomic_unchecked_t no_free_exch_xid;
36739+ atomic_unchecked_t xid_not_found;
36740+ atomic_unchecked_t xid_busy;
36741+ atomic_unchecked_t seq_not_found;
36742+ atomic_unchecked_t non_bls_resp;
36743 } stats;
36744 };
36745
36746@@ -719,7 +719,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
36747 /* allocate memory for exchange */
36748 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
36749 if (!ep) {
36750- atomic_inc(&mp->stats.no_free_exch);
36751+ atomic_inc_unchecked(&mp->stats.no_free_exch);
36752 goto out;
36753 }
36754 memset(ep, 0, sizeof(*ep));
36755@@ -780,7 +780,7 @@ out:
36756 return ep;
36757 err:
36758 spin_unlock_bh(&pool->lock);
36759- atomic_inc(&mp->stats.no_free_exch_xid);
36760+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
36761 mempool_free(ep, mp->ep_pool);
36762 return NULL;
36763 }
36764@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36765 xid = ntohs(fh->fh_ox_id); /* we originated exch */
36766 ep = fc_exch_find(mp, xid);
36767 if (!ep) {
36768- atomic_inc(&mp->stats.xid_not_found);
36769+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36770 reject = FC_RJT_OX_ID;
36771 goto out;
36772 }
36773@@ -953,7 +953,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36774 ep = fc_exch_find(mp, xid);
36775 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
36776 if (ep) {
36777- atomic_inc(&mp->stats.xid_busy);
36778+ atomic_inc_unchecked(&mp->stats.xid_busy);
36779 reject = FC_RJT_RX_ID;
36780 goto rel;
36781 }
36782@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36783 }
36784 xid = ep->xid; /* get our XID */
36785 } else if (!ep) {
36786- atomic_inc(&mp->stats.xid_not_found);
36787+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36788 reject = FC_RJT_RX_ID; /* XID not found */
36789 goto out;
36790 }
36791@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36792 } else {
36793 sp = &ep->seq;
36794 if (sp->id != fh->fh_seq_id) {
36795- atomic_inc(&mp->stats.seq_not_found);
36796+ atomic_inc_unchecked(&mp->stats.seq_not_found);
36797 if (f_ctl & FC_FC_END_SEQ) {
36798 /*
36799 * Update sequence_id based on incoming last
36800@@ -1431,22 +1431,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36801
36802 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
36803 if (!ep) {
36804- atomic_inc(&mp->stats.xid_not_found);
36805+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36806 goto out;
36807 }
36808 if (ep->esb_stat & ESB_ST_COMPLETE) {
36809- atomic_inc(&mp->stats.xid_not_found);
36810+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36811 goto rel;
36812 }
36813 if (ep->rxid == FC_XID_UNKNOWN)
36814 ep->rxid = ntohs(fh->fh_rx_id);
36815 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
36816- atomic_inc(&mp->stats.xid_not_found);
36817+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36818 goto rel;
36819 }
36820 if (ep->did != ntoh24(fh->fh_s_id) &&
36821 ep->did != FC_FID_FLOGI) {
36822- atomic_inc(&mp->stats.xid_not_found);
36823+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36824 goto rel;
36825 }
36826 sof = fr_sof(fp);
36827@@ -1455,7 +1455,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36828 sp->ssb_stat |= SSB_ST_RESP;
36829 sp->id = fh->fh_seq_id;
36830 } else if (sp->id != fh->fh_seq_id) {
36831- atomic_inc(&mp->stats.seq_not_found);
36832+ atomic_inc_unchecked(&mp->stats.seq_not_found);
36833 goto rel;
36834 }
36835
36836@@ -1519,9 +1519,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36837 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
36838
36839 if (!sp)
36840- atomic_inc(&mp->stats.xid_not_found);
36841+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36842 else
36843- atomic_inc(&mp->stats.non_bls_resp);
36844+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
36845
36846 fc_frame_free(fp);
36847 }
36848diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
36849index db9238f..4378ed2 100644
36850--- a/drivers/scsi/libsas/sas_ata.c
36851+++ b/drivers/scsi/libsas/sas_ata.c
36852@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sata_ops = {
36853 .postreset = ata_std_postreset,
36854 .error_handler = ata_std_error_handler,
36855 .post_internal_cmd = sas_ata_post_internal,
36856- .qc_defer = ata_std_qc_defer,
36857+ .qc_defer = ata_std_qc_defer,
36858 .qc_prep = ata_noop_qc_prep,
36859 .qc_issue = sas_ata_qc_issue,
36860 .qc_fill_rtf = sas_ata_qc_fill_rtf,
36861diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
36862index 825f930..ce42672 100644
36863--- a/drivers/scsi/lpfc/lpfc.h
36864+++ b/drivers/scsi/lpfc/lpfc.h
36865@@ -413,7 +413,7 @@ struct lpfc_vport {
36866 struct dentry *debug_nodelist;
36867 struct dentry *vport_debugfs_root;
36868 struct lpfc_debugfs_trc *disc_trc;
36869- atomic_t disc_trc_cnt;
36870+ atomic_unchecked_t disc_trc_cnt;
36871 #endif
36872 uint8_t stat_data_enabled;
36873 uint8_t stat_data_blocked;
36874@@ -821,8 +821,8 @@ struct lpfc_hba {
36875 struct timer_list fabric_block_timer;
36876 unsigned long bit_flags;
36877 #define FABRIC_COMANDS_BLOCKED 0
36878- atomic_t num_rsrc_err;
36879- atomic_t num_cmd_success;
36880+ atomic_unchecked_t num_rsrc_err;
36881+ atomic_unchecked_t num_cmd_success;
36882 unsigned long last_rsrc_error_time;
36883 unsigned long last_ramp_down_time;
36884 unsigned long last_ramp_up_time;
36885@@ -852,7 +852,7 @@ struct lpfc_hba {
36886
36887 struct dentry *debug_slow_ring_trc;
36888 struct lpfc_debugfs_trc *slow_ring_trc;
36889- atomic_t slow_ring_trc_cnt;
36890+ atomic_unchecked_t slow_ring_trc_cnt;
36891 /* iDiag debugfs sub-directory */
36892 struct dentry *idiag_root;
36893 struct dentry *idiag_pci_cfg;
36894diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
36895index 3587a3f..d45b81b 100644
36896--- a/drivers/scsi/lpfc/lpfc_debugfs.c
36897+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
36898@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
36899
36900 #include <linux/debugfs.h>
36901
36902-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
36903+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
36904 static unsigned long lpfc_debugfs_start_time = 0L;
36905
36906 /* iDiag */
36907@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
36908 lpfc_debugfs_enable = 0;
36909
36910 len = 0;
36911- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
36912+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
36913 (lpfc_debugfs_max_disc_trc - 1);
36914 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
36915 dtp = vport->disc_trc + i;
36916@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
36917 lpfc_debugfs_enable = 0;
36918
36919 len = 0;
36920- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
36921+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
36922 (lpfc_debugfs_max_slow_ring_trc - 1);
36923 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
36924 dtp = phba->slow_ring_trc + i;
36925@@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
36926 !vport || !vport->disc_trc)
36927 return;
36928
36929- index = atomic_inc_return(&vport->disc_trc_cnt) &
36930+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
36931 (lpfc_debugfs_max_disc_trc - 1);
36932 dtp = vport->disc_trc + index;
36933 dtp->fmt = fmt;
36934 dtp->data1 = data1;
36935 dtp->data2 = data2;
36936 dtp->data3 = data3;
36937- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
36938+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
36939 dtp->jif = jiffies;
36940 #endif
36941 return;
36942@@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
36943 !phba || !phba->slow_ring_trc)
36944 return;
36945
36946- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
36947+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
36948 (lpfc_debugfs_max_slow_ring_trc - 1);
36949 dtp = phba->slow_ring_trc + index;
36950 dtp->fmt = fmt;
36951 dtp->data1 = data1;
36952 dtp->data2 = data2;
36953 dtp->data3 = data3;
36954- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
36955+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
36956 dtp->jif = jiffies;
36957 #endif
36958 return;
36959@@ -4040,7 +4040,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
36960 "slow_ring buffer\n");
36961 goto debug_failed;
36962 }
36963- atomic_set(&phba->slow_ring_trc_cnt, 0);
36964+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
36965 memset(phba->slow_ring_trc, 0,
36966 (sizeof(struct lpfc_debugfs_trc) *
36967 lpfc_debugfs_max_slow_ring_trc));
36968@@ -4086,7 +4086,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
36969 "buffer\n");
36970 goto debug_failed;
36971 }
36972- atomic_set(&vport->disc_trc_cnt, 0);
36973+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
36974
36975 snprintf(name, sizeof(name), "discovery_trace");
36976 vport->debug_disc_trc =
36977diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
36978index dfea2da..8e17227 100644
36979--- a/drivers/scsi/lpfc/lpfc_init.c
36980+++ b/drivers/scsi/lpfc/lpfc_init.c
36981@@ -10145,8 +10145,10 @@ lpfc_init(void)
36982 printk(LPFC_COPYRIGHT "\n");
36983
36984 if (lpfc_enable_npiv) {
36985- lpfc_transport_functions.vport_create = lpfc_vport_create;
36986- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
36987+ pax_open_kernel();
36988+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
36989+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
36990+ pax_close_kernel();
36991 }
36992 lpfc_transport_template =
36993 fc_attach_transport(&lpfc_transport_functions);
36994diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
36995index c60f5d0..751535c 100644
36996--- a/drivers/scsi/lpfc/lpfc_scsi.c
36997+++ b/drivers/scsi/lpfc/lpfc_scsi.c
36998@@ -305,7 +305,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
36999 uint32_t evt_posted;
37000
37001 spin_lock_irqsave(&phba->hbalock, flags);
37002- atomic_inc(&phba->num_rsrc_err);
37003+ atomic_inc_unchecked(&phba->num_rsrc_err);
37004 phba->last_rsrc_error_time = jiffies;
37005
37006 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
37007@@ -346,7 +346,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
37008 unsigned long flags;
37009 struct lpfc_hba *phba = vport->phba;
37010 uint32_t evt_posted;
37011- atomic_inc(&phba->num_cmd_success);
37012+ atomic_inc_unchecked(&phba->num_cmd_success);
37013
37014 if (vport->cfg_lun_queue_depth <= queue_depth)
37015 return;
37016@@ -390,8 +390,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37017 unsigned long num_rsrc_err, num_cmd_success;
37018 int i;
37019
37020- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
37021- num_cmd_success = atomic_read(&phba->num_cmd_success);
37022+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
37023+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
37024
37025 vports = lpfc_create_vport_work_array(phba);
37026 if (vports != NULL)
37027@@ -411,8 +411,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37028 }
37029 }
37030 lpfc_destroy_vport_work_array(phba, vports);
37031- atomic_set(&phba->num_rsrc_err, 0);
37032- atomic_set(&phba->num_cmd_success, 0);
37033+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37034+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37035 }
37036
37037 /**
37038@@ -446,8 +446,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
37039 }
37040 }
37041 lpfc_destroy_vport_work_array(phba, vports);
37042- atomic_set(&phba->num_rsrc_err, 0);
37043- atomic_set(&phba->num_cmd_success, 0);
37044+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37045+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37046 }
37047
37048 /**
37049diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
37050index ea8a0b4..812a124 100644
37051--- a/drivers/scsi/pmcraid.c
37052+++ b/drivers/scsi/pmcraid.c
37053@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
37054 res->scsi_dev = scsi_dev;
37055 scsi_dev->hostdata = res;
37056 res->change_detected = 0;
37057- atomic_set(&res->read_failures, 0);
37058- atomic_set(&res->write_failures, 0);
37059+ atomic_set_unchecked(&res->read_failures, 0);
37060+ atomic_set_unchecked(&res->write_failures, 0);
37061 rc = 0;
37062 }
37063 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
37064@@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
37065
37066 /* If this was a SCSI read/write command keep count of errors */
37067 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
37068- atomic_inc(&res->read_failures);
37069+ atomic_inc_unchecked(&res->read_failures);
37070 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
37071- atomic_inc(&res->write_failures);
37072+ atomic_inc_unchecked(&res->write_failures);
37073
37074 if (!RES_IS_GSCSI(res->cfg_entry) &&
37075 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
37076@@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
37077 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37078 * hrrq_id assigned here in queuecommand
37079 */
37080- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37081+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37082 pinstance->num_hrrq;
37083 cmd->cmd_done = pmcraid_io_done;
37084
37085@@ -3859,7 +3859,7 @@ static long pmcraid_ioctl_passthrough(
37086 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37087 * hrrq_id assigned here in queuecommand
37088 */
37089- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37090+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37091 pinstance->num_hrrq;
37092
37093 if (request_size) {
37094@@ -4497,7 +4497,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
37095
37096 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
37097 /* add resources only after host is added into system */
37098- if (!atomic_read(&pinstance->expose_resources))
37099+ if (!atomic_read_unchecked(&pinstance->expose_resources))
37100 return;
37101
37102 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
37103@@ -5331,8 +5331,8 @@ static int __devinit pmcraid_init_instance(
37104 init_waitqueue_head(&pinstance->reset_wait_q);
37105
37106 atomic_set(&pinstance->outstanding_cmds, 0);
37107- atomic_set(&pinstance->last_message_id, 0);
37108- atomic_set(&pinstance->expose_resources, 0);
37109+ atomic_set_unchecked(&pinstance->last_message_id, 0);
37110+ atomic_set_unchecked(&pinstance->expose_resources, 0);
37111
37112 INIT_LIST_HEAD(&pinstance->free_res_q);
37113 INIT_LIST_HEAD(&pinstance->used_res_q);
37114@@ -6047,7 +6047,7 @@ static int __devinit pmcraid_probe(
37115 /* Schedule worker thread to handle CCN and take care of adding and
37116 * removing devices to OS
37117 */
37118- atomic_set(&pinstance->expose_resources, 1);
37119+ atomic_set_unchecked(&pinstance->expose_resources, 1);
37120 schedule_work(&pinstance->worker_q);
37121 return rc;
37122
37123diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
37124index ca496c7..9c791d5 100644
37125--- a/drivers/scsi/pmcraid.h
37126+++ b/drivers/scsi/pmcraid.h
37127@@ -748,7 +748,7 @@ struct pmcraid_instance {
37128 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
37129
37130 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
37131- atomic_t last_message_id;
37132+ atomic_unchecked_t last_message_id;
37133
37134 /* configuration table */
37135 struct pmcraid_config_table *cfg_table;
37136@@ -777,7 +777,7 @@ struct pmcraid_instance {
37137 atomic_t outstanding_cmds;
37138
37139 /* should add/delete resources to mid-layer now ?*/
37140- atomic_t expose_resources;
37141+ atomic_unchecked_t expose_resources;
37142
37143
37144
37145@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
37146 struct pmcraid_config_table_entry_ext cfg_entry_ext;
37147 };
37148 struct scsi_device *scsi_dev; /* Link scsi_device structure */
37149- atomic_t read_failures; /* count of failed READ commands */
37150- atomic_t write_failures; /* count of failed WRITE commands */
37151+ atomic_unchecked_t read_failures; /* count of failed READ commands */
37152+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
37153
37154 /* To indicate add/delete/modify during CCN */
37155 u8 change_detected;
37156diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
37157index af1003f..be55a75 100644
37158--- a/drivers/scsi/qla2xxx/qla_def.h
37159+++ b/drivers/scsi/qla2xxx/qla_def.h
37160@@ -2247,7 +2247,7 @@ struct isp_operations {
37161 int (*start_scsi) (srb_t *);
37162 int (*abort_isp) (struct scsi_qla_host *);
37163 int (*iospace_config)(struct qla_hw_data*);
37164-};
37165+} __no_const;
37166
37167 /* MSI-X Support *************************************************************/
37168
37169diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
37170index bfe6854..ceac088 100644
37171--- a/drivers/scsi/qla4xxx/ql4_def.h
37172+++ b/drivers/scsi/qla4xxx/ql4_def.h
37173@@ -261,7 +261,7 @@ struct ddb_entry {
37174 * (4000 only) */
37175 atomic_t relogin_timer; /* Max Time to wait for
37176 * relogin to complete */
37177- atomic_t relogin_retry_count; /* Num of times relogin has been
37178+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
37179 * retried */
37180 uint32_t default_time2wait; /* Default Min time between
37181 * relogins (+aens) */
37182diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
37183index ce6d3b7..73fac54 100644
37184--- a/drivers/scsi/qla4xxx/ql4_os.c
37185+++ b/drivers/scsi/qla4xxx/ql4_os.c
37186@@ -2178,12 +2178,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
37187 */
37188 if (!iscsi_is_session_online(cls_sess)) {
37189 /* Reset retry relogin timer */
37190- atomic_inc(&ddb_entry->relogin_retry_count);
37191+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
37192 DEBUG2(ql4_printk(KERN_INFO, ha,
37193 "%s: index[%d] relogin timed out-retrying"
37194 " relogin (%d), retry (%d)\n", __func__,
37195 ddb_entry->fw_ddb_index,
37196- atomic_read(&ddb_entry->relogin_retry_count),
37197+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
37198 ddb_entry->default_time2wait + 4));
37199 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
37200 atomic_set(&ddb_entry->retry_relogin_timer,
37201@@ -3953,7 +3953,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
37202
37203 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
37204 atomic_set(&ddb_entry->relogin_timer, 0);
37205- atomic_set(&ddb_entry->relogin_retry_count, 0);
37206+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
37207 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
37208 ddb_entry->default_relogin_timeout =
37209 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
37210diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
37211index 2aeb2e9..46e3925 100644
37212--- a/drivers/scsi/scsi.c
37213+++ b/drivers/scsi/scsi.c
37214@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
37215 unsigned long timeout;
37216 int rtn = 0;
37217
37218- atomic_inc(&cmd->device->iorequest_cnt);
37219+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37220
37221 /* check if the device is still usable */
37222 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
37223diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
37224index b2c95db..227d74e 100644
37225--- a/drivers/scsi/scsi_lib.c
37226+++ b/drivers/scsi/scsi_lib.c
37227@@ -1411,7 +1411,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
37228 shost = sdev->host;
37229 scsi_init_cmd_errh(cmd);
37230 cmd->result = DID_NO_CONNECT << 16;
37231- atomic_inc(&cmd->device->iorequest_cnt);
37232+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37233
37234 /*
37235 * SCSI request completion path will do scsi_device_unbusy(),
37236@@ -1437,9 +1437,9 @@ static void scsi_softirq_done(struct request *rq)
37237
37238 INIT_LIST_HEAD(&cmd->eh_entry);
37239
37240- atomic_inc(&cmd->device->iodone_cnt);
37241+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
37242 if (cmd->result)
37243- atomic_inc(&cmd->device->ioerr_cnt);
37244+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
37245
37246 disposition = scsi_decide_disposition(cmd);
37247 if (disposition != SUCCESS &&
37248diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
37249index 04c2a27..9d8bd66 100644
37250--- a/drivers/scsi/scsi_sysfs.c
37251+++ b/drivers/scsi/scsi_sysfs.c
37252@@ -660,7 +660,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
37253 char *buf) \
37254 { \
37255 struct scsi_device *sdev = to_scsi_device(dev); \
37256- unsigned long long count = atomic_read(&sdev->field); \
37257+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
37258 return snprintf(buf, 20, "0x%llx\n", count); \
37259 } \
37260 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
37261diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
37262index 84a1fdf..693b0d6 100644
37263--- a/drivers/scsi/scsi_tgt_lib.c
37264+++ b/drivers/scsi/scsi_tgt_lib.c
37265@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
37266 int err;
37267
37268 dprintk("%lx %u\n", uaddr, len);
37269- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
37270+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
37271 if (err) {
37272 /*
37273 * TODO: need to fixup sg_tablesize, max_segment_size,
37274diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
37275index f59d4a0..1d89407 100644
37276--- a/drivers/scsi/scsi_transport_fc.c
37277+++ b/drivers/scsi/scsi_transport_fc.c
37278@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
37279 * Netlink Infrastructure
37280 */
37281
37282-static atomic_t fc_event_seq;
37283+static atomic_unchecked_t fc_event_seq;
37284
37285 /**
37286 * fc_get_event_number - Obtain the next sequential FC event number
37287@@ -497,7 +497,7 @@ static atomic_t fc_event_seq;
37288 u32
37289 fc_get_event_number(void)
37290 {
37291- return atomic_add_return(1, &fc_event_seq);
37292+ return atomic_add_return_unchecked(1, &fc_event_seq);
37293 }
37294 EXPORT_SYMBOL(fc_get_event_number);
37295
37296@@ -645,7 +645,7 @@ static __init int fc_transport_init(void)
37297 {
37298 int error;
37299
37300- atomic_set(&fc_event_seq, 0);
37301+ atomic_set_unchecked(&fc_event_seq, 0);
37302
37303 error = transport_class_register(&fc_host_class);
37304 if (error)
37305@@ -835,7 +835,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
37306 char *cp;
37307
37308 *val = simple_strtoul(buf, &cp, 0);
37309- if ((*cp && (*cp != '\n')) || (*val < 0))
37310+ if (*cp && (*cp != '\n'))
37311 return -EINVAL;
37312 /*
37313 * Check for overflow; dev_loss_tmo is u32
37314diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
37315index e3e3c7d..ebdab62 100644
37316--- a/drivers/scsi/scsi_transport_iscsi.c
37317+++ b/drivers/scsi/scsi_transport_iscsi.c
37318@@ -79,7 +79,7 @@ struct iscsi_internal {
37319 struct transport_container session_cont;
37320 };
37321
37322-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
37323+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
37324 static struct workqueue_struct *iscsi_eh_timer_workq;
37325
37326 static DEFINE_IDA(iscsi_sess_ida);
37327@@ -1063,7 +1063,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
37328 int err;
37329
37330 ihost = shost->shost_data;
37331- session->sid = atomic_add_return(1, &iscsi_session_nr);
37332+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
37333
37334 if (target_id == ISCSI_MAX_TARGET) {
37335 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
37336@@ -2680,7 +2680,7 @@ static __init int iscsi_transport_init(void)
37337 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
37338 ISCSI_TRANSPORT_VERSION);
37339
37340- atomic_set(&iscsi_session_nr, 0);
37341+ atomic_set_unchecked(&iscsi_session_nr, 0);
37342
37343 err = class_register(&iscsi_transport_class);
37344 if (err)
37345diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
37346index 21a045e..ec89e03 100644
37347--- a/drivers/scsi/scsi_transport_srp.c
37348+++ b/drivers/scsi/scsi_transport_srp.c
37349@@ -33,7 +33,7 @@
37350 #include "scsi_transport_srp_internal.h"
37351
37352 struct srp_host_attrs {
37353- atomic_t next_port_id;
37354+ atomic_unchecked_t next_port_id;
37355 };
37356 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
37357
37358@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
37359 struct Scsi_Host *shost = dev_to_shost(dev);
37360 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
37361
37362- atomic_set(&srp_host->next_port_id, 0);
37363+ atomic_set_unchecked(&srp_host->next_port_id, 0);
37364 return 0;
37365 }
37366
37367@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
37368 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
37369 rport->roles = ids->roles;
37370
37371- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
37372+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
37373 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
37374
37375 transport_setup_device(&rport->dev);
37376diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
37377index eacd46b..e3f4d62 100644
37378--- a/drivers/scsi/sg.c
37379+++ b/drivers/scsi/sg.c
37380@@ -1077,7 +1077,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
37381 sdp->disk->disk_name,
37382 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
37383 NULL,
37384- (char *)arg);
37385+ (char __user *)arg);
37386 case BLKTRACESTART:
37387 return blk_trace_startstop(sdp->device->request_queue, 1);
37388 case BLKTRACESTOP:
37389@@ -2312,7 +2312,7 @@ struct sg_proc_leaf {
37390 const struct file_operations * fops;
37391 };
37392
37393-static struct sg_proc_leaf sg_proc_leaf_arr[] = {
37394+static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
37395 {"allow_dio", &adio_fops},
37396 {"debug", &debug_fops},
37397 {"def_reserved_size", &dressz_fops},
37398@@ -2332,7 +2332,7 @@ sg_proc_init(void)
37399 if (!sg_proc_sgp)
37400 return 1;
37401 for (k = 0; k < num_leaves; ++k) {
37402- struct sg_proc_leaf *leaf = &sg_proc_leaf_arr[k];
37403+ const struct sg_proc_leaf *leaf = &sg_proc_leaf_arr[k];
37404 umode_t mask = leaf->fops->write ? S_IRUGO | S_IWUSR : S_IRUGO;
37405 proc_create(leaf->name, mask, sg_proc_sgp, leaf->fops);
37406 }
37407diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
37408index f64250e..1ee3049 100644
37409--- a/drivers/spi/spi-dw-pci.c
37410+++ b/drivers/spi/spi-dw-pci.c
37411@@ -149,7 +149,7 @@ static int spi_resume(struct pci_dev *pdev)
37412 #define spi_resume NULL
37413 #endif
37414
37415-static const struct pci_device_id pci_ids[] __devinitdata = {
37416+static const struct pci_device_id pci_ids[] __devinitconst = {
37417 /* Intel MID platform SPI controller 0 */
37418 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
37419 {},
37420diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
37421index b2ccdea..84cde75 100644
37422--- a/drivers/spi/spi.c
37423+++ b/drivers/spi/spi.c
37424@@ -1024,7 +1024,7 @@ int spi_bus_unlock(struct spi_master *master)
37425 EXPORT_SYMBOL_GPL(spi_bus_unlock);
37426
37427 /* portable code must never pass more than 32 bytes */
37428-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
37429+#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
37430
37431 static u8 *buf;
37432
37433diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
37434index 400df8c..065d4f4 100644
37435--- a/drivers/staging/octeon/ethernet-rx.c
37436+++ b/drivers/staging/octeon/ethernet-rx.c
37437@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37438 /* Increment RX stats for virtual ports */
37439 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
37440 #ifdef CONFIG_64BIT
37441- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
37442- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
37443+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
37444+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
37445 #else
37446- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
37447- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
37448+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
37449+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
37450 #endif
37451 }
37452 netif_receive_skb(skb);
37453@@ -436,9 +436,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37454 dev->name);
37455 */
37456 #ifdef CONFIG_64BIT
37457- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
37458+ atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37459 #else
37460- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
37461+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
37462 #endif
37463 dev_kfree_skb_irq(skb);
37464 }
37465diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
37466index 9112cd8..92f8d51 100644
37467--- a/drivers/staging/octeon/ethernet.c
37468+++ b/drivers/staging/octeon/ethernet.c
37469@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
37470 * since the RX tasklet also increments it.
37471 */
37472 #ifdef CONFIG_64BIT
37473- atomic64_add(rx_status.dropped_packets,
37474- (atomic64_t *)&priv->stats.rx_dropped);
37475+ atomic64_add_unchecked(rx_status.dropped_packets,
37476+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37477 #else
37478- atomic_add(rx_status.dropped_packets,
37479- (atomic_t *)&priv->stats.rx_dropped);
37480+ atomic_add_unchecked(rx_status.dropped_packets,
37481+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
37482 #endif
37483 }
37484
37485diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
37486index f9dae95..ff48901 100644
37487--- a/drivers/staging/rtl8192e/rtllib_module.c
37488+++ b/drivers/staging/rtl8192e/rtllib_module.c
37489@@ -215,6 +215,8 @@ static int show_debug_level(char *page, char **start, off_t offset,
37490 }
37491
37492 static int store_debug_level(struct file *file, const char __user *buffer,
37493+ unsigned long count, void *data) __size_overflow(3);
37494+static int store_debug_level(struct file *file, const char __user *buffer,
37495 unsigned long count, void *data)
37496 {
37497 char buf[] = "0x00000000";
37498diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37499index e3d47bc..85f4d0d 100644
37500--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37501+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37502@@ -250,6 +250,8 @@ static int show_debug_level(char *page, char **start, off_t offset,
37503 }
37504
37505 static int store_debug_level(struct file *file, const char *buffer,
37506+ unsigned long count, void *data) __size_overflow(3);
37507+static int store_debug_level(struct file *file, const char *buffer,
37508 unsigned long count, void *data)
37509 {
37510 char buf[] = "0x00000000";
37511diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
37512index 86308a0..feaa925 100644
37513--- a/drivers/staging/rtl8712/rtl871x_io.h
37514+++ b/drivers/staging/rtl8712/rtl871x_io.h
37515@@ -108,7 +108,7 @@ struct _io_ops {
37516 u8 *pmem);
37517 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
37518 u8 *pmem);
37519-};
37520+} __no_const;
37521
37522 struct io_req {
37523 struct list_head list;
37524diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
37525index c7b5e8b..783d6cb 100644
37526--- a/drivers/staging/sbe-2t3e3/netdev.c
37527+++ b/drivers/staging/sbe-2t3e3/netdev.c
37528@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
37529 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
37530
37531 if (rlen)
37532- if (copy_to_user(data, &resp, rlen))
37533+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
37534 return -EFAULT;
37535
37536 return 0;
37537diff --git a/drivers/staging/speakup/speakup_soft.c b/drivers/staging/speakup/speakup_soft.c
37538index 42cdafe..2769103 100644
37539--- a/drivers/staging/speakup/speakup_soft.c
37540+++ b/drivers/staging/speakup/speakup_soft.c
37541@@ -241,11 +241,11 @@ static ssize_t softsynth_read(struct file *fp, char *buf, size_t count,
37542 break;
37543 } else if (!initialized) {
37544 if (*init) {
37545- ch = *init;
37546 init++;
37547 } else {
37548 initialized = 1;
37549 }
37550+ ch = *init;
37551 } else {
37552 ch = synth_buffer_getc();
37553 }
37554diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
37555index b8f8c48..1fc5025 100644
37556--- a/drivers/staging/usbip/usbip_common.h
37557+++ b/drivers/staging/usbip/usbip_common.h
37558@@ -289,7 +289,7 @@ struct usbip_device {
37559 void (*shutdown)(struct usbip_device *);
37560 void (*reset)(struct usbip_device *);
37561 void (*unusable)(struct usbip_device *);
37562- } eh_ops;
37563+ } __no_const eh_ops;
37564 };
37565
37566 /* usbip_common.c */
37567diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
37568index 88b3298..3783eee 100644
37569--- a/drivers/staging/usbip/vhci.h
37570+++ b/drivers/staging/usbip/vhci.h
37571@@ -88,7 +88,7 @@ struct vhci_hcd {
37572 unsigned resuming:1;
37573 unsigned long re_timeout;
37574
37575- atomic_t seqnum;
37576+ atomic_unchecked_t seqnum;
37577
37578 /*
37579 * NOTE:
37580diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
37581index 2ee97e2..0420b86 100644
37582--- a/drivers/staging/usbip/vhci_hcd.c
37583+++ b/drivers/staging/usbip/vhci_hcd.c
37584@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
37585 return;
37586 }
37587
37588- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
37589+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37590 if (priv->seqnum == 0xffff)
37591 dev_info(&urb->dev->dev, "seqnum max\n");
37592
37593@@ -779,7 +779,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
37594 return -ENOMEM;
37595 }
37596
37597- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
37598+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37599 if (unlink->seqnum == 0xffff)
37600 pr_info("seqnum max\n");
37601
37602@@ -969,7 +969,7 @@ static int vhci_start(struct usb_hcd *hcd)
37603 vdev->rhport = rhport;
37604 }
37605
37606- atomic_set(&vhci->seqnum, 0);
37607+ atomic_set_unchecked(&vhci->seqnum, 0);
37608 spin_lock_init(&vhci->lock);
37609
37610 hcd->power_budget = 0; /* no limit */
37611diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
37612index 3f511b4..d3dbc1e 100644
37613--- a/drivers/staging/usbip/vhci_rx.c
37614+++ b/drivers/staging/usbip/vhci_rx.c
37615@@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
37616 if (!urb) {
37617 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
37618 pr_info("max seqnum %d\n",
37619- atomic_read(&the_controller->seqnum));
37620+ atomic_read_unchecked(&the_controller->seqnum));
37621 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
37622 return;
37623 }
37624diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
37625index 7735027..30eed13 100644
37626--- a/drivers/staging/vt6655/hostap.c
37627+++ b/drivers/staging/vt6655/hostap.c
37628@@ -79,14 +79,13 @@ static int msglevel =MSG_LEVEL_INFO;
37629 *
37630 */
37631
37632+static net_device_ops_no_const apdev_netdev_ops;
37633+
37634 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37635 {
37636 PSDevice apdev_priv;
37637 struct net_device *dev = pDevice->dev;
37638 int ret;
37639- const struct net_device_ops apdev_netdev_ops = {
37640- .ndo_start_xmit = pDevice->tx_80211,
37641- };
37642
37643 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37644
37645@@ -98,6 +97,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37646 *apdev_priv = *pDevice;
37647 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37648
37649+ /* only half broken now */
37650+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37651 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37652
37653 pDevice->apdev->type = ARPHRD_IEEE80211;
37654diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
37655index 51b5adf..098e320 100644
37656--- a/drivers/staging/vt6656/hostap.c
37657+++ b/drivers/staging/vt6656/hostap.c
37658@@ -80,14 +80,13 @@ static int msglevel =MSG_LEVEL_INFO;
37659 *
37660 */
37661
37662+static net_device_ops_no_const apdev_netdev_ops;
37663+
37664 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37665 {
37666 PSDevice apdev_priv;
37667 struct net_device *dev = pDevice->dev;
37668 int ret;
37669- const struct net_device_ops apdev_netdev_ops = {
37670- .ndo_start_xmit = pDevice->tx_80211,
37671- };
37672
37673 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37674
37675@@ -99,6 +98,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37676 *apdev_priv = *pDevice;
37677 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37678
37679+ /* only half broken now */
37680+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37681 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37682
37683 pDevice->apdev->type = ARPHRD_IEEE80211;
37684diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
37685index 7843dfd..3db105f 100644
37686--- a/drivers/staging/wlan-ng/hfa384x_usb.c
37687+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
37688@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
37689
37690 struct usbctlx_completor {
37691 int (*complete) (struct usbctlx_completor *);
37692-};
37693+} __no_const;
37694
37695 static int
37696 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
37697diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
37698index 1ca66ea..76f1343 100644
37699--- a/drivers/staging/zcache/tmem.c
37700+++ b/drivers/staging/zcache/tmem.c
37701@@ -39,7 +39,7 @@
37702 * A tmem host implementation must use this function to register callbacks
37703 * for memory allocation.
37704 */
37705-static struct tmem_hostops tmem_hostops;
37706+static tmem_hostops_no_const tmem_hostops;
37707
37708 static void tmem_objnode_tree_init(void);
37709
37710@@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_hostops *m)
37711 * A tmem host implementation must use this function to register
37712 * callbacks for a page-accessible memory (PAM) implementation
37713 */
37714-static struct tmem_pamops tmem_pamops;
37715+static tmem_pamops_no_const tmem_pamops;
37716
37717 void tmem_register_pamops(struct tmem_pamops *m)
37718 {
37719diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
37720index ed147c4..94fc3c6 100644
37721--- a/drivers/staging/zcache/tmem.h
37722+++ b/drivers/staging/zcache/tmem.h
37723@@ -180,6 +180,7 @@ struct tmem_pamops {
37724 void (*new_obj)(struct tmem_obj *);
37725 int (*replace_in_obj)(void *, struct tmem_obj *);
37726 };
37727+typedef struct tmem_pamops __no_const tmem_pamops_no_const;
37728 extern void tmem_register_pamops(struct tmem_pamops *m);
37729
37730 /* memory allocation methods provided by the host implementation */
37731@@ -189,6 +190,7 @@ struct tmem_hostops {
37732 struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
37733 void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
37734 };
37735+typedef struct tmem_hostops __no_const tmem_hostops_no_const;
37736 extern void tmem_register_hostops(struct tmem_hostops *m);
37737
37738 /* core tmem accessor functions */
37739diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
37740index 97c74ee..7f6d77d 100644
37741--- a/drivers/target/iscsi/iscsi_target.c
37742+++ b/drivers/target/iscsi/iscsi_target.c
37743@@ -1361,7 +1361,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
37744 * outstanding_r2ts reaches zero, go ahead and send the delayed
37745 * TASK_ABORTED status.
37746 */
37747- if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
37748+ if (atomic_read_unchecked(&se_cmd->t_transport_aborted) != 0) {
37749 if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
37750 if (--cmd->outstanding_r2ts < 1) {
37751 iscsit_stop_dataout_timer(cmd);
37752diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
37753index dcb0618..97e3d85 100644
37754--- a/drivers/target/target_core_tmr.c
37755+++ b/drivers/target/target_core_tmr.c
37756@@ -260,7 +260,7 @@ static void core_tmr_drain_task_list(
37757 cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
37758 cmd->t_task_list_num,
37759 atomic_read(&cmd->t_task_cdbs_left),
37760- atomic_read(&cmd->t_task_cdbs_sent),
37761+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
37762 atomic_read(&cmd->t_transport_active),
37763 atomic_read(&cmd->t_transport_stop),
37764 atomic_read(&cmd->t_transport_sent));
37765@@ -291,7 +291,7 @@ static void core_tmr_drain_task_list(
37766 pr_debug("LUN_RESET: got t_transport_active = 1 for"
37767 " task: %p, t_fe_count: %d dev: %p\n", task,
37768 fe_count, dev);
37769- atomic_set(&cmd->t_transport_aborted, 1);
37770+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
37771 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37772
37773 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
37774@@ -299,7 +299,7 @@ static void core_tmr_drain_task_list(
37775 }
37776 pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
37777 " t_fe_count: %d dev: %p\n", task, fe_count, dev);
37778- atomic_set(&cmd->t_transport_aborted, 1);
37779+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
37780 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37781
37782 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
37783diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
37784index cd5cd95..5249d30 100644
37785--- a/drivers/target/target_core_transport.c
37786+++ b/drivers/target/target_core_transport.c
37787@@ -1330,7 +1330,7 @@ struct se_device *transport_add_device_to_core_hba(
37788 spin_lock_init(&dev->se_port_lock);
37789 spin_lock_init(&dev->se_tmr_lock);
37790 spin_lock_init(&dev->qf_cmd_lock);
37791- atomic_set(&dev->dev_ordered_id, 0);
37792+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
37793
37794 se_dev_set_default_attribs(dev, dev_limits);
37795
37796@@ -1517,7 +1517,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
37797 * Used to determine when ORDERED commands should go from
37798 * Dormant to Active status.
37799 */
37800- cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
37801+ cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
37802 smp_mb__after_atomic_inc();
37803 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
37804 cmd->se_ordered_id, cmd->sam_task_attr,
37805@@ -1862,7 +1862,7 @@ static void transport_generic_request_failure(struct se_cmd *cmd)
37806 " t_transport_active: %d t_transport_stop: %d"
37807 " t_transport_sent: %d\n", cmd->t_task_list_num,
37808 atomic_read(&cmd->t_task_cdbs_left),
37809- atomic_read(&cmd->t_task_cdbs_sent),
37810+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
37811 atomic_read(&cmd->t_task_cdbs_ex_left),
37812 atomic_read(&cmd->t_transport_active),
37813 atomic_read(&cmd->t_transport_stop),
37814@@ -2121,9 +2121,9 @@ check_depth:
37815 cmd = task->task_se_cmd;
37816 spin_lock_irqsave(&cmd->t_state_lock, flags);
37817 task->task_flags |= (TF_ACTIVE | TF_SENT);
37818- atomic_inc(&cmd->t_task_cdbs_sent);
37819+ atomic_inc_unchecked(&cmd->t_task_cdbs_sent);
37820
37821- if (atomic_read(&cmd->t_task_cdbs_sent) ==
37822+ if (atomic_read_unchecked(&cmd->t_task_cdbs_sent) ==
37823 cmd->t_task_list_num)
37824 atomic_set(&cmd->t_transport_sent, 1);
37825
37826@@ -4348,7 +4348,7 @@ bool transport_wait_for_tasks(struct se_cmd *cmd)
37827 atomic_set(&cmd->transport_lun_stop, 0);
37828 }
37829 if (!atomic_read(&cmd->t_transport_active) ||
37830- atomic_read(&cmd->t_transport_aborted)) {
37831+ atomic_read_unchecked(&cmd->t_transport_aborted)) {
37832 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37833 return false;
37834 }
37835@@ -4597,7 +4597,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
37836 {
37837 int ret = 0;
37838
37839- if (atomic_read(&cmd->t_transport_aborted) != 0) {
37840+ if (atomic_read_unchecked(&cmd->t_transport_aborted) != 0) {
37841 if (!send_status ||
37842 (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
37843 return 1;
37844@@ -4634,7 +4634,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
37845 */
37846 if (cmd->data_direction == DMA_TO_DEVICE) {
37847 if (cmd->se_tfo->write_pending_status(cmd) != 0) {
37848- atomic_inc(&cmd->t_transport_aborted);
37849+ atomic_inc_unchecked(&cmd->t_transport_aborted);
37850 smp_mb__after_atomic_inc();
37851 }
37852 }
37853diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
37854index b9040be..e3f5aab 100644
37855--- a/drivers/tty/hvc/hvcs.c
37856+++ b/drivers/tty/hvc/hvcs.c
37857@@ -83,6 +83,7 @@
37858 #include <asm/hvcserver.h>
37859 #include <asm/uaccess.h>
37860 #include <asm/vio.h>
37861+#include <asm/local.h>
37862
37863 /*
37864 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
37865@@ -270,7 +271,7 @@ struct hvcs_struct {
37866 unsigned int index;
37867
37868 struct tty_struct *tty;
37869- int open_count;
37870+ local_t open_count;
37871
37872 /*
37873 * Used to tell the driver kernel_thread what operations need to take
37874@@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
37875
37876 spin_lock_irqsave(&hvcsd->lock, flags);
37877
37878- if (hvcsd->open_count > 0) {
37879+ if (local_read(&hvcsd->open_count) > 0) {
37880 spin_unlock_irqrestore(&hvcsd->lock, flags);
37881 printk(KERN_INFO "HVCS: vterm state unchanged. "
37882 "The hvcs device node is still in use.\n");
37883@@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
37884 if ((retval = hvcs_partner_connect(hvcsd)))
37885 goto error_release;
37886
37887- hvcsd->open_count = 1;
37888+ local_set(&hvcsd->open_count, 1);
37889 hvcsd->tty = tty;
37890 tty->driver_data = hvcsd;
37891
37892@@ -1179,7 +1180,7 @@ fast_open:
37893
37894 spin_lock_irqsave(&hvcsd->lock, flags);
37895 kref_get(&hvcsd->kref);
37896- hvcsd->open_count++;
37897+ local_inc(&hvcsd->open_count);
37898 hvcsd->todo_mask |= HVCS_SCHED_READ;
37899 spin_unlock_irqrestore(&hvcsd->lock, flags);
37900
37901@@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
37902 hvcsd = tty->driver_data;
37903
37904 spin_lock_irqsave(&hvcsd->lock, flags);
37905- if (--hvcsd->open_count == 0) {
37906+ if (local_dec_and_test(&hvcsd->open_count)) {
37907
37908 vio_disable_interrupts(hvcsd->vdev);
37909
37910@@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
37911 free_irq(irq, hvcsd);
37912 kref_put(&hvcsd->kref, destroy_hvcs_struct);
37913 return;
37914- } else if (hvcsd->open_count < 0) {
37915+ } else if (local_read(&hvcsd->open_count) < 0) {
37916 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
37917 " is missmanaged.\n",
37918- hvcsd->vdev->unit_address, hvcsd->open_count);
37919+ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
37920 }
37921
37922 spin_unlock_irqrestore(&hvcsd->lock, flags);
37923@@ -1268,7 +1269,7 @@ static void hvcs_hangup(struct tty_struct * tty)
37924
37925 spin_lock_irqsave(&hvcsd->lock, flags);
37926 /* Preserve this so that we know how many kref refs to put */
37927- temp_open_count = hvcsd->open_count;
37928+ temp_open_count = local_read(&hvcsd->open_count);
37929
37930 /*
37931 * Don't kref put inside the spinlock because the destruction
37932@@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struct * tty)
37933 hvcsd->tty->driver_data = NULL;
37934 hvcsd->tty = NULL;
37935
37936- hvcsd->open_count = 0;
37937+ local_set(&hvcsd->open_count, 0);
37938
37939 /* This will drop any buffered data on the floor which is OK in a hangup
37940 * scenario. */
37941@@ -1354,7 +1355,7 @@ static int hvcs_write(struct tty_struct *tty,
37942 * the middle of a write operation? This is a crummy place to do this
37943 * but we want to keep it all in the spinlock.
37944 */
37945- if (hvcsd->open_count <= 0) {
37946+ if (local_read(&hvcsd->open_count) <= 0) {
37947 spin_unlock_irqrestore(&hvcsd->lock, flags);
37948 return -ENODEV;
37949 }
37950@@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_struct *tty)
37951 {
37952 struct hvcs_struct *hvcsd = tty->driver_data;
37953
37954- if (!hvcsd || hvcsd->open_count <= 0)
37955+ if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
37956 return 0;
37957
37958 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
37959diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
37960index ef92869..f4ebd88 100644
37961--- a/drivers/tty/ipwireless/tty.c
37962+++ b/drivers/tty/ipwireless/tty.c
37963@@ -29,6 +29,7 @@
37964 #include <linux/tty_driver.h>
37965 #include <linux/tty_flip.h>
37966 #include <linux/uaccess.h>
37967+#include <asm/local.h>
37968
37969 #include "tty.h"
37970 #include "network.h"
37971@@ -51,7 +52,7 @@ struct ipw_tty {
37972 int tty_type;
37973 struct ipw_network *network;
37974 struct tty_struct *linux_tty;
37975- int open_count;
37976+ local_t open_count;
37977 unsigned int control_lines;
37978 struct mutex ipw_tty_mutex;
37979 int tx_bytes_queued;
37980@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
37981 mutex_unlock(&tty->ipw_tty_mutex);
37982 return -ENODEV;
37983 }
37984- if (tty->open_count == 0)
37985+ if (local_read(&tty->open_count) == 0)
37986 tty->tx_bytes_queued = 0;
37987
37988- tty->open_count++;
37989+ local_inc(&tty->open_count);
37990
37991 tty->linux_tty = linux_tty;
37992 linux_tty->driver_data = tty;
37993@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
37994
37995 static void do_ipw_close(struct ipw_tty *tty)
37996 {
37997- tty->open_count--;
37998-
37999- if (tty->open_count == 0) {
38000+ if (local_dec_return(&tty->open_count) == 0) {
38001 struct tty_struct *linux_tty = tty->linux_tty;
38002
38003 if (linux_tty != NULL) {
38004@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
38005 return;
38006
38007 mutex_lock(&tty->ipw_tty_mutex);
38008- if (tty->open_count == 0) {
38009+ if (local_read(&tty->open_count) == 0) {
38010 mutex_unlock(&tty->ipw_tty_mutex);
38011 return;
38012 }
38013@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
38014 return;
38015 }
38016
38017- if (!tty->open_count) {
38018+ if (!local_read(&tty->open_count)) {
38019 mutex_unlock(&tty->ipw_tty_mutex);
38020 return;
38021 }
38022@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty,
38023 return -ENODEV;
38024
38025 mutex_lock(&tty->ipw_tty_mutex);
38026- if (!tty->open_count) {
38027+ if (!local_read(&tty->open_count)) {
38028 mutex_unlock(&tty->ipw_tty_mutex);
38029 return -EINVAL;
38030 }
38031@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
38032 if (!tty)
38033 return -ENODEV;
38034
38035- if (!tty->open_count)
38036+ if (!local_read(&tty->open_count))
38037 return -EINVAL;
38038
38039 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
38040@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
38041 if (!tty)
38042 return 0;
38043
38044- if (!tty->open_count)
38045+ if (!local_read(&tty->open_count))
38046 return 0;
38047
38048 return tty->tx_bytes_queued;
38049@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
38050 if (!tty)
38051 return -ENODEV;
38052
38053- if (!tty->open_count)
38054+ if (!local_read(&tty->open_count))
38055 return -EINVAL;
38056
38057 return get_control_lines(tty);
38058@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
38059 if (!tty)
38060 return -ENODEV;
38061
38062- if (!tty->open_count)
38063+ if (!local_read(&tty->open_count))
38064 return -EINVAL;
38065
38066 return set_control_lines(tty, set, clear);
38067@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
38068 if (!tty)
38069 return -ENODEV;
38070
38071- if (!tty->open_count)
38072+ if (!local_read(&tty->open_count))
38073 return -EINVAL;
38074
38075 /* FIXME: Exactly how is the tty object locked here .. */
38076@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
38077 against a parallel ioctl etc */
38078 mutex_lock(&ttyj->ipw_tty_mutex);
38079 }
38080- while (ttyj->open_count)
38081+ while (local_read(&ttyj->open_count))
38082 do_ipw_close(ttyj);
38083 ipwireless_disassociate_network_ttys(network,
38084 ttyj->channel_idx);
38085diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
38086index fc7bbba..9527e93 100644
38087--- a/drivers/tty/n_gsm.c
38088+++ b/drivers/tty/n_gsm.c
38089@@ -1629,7 +1629,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
38090 kref_init(&dlci->ref);
38091 mutex_init(&dlci->mutex);
38092 dlci->fifo = &dlci->_fifo;
38093- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
38094+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
38095 kfree(dlci);
38096 return NULL;
38097 }
38098diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
38099index d2256d0..97476fa 100644
38100--- a/drivers/tty/n_tty.c
38101+++ b/drivers/tty/n_tty.c
38102@@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
38103 {
38104 *ops = tty_ldisc_N_TTY;
38105 ops->owner = NULL;
38106- ops->refcount = ops->flags = 0;
38107+ atomic_set(&ops->refcount, 0);
38108+ ops->flags = 0;
38109 }
38110 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
38111diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
38112index d8653ab..f8afd9d 100644
38113--- a/drivers/tty/pty.c
38114+++ b/drivers/tty/pty.c
38115@@ -765,8 +765,10 @@ static void __init unix98_pty_init(void)
38116 register_sysctl_table(pty_root_table);
38117
38118 /* Now create the /dev/ptmx special device */
38119+ pax_open_kernel();
38120 tty_default_fops(&ptmx_fops);
38121- ptmx_fops.open = ptmx_open;
38122+ *(void **)&ptmx_fops.open = ptmx_open;
38123+ pax_close_kernel();
38124
38125 cdev_init(&ptmx_cdev, &ptmx_fops);
38126 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
38127diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
38128index 2b42a01..32a2ed3 100644
38129--- a/drivers/tty/serial/kgdboc.c
38130+++ b/drivers/tty/serial/kgdboc.c
38131@@ -24,8 +24,9 @@
38132 #define MAX_CONFIG_LEN 40
38133
38134 static struct kgdb_io kgdboc_io_ops;
38135+static struct kgdb_io kgdboc_io_ops_console;
38136
38137-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
38138+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
38139 static int configured = -1;
38140
38141 static char config[MAX_CONFIG_LEN];
38142@@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
38143 kgdboc_unregister_kbd();
38144 if (configured == 1)
38145 kgdb_unregister_io_module(&kgdboc_io_ops);
38146+ else if (configured == 2)
38147+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
38148 }
38149
38150 static int configure_kgdboc(void)
38151@@ -157,13 +160,13 @@ static int configure_kgdboc(void)
38152 int err;
38153 char *cptr = config;
38154 struct console *cons;
38155+ int is_console = 0;
38156
38157 err = kgdboc_option_setup(config);
38158 if (err || !strlen(config) || isspace(config[0]))
38159 goto noconfig;
38160
38161 err = -ENODEV;
38162- kgdboc_io_ops.is_console = 0;
38163 kgdb_tty_driver = NULL;
38164
38165 kgdboc_use_kms = 0;
38166@@ -184,7 +187,7 @@ static int configure_kgdboc(void)
38167 int idx;
38168 if (cons->device && cons->device(cons, &idx) == p &&
38169 idx == tty_line) {
38170- kgdboc_io_ops.is_console = 1;
38171+ is_console = 1;
38172 break;
38173 }
38174 cons = cons->next;
38175@@ -194,12 +197,16 @@ static int configure_kgdboc(void)
38176 kgdb_tty_line = tty_line;
38177
38178 do_register:
38179- err = kgdb_register_io_module(&kgdboc_io_ops);
38180+ if (is_console) {
38181+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
38182+ configured = 2;
38183+ } else {
38184+ err = kgdb_register_io_module(&kgdboc_io_ops);
38185+ configured = 1;
38186+ }
38187 if (err)
38188 goto noconfig;
38189
38190- configured = 1;
38191-
38192 return 0;
38193
38194 noconfig:
38195@@ -213,7 +220,7 @@ noconfig:
38196 static int __init init_kgdboc(void)
38197 {
38198 /* Already configured? */
38199- if (configured == 1)
38200+ if (configured >= 1)
38201 return 0;
38202
38203 return configure_kgdboc();
38204@@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
38205 if (config[len - 1] == '\n')
38206 config[len - 1] = '\0';
38207
38208- if (configured == 1)
38209+ if (configured >= 1)
38210 cleanup_kgdboc();
38211
38212 /* Go and configure with the new params. */
38213@@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
38214 .post_exception = kgdboc_post_exp_handler,
38215 };
38216
38217+static struct kgdb_io kgdboc_io_ops_console = {
38218+ .name = "kgdboc",
38219+ .read_char = kgdboc_get_char,
38220+ .write_char = kgdboc_put_char,
38221+ .pre_exception = kgdboc_pre_exp_handler,
38222+ .post_exception = kgdboc_post_exp_handler,
38223+ .is_console = 1
38224+};
38225+
38226 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
38227 /* This is only available if kgdboc is a built in for early debugging */
38228 static int __init kgdboc_early_init(char *opt)
38229diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
38230index 7867b7c..b3c119d 100644
38231--- a/drivers/tty/sysrq.c
38232+++ b/drivers/tty/sysrq.c
38233@@ -862,7 +862,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
38234 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
38235 size_t count, loff_t *ppos)
38236 {
38237- if (count) {
38238+ if (count && capable(CAP_SYS_ADMIN)) {
38239 char c;
38240
38241 if (get_user(c, buf))
38242diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
38243index e41b9bb..84002fb 100644
38244--- a/drivers/tty/tty_io.c
38245+++ b/drivers/tty/tty_io.c
38246@@ -3291,7 +3291,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
38247
38248 void tty_default_fops(struct file_operations *fops)
38249 {
38250- *fops = tty_fops;
38251+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
38252 }
38253
38254 /*
38255diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
38256index 24b95db..9c078d0 100644
38257--- a/drivers/tty/tty_ldisc.c
38258+++ b/drivers/tty/tty_ldisc.c
38259@@ -57,7 +57,7 @@ static void put_ldisc(struct tty_ldisc *ld)
38260 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
38261 struct tty_ldisc_ops *ldo = ld->ops;
38262
38263- ldo->refcount--;
38264+ atomic_dec(&ldo->refcount);
38265 module_put(ldo->owner);
38266 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38267
38268@@ -92,7 +92,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
38269 spin_lock_irqsave(&tty_ldisc_lock, flags);
38270 tty_ldiscs[disc] = new_ldisc;
38271 new_ldisc->num = disc;
38272- new_ldisc->refcount = 0;
38273+ atomic_set(&new_ldisc->refcount, 0);
38274 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38275
38276 return ret;
38277@@ -120,7 +120,7 @@ int tty_unregister_ldisc(int disc)
38278 return -EINVAL;
38279
38280 spin_lock_irqsave(&tty_ldisc_lock, flags);
38281- if (tty_ldiscs[disc]->refcount)
38282+ if (atomic_read(&tty_ldiscs[disc]->refcount))
38283 ret = -EBUSY;
38284 else
38285 tty_ldiscs[disc] = NULL;
38286@@ -141,7 +141,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
38287 if (ldops) {
38288 ret = ERR_PTR(-EAGAIN);
38289 if (try_module_get(ldops->owner)) {
38290- ldops->refcount++;
38291+ atomic_inc(&ldops->refcount);
38292 ret = ldops;
38293 }
38294 }
38295@@ -154,7 +154,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
38296 unsigned long flags;
38297
38298 spin_lock_irqsave(&tty_ldisc_lock, flags);
38299- ldops->refcount--;
38300+ atomic_dec(&ldops->refcount);
38301 module_put(ldops->owner);
38302 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38303 }
38304diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
38305index a605549..6bd3c96 100644
38306--- a/drivers/tty/vt/keyboard.c
38307+++ b/drivers/tty/vt/keyboard.c
38308@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
38309 kbd->kbdmode == VC_OFF) &&
38310 value != KVAL(K_SAK))
38311 return; /* SAK is allowed even in raw mode */
38312+
38313+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
38314+ {
38315+ void *func = fn_handler[value];
38316+ if (func == fn_show_state || func == fn_show_ptregs ||
38317+ func == fn_show_mem)
38318+ return;
38319+ }
38320+#endif
38321+
38322 fn_handler[value](vc);
38323 }
38324
38325diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
38326index 65447c5..0526f0a 100644
38327--- a/drivers/tty/vt/vt_ioctl.c
38328+++ b/drivers/tty/vt/vt_ioctl.c
38329@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
38330 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
38331 return -EFAULT;
38332
38333- if (!capable(CAP_SYS_TTY_CONFIG))
38334- perm = 0;
38335-
38336 switch (cmd) {
38337 case KDGKBENT:
38338 key_map = key_maps[s];
38339@@ -221,6 +218,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
38340 val = (i ? K_HOLE : K_NOSUCHMAP);
38341 return put_user(val, &user_kbe->kb_value);
38342 case KDSKBENT:
38343+ if (!capable(CAP_SYS_TTY_CONFIG))
38344+ perm = 0;
38345+
38346 if (!perm)
38347 return -EPERM;
38348 if (!i && v == K_NOSUCHMAP) {
38349@@ -322,9 +322,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38350 int i, j, k;
38351 int ret;
38352
38353- if (!capable(CAP_SYS_TTY_CONFIG))
38354- perm = 0;
38355-
38356 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
38357 if (!kbs) {
38358 ret = -ENOMEM;
38359@@ -358,6 +355,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38360 kfree(kbs);
38361 return ((p && *p) ? -EOVERFLOW : 0);
38362 case KDSKBSENT:
38363+ if (!capable(CAP_SYS_TTY_CONFIG))
38364+ perm = 0;
38365+
38366 if (!perm) {
38367 ret = -EPERM;
38368 goto reterr;
38369diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
38370index a783d53..cb30d94 100644
38371--- a/drivers/uio/uio.c
38372+++ b/drivers/uio/uio.c
38373@@ -25,6 +25,7 @@
38374 #include <linux/kobject.h>
38375 #include <linux/cdev.h>
38376 #include <linux/uio_driver.h>
38377+#include <asm/local.h>
38378
38379 #define UIO_MAX_DEVICES (1U << MINORBITS)
38380
38381@@ -32,10 +33,10 @@ struct uio_device {
38382 struct module *owner;
38383 struct device *dev;
38384 int minor;
38385- atomic_t event;
38386+ atomic_unchecked_t event;
38387 struct fasync_struct *async_queue;
38388 wait_queue_head_t wait;
38389- int vma_count;
38390+ local_t vma_count;
38391 struct uio_info *info;
38392 struct kobject *map_dir;
38393 struct kobject *portio_dir;
38394@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
38395 struct device_attribute *attr, char *buf)
38396 {
38397 struct uio_device *idev = dev_get_drvdata(dev);
38398- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
38399+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
38400 }
38401
38402 static struct device_attribute uio_class_attributes[] = {
38403@@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *info)
38404 {
38405 struct uio_device *idev = info->uio_dev;
38406
38407- atomic_inc(&idev->event);
38408+ atomic_inc_unchecked(&idev->event);
38409 wake_up_interruptible(&idev->wait);
38410 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
38411 }
38412@@ -461,7 +462,7 @@ static int uio_open(struct inode *inode, struct file *filep)
38413 }
38414
38415 listener->dev = idev;
38416- listener->event_count = atomic_read(&idev->event);
38417+ listener->event_count = atomic_read_unchecked(&idev->event);
38418 filep->private_data = listener;
38419
38420 if (idev->info->open) {
38421@@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
38422 return -EIO;
38423
38424 poll_wait(filep, &idev->wait, wait);
38425- if (listener->event_count != atomic_read(&idev->event))
38426+ if (listener->event_count != atomic_read_unchecked(&idev->event))
38427 return POLLIN | POLLRDNORM;
38428 return 0;
38429 }
38430@@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
38431 do {
38432 set_current_state(TASK_INTERRUPTIBLE);
38433
38434- event_count = atomic_read(&idev->event);
38435+ event_count = atomic_read_unchecked(&idev->event);
38436 if (event_count != listener->event_count) {
38437 if (copy_to_user(buf, &event_count, count))
38438 retval = -EFAULT;
38439@@ -606,13 +607,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
38440 static void uio_vma_open(struct vm_area_struct *vma)
38441 {
38442 struct uio_device *idev = vma->vm_private_data;
38443- idev->vma_count++;
38444+ local_inc(&idev->vma_count);
38445 }
38446
38447 static void uio_vma_close(struct vm_area_struct *vma)
38448 {
38449 struct uio_device *idev = vma->vm_private_data;
38450- idev->vma_count--;
38451+ local_dec(&idev->vma_count);
38452 }
38453
38454 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
38455@@ -821,7 +822,7 @@ int __uio_register_device(struct module *owner,
38456 idev->owner = owner;
38457 idev->info = info;
38458 init_waitqueue_head(&idev->wait);
38459- atomic_set(&idev->event, 0);
38460+ atomic_set_unchecked(&idev->event, 0);
38461
38462 ret = uio_get_minor(idev);
38463 if (ret)
38464diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
38465index 98b89fe..aff824e 100644
38466--- a/drivers/usb/atm/cxacru.c
38467+++ b/drivers/usb/atm/cxacru.c
38468@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
38469 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
38470 if (ret < 2)
38471 return -EINVAL;
38472- if (index < 0 || index > 0x7f)
38473+ if (index > 0x7f)
38474 return -EINVAL;
38475 pos += tmp;
38476
38477diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
38478index d3448ca..d2864ca 100644
38479--- a/drivers/usb/atm/usbatm.c
38480+++ b/drivers/usb/atm/usbatm.c
38481@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38482 if (printk_ratelimit())
38483 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
38484 __func__, vpi, vci);
38485- atomic_inc(&vcc->stats->rx_err);
38486+ atomic_inc_unchecked(&vcc->stats->rx_err);
38487 return;
38488 }
38489
38490@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38491 if (length > ATM_MAX_AAL5_PDU) {
38492 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
38493 __func__, length, vcc);
38494- atomic_inc(&vcc->stats->rx_err);
38495+ atomic_inc_unchecked(&vcc->stats->rx_err);
38496 goto out;
38497 }
38498
38499@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38500 if (sarb->len < pdu_length) {
38501 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
38502 __func__, pdu_length, sarb->len, vcc);
38503- atomic_inc(&vcc->stats->rx_err);
38504+ atomic_inc_unchecked(&vcc->stats->rx_err);
38505 goto out;
38506 }
38507
38508 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
38509 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
38510 __func__, vcc);
38511- atomic_inc(&vcc->stats->rx_err);
38512+ atomic_inc_unchecked(&vcc->stats->rx_err);
38513 goto out;
38514 }
38515
38516@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38517 if (printk_ratelimit())
38518 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
38519 __func__, length);
38520- atomic_inc(&vcc->stats->rx_drop);
38521+ atomic_inc_unchecked(&vcc->stats->rx_drop);
38522 goto out;
38523 }
38524
38525@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38526
38527 vcc->push(vcc, skb);
38528
38529- atomic_inc(&vcc->stats->rx);
38530+ atomic_inc_unchecked(&vcc->stats->rx);
38531 out:
38532 skb_trim(sarb, 0);
38533 }
38534@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
38535 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
38536
38537 usbatm_pop(vcc, skb);
38538- atomic_inc(&vcc->stats->tx);
38539+ atomic_inc_unchecked(&vcc->stats->tx);
38540
38541 skb = skb_dequeue(&instance->sndqueue);
38542 }
38543@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
38544 if (!left--)
38545 return sprintf(page,
38546 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
38547- atomic_read(&atm_dev->stats.aal5.tx),
38548- atomic_read(&atm_dev->stats.aal5.tx_err),
38549- atomic_read(&atm_dev->stats.aal5.rx),
38550- atomic_read(&atm_dev->stats.aal5.rx_err),
38551- atomic_read(&atm_dev->stats.aal5.rx_drop));
38552+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
38553+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
38554+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
38555+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
38556+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
38557
38558 if (!left--) {
38559 if (instance->disconnected)
38560diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
38561index d956965..4179a77 100644
38562--- a/drivers/usb/core/devices.c
38563+++ b/drivers/usb/core/devices.c
38564@@ -126,7 +126,7 @@ static const char format_endpt[] =
38565 * time it gets called.
38566 */
38567 static struct device_connect_event {
38568- atomic_t count;
38569+ atomic_unchecked_t count;
38570 wait_queue_head_t wait;
38571 } device_event = {
38572 .count = ATOMIC_INIT(1),
38573@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
38574
38575 void usbfs_conn_disc_event(void)
38576 {
38577- atomic_add(2, &device_event.count);
38578+ atomic_add_unchecked(2, &device_event.count);
38579 wake_up(&device_event.wait);
38580 }
38581
38582@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
38583
38584 poll_wait(file, &device_event.wait, wait);
38585
38586- event_count = atomic_read(&device_event.count);
38587+ event_count = atomic_read_unchecked(&device_event.count);
38588 if (file->f_version != event_count) {
38589 file->f_version = event_count;
38590 return POLLIN | POLLRDNORM;
38591diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
38592index 1fc8f12..20647c1 100644
38593--- a/drivers/usb/early/ehci-dbgp.c
38594+++ b/drivers/usb/early/ehci-dbgp.c
38595@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
38596
38597 #ifdef CONFIG_KGDB
38598 static struct kgdb_io kgdbdbgp_io_ops;
38599-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
38600+static struct kgdb_io kgdbdbgp_io_ops_console;
38601+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
38602 #else
38603 #define dbgp_kgdb_mode (0)
38604 #endif
38605@@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
38606 .write_char = kgdbdbgp_write_char,
38607 };
38608
38609+static struct kgdb_io kgdbdbgp_io_ops_console = {
38610+ .name = "kgdbdbgp",
38611+ .read_char = kgdbdbgp_read_char,
38612+ .write_char = kgdbdbgp_write_char,
38613+ .is_console = 1
38614+};
38615+
38616 static int kgdbdbgp_wait_time;
38617
38618 static int __init kgdbdbgp_parse_config(char *str)
38619@@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
38620 ptr++;
38621 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
38622 }
38623- kgdb_register_io_module(&kgdbdbgp_io_ops);
38624- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
38625+ if (early_dbgp_console.index != -1)
38626+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
38627+ else
38628+ kgdb_register_io_module(&kgdbdbgp_io_ops);
38629
38630 return 0;
38631 }
38632diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
38633index d6bea3e..60b250e 100644
38634--- a/drivers/usb/wusbcore/wa-hc.h
38635+++ b/drivers/usb/wusbcore/wa-hc.h
38636@@ -192,7 +192,7 @@ struct wahc {
38637 struct list_head xfer_delayed_list;
38638 spinlock_t xfer_list_lock;
38639 struct work_struct xfer_work;
38640- atomic_t xfer_id_count;
38641+ atomic_unchecked_t xfer_id_count;
38642 };
38643
38644
38645@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
38646 INIT_LIST_HEAD(&wa->xfer_delayed_list);
38647 spin_lock_init(&wa->xfer_list_lock);
38648 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
38649- atomic_set(&wa->xfer_id_count, 1);
38650+ atomic_set_unchecked(&wa->xfer_id_count, 1);
38651 }
38652
38653 /**
38654diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
38655index 57c01ab..8a05959 100644
38656--- a/drivers/usb/wusbcore/wa-xfer.c
38657+++ b/drivers/usb/wusbcore/wa-xfer.c
38658@@ -296,7 +296,7 @@ out:
38659 */
38660 static void wa_xfer_id_init(struct wa_xfer *xfer)
38661 {
38662- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
38663+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
38664 }
38665
38666 /*
38667diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
38668index c14c42b..f955cc2 100644
38669--- a/drivers/vhost/vhost.c
38670+++ b/drivers/vhost/vhost.c
38671@@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
38672 return 0;
38673 }
38674
38675-static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
38676+static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
38677 {
38678 struct file *eventfp, *filep = NULL,
38679 *pollstart = NULL, *pollstop = NULL;
38680diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
38681index b0b2ac3..89a4399 100644
38682--- a/drivers/video/aty/aty128fb.c
38683+++ b/drivers/video/aty/aty128fb.c
38684@@ -148,7 +148,7 @@ enum {
38685 };
38686
38687 /* Must match above enum */
38688-static const char *r128_family[] __devinitdata = {
38689+static const char *r128_family[] __devinitconst = {
38690 "AGP",
38691 "PCI",
38692 "PRO AGP",
38693diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
38694index 5c3960d..15cf8fc 100644
38695--- a/drivers/video/fbcmap.c
38696+++ b/drivers/video/fbcmap.c
38697@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
38698 rc = -ENODEV;
38699 goto out;
38700 }
38701- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
38702- !info->fbops->fb_setcmap)) {
38703+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
38704 rc = -EINVAL;
38705 goto out1;
38706 }
38707diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
38708index c6ce416..3b9b642 100644
38709--- a/drivers/video/fbmem.c
38710+++ b/drivers/video/fbmem.c
38711@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
38712 image->dx += image->width + 8;
38713 }
38714 } else if (rotate == FB_ROTATE_UD) {
38715- for (x = 0; x < num && image->dx >= 0; x++) {
38716+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
38717 info->fbops->fb_imageblit(info, image);
38718 image->dx -= image->width + 8;
38719 }
38720@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
38721 image->dy += image->height + 8;
38722 }
38723 } else if (rotate == FB_ROTATE_CCW) {
38724- for (x = 0; x < num && image->dy >= 0; x++) {
38725+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
38726 info->fbops->fb_imageblit(info, image);
38727 image->dy -= image->height + 8;
38728 }
38729@@ -1157,7 +1157,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
38730 return -EFAULT;
38731 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
38732 return -EINVAL;
38733- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
38734+ if (con2fb.framebuffer >= FB_MAX)
38735 return -EINVAL;
38736 if (!registered_fb[con2fb.framebuffer])
38737 request_module("fb%d", con2fb.framebuffer);
38738diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
38739index 5a5d092..265c5ed 100644
38740--- a/drivers/video/geode/gx1fb_core.c
38741+++ b/drivers/video/geode/gx1fb_core.c
38742@@ -29,7 +29,7 @@ static int crt_option = 1;
38743 static char panel_option[32] = "";
38744
38745 /* Modes relevant to the GX1 (taken from modedb.c) */
38746-static const struct fb_videomode __devinitdata gx1_modedb[] = {
38747+static const struct fb_videomode __devinitconst gx1_modedb[] = {
38748 /* 640x480-60 VESA */
38749 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
38750 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
38751diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
38752index 0fad23f..0e9afa4 100644
38753--- a/drivers/video/gxt4500.c
38754+++ b/drivers/video/gxt4500.c
38755@@ -156,7 +156,7 @@ struct gxt4500_par {
38756 static char *mode_option;
38757
38758 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
38759-static const struct fb_videomode defaultmode __devinitdata = {
38760+static const struct fb_videomode defaultmode __devinitconst = {
38761 .refresh = 60,
38762 .xres = 1280,
38763 .yres = 1024,
38764@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
38765 return 0;
38766 }
38767
38768-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
38769+static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
38770 .id = "IBM GXT4500P",
38771 .type = FB_TYPE_PACKED_PIXELS,
38772 .visual = FB_VISUAL_PSEUDOCOLOR,
38773diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
38774index 7672d2e..b56437f 100644
38775--- a/drivers/video/i810/i810_accel.c
38776+++ b/drivers/video/i810/i810_accel.c
38777@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
38778 }
38779 }
38780 printk("ringbuffer lockup!!!\n");
38781+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
38782 i810_report_error(mmio);
38783 par->dev_flags |= LOCKUP;
38784 info->pixmap.scan_align = 1;
38785diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
38786index b83f361..2b05a91 100644
38787--- a/drivers/video/i810/i810_main.c
38788+++ b/drivers/video/i810/i810_main.c
38789@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
38790 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
38791
38792 /* PCI */
38793-static const char *i810_pci_list[] __devinitdata = {
38794+static const char *i810_pci_list[] __devinitconst = {
38795 "Intel(R) 810 Framebuffer Device" ,
38796 "Intel(R) 810-DC100 Framebuffer Device" ,
38797 "Intel(R) 810E Framebuffer Device" ,
38798diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
38799index de36693..3c63fc2 100644
38800--- a/drivers/video/jz4740_fb.c
38801+++ b/drivers/video/jz4740_fb.c
38802@@ -136,7 +136,7 @@ struct jzfb {
38803 uint32_t pseudo_palette[16];
38804 };
38805
38806-static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
38807+static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
38808 .id = "JZ4740 FB",
38809 .type = FB_TYPE_PACKED_PIXELS,
38810 .visual = FB_VISUAL_TRUECOLOR,
38811diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
38812index 3c14e43..eafa544 100644
38813--- a/drivers/video/logo/logo_linux_clut224.ppm
38814+++ b/drivers/video/logo/logo_linux_clut224.ppm
38815@@ -1,1604 +1,1123 @@
38816 P3
38817-# Standard 224-color Linux logo
38818 80 80
38819 255
38820- 0 0 0 0 0 0 0 0 0 0 0 0
38821- 0 0 0 0 0 0 0 0 0 0 0 0
38822- 0 0 0 0 0 0 0 0 0 0 0 0
38823- 0 0 0 0 0 0 0 0 0 0 0 0
38824- 0 0 0 0 0 0 0 0 0 0 0 0
38825- 0 0 0 0 0 0 0 0 0 0 0 0
38826- 0 0 0 0 0 0 0 0 0 0 0 0
38827- 0 0 0 0 0 0 0 0 0 0 0 0
38828- 0 0 0 0 0 0 0 0 0 0 0 0
38829- 6 6 6 6 6 6 10 10 10 10 10 10
38830- 10 10 10 6 6 6 6 6 6 6 6 6
38831- 0 0 0 0 0 0 0 0 0 0 0 0
38832- 0 0 0 0 0 0 0 0 0 0 0 0
38833- 0 0 0 0 0 0 0 0 0 0 0 0
38834- 0 0 0 0 0 0 0 0 0 0 0 0
38835- 0 0 0 0 0 0 0 0 0 0 0 0
38836- 0 0 0 0 0 0 0 0 0 0 0 0
38837- 0 0 0 0 0 0 0 0 0 0 0 0
38838- 0 0 0 0 0 0 0 0 0 0 0 0
38839- 0 0 0 0 0 0 0 0 0 0 0 0
38840- 0 0 0 0 0 0 0 0 0 0 0 0
38841- 0 0 0 0 0 0 0 0 0 0 0 0
38842- 0 0 0 0 0 0 0 0 0 0 0 0
38843- 0 0 0 0 0 0 0 0 0 0 0 0
38844- 0 0 0 0 0 0 0 0 0 0 0 0
38845- 0 0 0 0 0 0 0 0 0 0 0 0
38846- 0 0 0 0 0 0 0 0 0 0 0 0
38847- 0 0 0 0 0 0 0 0 0 0 0 0
38848- 0 0 0 6 6 6 10 10 10 14 14 14
38849- 22 22 22 26 26 26 30 30 30 34 34 34
38850- 30 30 30 30 30 30 26 26 26 18 18 18
38851- 14 14 14 10 10 10 6 6 6 0 0 0
38852- 0 0 0 0 0 0 0 0 0 0 0 0
38853- 0 0 0 0 0 0 0 0 0 0 0 0
38854- 0 0 0 0 0 0 0 0 0 0 0 0
38855- 0 0 0 0 0 0 0 0 0 0 0 0
38856- 0 0 0 0 0 0 0 0 0 0 0 0
38857- 0 0 0 0 0 0 0 0 0 0 0 0
38858- 0 0 0 0 0 0 0 0 0 0 0 0
38859- 0 0 0 0 0 0 0 0 0 0 0 0
38860- 0 0 0 0 0 0 0 0 0 0 0 0
38861- 0 0 0 0 0 1 0 0 1 0 0 0
38862- 0 0 0 0 0 0 0 0 0 0 0 0
38863- 0 0 0 0 0 0 0 0 0 0 0 0
38864- 0 0 0 0 0 0 0 0 0 0 0 0
38865- 0 0 0 0 0 0 0 0 0 0 0 0
38866- 0 0 0 0 0 0 0 0 0 0 0 0
38867- 0 0 0 0 0 0 0 0 0 0 0 0
38868- 6 6 6 14 14 14 26 26 26 42 42 42
38869- 54 54 54 66 66 66 78 78 78 78 78 78
38870- 78 78 78 74 74 74 66 66 66 54 54 54
38871- 42 42 42 26 26 26 18 18 18 10 10 10
38872- 6 6 6 0 0 0 0 0 0 0 0 0
38873- 0 0 0 0 0 0 0 0 0 0 0 0
38874- 0 0 0 0 0 0 0 0 0 0 0 0
38875- 0 0 0 0 0 0 0 0 0 0 0 0
38876- 0 0 0 0 0 0 0 0 0 0 0 0
38877- 0 0 0 0 0 0 0 0 0 0 0 0
38878- 0 0 0 0 0 0 0 0 0 0 0 0
38879- 0 0 0 0 0 0 0 0 0 0 0 0
38880- 0 0 0 0 0 0 0 0 0 0 0 0
38881- 0 0 1 0 0 0 0 0 0 0 0 0
38882- 0 0 0 0 0 0 0 0 0 0 0 0
38883- 0 0 0 0 0 0 0 0 0 0 0 0
38884- 0 0 0 0 0 0 0 0 0 0 0 0
38885- 0 0 0 0 0 0 0 0 0 0 0 0
38886- 0 0 0 0 0 0 0 0 0 0 0 0
38887- 0 0 0 0 0 0 0 0 0 10 10 10
38888- 22 22 22 42 42 42 66 66 66 86 86 86
38889- 66 66 66 38 38 38 38 38 38 22 22 22
38890- 26 26 26 34 34 34 54 54 54 66 66 66
38891- 86 86 86 70 70 70 46 46 46 26 26 26
38892- 14 14 14 6 6 6 0 0 0 0 0 0
38893- 0 0 0 0 0 0 0 0 0 0 0 0
38894- 0 0 0 0 0 0 0 0 0 0 0 0
38895- 0 0 0 0 0 0 0 0 0 0 0 0
38896- 0 0 0 0 0 0 0 0 0 0 0 0
38897- 0 0 0 0 0 0 0 0 0 0 0 0
38898- 0 0 0 0 0 0 0 0 0 0 0 0
38899- 0 0 0 0 0 0 0 0 0 0 0 0
38900- 0 0 0 0 0 0 0 0 0 0 0 0
38901- 0 0 1 0 0 1 0 0 1 0 0 0
38902- 0 0 0 0 0 0 0 0 0 0 0 0
38903- 0 0 0 0 0 0 0 0 0 0 0 0
38904- 0 0 0 0 0 0 0 0 0 0 0 0
38905- 0 0 0 0 0 0 0 0 0 0 0 0
38906- 0 0 0 0 0 0 0 0 0 0 0 0
38907- 0 0 0 0 0 0 10 10 10 26 26 26
38908- 50 50 50 82 82 82 58 58 58 6 6 6
38909- 2 2 6 2 2 6 2 2 6 2 2 6
38910- 2 2 6 2 2 6 2 2 6 2 2 6
38911- 6 6 6 54 54 54 86 86 86 66 66 66
38912- 38 38 38 18 18 18 6 6 6 0 0 0
38913- 0 0 0 0 0 0 0 0 0 0 0 0
38914- 0 0 0 0 0 0 0 0 0 0 0 0
38915- 0 0 0 0 0 0 0 0 0 0 0 0
38916- 0 0 0 0 0 0 0 0 0 0 0 0
38917- 0 0 0 0 0 0 0 0 0 0 0 0
38918- 0 0 0 0 0 0 0 0 0 0 0 0
38919- 0 0 0 0 0 0 0 0 0 0 0 0
38920- 0 0 0 0 0 0 0 0 0 0 0 0
38921- 0 0 0 0 0 0 0 0 0 0 0 0
38922- 0 0 0 0 0 0 0 0 0 0 0 0
38923- 0 0 0 0 0 0 0 0 0 0 0 0
38924- 0 0 0 0 0 0 0 0 0 0 0 0
38925- 0 0 0 0 0 0 0 0 0 0 0 0
38926- 0 0 0 0 0 0 0 0 0 0 0 0
38927- 0 0 0 6 6 6 22 22 22 50 50 50
38928- 78 78 78 34 34 34 2 2 6 2 2 6
38929- 2 2 6 2 2 6 2 2 6 2 2 6
38930- 2 2 6 2 2 6 2 2 6 2 2 6
38931- 2 2 6 2 2 6 6 6 6 70 70 70
38932- 78 78 78 46 46 46 22 22 22 6 6 6
38933- 0 0 0 0 0 0 0 0 0 0 0 0
38934- 0 0 0 0 0 0 0 0 0 0 0 0
38935- 0 0 0 0 0 0 0 0 0 0 0 0
38936- 0 0 0 0 0 0 0 0 0 0 0 0
38937- 0 0 0 0 0 0 0 0 0 0 0 0
38938- 0 0 0 0 0 0 0 0 0 0 0 0
38939- 0 0 0 0 0 0 0 0 0 0 0 0
38940- 0 0 0 0 0 0 0 0 0 0 0 0
38941- 0 0 1 0 0 1 0 0 1 0 0 0
38942- 0 0 0 0 0 0 0 0 0 0 0 0
38943- 0 0 0 0 0 0 0 0 0 0 0 0
38944- 0 0 0 0 0 0 0 0 0 0 0 0
38945- 0 0 0 0 0 0 0 0 0 0 0 0
38946- 0 0 0 0 0 0 0 0 0 0 0 0
38947- 6 6 6 18 18 18 42 42 42 82 82 82
38948- 26 26 26 2 2 6 2 2 6 2 2 6
38949- 2 2 6 2 2 6 2 2 6 2 2 6
38950- 2 2 6 2 2 6 2 2 6 14 14 14
38951- 46 46 46 34 34 34 6 6 6 2 2 6
38952- 42 42 42 78 78 78 42 42 42 18 18 18
38953- 6 6 6 0 0 0 0 0 0 0 0 0
38954- 0 0 0 0 0 0 0 0 0 0 0 0
38955- 0 0 0 0 0 0 0 0 0 0 0 0
38956- 0 0 0 0 0 0 0 0 0 0 0 0
38957- 0 0 0 0 0 0 0 0 0 0 0 0
38958- 0 0 0 0 0 0 0 0 0 0 0 0
38959- 0 0 0 0 0 0 0 0 0 0 0 0
38960- 0 0 0 0 0 0 0 0 0 0 0 0
38961- 0 0 1 0 0 0 0 0 1 0 0 0
38962- 0 0 0 0 0 0 0 0 0 0 0 0
38963- 0 0 0 0 0 0 0 0 0 0 0 0
38964- 0 0 0 0 0 0 0 0 0 0 0 0
38965- 0 0 0 0 0 0 0 0 0 0 0 0
38966- 0 0 0 0 0 0 0 0 0 0 0 0
38967- 10 10 10 30 30 30 66 66 66 58 58 58
38968- 2 2 6 2 2 6 2 2 6 2 2 6
38969- 2 2 6 2 2 6 2 2 6 2 2 6
38970- 2 2 6 2 2 6 2 2 6 26 26 26
38971- 86 86 86 101 101 101 46 46 46 10 10 10
38972- 2 2 6 58 58 58 70 70 70 34 34 34
38973- 10 10 10 0 0 0 0 0 0 0 0 0
38974- 0 0 0 0 0 0 0 0 0 0 0 0
38975- 0 0 0 0 0 0 0 0 0 0 0 0
38976- 0 0 0 0 0 0 0 0 0 0 0 0
38977- 0 0 0 0 0 0 0 0 0 0 0 0
38978- 0 0 0 0 0 0 0 0 0 0 0 0
38979- 0 0 0 0 0 0 0 0 0 0 0 0
38980- 0 0 0 0 0 0 0 0 0 0 0 0
38981- 0 0 1 0 0 1 0 0 1 0 0 0
38982- 0 0 0 0 0 0 0 0 0 0 0 0
38983- 0 0 0 0 0 0 0 0 0 0 0 0
38984- 0 0 0 0 0 0 0 0 0 0 0 0
38985- 0 0 0 0 0 0 0 0 0 0 0 0
38986- 0 0 0 0 0 0 0 0 0 0 0 0
38987- 14 14 14 42 42 42 86 86 86 10 10 10
38988- 2 2 6 2 2 6 2 2 6 2 2 6
38989- 2 2 6 2 2 6 2 2 6 2 2 6
38990- 2 2 6 2 2 6 2 2 6 30 30 30
38991- 94 94 94 94 94 94 58 58 58 26 26 26
38992- 2 2 6 6 6 6 78 78 78 54 54 54
38993- 22 22 22 6 6 6 0 0 0 0 0 0
38994- 0 0 0 0 0 0 0 0 0 0 0 0
38995- 0 0 0 0 0 0 0 0 0 0 0 0
38996- 0 0 0 0 0 0 0 0 0 0 0 0
38997- 0 0 0 0 0 0 0 0 0 0 0 0
38998- 0 0 0 0 0 0 0 0 0 0 0 0
38999- 0 0 0 0 0 0 0 0 0 0 0 0
39000- 0 0 0 0 0 0 0 0 0 0 0 0
39001- 0 0 0 0 0 0 0 0 0 0 0 0
39002- 0 0 0 0 0 0 0 0 0 0 0 0
39003- 0 0 0 0 0 0 0 0 0 0 0 0
39004- 0 0 0 0 0 0 0 0 0 0 0 0
39005- 0 0 0 0 0 0 0 0 0 0 0 0
39006- 0 0 0 0 0 0 0 0 0 6 6 6
39007- 22 22 22 62 62 62 62 62 62 2 2 6
39008- 2 2 6 2 2 6 2 2 6 2 2 6
39009- 2 2 6 2 2 6 2 2 6 2 2 6
39010- 2 2 6 2 2 6 2 2 6 26 26 26
39011- 54 54 54 38 38 38 18 18 18 10 10 10
39012- 2 2 6 2 2 6 34 34 34 82 82 82
39013- 38 38 38 14 14 14 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- 0 0 0 0 0 0 0 0 0 0 0 0
39017- 0 0 0 0 0 0 0 0 0 0 0 0
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 1 0 0 1 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 6 6 6
39027- 30 30 30 78 78 78 30 30 30 2 2 6
39028- 2 2 6 2 2 6 2 2 6 2 2 6
39029- 2 2 6 2 2 6 2 2 6 2 2 6
39030- 2 2 6 2 2 6 2 2 6 10 10 10
39031- 10 10 10 2 2 6 2 2 6 2 2 6
39032- 2 2 6 2 2 6 2 2 6 78 78 78
39033- 50 50 50 18 18 18 6 6 6 0 0 0
39034- 0 0 0 0 0 0 0 0 0 0 0 0
39035- 0 0 0 0 0 0 0 0 0 0 0 0
39036- 0 0 0 0 0 0 0 0 0 0 0 0
39037- 0 0 0 0 0 0 0 0 0 0 0 0
39038- 0 0 0 0 0 0 0 0 0 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 1 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 10 10 10
39047- 38 38 38 86 86 86 14 14 14 2 2 6
39048- 2 2 6 2 2 6 2 2 6 2 2 6
39049- 2 2 6 2 2 6 2 2 6 2 2 6
39050- 2 2 6 2 2 6 2 2 6 2 2 6
39051- 2 2 6 2 2 6 2 2 6 2 2 6
39052- 2 2 6 2 2 6 2 2 6 54 54 54
39053- 66 66 66 26 26 26 6 6 6 0 0 0
39054- 0 0 0 0 0 0 0 0 0 0 0 0
39055- 0 0 0 0 0 0 0 0 0 0 0 0
39056- 0 0 0 0 0 0 0 0 0 0 0 0
39057- 0 0 0 0 0 0 0 0 0 0 0 0
39058- 0 0 0 0 0 0 0 0 0 0 0 0
39059- 0 0 0 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 1 0 0 1 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 14 14 14
39067- 42 42 42 82 82 82 2 2 6 2 2 6
39068- 2 2 6 6 6 6 10 10 10 2 2 6
39069- 2 2 6 2 2 6 2 2 6 2 2 6
39070- 2 2 6 2 2 6 2 2 6 6 6 6
39071- 14 14 14 10 10 10 2 2 6 2 2 6
39072- 2 2 6 2 2 6 2 2 6 18 18 18
39073- 82 82 82 34 34 34 10 10 10 0 0 0
39074- 0 0 0 0 0 0 0 0 0 0 0 0
39075- 0 0 0 0 0 0 0 0 0 0 0 0
39076- 0 0 0 0 0 0 0 0 0 0 0 0
39077- 0 0 0 0 0 0 0 0 0 0 0 0
39078- 0 0 0 0 0 0 0 0 0 0 0 0
39079- 0 0 0 0 0 0 0 0 0 0 0 0
39080- 0 0 0 0 0 0 0 0 0 0 0 0
39081- 0 0 1 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 14 14 14
39087- 46 46 46 86 86 86 2 2 6 2 2 6
39088- 6 6 6 6 6 6 22 22 22 34 34 34
39089- 6 6 6 2 2 6 2 2 6 2 2 6
39090- 2 2 6 2 2 6 18 18 18 34 34 34
39091- 10 10 10 50 50 50 22 22 22 2 2 6
39092- 2 2 6 2 2 6 2 2 6 10 10 10
39093- 86 86 86 42 42 42 14 14 14 0 0 0
39094- 0 0 0 0 0 0 0 0 0 0 0 0
39095- 0 0 0 0 0 0 0 0 0 0 0 0
39096- 0 0 0 0 0 0 0 0 0 0 0 0
39097- 0 0 0 0 0 0 0 0 0 0 0 0
39098- 0 0 0 0 0 0 0 0 0 0 0 0
39099- 0 0 0 0 0 0 0 0 0 0 0 0
39100- 0 0 0 0 0 0 0 0 0 0 0 0
39101- 0 0 1 0 0 1 0 0 1 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 14 14 14
39107- 46 46 46 86 86 86 2 2 6 2 2 6
39108- 38 38 38 116 116 116 94 94 94 22 22 22
39109- 22 22 22 2 2 6 2 2 6 2 2 6
39110- 14 14 14 86 86 86 138 138 138 162 162 162
39111-154 154 154 38 38 38 26 26 26 6 6 6
39112- 2 2 6 2 2 6 2 2 6 2 2 6
39113- 86 86 86 46 46 46 14 14 14 0 0 0
39114- 0 0 0 0 0 0 0 0 0 0 0 0
39115- 0 0 0 0 0 0 0 0 0 0 0 0
39116- 0 0 0 0 0 0 0 0 0 0 0 0
39117- 0 0 0 0 0 0 0 0 0 0 0 0
39118- 0 0 0 0 0 0 0 0 0 0 0 0
39119- 0 0 0 0 0 0 0 0 0 0 0 0
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 14 14 14
39127- 46 46 46 86 86 86 2 2 6 14 14 14
39128-134 134 134 198 198 198 195 195 195 116 116 116
39129- 10 10 10 2 2 6 2 2 6 6 6 6
39130-101 98 89 187 187 187 210 210 210 218 218 218
39131-214 214 214 134 134 134 14 14 14 6 6 6
39132- 2 2 6 2 2 6 2 2 6 2 2 6
39133- 86 86 86 50 50 50 18 18 18 6 6 6
39134- 0 0 0 0 0 0 0 0 0 0 0 0
39135- 0 0 0 0 0 0 0 0 0 0 0 0
39136- 0 0 0 0 0 0 0 0 0 0 0 0
39137- 0 0 0 0 0 0 0 0 0 0 0 0
39138- 0 0 0 0 0 0 0 0 0 0 0 0
39139- 0 0 0 0 0 0 0 0 0 0 0 0
39140- 0 0 0 0 0 0 0 0 1 0 0 0
39141- 0 0 1 0 0 1 0 0 1 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 14 14 14
39147- 46 46 46 86 86 86 2 2 6 54 54 54
39148-218 218 218 195 195 195 226 226 226 246 246 246
39149- 58 58 58 2 2 6 2 2 6 30 30 30
39150-210 210 210 253 253 253 174 174 174 123 123 123
39151-221 221 221 234 234 234 74 74 74 2 2 6
39152- 2 2 6 2 2 6 2 2 6 2 2 6
39153- 70 70 70 58 58 58 22 22 22 6 6 6
39154- 0 0 0 0 0 0 0 0 0 0 0 0
39155- 0 0 0 0 0 0 0 0 0 0 0 0
39156- 0 0 0 0 0 0 0 0 0 0 0 0
39157- 0 0 0 0 0 0 0 0 0 0 0 0
39158- 0 0 0 0 0 0 0 0 0 0 0 0
39159- 0 0 0 0 0 0 0 0 0 0 0 0
39160- 0 0 0 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 14 14 14
39167- 46 46 46 82 82 82 2 2 6 106 106 106
39168-170 170 170 26 26 26 86 86 86 226 226 226
39169-123 123 123 10 10 10 14 14 14 46 46 46
39170-231 231 231 190 190 190 6 6 6 70 70 70
39171- 90 90 90 238 238 238 158 158 158 2 2 6
39172- 2 2 6 2 2 6 2 2 6 2 2 6
39173- 70 70 70 58 58 58 22 22 22 6 6 6
39174- 0 0 0 0 0 0 0 0 0 0 0 0
39175- 0 0 0 0 0 0 0 0 0 0 0 0
39176- 0 0 0 0 0 0 0 0 0 0 0 0
39177- 0 0 0 0 0 0 0 0 0 0 0 0
39178- 0 0 0 0 0 0 0 0 0 0 0 0
39179- 0 0 0 0 0 0 0 0 0 0 0 0
39180- 0 0 0 0 0 0 0 0 1 0 0 0
39181- 0 0 1 0 0 1 0 0 1 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 14 14 14
39187- 42 42 42 86 86 86 6 6 6 116 116 116
39188-106 106 106 6 6 6 70 70 70 149 149 149
39189-128 128 128 18 18 18 38 38 38 54 54 54
39190-221 221 221 106 106 106 2 2 6 14 14 14
39191- 46 46 46 190 190 190 198 198 198 2 2 6
39192- 2 2 6 2 2 6 2 2 6 2 2 6
39193- 74 74 74 62 62 62 22 22 22 6 6 6
39194- 0 0 0 0 0 0 0 0 0 0 0 0
39195- 0 0 0 0 0 0 0 0 0 0 0 0
39196- 0 0 0 0 0 0 0 0 0 0 0 0
39197- 0 0 0 0 0 0 0 0 0 0 0 0
39198- 0 0 0 0 0 0 0 0 0 0 0 0
39199- 0 0 0 0 0 0 0 0 0 0 0 0
39200- 0 0 0 0 0 0 0 0 1 0 0 0
39201- 0 0 1 0 0 0 0 0 1 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 14 14 14
39207- 42 42 42 94 94 94 14 14 14 101 101 101
39208-128 128 128 2 2 6 18 18 18 116 116 116
39209-118 98 46 121 92 8 121 92 8 98 78 10
39210-162 162 162 106 106 106 2 2 6 2 2 6
39211- 2 2 6 195 195 195 195 195 195 6 6 6
39212- 2 2 6 2 2 6 2 2 6 2 2 6
39213- 74 74 74 62 62 62 22 22 22 6 6 6
39214- 0 0 0 0 0 0 0 0 0 0 0 0
39215- 0 0 0 0 0 0 0 0 0 0 0 0
39216- 0 0 0 0 0 0 0 0 0 0 0 0
39217- 0 0 0 0 0 0 0 0 0 0 0 0
39218- 0 0 0 0 0 0 0 0 0 0 0 0
39219- 0 0 0 0 0 0 0 0 0 0 0 0
39220- 0 0 0 0 0 0 0 0 1 0 0 1
39221- 0 0 1 0 0 0 0 0 1 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 10 10 10
39227- 38 38 38 90 90 90 14 14 14 58 58 58
39228-210 210 210 26 26 26 54 38 6 154 114 10
39229-226 170 11 236 186 11 225 175 15 184 144 12
39230-215 174 15 175 146 61 37 26 9 2 2 6
39231- 70 70 70 246 246 246 138 138 138 2 2 6
39232- 2 2 6 2 2 6 2 2 6 2 2 6
39233- 70 70 70 66 66 66 26 26 26 6 6 6
39234- 0 0 0 0 0 0 0 0 0 0 0 0
39235- 0 0 0 0 0 0 0 0 0 0 0 0
39236- 0 0 0 0 0 0 0 0 0 0 0 0
39237- 0 0 0 0 0 0 0 0 0 0 0 0
39238- 0 0 0 0 0 0 0 0 0 0 0 0
39239- 0 0 0 0 0 0 0 0 0 0 0 0
39240- 0 0 0 0 0 0 0 0 0 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 10 10 10
39247- 38 38 38 86 86 86 14 14 14 10 10 10
39248-195 195 195 188 164 115 192 133 9 225 175 15
39249-239 182 13 234 190 10 232 195 16 232 200 30
39250-245 207 45 241 208 19 232 195 16 184 144 12
39251-218 194 134 211 206 186 42 42 42 2 2 6
39252- 2 2 6 2 2 6 2 2 6 2 2 6
39253- 50 50 50 74 74 74 30 30 30 6 6 6
39254- 0 0 0 0 0 0 0 0 0 0 0 0
39255- 0 0 0 0 0 0 0 0 0 0 0 0
39256- 0 0 0 0 0 0 0 0 0 0 0 0
39257- 0 0 0 0 0 0 0 0 0 0 0 0
39258- 0 0 0 0 0 0 0 0 0 0 0 0
39259- 0 0 0 0 0 0 0 0 0 0 0 0
39260- 0 0 0 0 0 0 0 0 0 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 10 10 10
39267- 34 34 34 86 86 86 14 14 14 2 2 6
39268-121 87 25 192 133 9 219 162 10 239 182 13
39269-236 186 11 232 195 16 241 208 19 244 214 54
39270-246 218 60 246 218 38 246 215 20 241 208 19
39271-241 208 19 226 184 13 121 87 25 2 2 6
39272- 2 2 6 2 2 6 2 2 6 2 2 6
39273- 50 50 50 82 82 82 34 34 34 10 10 10
39274- 0 0 0 0 0 0 0 0 0 0 0 0
39275- 0 0 0 0 0 0 0 0 0 0 0 0
39276- 0 0 0 0 0 0 0 0 0 0 0 0
39277- 0 0 0 0 0 0 0 0 0 0 0 0
39278- 0 0 0 0 0 0 0 0 0 0 0 0
39279- 0 0 0 0 0 0 0 0 0 0 0 0
39280- 0 0 0 0 0 0 0 0 0 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 10 10 10
39287- 34 34 34 82 82 82 30 30 30 61 42 6
39288-180 123 7 206 145 10 230 174 11 239 182 13
39289-234 190 10 238 202 15 241 208 19 246 218 74
39290-246 218 38 246 215 20 246 215 20 246 215 20
39291-226 184 13 215 174 15 184 144 12 6 6 6
39292- 2 2 6 2 2 6 2 2 6 2 2 6
39293- 26 26 26 94 94 94 42 42 42 14 14 14
39294- 0 0 0 0 0 0 0 0 0 0 0 0
39295- 0 0 0 0 0 0 0 0 0 0 0 0
39296- 0 0 0 0 0 0 0 0 0 0 0 0
39297- 0 0 0 0 0 0 0 0 0 0 0 0
39298- 0 0 0 0 0 0 0 0 0 0 0 0
39299- 0 0 0 0 0 0 0 0 0 0 0 0
39300- 0 0 0 0 0 0 0 0 0 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 10 10 10
39307- 30 30 30 78 78 78 50 50 50 104 69 6
39308-192 133 9 216 158 10 236 178 12 236 186 11
39309-232 195 16 241 208 19 244 214 54 245 215 43
39310-246 215 20 246 215 20 241 208 19 198 155 10
39311-200 144 11 216 158 10 156 118 10 2 2 6
39312- 2 2 6 2 2 6 2 2 6 2 2 6
39313- 6 6 6 90 90 90 54 54 54 18 18 18
39314- 6 6 6 0 0 0 0 0 0 0 0 0
39315- 0 0 0 0 0 0 0 0 0 0 0 0
39316- 0 0 0 0 0 0 0 0 0 0 0 0
39317- 0 0 0 0 0 0 0 0 0 0 0 0
39318- 0 0 0 0 0 0 0 0 0 0 0 0
39319- 0 0 0 0 0 0 0 0 0 0 0 0
39320- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
39327- 30 30 30 78 78 78 46 46 46 22 22 22
39328-137 92 6 210 162 10 239 182 13 238 190 10
39329-238 202 15 241 208 19 246 215 20 246 215 20
39330-241 208 19 203 166 17 185 133 11 210 150 10
39331-216 158 10 210 150 10 102 78 10 2 2 6
39332- 6 6 6 54 54 54 14 14 14 2 2 6
39333- 2 2 6 62 62 62 74 74 74 30 30 30
39334- 10 10 10 0 0 0 0 0 0 0 0 0
39335- 0 0 0 0 0 0 0 0 0 0 0 0
39336- 0 0 0 0 0 0 0 0 0 0 0 0
39337- 0 0 0 0 0 0 0 0 0 0 0 0
39338- 0 0 0 0 0 0 0 0 0 0 0 0
39339- 0 0 0 0 0 0 0 0 0 0 0 0
39340- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
39347- 34 34 34 78 78 78 50 50 50 6 6 6
39348- 94 70 30 139 102 15 190 146 13 226 184 13
39349-232 200 30 232 195 16 215 174 15 190 146 13
39350-168 122 10 192 133 9 210 150 10 213 154 11
39351-202 150 34 182 157 106 101 98 89 2 2 6
39352- 2 2 6 78 78 78 116 116 116 58 58 58
39353- 2 2 6 22 22 22 90 90 90 46 46 46
39354- 18 18 18 6 6 6 0 0 0 0 0 0
39355- 0 0 0 0 0 0 0 0 0 0 0 0
39356- 0 0 0 0 0 0 0 0 0 0 0 0
39357- 0 0 0 0 0 0 0 0 0 0 0 0
39358- 0 0 0 0 0 0 0 0 0 0 0 0
39359- 0 0 0 0 0 0 0 0 0 0 0 0
39360- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
39367- 38 38 38 86 86 86 50 50 50 6 6 6
39368-128 128 128 174 154 114 156 107 11 168 122 10
39369-198 155 10 184 144 12 197 138 11 200 144 11
39370-206 145 10 206 145 10 197 138 11 188 164 115
39371-195 195 195 198 198 198 174 174 174 14 14 14
39372- 2 2 6 22 22 22 116 116 116 116 116 116
39373- 22 22 22 2 2 6 74 74 74 70 70 70
39374- 30 30 30 10 10 10 0 0 0 0 0 0
39375- 0 0 0 0 0 0 0 0 0 0 0 0
39376- 0 0 0 0 0 0 0 0 0 0 0 0
39377- 0 0 0 0 0 0 0 0 0 0 0 0
39378- 0 0 0 0 0 0 0 0 0 0 0 0
39379- 0 0 0 0 0 0 0 0 0 0 0 0
39380- 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6 18 18 18
39387- 50 50 50 101 101 101 26 26 26 10 10 10
39388-138 138 138 190 190 190 174 154 114 156 107 11
39389-197 138 11 200 144 11 197 138 11 192 133 9
39390-180 123 7 190 142 34 190 178 144 187 187 187
39391-202 202 202 221 221 221 214 214 214 66 66 66
39392- 2 2 6 2 2 6 50 50 50 62 62 62
39393- 6 6 6 2 2 6 10 10 10 90 90 90
39394- 50 50 50 18 18 18 6 6 6 0 0 0
39395- 0 0 0 0 0 0 0 0 0 0 0 0
39396- 0 0 0 0 0 0 0 0 0 0 0 0
39397- 0 0 0 0 0 0 0 0 0 0 0 0
39398- 0 0 0 0 0 0 0 0 0 0 0 0
39399- 0 0 0 0 0 0 0 0 0 0 0 0
39400- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10 34 34 34
39407- 74 74 74 74 74 74 2 2 6 6 6 6
39408-144 144 144 198 198 198 190 190 190 178 166 146
39409-154 121 60 156 107 11 156 107 11 168 124 44
39410-174 154 114 187 187 187 190 190 190 210 210 210
39411-246 246 246 253 253 253 253 253 253 182 182 182
39412- 6 6 6 2 2 6 2 2 6 2 2 6
39413- 2 2 6 2 2 6 2 2 6 62 62 62
39414- 74 74 74 34 34 34 14 14 14 0 0 0
39415- 0 0 0 0 0 0 0 0 0 0 0 0
39416- 0 0 0 0 0 0 0 0 0 0 0 0
39417- 0 0 0 0 0 0 0 0 0 0 0 0
39418- 0 0 0 0 0 0 0 0 0 0 0 0
39419- 0 0 0 0 0 0 0 0 0 0 0 0
39420- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10 22 22 22 54 54 54
39427- 94 94 94 18 18 18 2 2 6 46 46 46
39428-234 234 234 221 221 221 190 190 190 190 190 190
39429-190 190 190 187 187 187 187 187 187 190 190 190
39430-190 190 190 195 195 195 214 214 214 242 242 242
39431-253 253 253 253 253 253 253 253 253 253 253 253
39432- 82 82 82 2 2 6 2 2 6 2 2 6
39433- 2 2 6 2 2 6 2 2 6 14 14 14
39434- 86 86 86 54 54 54 22 22 22 6 6 6
39435- 0 0 0 0 0 0 0 0 0 0 0 0
39436- 0 0 0 0 0 0 0 0 0 0 0 0
39437- 0 0 0 0 0 0 0 0 0 0 0 0
39438- 0 0 0 0 0 0 0 0 0 0 0 0
39439- 0 0 0 0 0 0 0 0 0 0 0 0
39440- 0 0 0 0 0 0 0 0 0 0 0 0
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- 6 6 6 18 18 18 46 46 46 90 90 90
39447- 46 46 46 18 18 18 6 6 6 182 182 182
39448-253 253 253 246 246 246 206 206 206 190 190 190
39449-190 190 190 190 190 190 190 190 190 190 190 190
39450-206 206 206 231 231 231 250 250 250 253 253 253
39451-253 253 253 253 253 253 253 253 253 253 253 253
39452-202 202 202 14 14 14 2 2 6 2 2 6
39453- 2 2 6 2 2 6 2 2 6 2 2 6
39454- 42 42 42 86 86 86 42 42 42 18 18 18
39455- 6 6 6 0 0 0 0 0 0 0 0 0
39456- 0 0 0 0 0 0 0 0 0 0 0 0
39457- 0 0 0 0 0 0 0 0 0 0 0 0
39458- 0 0 0 0 0 0 0 0 0 0 0 0
39459- 0 0 0 0 0 0 0 0 0 0 0 0
39460- 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6
39466- 14 14 14 38 38 38 74 74 74 66 66 66
39467- 2 2 6 6 6 6 90 90 90 250 250 250
39468-253 253 253 253 253 253 238 238 238 198 198 198
39469-190 190 190 190 190 190 195 195 195 221 221 221
39470-246 246 246 253 253 253 253 253 253 253 253 253
39471-253 253 253 253 253 253 253 253 253 253 253 253
39472-253 253 253 82 82 82 2 2 6 2 2 6
39473- 2 2 6 2 2 6 2 2 6 2 2 6
39474- 2 2 6 78 78 78 70 70 70 34 34 34
39475- 14 14 14 6 6 6 0 0 0 0 0 0
39476- 0 0 0 0 0 0 0 0 0 0 0 0
39477- 0 0 0 0 0 0 0 0 0 0 0 0
39478- 0 0 0 0 0 0 0 0 0 0 0 0
39479- 0 0 0 0 0 0 0 0 0 0 0 0
39480- 0 0 0 0 0 0 0 0 0 0 0 0
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 14 14 14
39486- 34 34 34 66 66 66 78 78 78 6 6 6
39487- 2 2 6 18 18 18 218 218 218 253 253 253
39488-253 253 253 253 253 253 253 253 253 246 246 246
39489-226 226 226 231 231 231 246 246 246 253 253 253
39490-253 253 253 253 253 253 253 253 253 253 253 253
39491-253 253 253 253 253 253 253 253 253 253 253 253
39492-253 253 253 178 178 178 2 2 6 2 2 6
39493- 2 2 6 2 2 6 2 2 6 2 2 6
39494- 2 2 6 18 18 18 90 90 90 62 62 62
39495- 30 30 30 10 10 10 0 0 0 0 0 0
39496- 0 0 0 0 0 0 0 0 0 0 0 0
39497- 0 0 0 0 0 0 0 0 0 0 0 0
39498- 0 0 0 0 0 0 0 0 0 0 0 0
39499- 0 0 0 0 0 0 0 0 0 0 0 0
39500- 0 0 0 0 0 0 0 0 0 0 0 0
39501- 0 0 0 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 10 10 10 26 26 26
39506- 58 58 58 90 90 90 18 18 18 2 2 6
39507- 2 2 6 110 110 110 253 253 253 253 253 253
39508-253 253 253 253 253 253 253 253 253 253 253 253
39509-250 250 250 253 253 253 253 253 253 253 253 253
39510-253 253 253 253 253 253 253 253 253 253 253 253
39511-253 253 253 253 253 253 253 253 253 253 253 253
39512-253 253 253 231 231 231 18 18 18 2 2 6
39513- 2 2 6 2 2 6 2 2 6 2 2 6
39514- 2 2 6 2 2 6 18 18 18 94 94 94
39515- 54 54 54 26 26 26 10 10 10 0 0 0
39516- 0 0 0 0 0 0 0 0 0 0 0 0
39517- 0 0 0 0 0 0 0 0 0 0 0 0
39518- 0 0 0 0 0 0 0 0 0 0 0 0
39519- 0 0 0 0 0 0 0 0 0 0 0 0
39520- 0 0 0 0 0 0 0 0 0 0 0 0
39521- 0 0 0 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 6 6 6 22 22 22 50 50 50
39526- 90 90 90 26 26 26 2 2 6 2 2 6
39527- 14 14 14 195 195 195 250 250 250 253 253 253
39528-253 253 253 253 253 253 253 253 253 253 253 253
39529-253 253 253 253 253 253 253 253 253 253 253 253
39530-253 253 253 253 253 253 253 253 253 253 253 253
39531-253 253 253 253 253 253 253 253 253 253 253 253
39532-250 250 250 242 242 242 54 54 54 2 2 6
39533- 2 2 6 2 2 6 2 2 6 2 2 6
39534- 2 2 6 2 2 6 2 2 6 38 38 38
39535- 86 86 86 50 50 50 22 22 22 6 6 6
39536- 0 0 0 0 0 0 0 0 0 0 0 0
39537- 0 0 0 0 0 0 0 0 0 0 0 0
39538- 0 0 0 0 0 0 0 0 0 0 0 0
39539- 0 0 0 0 0 0 0 0 0 0 0 0
39540- 0 0 0 0 0 0 0 0 0 0 0 0
39541- 0 0 0 0 0 0 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- 6 6 6 14 14 14 38 38 38 82 82 82
39546- 34 34 34 2 2 6 2 2 6 2 2 6
39547- 42 42 42 195 195 195 246 246 246 253 253 253
39548-253 253 253 253 253 253 253 253 253 250 250 250
39549-242 242 242 242 242 242 250 250 250 253 253 253
39550-253 253 253 253 253 253 253 253 253 253 253 253
39551-253 253 253 250 250 250 246 246 246 238 238 238
39552-226 226 226 231 231 231 101 101 101 6 6 6
39553- 2 2 6 2 2 6 2 2 6 2 2 6
39554- 2 2 6 2 2 6 2 2 6 2 2 6
39555- 38 38 38 82 82 82 42 42 42 14 14 14
39556- 6 6 6 0 0 0 0 0 0 0 0 0
39557- 0 0 0 0 0 0 0 0 0 0 0 0
39558- 0 0 0 0 0 0 0 0 0 0 0 0
39559- 0 0 0 0 0 0 0 0 0 0 0 0
39560- 0 0 0 0 0 0 0 0 0 0 0 0
39561- 0 0 0 0 0 0 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- 10 10 10 26 26 26 62 62 62 66 66 66
39566- 2 2 6 2 2 6 2 2 6 6 6 6
39567- 70 70 70 170 170 170 206 206 206 234 234 234
39568-246 246 246 250 250 250 250 250 250 238 238 238
39569-226 226 226 231 231 231 238 238 238 250 250 250
39570-250 250 250 250 250 250 246 246 246 231 231 231
39571-214 214 214 206 206 206 202 202 202 202 202 202
39572-198 198 198 202 202 202 182 182 182 18 18 18
39573- 2 2 6 2 2 6 2 2 6 2 2 6
39574- 2 2 6 2 2 6 2 2 6 2 2 6
39575- 2 2 6 62 62 62 66 66 66 30 30 30
39576- 10 10 10 0 0 0 0 0 0 0 0 0
39577- 0 0 0 0 0 0 0 0 0 0 0 0
39578- 0 0 0 0 0 0 0 0 0 0 0 0
39579- 0 0 0 0 0 0 0 0 0 0 0 0
39580- 0 0 0 0 0 0 0 0 0 0 0 0
39581- 0 0 0 0 0 0 0 0 0 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- 14 14 14 42 42 42 82 82 82 18 18 18
39586- 2 2 6 2 2 6 2 2 6 10 10 10
39587- 94 94 94 182 182 182 218 218 218 242 242 242
39588-250 250 250 253 253 253 253 253 253 250 250 250
39589-234 234 234 253 253 253 253 253 253 253 253 253
39590-253 253 253 253 253 253 253 253 253 246 246 246
39591-238 238 238 226 226 226 210 210 210 202 202 202
39592-195 195 195 195 195 195 210 210 210 158 158 158
39593- 6 6 6 14 14 14 50 50 50 14 14 14
39594- 2 2 6 2 2 6 2 2 6 2 2 6
39595- 2 2 6 6 6 6 86 86 86 46 46 46
39596- 18 18 18 6 6 6 0 0 0 0 0 0
39597- 0 0 0 0 0 0 0 0 0 0 0 0
39598- 0 0 0 0 0 0 0 0 0 0 0 0
39599- 0 0 0 0 0 0 0 0 0 0 0 0
39600- 0 0 0 0 0 0 0 0 0 0 0 0
39601- 0 0 0 0 0 0 0 0 0 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 6 6 6
39605- 22 22 22 54 54 54 70 70 70 2 2 6
39606- 2 2 6 10 10 10 2 2 6 22 22 22
39607-166 166 166 231 231 231 250 250 250 253 253 253
39608-253 253 253 253 253 253 253 253 253 250 250 250
39609-242 242 242 253 253 253 253 253 253 253 253 253
39610-253 253 253 253 253 253 253 253 253 253 253 253
39611-253 253 253 253 253 253 253 253 253 246 246 246
39612-231 231 231 206 206 206 198 198 198 226 226 226
39613- 94 94 94 2 2 6 6 6 6 38 38 38
39614- 30 30 30 2 2 6 2 2 6 2 2 6
39615- 2 2 6 2 2 6 62 62 62 66 66 66
39616- 26 26 26 10 10 10 0 0 0 0 0 0
39617- 0 0 0 0 0 0 0 0 0 0 0 0
39618- 0 0 0 0 0 0 0 0 0 0 0 0
39619- 0 0 0 0 0 0 0 0 0 0 0 0
39620- 0 0 0 0 0 0 0 0 0 0 0 0
39621- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
39625- 30 30 30 74 74 74 50 50 50 2 2 6
39626- 26 26 26 26 26 26 2 2 6 106 106 106
39627-238 238 238 253 253 253 253 253 253 253 253 253
39628-253 253 253 253 253 253 253 253 253 253 253 253
39629-253 253 253 253 253 253 253 253 253 253 253 253
39630-253 253 253 253 253 253 253 253 253 253 253 253
39631-253 253 253 253 253 253 253 253 253 253 253 253
39632-253 253 253 246 246 246 218 218 218 202 202 202
39633-210 210 210 14 14 14 2 2 6 2 2 6
39634- 30 30 30 22 22 22 2 2 6 2 2 6
39635- 2 2 6 2 2 6 18 18 18 86 86 86
39636- 42 42 42 14 14 14 0 0 0 0 0 0
39637- 0 0 0 0 0 0 0 0 0 0 0 0
39638- 0 0 0 0 0 0 0 0 0 0 0 0
39639- 0 0 0 0 0 0 0 0 0 0 0 0
39640- 0 0 0 0 0 0 0 0 0 0 0 0
39641- 0 0 0 0 0 0 0 0 0 0 0 0
39642- 0 0 0 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 14 14 14
39645- 42 42 42 90 90 90 22 22 22 2 2 6
39646- 42 42 42 2 2 6 18 18 18 218 218 218
39647-253 253 253 253 253 253 253 253 253 253 253 253
39648-253 253 253 253 253 253 253 253 253 253 253 253
39649-253 253 253 253 253 253 253 253 253 253 253 253
39650-253 253 253 253 253 253 253 253 253 253 253 253
39651-253 253 253 253 253 253 253 253 253 253 253 253
39652-253 253 253 253 253 253 250 250 250 221 221 221
39653-218 218 218 101 101 101 2 2 6 14 14 14
39654- 18 18 18 38 38 38 10 10 10 2 2 6
39655- 2 2 6 2 2 6 2 2 6 78 78 78
39656- 58 58 58 22 22 22 6 6 6 0 0 0
39657- 0 0 0 0 0 0 0 0 0 0 0 0
39658- 0 0 0 0 0 0 0 0 0 0 0 0
39659- 0 0 0 0 0 0 0 0 0 0 0 0
39660- 0 0 0 0 0 0 0 0 0 0 0 0
39661- 0 0 0 0 0 0 0 0 0 0 0 0
39662- 0 0 0 0 0 0 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 6 6 6 18 18 18
39665- 54 54 54 82 82 82 2 2 6 26 26 26
39666- 22 22 22 2 2 6 123 123 123 253 253 253
39667-253 253 253 253 253 253 253 253 253 253 253 253
39668-253 253 253 253 253 253 253 253 253 253 253 253
39669-253 253 253 253 253 253 253 253 253 253 253 253
39670-253 253 253 253 253 253 253 253 253 253 253 253
39671-253 253 253 253 253 253 253 253 253 253 253 253
39672-253 253 253 253 253 253 253 253 253 250 250 250
39673-238 238 238 198 198 198 6 6 6 38 38 38
39674- 58 58 58 26 26 26 38 38 38 2 2 6
39675- 2 2 6 2 2 6 2 2 6 46 46 46
39676- 78 78 78 30 30 30 10 10 10 0 0 0
39677- 0 0 0 0 0 0 0 0 0 0 0 0
39678- 0 0 0 0 0 0 0 0 0 0 0 0
39679- 0 0 0 0 0 0 0 0 0 0 0 0
39680- 0 0 0 0 0 0 0 0 0 0 0 0
39681- 0 0 0 0 0 0 0 0 0 0 0 0
39682- 0 0 0 0 0 0 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 10 10 10 30 30 30
39685- 74 74 74 58 58 58 2 2 6 42 42 42
39686- 2 2 6 22 22 22 231 231 231 253 253 253
39687-253 253 253 253 253 253 253 253 253 253 253 253
39688-253 253 253 253 253 253 253 253 253 250 250 250
39689-253 253 253 253 253 253 253 253 253 253 253 253
39690-253 253 253 253 253 253 253 253 253 253 253 253
39691-253 253 253 253 253 253 253 253 253 253 253 253
39692-253 253 253 253 253 253 253 253 253 253 253 253
39693-253 253 253 246 246 246 46 46 46 38 38 38
39694- 42 42 42 14 14 14 38 38 38 14 14 14
39695- 2 2 6 2 2 6 2 2 6 6 6 6
39696- 86 86 86 46 46 46 14 14 14 0 0 0
39697- 0 0 0 0 0 0 0 0 0 0 0 0
39698- 0 0 0 0 0 0 0 0 0 0 0 0
39699- 0 0 0 0 0 0 0 0 0 0 0 0
39700- 0 0 0 0 0 0 0 0 0 0 0 0
39701- 0 0 0 0 0 0 0 0 0 0 0 0
39702- 0 0 0 0 0 0 0 0 0 0 0 0
39703- 0 0 0 0 0 0 0 0 0 0 0 0
39704- 0 0 0 6 6 6 14 14 14 42 42 42
39705- 90 90 90 18 18 18 18 18 18 26 26 26
39706- 2 2 6 116 116 116 253 253 253 253 253 253
39707-253 253 253 253 253 253 253 253 253 253 253 253
39708-253 253 253 253 253 253 250 250 250 238 238 238
39709-253 253 253 253 253 253 253 253 253 253 253 253
39710-253 253 253 253 253 253 253 253 253 253 253 253
39711-253 253 253 253 253 253 253 253 253 253 253 253
39712-253 253 253 253 253 253 253 253 253 253 253 253
39713-253 253 253 253 253 253 94 94 94 6 6 6
39714- 2 2 6 2 2 6 10 10 10 34 34 34
39715- 2 2 6 2 2 6 2 2 6 2 2 6
39716- 74 74 74 58 58 58 22 22 22 6 6 6
39717- 0 0 0 0 0 0 0 0 0 0 0 0
39718- 0 0 0 0 0 0 0 0 0 0 0 0
39719- 0 0 0 0 0 0 0 0 0 0 0 0
39720- 0 0 0 0 0 0 0 0 0 0 0 0
39721- 0 0 0 0 0 0 0 0 0 0 0 0
39722- 0 0 0 0 0 0 0 0 0 0 0 0
39723- 0 0 0 0 0 0 0 0 0 0 0 0
39724- 0 0 0 10 10 10 26 26 26 66 66 66
39725- 82 82 82 2 2 6 38 38 38 6 6 6
39726- 14 14 14 210 210 210 253 253 253 253 253 253
39727-253 253 253 253 253 253 253 253 253 253 253 253
39728-253 253 253 253 253 253 246 246 246 242 242 242
39729-253 253 253 253 253 253 253 253 253 253 253 253
39730-253 253 253 253 253 253 253 253 253 253 253 253
39731-253 253 253 253 253 253 253 253 253 253 253 253
39732-253 253 253 253 253 253 253 253 253 253 253 253
39733-253 253 253 253 253 253 144 144 144 2 2 6
39734- 2 2 6 2 2 6 2 2 6 46 46 46
39735- 2 2 6 2 2 6 2 2 6 2 2 6
39736- 42 42 42 74 74 74 30 30 30 10 10 10
39737- 0 0 0 0 0 0 0 0 0 0 0 0
39738- 0 0 0 0 0 0 0 0 0 0 0 0
39739- 0 0 0 0 0 0 0 0 0 0 0 0
39740- 0 0 0 0 0 0 0 0 0 0 0 0
39741- 0 0 0 0 0 0 0 0 0 0 0 0
39742- 0 0 0 0 0 0 0 0 0 0 0 0
39743- 0 0 0 0 0 0 0 0 0 0 0 0
39744- 6 6 6 14 14 14 42 42 42 90 90 90
39745- 26 26 26 6 6 6 42 42 42 2 2 6
39746- 74 74 74 250 250 250 253 253 253 253 253 253
39747-253 253 253 253 253 253 253 253 253 253 253 253
39748-253 253 253 253 253 253 242 242 242 242 242 242
39749-253 253 253 253 253 253 253 253 253 253 253 253
39750-253 253 253 253 253 253 253 253 253 253 253 253
39751-253 253 253 253 253 253 253 253 253 253 253 253
39752-253 253 253 253 253 253 253 253 253 253 253 253
39753-253 253 253 253 253 253 182 182 182 2 2 6
39754- 2 2 6 2 2 6 2 2 6 46 46 46
39755- 2 2 6 2 2 6 2 2 6 2 2 6
39756- 10 10 10 86 86 86 38 38 38 10 10 10
39757- 0 0 0 0 0 0 0 0 0 0 0 0
39758- 0 0 0 0 0 0 0 0 0 0 0 0
39759- 0 0 0 0 0 0 0 0 0 0 0 0
39760- 0 0 0 0 0 0 0 0 0 0 0 0
39761- 0 0 0 0 0 0 0 0 0 0 0 0
39762- 0 0 0 0 0 0 0 0 0 0 0 0
39763- 0 0 0 0 0 0 0 0 0 0 0 0
39764- 10 10 10 26 26 26 66 66 66 82 82 82
39765- 2 2 6 22 22 22 18 18 18 2 2 6
39766-149 149 149 253 253 253 253 253 253 253 253 253
39767-253 253 253 253 253 253 253 253 253 253 253 253
39768-253 253 253 253 253 253 234 234 234 242 242 242
39769-253 253 253 253 253 253 253 253 253 253 253 253
39770-253 253 253 253 253 253 253 253 253 253 253 253
39771-253 253 253 253 253 253 253 253 253 253 253 253
39772-253 253 253 253 253 253 253 253 253 253 253 253
39773-253 253 253 253 253 253 206 206 206 2 2 6
39774- 2 2 6 2 2 6 2 2 6 38 38 38
39775- 2 2 6 2 2 6 2 2 6 2 2 6
39776- 6 6 6 86 86 86 46 46 46 14 14 14
39777- 0 0 0 0 0 0 0 0 0 0 0 0
39778- 0 0 0 0 0 0 0 0 0 0 0 0
39779- 0 0 0 0 0 0 0 0 0 0 0 0
39780- 0 0 0 0 0 0 0 0 0 0 0 0
39781- 0 0 0 0 0 0 0 0 0 0 0 0
39782- 0 0 0 0 0 0 0 0 0 0 0 0
39783- 0 0 0 0 0 0 0 0 0 6 6 6
39784- 18 18 18 46 46 46 86 86 86 18 18 18
39785- 2 2 6 34 34 34 10 10 10 6 6 6
39786-210 210 210 253 253 253 253 253 253 253 253 253
39787-253 253 253 253 253 253 253 253 253 253 253 253
39788-253 253 253 253 253 253 234 234 234 242 242 242
39789-253 253 253 253 253 253 253 253 253 253 253 253
39790-253 253 253 253 253 253 253 253 253 253 253 253
39791-253 253 253 253 253 253 253 253 253 253 253 253
39792-253 253 253 253 253 253 253 253 253 253 253 253
39793-253 253 253 253 253 253 221 221 221 6 6 6
39794- 2 2 6 2 2 6 6 6 6 30 30 30
39795- 2 2 6 2 2 6 2 2 6 2 2 6
39796- 2 2 6 82 82 82 54 54 54 18 18 18
39797- 6 6 6 0 0 0 0 0 0 0 0 0
39798- 0 0 0 0 0 0 0 0 0 0 0 0
39799- 0 0 0 0 0 0 0 0 0 0 0 0
39800- 0 0 0 0 0 0 0 0 0 0 0 0
39801- 0 0 0 0 0 0 0 0 0 0 0 0
39802- 0 0 0 0 0 0 0 0 0 0 0 0
39803- 0 0 0 0 0 0 0 0 0 10 10 10
39804- 26 26 26 66 66 66 62 62 62 2 2 6
39805- 2 2 6 38 38 38 10 10 10 26 26 26
39806-238 238 238 253 253 253 253 253 253 253 253 253
39807-253 253 253 253 253 253 253 253 253 253 253 253
39808-253 253 253 253 253 253 231 231 231 238 238 238
39809-253 253 253 253 253 253 253 253 253 253 253 253
39810-253 253 253 253 253 253 253 253 253 253 253 253
39811-253 253 253 253 253 253 253 253 253 253 253 253
39812-253 253 253 253 253 253 253 253 253 253 253 253
39813-253 253 253 253 253 253 231 231 231 6 6 6
39814- 2 2 6 2 2 6 10 10 10 30 30 30
39815- 2 2 6 2 2 6 2 2 6 2 2 6
39816- 2 2 6 66 66 66 58 58 58 22 22 22
39817- 6 6 6 0 0 0 0 0 0 0 0 0
39818- 0 0 0 0 0 0 0 0 0 0 0 0
39819- 0 0 0 0 0 0 0 0 0 0 0 0
39820- 0 0 0 0 0 0 0 0 0 0 0 0
39821- 0 0 0 0 0 0 0 0 0 0 0 0
39822- 0 0 0 0 0 0 0 0 0 0 0 0
39823- 0 0 0 0 0 0 0 0 0 10 10 10
39824- 38 38 38 78 78 78 6 6 6 2 2 6
39825- 2 2 6 46 46 46 14 14 14 42 42 42
39826-246 246 246 253 253 253 253 253 253 253 253 253
39827-253 253 253 253 253 253 253 253 253 253 253 253
39828-253 253 253 253 253 253 231 231 231 242 242 242
39829-253 253 253 253 253 253 253 253 253 253 253 253
39830-253 253 253 253 253 253 253 253 253 253 253 253
39831-253 253 253 253 253 253 253 253 253 253 253 253
39832-253 253 253 253 253 253 253 253 253 253 253 253
39833-253 253 253 253 253 253 234 234 234 10 10 10
39834- 2 2 6 2 2 6 22 22 22 14 14 14
39835- 2 2 6 2 2 6 2 2 6 2 2 6
39836- 2 2 6 66 66 66 62 62 62 22 22 22
39837- 6 6 6 0 0 0 0 0 0 0 0 0
39838- 0 0 0 0 0 0 0 0 0 0 0 0
39839- 0 0 0 0 0 0 0 0 0 0 0 0
39840- 0 0 0 0 0 0 0 0 0 0 0 0
39841- 0 0 0 0 0 0 0 0 0 0 0 0
39842- 0 0 0 0 0 0 0 0 0 0 0 0
39843- 0 0 0 0 0 0 6 6 6 18 18 18
39844- 50 50 50 74 74 74 2 2 6 2 2 6
39845- 14 14 14 70 70 70 34 34 34 62 62 62
39846-250 250 250 253 253 253 253 253 253 253 253 253
39847-253 253 253 253 253 253 253 253 253 253 253 253
39848-253 253 253 253 253 253 231 231 231 246 246 246
39849-253 253 253 253 253 253 253 253 253 253 253 253
39850-253 253 253 253 253 253 253 253 253 253 253 253
39851-253 253 253 253 253 253 253 253 253 253 253 253
39852-253 253 253 253 253 253 253 253 253 253 253 253
39853-253 253 253 253 253 253 234 234 234 14 14 14
39854- 2 2 6 2 2 6 30 30 30 2 2 6
39855- 2 2 6 2 2 6 2 2 6 2 2 6
39856- 2 2 6 66 66 66 62 62 62 22 22 22
39857- 6 6 6 0 0 0 0 0 0 0 0 0
39858- 0 0 0 0 0 0 0 0 0 0 0 0
39859- 0 0 0 0 0 0 0 0 0 0 0 0
39860- 0 0 0 0 0 0 0 0 0 0 0 0
39861- 0 0 0 0 0 0 0 0 0 0 0 0
39862- 0 0 0 0 0 0 0 0 0 0 0 0
39863- 0 0 0 0 0 0 6 6 6 18 18 18
39864- 54 54 54 62 62 62 2 2 6 2 2 6
39865- 2 2 6 30 30 30 46 46 46 70 70 70
39866-250 250 250 253 253 253 253 253 253 253 253 253
39867-253 253 253 253 253 253 253 253 253 253 253 253
39868-253 253 253 253 253 253 231 231 231 246 246 246
39869-253 253 253 253 253 253 253 253 253 253 253 253
39870-253 253 253 253 253 253 253 253 253 253 253 253
39871-253 253 253 253 253 253 253 253 253 253 253 253
39872-253 253 253 253 253 253 253 253 253 253 253 253
39873-253 253 253 253 253 253 226 226 226 10 10 10
39874- 2 2 6 6 6 6 30 30 30 2 2 6
39875- 2 2 6 2 2 6 2 2 6 2 2 6
39876- 2 2 6 66 66 66 58 58 58 22 22 22
39877- 6 6 6 0 0 0 0 0 0 0 0 0
39878- 0 0 0 0 0 0 0 0 0 0 0 0
39879- 0 0 0 0 0 0 0 0 0 0 0 0
39880- 0 0 0 0 0 0 0 0 0 0 0 0
39881- 0 0 0 0 0 0 0 0 0 0 0 0
39882- 0 0 0 0 0 0 0 0 0 0 0 0
39883- 0 0 0 0 0 0 6 6 6 22 22 22
39884- 58 58 58 62 62 62 2 2 6 2 2 6
39885- 2 2 6 2 2 6 30 30 30 78 78 78
39886-250 250 250 253 253 253 253 253 253 253 253 253
39887-253 253 253 253 253 253 253 253 253 253 253 253
39888-253 253 253 253 253 253 231 231 231 246 246 246
39889-253 253 253 253 253 253 253 253 253 253 253 253
39890-253 253 253 253 253 253 253 253 253 253 253 253
39891-253 253 253 253 253 253 253 253 253 253 253 253
39892-253 253 253 253 253 253 253 253 253 253 253 253
39893-253 253 253 253 253 253 206 206 206 2 2 6
39894- 22 22 22 34 34 34 18 14 6 22 22 22
39895- 26 26 26 18 18 18 6 6 6 2 2 6
39896- 2 2 6 82 82 82 54 54 54 18 18 18
39897- 6 6 6 0 0 0 0 0 0 0 0 0
39898- 0 0 0 0 0 0 0 0 0 0 0 0
39899- 0 0 0 0 0 0 0 0 0 0 0 0
39900- 0 0 0 0 0 0 0 0 0 0 0 0
39901- 0 0 0 0 0 0 0 0 0 0 0 0
39902- 0 0 0 0 0 0 0 0 0 0 0 0
39903- 0 0 0 0 0 0 6 6 6 26 26 26
39904- 62 62 62 106 106 106 74 54 14 185 133 11
39905-210 162 10 121 92 8 6 6 6 62 62 62
39906-238 238 238 253 253 253 253 253 253 253 253 253
39907-253 253 253 253 253 253 253 253 253 253 253 253
39908-253 253 253 253 253 253 231 231 231 246 246 246
39909-253 253 253 253 253 253 253 253 253 253 253 253
39910-253 253 253 253 253 253 253 253 253 253 253 253
39911-253 253 253 253 253 253 253 253 253 253 253 253
39912-253 253 253 253 253 253 253 253 253 253 253 253
39913-253 253 253 253 253 253 158 158 158 18 18 18
39914- 14 14 14 2 2 6 2 2 6 2 2 6
39915- 6 6 6 18 18 18 66 66 66 38 38 38
39916- 6 6 6 94 94 94 50 50 50 18 18 18
39917- 6 6 6 0 0 0 0 0 0 0 0 0
39918- 0 0 0 0 0 0 0 0 0 0 0 0
39919- 0 0 0 0 0 0 0 0 0 0 0 0
39920- 0 0 0 0 0 0 0 0 0 0 0 0
39921- 0 0 0 0 0 0 0 0 0 0 0 0
39922- 0 0 0 0 0 0 0 0 0 6 6 6
39923- 10 10 10 10 10 10 18 18 18 38 38 38
39924- 78 78 78 142 134 106 216 158 10 242 186 14
39925-246 190 14 246 190 14 156 118 10 10 10 10
39926- 90 90 90 238 238 238 253 253 253 253 253 253
39927-253 253 253 253 253 253 253 253 253 253 253 253
39928-253 253 253 253 253 253 231 231 231 250 250 250
39929-253 253 253 253 253 253 253 253 253 253 253 253
39930-253 253 253 253 253 253 253 253 253 253 253 253
39931-253 253 253 253 253 253 253 253 253 253 253 253
39932-253 253 253 253 253 253 253 253 253 246 230 190
39933-238 204 91 238 204 91 181 142 44 37 26 9
39934- 2 2 6 2 2 6 2 2 6 2 2 6
39935- 2 2 6 2 2 6 38 38 38 46 46 46
39936- 26 26 26 106 106 106 54 54 54 18 18 18
39937- 6 6 6 0 0 0 0 0 0 0 0 0
39938- 0 0 0 0 0 0 0 0 0 0 0 0
39939- 0 0 0 0 0 0 0 0 0 0 0 0
39940- 0 0 0 0 0 0 0 0 0 0 0 0
39941- 0 0 0 0 0 0 0 0 0 0 0 0
39942- 0 0 0 6 6 6 14 14 14 22 22 22
39943- 30 30 30 38 38 38 50 50 50 70 70 70
39944-106 106 106 190 142 34 226 170 11 242 186 14
39945-246 190 14 246 190 14 246 190 14 154 114 10
39946- 6 6 6 74 74 74 226 226 226 253 253 253
39947-253 253 253 253 253 253 253 253 253 253 253 253
39948-253 253 253 253 253 253 231 231 231 250 250 250
39949-253 253 253 253 253 253 253 253 253 253 253 253
39950-253 253 253 253 253 253 253 253 253 253 253 253
39951-253 253 253 253 253 253 253 253 253 253 253 253
39952-253 253 253 253 253 253 253 253 253 228 184 62
39953-241 196 14 241 208 19 232 195 16 38 30 10
39954- 2 2 6 2 2 6 2 2 6 2 2 6
39955- 2 2 6 6 6 6 30 30 30 26 26 26
39956-203 166 17 154 142 90 66 66 66 26 26 26
39957- 6 6 6 0 0 0 0 0 0 0 0 0
39958- 0 0 0 0 0 0 0 0 0 0 0 0
39959- 0 0 0 0 0 0 0 0 0 0 0 0
39960- 0 0 0 0 0 0 0 0 0 0 0 0
39961- 0 0 0 0 0 0 0 0 0 0 0 0
39962- 6 6 6 18 18 18 38 38 38 58 58 58
39963- 78 78 78 86 86 86 101 101 101 123 123 123
39964-175 146 61 210 150 10 234 174 13 246 186 14
39965-246 190 14 246 190 14 246 190 14 238 190 10
39966-102 78 10 2 2 6 46 46 46 198 198 198
39967-253 253 253 253 253 253 253 253 253 253 253 253
39968-253 253 253 253 253 253 234 234 234 242 242 242
39969-253 253 253 253 253 253 253 253 253 253 253 253
39970-253 253 253 253 253 253 253 253 253 253 253 253
39971-253 253 253 253 253 253 253 253 253 253 253 253
39972-253 253 253 253 253 253 253 253 253 224 178 62
39973-242 186 14 241 196 14 210 166 10 22 18 6
39974- 2 2 6 2 2 6 2 2 6 2 2 6
39975- 2 2 6 2 2 6 6 6 6 121 92 8
39976-238 202 15 232 195 16 82 82 82 34 34 34
39977- 10 10 10 0 0 0 0 0 0 0 0 0
39978- 0 0 0 0 0 0 0 0 0 0 0 0
39979- 0 0 0 0 0 0 0 0 0 0 0 0
39980- 0 0 0 0 0 0 0 0 0 0 0 0
39981- 0 0 0 0 0 0 0 0 0 0 0 0
39982- 14 14 14 38 38 38 70 70 70 154 122 46
39983-190 142 34 200 144 11 197 138 11 197 138 11
39984-213 154 11 226 170 11 242 186 14 246 190 14
39985-246 190 14 246 190 14 246 190 14 246 190 14
39986-225 175 15 46 32 6 2 2 6 22 22 22
39987-158 158 158 250 250 250 253 253 253 253 253 253
39988-253 253 253 253 253 253 253 253 253 253 253 253
39989-253 253 253 253 253 253 253 253 253 253 253 253
39990-253 253 253 253 253 253 253 253 253 253 253 253
39991-253 253 253 253 253 253 253 253 253 253 253 253
39992-253 253 253 250 250 250 242 242 242 224 178 62
39993-239 182 13 236 186 11 213 154 11 46 32 6
39994- 2 2 6 2 2 6 2 2 6 2 2 6
39995- 2 2 6 2 2 6 61 42 6 225 175 15
39996-238 190 10 236 186 11 112 100 78 42 42 42
39997- 14 14 14 0 0 0 0 0 0 0 0 0
39998- 0 0 0 0 0 0 0 0 0 0 0 0
39999- 0 0 0 0 0 0 0 0 0 0 0 0
40000- 0 0 0 0 0 0 0 0 0 0 0 0
40001- 0 0 0 0 0 0 0 0 0 6 6 6
40002- 22 22 22 54 54 54 154 122 46 213 154 11
40003-226 170 11 230 174 11 226 170 11 226 170 11
40004-236 178 12 242 186 14 246 190 14 246 190 14
40005-246 190 14 246 190 14 246 190 14 246 190 14
40006-241 196 14 184 144 12 10 10 10 2 2 6
40007- 6 6 6 116 116 116 242 242 242 253 253 253
40008-253 253 253 253 253 253 253 253 253 253 253 253
40009-253 253 253 253 253 253 253 253 253 253 253 253
40010-253 253 253 253 253 253 253 253 253 253 253 253
40011-253 253 253 253 253 253 253 253 253 253 253 253
40012-253 253 253 231 231 231 198 198 198 214 170 54
40013-236 178 12 236 178 12 210 150 10 137 92 6
40014- 18 14 6 2 2 6 2 2 6 2 2 6
40015- 6 6 6 70 47 6 200 144 11 236 178 12
40016-239 182 13 239 182 13 124 112 88 58 58 58
40017- 22 22 22 6 6 6 0 0 0 0 0 0
40018- 0 0 0 0 0 0 0 0 0 0 0 0
40019- 0 0 0 0 0 0 0 0 0 0 0 0
40020- 0 0 0 0 0 0 0 0 0 0 0 0
40021- 0 0 0 0 0 0 0 0 0 10 10 10
40022- 30 30 30 70 70 70 180 133 36 226 170 11
40023-239 182 13 242 186 14 242 186 14 246 186 14
40024-246 190 14 246 190 14 246 190 14 246 190 14
40025-246 190 14 246 190 14 246 190 14 246 190 14
40026-246 190 14 232 195 16 98 70 6 2 2 6
40027- 2 2 6 2 2 6 66 66 66 221 221 221
40028-253 253 253 253 253 253 253 253 253 253 253 253
40029-253 253 253 253 253 253 253 253 253 253 253 253
40030-253 253 253 253 253 253 253 253 253 253 253 253
40031-253 253 253 253 253 253 253 253 253 253 253 253
40032-253 253 253 206 206 206 198 198 198 214 166 58
40033-230 174 11 230 174 11 216 158 10 192 133 9
40034-163 110 8 116 81 8 102 78 10 116 81 8
40035-167 114 7 197 138 11 226 170 11 239 182 13
40036-242 186 14 242 186 14 162 146 94 78 78 78
40037- 34 34 34 14 14 14 6 6 6 0 0 0
40038- 0 0 0 0 0 0 0 0 0 0 0 0
40039- 0 0 0 0 0 0 0 0 0 0 0 0
40040- 0 0 0 0 0 0 0 0 0 0 0 0
40041- 0 0 0 0 0 0 0 0 0 6 6 6
40042- 30 30 30 78 78 78 190 142 34 226 170 11
40043-239 182 13 246 190 14 246 190 14 246 190 14
40044-246 190 14 246 190 14 246 190 14 246 190 14
40045-246 190 14 246 190 14 246 190 14 246 190 14
40046-246 190 14 241 196 14 203 166 17 22 18 6
40047- 2 2 6 2 2 6 2 2 6 38 38 38
40048-218 218 218 253 253 253 253 253 253 253 253 253
40049-253 253 253 253 253 253 253 253 253 253 253 253
40050-253 253 253 253 253 253 253 253 253 253 253 253
40051-253 253 253 253 253 253 253 253 253 253 253 253
40052-250 250 250 206 206 206 198 198 198 202 162 69
40053-226 170 11 236 178 12 224 166 10 210 150 10
40054-200 144 11 197 138 11 192 133 9 197 138 11
40055-210 150 10 226 170 11 242 186 14 246 190 14
40056-246 190 14 246 186 14 225 175 15 124 112 88
40057- 62 62 62 30 30 30 14 14 14 6 6 6
40058- 0 0 0 0 0 0 0 0 0 0 0 0
40059- 0 0 0 0 0 0 0 0 0 0 0 0
40060- 0 0 0 0 0 0 0 0 0 0 0 0
40061- 0 0 0 0 0 0 0 0 0 10 10 10
40062- 30 30 30 78 78 78 174 135 50 224 166 10
40063-239 182 13 246 190 14 246 190 14 246 190 14
40064-246 190 14 246 190 14 246 190 14 246 190 14
40065-246 190 14 246 190 14 246 190 14 246 190 14
40066-246 190 14 246 190 14 241 196 14 139 102 15
40067- 2 2 6 2 2 6 2 2 6 2 2 6
40068- 78 78 78 250 250 250 253 253 253 253 253 253
40069-253 253 253 253 253 253 253 253 253 253 253 253
40070-253 253 253 253 253 253 253 253 253 253 253 253
40071-253 253 253 253 253 253 253 253 253 253 253 253
40072-250 250 250 214 214 214 198 198 198 190 150 46
40073-219 162 10 236 178 12 234 174 13 224 166 10
40074-216 158 10 213 154 11 213 154 11 216 158 10
40075-226 170 11 239 182 13 246 190 14 246 190 14
40076-246 190 14 246 190 14 242 186 14 206 162 42
40077-101 101 101 58 58 58 30 30 30 14 14 14
40078- 6 6 6 0 0 0 0 0 0 0 0 0
40079- 0 0 0 0 0 0 0 0 0 0 0 0
40080- 0 0 0 0 0 0 0 0 0 0 0 0
40081- 0 0 0 0 0 0 0 0 0 10 10 10
40082- 30 30 30 74 74 74 174 135 50 216 158 10
40083-236 178 12 246 190 14 246 190 14 246 190 14
40084-246 190 14 246 190 14 246 190 14 246 190 14
40085-246 190 14 246 190 14 246 190 14 246 190 14
40086-246 190 14 246 190 14 241 196 14 226 184 13
40087- 61 42 6 2 2 6 2 2 6 2 2 6
40088- 22 22 22 238 238 238 253 253 253 253 253 253
40089-253 253 253 253 253 253 253 253 253 253 253 253
40090-253 253 253 253 253 253 253 253 253 253 253 253
40091-253 253 253 253 253 253 253 253 253 253 253 253
40092-253 253 253 226 226 226 187 187 187 180 133 36
40093-216 158 10 236 178 12 239 182 13 236 178 12
40094-230 174 11 226 170 11 226 170 11 230 174 11
40095-236 178 12 242 186 14 246 190 14 246 190 14
40096-246 190 14 246 190 14 246 186 14 239 182 13
40097-206 162 42 106 106 106 66 66 66 34 34 34
40098- 14 14 14 6 6 6 0 0 0 0 0 0
40099- 0 0 0 0 0 0 0 0 0 0 0 0
40100- 0 0 0 0 0 0 0 0 0 0 0 0
40101- 0 0 0 0 0 0 0 0 0 6 6 6
40102- 26 26 26 70 70 70 163 133 67 213 154 11
40103-236 178 12 246 190 14 246 190 14 246 190 14
40104-246 190 14 246 190 14 246 190 14 246 190 14
40105-246 190 14 246 190 14 246 190 14 246 190 14
40106-246 190 14 246 190 14 246 190 14 241 196 14
40107-190 146 13 18 14 6 2 2 6 2 2 6
40108- 46 46 46 246 246 246 253 253 253 253 253 253
40109-253 253 253 253 253 253 253 253 253 253 253 253
40110-253 253 253 253 253 253 253 253 253 253 253 253
40111-253 253 253 253 253 253 253 253 253 253 253 253
40112-253 253 253 221 221 221 86 86 86 156 107 11
40113-216 158 10 236 178 12 242 186 14 246 186 14
40114-242 186 14 239 182 13 239 182 13 242 186 14
40115-242 186 14 246 186 14 246 190 14 246 190 14
40116-246 190 14 246 190 14 246 190 14 246 190 14
40117-242 186 14 225 175 15 142 122 72 66 66 66
40118- 30 30 30 10 10 10 0 0 0 0 0 0
40119- 0 0 0 0 0 0 0 0 0 0 0 0
40120- 0 0 0 0 0 0 0 0 0 0 0 0
40121- 0 0 0 0 0 0 0 0 0 6 6 6
40122- 26 26 26 70 70 70 163 133 67 210 150 10
40123-236 178 12 246 190 14 246 190 14 246 190 14
40124-246 190 14 246 190 14 246 190 14 246 190 14
40125-246 190 14 246 190 14 246 190 14 246 190 14
40126-246 190 14 246 190 14 246 190 14 246 190 14
40127-232 195 16 121 92 8 34 34 34 106 106 106
40128-221 221 221 253 253 253 253 253 253 253 253 253
40129-253 253 253 253 253 253 253 253 253 253 253 253
40130-253 253 253 253 253 253 253 253 253 253 253 253
40131-253 253 253 253 253 253 253 253 253 253 253 253
40132-242 242 242 82 82 82 18 14 6 163 110 8
40133-216 158 10 236 178 12 242 186 14 246 190 14
40134-246 190 14 246 190 14 246 190 14 246 190 14
40135-246 190 14 246 190 14 246 190 14 246 190 14
40136-246 190 14 246 190 14 246 190 14 246 190 14
40137-246 190 14 246 190 14 242 186 14 163 133 67
40138- 46 46 46 18 18 18 6 6 6 0 0 0
40139- 0 0 0 0 0 0 0 0 0 0 0 0
40140- 0 0 0 0 0 0 0 0 0 0 0 0
40141- 0 0 0 0 0 0 0 0 0 10 10 10
40142- 30 30 30 78 78 78 163 133 67 210 150 10
40143-236 178 12 246 186 14 246 190 14 246 190 14
40144-246 190 14 246 190 14 246 190 14 246 190 14
40145-246 190 14 246 190 14 246 190 14 246 190 14
40146-246 190 14 246 190 14 246 190 14 246 190 14
40147-241 196 14 215 174 15 190 178 144 253 253 253
40148-253 253 253 253 253 253 253 253 253 253 253 253
40149-253 253 253 253 253 253 253 253 253 253 253 253
40150-253 253 253 253 253 253 253 253 253 253 253 253
40151-253 253 253 253 253 253 253 253 253 218 218 218
40152- 58 58 58 2 2 6 22 18 6 167 114 7
40153-216 158 10 236 178 12 246 186 14 246 190 14
40154-246 190 14 246 190 14 246 190 14 246 190 14
40155-246 190 14 246 190 14 246 190 14 246 190 14
40156-246 190 14 246 190 14 246 190 14 246 190 14
40157-246 190 14 246 186 14 242 186 14 190 150 46
40158- 54 54 54 22 22 22 6 6 6 0 0 0
40159- 0 0 0 0 0 0 0 0 0 0 0 0
40160- 0 0 0 0 0 0 0 0 0 0 0 0
40161- 0 0 0 0 0 0 0 0 0 14 14 14
40162- 38 38 38 86 86 86 180 133 36 213 154 11
40163-236 178 12 246 186 14 246 190 14 246 190 14
40164-246 190 14 246 190 14 246 190 14 246 190 14
40165-246 190 14 246 190 14 246 190 14 246 190 14
40166-246 190 14 246 190 14 246 190 14 246 190 14
40167-246 190 14 232 195 16 190 146 13 214 214 214
40168-253 253 253 253 253 253 253 253 253 253 253 253
40169-253 253 253 253 253 253 253 253 253 253 253 253
40170-253 253 253 253 253 253 253 253 253 253 253 253
40171-253 253 253 250 250 250 170 170 170 26 26 26
40172- 2 2 6 2 2 6 37 26 9 163 110 8
40173-219 162 10 239 182 13 246 186 14 246 190 14
40174-246 190 14 246 190 14 246 190 14 246 190 14
40175-246 190 14 246 190 14 246 190 14 246 190 14
40176-246 190 14 246 190 14 246 190 14 246 190 14
40177-246 186 14 236 178 12 224 166 10 142 122 72
40178- 46 46 46 18 18 18 6 6 6 0 0 0
40179- 0 0 0 0 0 0 0 0 0 0 0 0
40180- 0 0 0 0 0 0 0 0 0 0 0 0
40181- 0 0 0 0 0 0 6 6 6 18 18 18
40182- 50 50 50 109 106 95 192 133 9 224 166 10
40183-242 186 14 246 190 14 246 190 14 246 190 14
40184-246 190 14 246 190 14 246 190 14 246 190 14
40185-246 190 14 246 190 14 246 190 14 246 190 14
40186-246 190 14 246 190 14 246 190 14 246 190 14
40187-242 186 14 226 184 13 210 162 10 142 110 46
40188-226 226 226 253 253 253 253 253 253 253 253 253
40189-253 253 253 253 253 253 253 253 253 253 253 253
40190-253 253 253 253 253 253 253 253 253 253 253 253
40191-198 198 198 66 66 66 2 2 6 2 2 6
40192- 2 2 6 2 2 6 50 34 6 156 107 11
40193-219 162 10 239 182 13 246 186 14 246 190 14
40194-246 190 14 246 190 14 246 190 14 246 190 14
40195-246 190 14 246 190 14 246 190 14 246 190 14
40196-246 190 14 246 190 14 246 190 14 242 186 14
40197-234 174 13 213 154 11 154 122 46 66 66 66
40198- 30 30 30 10 10 10 0 0 0 0 0 0
40199- 0 0 0 0 0 0 0 0 0 0 0 0
40200- 0 0 0 0 0 0 0 0 0 0 0 0
40201- 0 0 0 0 0 0 6 6 6 22 22 22
40202- 58 58 58 154 121 60 206 145 10 234 174 13
40203-242 186 14 246 186 14 246 190 14 246 190 14
40204-246 190 14 246 190 14 246 190 14 246 190 14
40205-246 190 14 246 190 14 246 190 14 246 190 14
40206-246 190 14 246 190 14 246 190 14 246 190 14
40207-246 186 14 236 178 12 210 162 10 163 110 8
40208- 61 42 6 138 138 138 218 218 218 250 250 250
40209-253 253 253 253 253 253 253 253 253 250 250 250
40210-242 242 242 210 210 210 144 144 144 66 66 66
40211- 6 6 6 2 2 6 2 2 6 2 2 6
40212- 2 2 6 2 2 6 61 42 6 163 110 8
40213-216 158 10 236 178 12 246 190 14 246 190 14
40214-246 190 14 246 190 14 246 190 14 246 190 14
40215-246 190 14 246 190 14 246 190 14 246 190 14
40216-246 190 14 239 182 13 230 174 11 216 158 10
40217-190 142 34 124 112 88 70 70 70 38 38 38
40218- 18 18 18 6 6 6 0 0 0 0 0 0
40219- 0 0 0 0 0 0 0 0 0 0 0 0
40220- 0 0 0 0 0 0 0 0 0 0 0 0
40221- 0 0 0 0 0 0 6 6 6 22 22 22
40222- 62 62 62 168 124 44 206 145 10 224 166 10
40223-236 178 12 239 182 13 242 186 14 242 186 14
40224-246 186 14 246 190 14 246 190 14 246 190 14
40225-246 190 14 246 190 14 246 190 14 246 190 14
40226-246 190 14 246 190 14 246 190 14 246 190 14
40227-246 190 14 236 178 12 216 158 10 175 118 6
40228- 80 54 7 2 2 6 6 6 6 30 30 30
40229- 54 54 54 62 62 62 50 50 50 38 38 38
40230- 14 14 14 2 2 6 2 2 6 2 2 6
40231- 2 2 6 2 2 6 2 2 6 2 2 6
40232- 2 2 6 6 6 6 80 54 7 167 114 7
40233-213 154 11 236 178 12 246 190 14 246 190 14
40234-246 190 14 246 190 14 246 190 14 246 190 14
40235-246 190 14 242 186 14 239 182 13 239 182 13
40236-230 174 11 210 150 10 174 135 50 124 112 88
40237- 82 82 82 54 54 54 34 34 34 18 18 18
40238- 6 6 6 0 0 0 0 0 0 0 0 0
40239- 0 0 0 0 0 0 0 0 0 0 0 0
40240- 0 0 0 0 0 0 0 0 0 0 0 0
40241- 0 0 0 0 0 0 6 6 6 18 18 18
40242- 50 50 50 158 118 36 192 133 9 200 144 11
40243-216 158 10 219 162 10 224 166 10 226 170 11
40244-230 174 11 236 178 12 239 182 13 239 182 13
40245-242 186 14 246 186 14 246 190 14 246 190 14
40246-246 190 14 246 190 14 246 190 14 246 190 14
40247-246 186 14 230 174 11 210 150 10 163 110 8
40248-104 69 6 10 10 10 2 2 6 2 2 6
40249- 2 2 6 2 2 6 2 2 6 2 2 6
40250- 2 2 6 2 2 6 2 2 6 2 2 6
40251- 2 2 6 2 2 6 2 2 6 2 2 6
40252- 2 2 6 6 6 6 91 60 6 167 114 7
40253-206 145 10 230 174 11 242 186 14 246 190 14
40254-246 190 14 246 190 14 246 186 14 242 186 14
40255-239 182 13 230 174 11 224 166 10 213 154 11
40256-180 133 36 124 112 88 86 86 86 58 58 58
40257- 38 38 38 22 22 22 10 10 10 6 6 6
40258- 0 0 0 0 0 0 0 0 0 0 0 0
40259- 0 0 0 0 0 0 0 0 0 0 0 0
40260- 0 0 0 0 0 0 0 0 0 0 0 0
40261- 0 0 0 0 0 0 0 0 0 14 14 14
40262- 34 34 34 70 70 70 138 110 50 158 118 36
40263-167 114 7 180 123 7 192 133 9 197 138 11
40264-200 144 11 206 145 10 213 154 11 219 162 10
40265-224 166 10 230 174 11 239 182 13 242 186 14
40266-246 186 14 246 186 14 246 186 14 246 186 14
40267-239 182 13 216 158 10 185 133 11 152 99 6
40268-104 69 6 18 14 6 2 2 6 2 2 6
40269- 2 2 6 2 2 6 2 2 6 2 2 6
40270- 2 2 6 2 2 6 2 2 6 2 2 6
40271- 2 2 6 2 2 6 2 2 6 2 2 6
40272- 2 2 6 6 6 6 80 54 7 152 99 6
40273-192 133 9 219 162 10 236 178 12 239 182 13
40274-246 186 14 242 186 14 239 182 13 236 178 12
40275-224 166 10 206 145 10 192 133 9 154 121 60
40276- 94 94 94 62 62 62 42 42 42 22 22 22
40277- 14 14 14 6 6 6 0 0 0 0 0 0
40278- 0 0 0 0 0 0 0 0 0 0 0 0
40279- 0 0 0 0 0 0 0 0 0 0 0 0
40280- 0 0 0 0 0 0 0 0 0 0 0 0
40281- 0 0 0 0 0 0 0 0 0 6 6 6
40282- 18 18 18 34 34 34 58 58 58 78 78 78
40283-101 98 89 124 112 88 142 110 46 156 107 11
40284-163 110 8 167 114 7 175 118 6 180 123 7
40285-185 133 11 197 138 11 210 150 10 219 162 10
40286-226 170 11 236 178 12 236 178 12 234 174 13
40287-219 162 10 197 138 11 163 110 8 130 83 6
40288- 91 60 6 10 10 10 2 2 6 2 2 6
40289- 18 18 18 38 38 38 38 38 38 38 38 38
40290- 38 38 38 38 38 38 38 38 38 38 38 38
40291- 38 38 38 38 38 38 26 26 26 2 2 6
40292- 2 2 6 6 6 6 70 47 6 137 92 6
40293-175 118 6 200 144 11 219 162 10 230 174 11
40294-234 174 13 230 174 11 219 162 10 210 150 10
40295-192 133 9 163 110 8 124 112 88 82 82 82
40296- 50 50 50 30 30 30 14 14 14 6 6 6
40297- 0 0 0 0 0 0 0 0 0 0 0 0
40298- 0 0 0 0 0 0 0 0 0 0 0 0
40299- 0 0 0 0 0 0 0 0 0 0 0 0
40300- 0 0 0 0 0 0 0 0 0 0 0 0
40301- 0 0 0 0 0 0 0 0 0 0 0 0
40302- 6 6 6 14 14 14 22 22 22 34 34 34
40303- 42 42 42 58 58 58 74 74 74 86 86 86
40304-101 98 89 122 102 70 130 98 46 121 87 25
40305-137 92 6 152 99 6 163 110 8 180 123 7
40306-185 133 11 197 138 11 206 145 10 200 144 11
40307-180 123 7 156 107 11 130 83 6 104 69 6
40308- 50 34 6 54 54 54 110 110 110 101 98 89
40309- 86 86 86 82 82 82 78 78 78 78 78 78
40310- 78 78 78 78 78 78 78 78 78 78 78 78
40311- 78 78 78 82 82 82 86 86 86 94 94 94
40312-106 106 106 101 101 101 86 66 34 124 80 6
40313-156 107 11 180 123 7 192 133 9 200 144 11
40314-206 145 10 200 144 11 192 133 9 175 118 6
40315-139 102 15 109 106 95 70 70 70 42 42 42
40316- 22 22 22 10 10 10 0 0 0 0 0 0
40317- 0 0 0 0 0 0 0 0 0 0 0 0
40318- 0 0 0 0 0 0 0 0 0 0 0 0
40319- 0 0 0 0 0 0 0 0 0 0 0 0
40320- 0 0 0 0 0 0 0 0 0 0 0 0
40321- 0 0 0 0 0 0 0 0 0 0 0 0
40322- 0 0 0 0 0 0 6 6 6 10 10 10
40323- 14 14 14 22 22 22 30 30 30 38 38 38
40324- 50 50 50 62 62 62 74 74 74 90 90 90
40325-101 98 89 112 100 78 121 87 25 124 80 6
40326-137 92 6 152 99 6 152 99 6 152 99 6
40327-138 86 6 124 80 6 98 70 6 86 66 30
40328-101 98 89 82 82 82 58 58 58 46 46 46
40329- 38 38 38 34 34 34 34 34 34 34 34 34
40330- 34 34 34 34 34 34 34 34 34 34 34 34
40331- 34 34 34 34 34 34 38 38 38 42 42 42
40332- 54 54 54 82 82 82 94 86 76 91 60 6
40333-134 86 6 156 107 11 167 114 7 175 118 6
40334-175 118 6 167 114 7 152 99 6 121 87 25
40335-101 98 89 62 62 62 34 34 34 18 18 18
40336- 6 6 6 0 0 0 0 0 0 0 0 0
40337- 0 0 0 0 0 0 0 0 0 0 0 0
40338- 0 0 0 0 0 0 0 0 0 0 0 0
40339- 0 0 0 0 0 0 0 0 0 0 0 0
40340- 0 0 0 0 0 0 0 0 0 0 0 0
40341- 0 0 0 0 0 0 0 0 0 0 0 0
40342- 0 0 0 0 0 0 0 0 0 0 0 0
40343- 0 0 0 6 6 6 6 6 6 10 10 10
40344- 18 18 18 22 22 22 30 30 30 42 42 42
40345- 50 50 50 66 66 66 86 86 86 101 98 89
40346-106 86 58 98 70 6 104 69 6 104 69 6
40347-104 69 6 91 60 6 82 62 34 90 90 90
40348- 62 62 62 38 38 38 22 22 22 14 14 14
40349- 10 10 10 10 10 10 10 10 10 10 10 10
40350- 10 10 10 10 10 10 6 6 6 10 10 10
40351- 10 10 10 10 10 10 10 10 10 14 14 14
40352- 22 22 22 42 42 42 70 70 70 89 81 66
40353- 80 54 7 104 69 6 124 80 6 137 92 6
40354-134 86 6 116 81 8 100 82 52 86 86 86
40355- 58 58 58 30 30 30 14 14 14 6 6 6
40356- 0 0 0 0 0 0 0 0 0 0 0 0
40357- 0 0 0 0 0 0 0 0 0 0 0 0
40358- 0 0 0 0 0 0 0 0 0 0 0 0
40359- 0 0 0 0 0 0 0 0 0 0 0 0
40360- 0 0 0 0 0 0 0 0 0 0 0 0
40361- 0 0 0 0 0 0 0 0 0 0 0 0
40362- 0 0 0 0 0 0 0 0 0 0 0 0
40363- 0 0 0 0 0 0 0 0 0 0 0 0
40364- 0 0 0 6 6 6 10 10 10 14 14 14
40365- 18 18 18 26 26 26 38 38 38 54 54 54
40366- 70 70 70 86 86 86 94 86 76 89 81 66
40367- 89 81 66 86 86 86 74 74 74 50 50 50
40368- 30 30 30 14 14 14 6 6 6 0 0 0
40369- 0 0 0 0 0 0 0 0 0 0 0 0
40370- 0 0 0 0 0 0 0 0 0 0 0 0
40371- 0 0 0 0 0 0 0 0 0 0 0 0
40372- 6 6 6 18 18 18 34 34 34 58 58 58
40373- 82 82 82 89 81 66 89 81 66 89 81 66
40374- 94 86 66 94 86 76 74 74 74 50 50 50
40375- 26 26 26 14 14 14 6 6 6 0 0 0
40376- 0 0 0 0 0 0 0 0 0 0 0 0
40377- 0 0 0 0 0 0 0 0 0 0 0 0
40378- 0 0 0 0 0 0 0 0 0 0 0 0
40379- 0 0 0 0 0 0 0 0 0 0 0 0
40380- 0 0 0 0 0 0 0 0 0 0 0 0
40381- 0 0 0 0 0 0 0 0 0 0 0 0
40382- 0 0 0 0 0 0 0 0 0 0 0 0
40383- 0 0 0 0 0 0 0 0 0 0 0 0
40384- 0 0 0 0 0 0 0 0 0 0 0 0
40385- 6 6 6 6 6 6 14 14 14 18 18 18
40386- 30 30 30 38 38 38 46 46 46 54 54 54
40387- 50 50 50 42 42 42 30 30 30 18 18 18
40388- 10 10 10 0 0 0 0 0 0 0 0 0
40389- 0 0 0 0 0 0 0 0 0 0 0 0
40390- 0 0 0 0 0 0 0 0 0 0 0 0
40391- 0 0 0 0 0 0 0 0 0 0 0 0
40392- 0 0 0 6 6 6 14 14 14 26 26 26
40393- 38 38 38 50 50 50 58 58 58 58 58 58
40394- 54 54 54 42 42 42 30 30 30 18 18 18
40395- 10 10 10 0 0 0 0 0 0 0 0 0
40396- 0 0 0 0 0 0 0 0 0 0 0 0
40397- 0 0 0 0 0 0 0 0 0 0 0 0
40398- 0 0 0 0 0 0 0 0 0 0 0 0
40399- 0 0 0 0 0 0 0 0 0 0 0 0
40400- 0 0 0 0 0 0 0 0 0 0 0 0
40401- 0 0 0 0 0 0 0 0 0 0 0 0
40402- 0 0 0 0 0 0 0 0 0 0 0 0
40403- 0 0 0 0 0 0 0 0 0 0 0 0
40404- 0 0 0 0 0 0 0 0 0 0 0 0
40405- 0 0 0 0 0 0 0 0 0 6 6 6
40406- 6 6 6 10 10 10 14 14 14 18 18 18
40407- 18 18 18 14 14 14 10 10 10 6 6 6
40408- 0 0 0 0 0 0 0 0 0 0 0 0
40409- 0 0 0 0 0 0 0 0 0 0 0 0
40410- 0 0 0 0 0 0 0 0 0 0 0 0
40411- 0 0 0 0 0 0 0 0 0 0 0 0
40412- 0 0 0 0 0 0 0 0 0 6 6 6
40413- 14 14 14 18 18 18 22 22 22 22 22 22
40414- 18 18 18 14 14 14 10 10 10 6 6 6
40415- 0 0 0 0 0 0 0 0 0 0 0 0
40416- 0 0 0 0 0 0 0 0 0 0 0 0
40417- 0 0 0 0 0 0 0 0 0 0 0 0
40418- 0 0 0 0 0 0 0 0 0 0 0 0
40419- 0 0 0 0 0 0 0 0 0 0 0 0
40420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40423+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40427+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40432+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40433+4 4 4 4 4 4
40434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40437+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40447+4 4 4 4 4 4
40448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40456+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40460+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40461+4 4 4 4 4 4
40462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40470+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40474+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40475+4 4 4 4 4 4
40476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40483+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40484+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40488+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40489+4 4 4 4 4 4
40490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40496+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40497+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40500+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40501+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40502+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40503+4 4 4 4 4 4
40504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40508+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
40509+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
40510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40513+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
40514+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40515+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
40516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40517+4 4 4 4 4 4
40518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40522+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
40523+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
40524+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40527+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
40528+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
40529+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
40530+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40531+4 4 4 4 4 4
40532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40534+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40535+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40536+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
40537+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
40538+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40539+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40541+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
40542+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
40543+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
40544+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
40545+4 4 4 4 4 4
40546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40548+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40549+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
40550+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
40551+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
40552+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
40553+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40554+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
40555+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
40556+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
40557+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
40558+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
40559+4 4 4 4 4 4
40560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40563+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
40564+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
40565+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
40566+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
40567+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
40568+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
40569+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
40570+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
40571+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
40572+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
40573+4 4 4 4 4 4
40574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40576+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
40577+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
40578+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
40579+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
40580+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
40581+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
40582+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
40583+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
40584+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
40585+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
40586+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
40587+4 4 4 4 4 4
40588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40590+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
40591+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
40592+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
40593+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
40594+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
40595+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
40596+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
40597+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
40598+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
40599+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
40600+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
40601+4 4 4 4 4 4
40602+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40604+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
40605+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
40606+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
40607+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
40608+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
40609+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
40610+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
40611+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
40612+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
40613+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
40614+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
40615+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 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
40619+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
40620+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
40621+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
40622+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
40623+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
40624+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
40625+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
40626+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
40627+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
40628+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40629+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+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
40633+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
40634+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
40635+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
40636+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
40637+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
40638+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
40639+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
40640+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
40641+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
40642+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
40643+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 3 3 3 0 0 0
40646+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
40647+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
40648+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
40649+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
40650+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
40651+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
40652+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
40653+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
40654+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
40655+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
40656+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
40657+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 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
40660+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
40661+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
40662+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
40663+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
40664+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
40665+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
40666+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
40667+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
40668+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
40669+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
40670+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
40671+0 0 0 4 4 4
40672+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
40673+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
40674+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
40675+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
40676+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
40677+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
40678+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
40679+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
40680+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
40681+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
40682+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
40683+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
40684+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
40685+2 0 0 0 0 0
40686+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
40687+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
40688+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
40689+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
40690+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
40691+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
40692+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
40693+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
40694+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
40695+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
40696+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
40697+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
40698+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
40699+37 38 37 0 0 0
40700+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
40701+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
40702+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
40703+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
40704+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
40705+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
40706+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
40707+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
40708+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
40709+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
40710+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
40711+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
40712+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
40713+85 115 134 4 0 0
40714+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
40715+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
40716+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
40717+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
40718+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
40719+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
40720+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
40721+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
40722+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
40723+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
40724+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
40725+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
40726+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
40727+60 73 81 4 0 0
40728+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
40729+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
40730+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
40731+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
40732+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
40733+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
40734+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
40735+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
40736+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
40737+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
40738+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
40739+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
40740+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
40741+16 19 21 4 0 0
40742+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
40743+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
40744+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
40745+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
40746+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
40747+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
40748+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
40749+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
40750+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
40751+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
40752+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
40753+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
40754+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
40755+4 0 0 4 3 3
40756+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
40757+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
40758+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
40759+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
40760+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
40761+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
40762+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
40763+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
40764+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
40765+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
40766+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
40767+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
40768+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
40769+3 2 2 4 4 4
40770+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
40771+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
40772+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
40773+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
40774+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
40775+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
40776+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
40777+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
40778+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
40779+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
40780+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
40781+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
40782+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
40783+4 4 4 4 4 4
40784+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
40785+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
40786+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
40787+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
40788+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
40789+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
40790+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
40791+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
40792+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
40793+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
40794+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
40795+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
40796+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
40797+4 4 4 4 4 4
40798+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
40799+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
40800+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
40801+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
40802+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
40803+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
40804+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
40805+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
40806+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
40807+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
40808+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
40809+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
40810+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
40811+5 5 5 5 5 5
40812+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
40813+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
40814+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
40815+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
40816+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
40817+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40818+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
40819+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
40820+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
40821+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
40822+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
40823+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
40824+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
40825+5 5 5 4 4 4
40826+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
40827+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
40828+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
40829+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
40830+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
40831+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
40832+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
40833+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
40834+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
40835+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
40836+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
40837+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
40838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40839+4 4 4 4 4 4
40840+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
40841+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
40842+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
40843+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
40844+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
40845+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40846+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40847+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
40848+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
40849+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
40850+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
40851+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
40852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40853+4 4 4 4 4 4
40854+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
40855+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
40856+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
40857+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
40858+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
40859+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
40860+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
40861+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
40862+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
40863+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
40864+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
40865+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40866+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40867+4 4 4 4 4 4
40868+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
40869+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
40870+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
40871+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
40872+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
40873+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40874+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40875+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
40876+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
40877+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
40878+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
40879+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40880+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40881+4 4 4 4 4 4
40882+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
40883+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
40884+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
40885+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
40886+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
40887+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
40888+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
40889+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
40890+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
40891+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
40892+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
40893+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40894+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40895+4 4 4 4 4 4
40896+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
40897+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
40898+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
40899+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
40900+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
40901+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
40902+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
40903+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
40904+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
40905+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
40906+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
40907+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40908+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40909+4 4 4 4 4 4
40910+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
40911+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
40912+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
40913+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
40914+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
40915+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
40916+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
40917+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
40918+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
40919+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
40920+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
40921+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40922+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40923+4 4 4 4 4 4
40924+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
40925+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
40926+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
40927+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
40928+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
40929+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
40930+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
40931+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
40932+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
40933+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
40934+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
40935+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40936+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40937+4 4 4 4 4 4
40938+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
40939+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
40940+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
40941+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
40942+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
40943+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
40944+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
40945+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
40946+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
40947+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
40948+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
40949+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40950+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40951+4 4 4 4 4 4
40952+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
40953+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
40954+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
40955+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
40956+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
40957+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
40958+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
40959+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
40960+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
40961+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
40962+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
40963+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40964+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40965+4 4 4 4 4 4
40966+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
40967+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
40968+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
40969+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
40970+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
40971+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
40972+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
40973+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
40974+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
40975+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
40976+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
40977+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40978+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40979+4 4 4 4 4 4
40980+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
40981+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
40982+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
40983+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
40984+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
40985+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
40986+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
40987+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
40988+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
40989+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
40990+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
40991+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40992+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40993+4 4 4 4 4 4
40994+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
40995+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
40996+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
40997+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
40998+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
40999+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
41000+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
41001+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
41002+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41003+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41004+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41005+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41006+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41007+4 4 4 4 4 4
41008+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
41009+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
41010+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41011+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
41012+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
41013+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
41014+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
41015+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
41016+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41017+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41018+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41019+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41020+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41021+4 4 4 4 4 4
41022+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
41023+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
41024+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41025+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
41026+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
41027+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
41028+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
41029+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
41030+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41031+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41032+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41033+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41034+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41035+4 4 4 4 4 4
41036+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41037+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
41038+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41039+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
41040+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
41041+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
41042+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
41043+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
41044+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41045+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41046+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41047+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41048+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41049+4 4 4 4 4 4
41050+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
41051+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
41052+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41053+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
41054+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
41055+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
41056+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
41057+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
41058+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
41059+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41060+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41061+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41062+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41063+4 4 4 4 4 4
41064+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41065+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
41066+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
41067+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
41068+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
41069+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
41070+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
41071+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
41072+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41073+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41074+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41075+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41076+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41077+4 4 4 4 4 4
41078+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41079+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
41080+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41081+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
41082+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
41083+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
41084+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
41085+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
41086+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41087+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41088+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41089+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41090+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41091+4 4 4 4 4 4
41092+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41093+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
41094+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
41095+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
41096+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
41097+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
41098+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41099+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
41100+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41101+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41102+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41103+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41104+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41105+4 4 4 4 4 4
41106+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41107+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
41108+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
41109+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41110+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
41111+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
41112+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41113+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
41114+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41115+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41116+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41117+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41118+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41119+4 4 4 4 4 4
41120+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41121+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
41122+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
41123+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
41124+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
41125+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
41126+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
41127+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
41128+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
41129+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41130+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41131+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41132+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41133+4 4 4 4 4 4
41134+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41135+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
41136+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
41137+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
41138+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
41139+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
41140+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
41141+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
41142+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
41143+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41144+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41145+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41146+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41147+4 4 4 4 4 4
41148+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
41149+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
41150+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
41151+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
41152+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41153+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
41154+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
41155+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
41156+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
41157+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41158+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41159+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41160+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41161+4 4 4 4 4 4
41162+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41163+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
41164+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
41165+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
41166+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
41167+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
41168+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
41169+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
41170+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
41171+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41172+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41173+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41174+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41175+4 4 4 4 4 4
41176+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
41177+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
41178+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
41179+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
41180+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
41181+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
41182+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
41183+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
41184+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
41185+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
41186+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41187+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41188+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41189+4 4 4 4 4 4
41190+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
41191+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41192+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
41193+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
41194+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
41195+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
41196+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
41197+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
41198+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
41199+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
41200+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41201+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41202+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41203+4 4 4 4 4 4
41204+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
41205+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41206+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
41207+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
41208+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
41209+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
41210+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41211+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
41212+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
41213+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
41214+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41215+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41216+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41217+4 4 4 4 4 4
41218+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
41219+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
41220+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
41221+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
41222+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
41223+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
41224+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
41225+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
41226+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
41227+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
41228+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41229+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41230+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41231+4 4 4 4 4 4
41232+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
41233+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
41234+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41235+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
41236+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
41237+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
41238+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
41239+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
41240+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
41241+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
41242+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41243+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41244+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41245+4 4 4 4 4 4
41246+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41247+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
41248+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
41249+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
41250+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
41251+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
41252+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
41253+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
41254+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
41255+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41256+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41257+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41258+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41259+4 4 4 4 4 4
41260+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
41261+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
41262+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
41263+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
41264+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
41265+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
41266+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
41267+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
41268+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
41269+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41270+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41271+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41272+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41273+4 4 4 4 4 4
41274+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
41275+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
41276+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
41277+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
41278+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
41279+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
41280+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
41281+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
41282+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
41283+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41284+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41285+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41286+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41287+4 4 4 4 4 4
41288+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
41289+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41290+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
41291+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41292+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
41293+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
41294+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
41295+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
41296+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
41297+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41298+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41299+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41300+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41301+4 4 4 4 4 4
41302+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
41303+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
41304+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
41305+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
41306+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
41307+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
41308+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
41309+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
41310+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
41311+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41312+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41313+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41314+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41315+4 4 4 4 4 4
41316+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41317+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
41318+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
41319+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
41320+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
41321+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
41322+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
41323+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
41324+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41325+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41326+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41327+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41328+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41329+4 4 4 4 4 4
41330+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
41331+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
41332+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41333+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
41334+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
41335+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
41336+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
41337+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
41338+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41339+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41340+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41341+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41342+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41343+4 4 4 4 4 4
41344+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41345+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
41346+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
41347+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
41348+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
41349+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
41350+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
41351+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41352+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41353+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41354+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41355+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41356+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41357+4 4 4 4 4 4
41358+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41359+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
41360+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41361+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
41362+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
41363+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
41364+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
41365+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
41366+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41367+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41368+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41369+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41370+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41371+4 4 4 4 4 4
41372+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41373+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
41374+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
41375+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
41376+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
41377+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
41378+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
41379+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
41380+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41381+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41382+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41383+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41384+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41385+4 4 4 4 4 4
41386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41387+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
41388+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
41389+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41390+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
41391+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
41392+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
41393+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41394+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41395+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41396+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41397+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41398+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41399+4 4 4 4 4 4
41400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41402+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41403+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
41404+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
41405+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
41406+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
41407+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41408+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41409+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41410+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41412+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41413+4 4 4 4 4 4
41414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41417+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41418+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
41419+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
41420+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
41421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41423+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41427+4 4 4 4 4 4
41428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41431+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41432+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41433+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
41434+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
41435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41437+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41441+4 4 4 4 4 4
41442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41445+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41446+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41447+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41448+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
41449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41455+4 4 4 4 4 4
41456+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41459+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
41460+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
41461+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
41462+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
41463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41469+4 4 4 4 4 4
41470+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41472+4 4 4 4 4 4 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 5 5 5
41474+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
41475+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41476+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41483+4 4 4 4 4 4
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 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
41489+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
41490+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
41491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41496+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41497+4 4 4 4 4 4
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 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
41503+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
41504+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41511+4 4 4 4 4 4
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 4 4 4 5 5 5 4 3 3 6 6 6
41517+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
41518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41522+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41525+4 4 4 4 4 4
41526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41530+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41531+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
41532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41534+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41535+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41536+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41537+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41538+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41539+4 4 4 4 4 4
41540diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
41541index a40c05e..785c583 100644
41542--- a/drivers/video/udlfb.c
41543+++ b/drivers/video/udlfb.c
41544@@ -619,11 +619,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
41545 dlfb_urb_completion(urb);
41546
41547 error:
41548- atomic_add(bytes_sent, &dev->bytes_sent);
41549- atomic_add(bytes_identical, &dev->bytes_identical);
41550- atomic_add(width*height*2, &dev->bytes_rendered);
41551+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41552+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41553+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
41554 end_cycles = get_cycles();
41555- atomic_add(((unsigned int) ((end_cycles - start_cycles)
41556+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41557 >> 10)), /* Kcycles */
41558 &dev->cpu_kcycles_used);
41559
41560@@ -744,11 +744,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
41561 dlfb_urb_completion(urb);
41562
41563 error:
41564- atomic_add(bytes_sent, &dev->bytes_sent);
41565- atomic_add(bytes_identical, &dev->bytes_identical);
41566- atomic_add(bytes_rendered, &dev->bytes_rendered);
41567+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41568+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41569+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
41570 end_cycles = get_cycles();
41571- atomic_add(((unsigned int) ((end_cycles - start_cycles)
41572+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41573 >> 10)), /* Kcycles */
41574 &dev->cpu_kcycles_used);
41575 }
41576@@ -1368,7 +1368,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
41577 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41578 struct dlfb_data *dev = fb_info->par;
41579 return snprintf(buf, PAGE_SIZE, "%u\n",
41580- atomic_read(&dev->bytes_rendered));
41581+ atomic_read_unchecked(&dev->bytes_rendered));
41582 }
41583
41584 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41585@@ -1376,7 +1376,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41586 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41587 struct dlfb_data *dev = fb_info->par;
41588 return snprintf(buf, PAGE_SIZE, "%u\n",
41589- atomic_read(&dev->bytes_identical));
41590+ atomic_read_unchecked(&dev->bytes_identical));
41591 }
41592
41593 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41594@@ -1384,7 +1384,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41595 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41596 struct dlfb_data *dev = fb_info->par;
41597 return snprintf(buf, PAGE_SIZE, "%u\n",
41598- atomic_read(&dev->bytes_sent));
41599+ atomic_read_unchecked(&dev->bytes_sent));
41600 }
41601
41602 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41603@@ -1392,7 +1392,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41604 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41605 struct dlfb_data *dev = fb_info->par;
41606 return snprintf(buf, PAGE_SIZE, "%u\n",
41607- atomic_read(&dev->cpu_kcycles_used));
41608+ atomic_read_unchecked(&dev->cpu_kcycles_used));
41609 }
41610
41611 static ssize_t edid_show(
41612@@ -1449,10 +1449,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
41613 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41614 struct dlfb_data *dev = fb_info->par;
41615
41616- atomic_set(&dev->bytes_rendered, 0);
41617- atomic_set(&dev->bytes_identical, 0);
41618- atomic_set(&dev->bytes_sent, 0);
41619- atomic_set(&dev->cpu_kcycles_used, 0);
41620+ atomic_set_unchecked(&dev->bytes_rendered, 0);
41621+ atomic_set_unchecked(&dev->bytes_identical, 0);
41622+ atomic_set_unchecked(&dev->bytes_sent, 0);
41623+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
41624
41625 return count;
41626 }
41627diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
41628index 8408543..357841c 100644
41629--- a/drivers/video/uvesafb.c
41630+++ b/drivers/video/uvesafb.c
41631@@ -19,6 +19,7 @@
41632 #include <linux/io.h>
41633 #include <linux/mutex.h>
41634 #include <linux/slab.h>
41635+#include <linux/moduleloader.h>
41636 #include <video/edid.h>
41637 #include <video/uvesafb.h>
41638 #ifdef CONFIG_X86
41639@@ -121,7 +122,7 @@ static int uvesafb_helper_start(void)
41640 NULL,
41641 };
41642
41643- return call_usermodehelper(v86d_path, argv, envp, 1);
41644+ return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
41645 }
41646
41647 /*
41648@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
41649 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
41650 par->pmi_setpal = par->ypan = 0;
41651 } else {
41652+
41653+#ifdef CONFIG_PAX_KERNEXEC
41654+#ifdef CONFIG_MODULES
41655+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
41656+#endif
41657+ if (!par->pmi_code) {
41658+ par->pmi_setpal = par->ypan = 0;
41659+ return 0;
41660+ }
41661+#endif
41662+
41663 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
41664 + task->t.regs.edi);
41665+
41666+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41667+ pax_open_kernel();
41668+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
41669+ pax_close_kernel();
41670+
41671+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
41672+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
41673+#else
41674 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
41675 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
41676+#endif
41677+
41678 printk(KERN_INFO "uvesafb: protected mode interface info at "
41679 "%04x:%04x\n",
41680 (u16)task->t.regs.es, (u16)task->t.regs.edi);
41681@@ -816,13 +839,14 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
41682 par->ypan = ypan;
41683
41684 if (par->pmi_setpal || par->ypan) {
41685+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
41686 if (__supported_pte_mask & _PAGE_NX) {
41687 par->pmi_setpal = par->ypan = 0;
41688 printk(KERN_WARNING "uvesafb: NX protection is actively."
41689 "We have better not to use the PMI.\n");
41690- } else {
41691+ } else
41692+#endif
41693 uvesafb_vbe_getpmi(task, par);
41694- }
41695 }
41696 #else
41697 /* The protected mode interface is not available on non-x86. */
41698@@ -1828,6 +1852,11 @@ out:
41699 if (par->vbe_modes)
41700 kfree(par->vbe_modes);
41701
41702+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41703+ if (par->pmi_code)
41704+ module_free_exec(NULL, par->pmi_code);
41705+#endif
41706+
41707 framebuffer_release(info);
41708 return err;
41709 }
41710@@ -1854,6 +1883,12 @@ static int uvesafb_remove(struct platform_device *dev)
41711 kfree(par->vbe_state_orig);
41712 if (par->vbe_state_saved)
41713 kfree(par->vbe_state_saved);
41714+
41715+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41716+ if (par->pmi_code)
41717+ module_free_exec(NULL, par->pmi_code);
41718+#endif
41719+
41720 }
41721
41722 framebuffer_release(info);
41723diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
41724index 501b340..86bd4cf 100644
41725--- a/drivers/video/vesafb.c
41726+++ b/drivers/video/vesafb.c
41727@@ -9,6 +9,7 @@
41728 */
41729
41730 #include <linux/module.h>
41731+#include <linux/moduleloader.h>
41732 #include <linux/kernel.h>
41733 #include <linux/errno.h>
41734 #include <linux/string.h>
41735@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
41736 static int vram_total __initdata; /* Set total amount of memory */
41737 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
41738 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
41739-static void (*pmi_start)(void) __read_mostly;
41740-static void (*pmi_pal) (void) __read_mostly;
41741+static void (*pmi_start)(void) __read_only;
41742+static void (*pmi_pal) (void) __read_only;
41743 static int depth __read_mostly;
41744 static int vga_compat __read_mostly;
41745 /* --------------------------------------------------------------------- */
41746@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
41747 unsigned int size_vmode;
41748 unsigned int size_remap;
41749 unsigned int size_total;
41750+ void *pmi_code = NULL;
41751
41752 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
41753 return -ENODEV;
41754@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
41755 size_remap = size_total;
41756 vesafb_fix.smem_len = size_remap;
41757
41758-#ifndef __i386__
41759- screen_info.vesapm_seg = 0;
41760-#endif
41761-
41762 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
41763 printk(KERN_WARNING
41764 "vesafb: cannot reserve video memory at 0x%lx\n",
41765@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
41766 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
41767 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
41768
41769+#ifdef __i386__
41770+
41771+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41772+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
41773+ if (!pmi_code)
41774+#elif !defined(CONFIG_PAX_KERNEXEC)
41775+ if (0)
41776+#endif
41777+
41778+#endif
41779+ screen_info.vesapm_seg = 0;
41780+
41781 if (screen_info.vesapm_seg) {
41782- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
41783- screen_info.vesapm_seg,screen_info.vesapm_off);
41784+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
41785+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
41786 }
41787
41788 if (screen_info.vesapm_seg < 0xc000)
41789@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
41790
41791 if (ypan || pmi_setpal) {
41792 unsigned short *pmi_base;
41793+
41794 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
41795- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
41796- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
41797+
41798+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41799+ pax_open_kernel();
41800+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
41801+#else
41802+ pmi_code = pmi_base;
41803+#endif
41804+
41805+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
41806+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
41807+
41808+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41809+ pmi_start = ktva_ktla(pmi_start);
41810+ pmi_pal = ktva_ktla(pmi_pal);
41811+ pax_close_kernel();
41812+#endif
41813+
41814 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
41815 if (pmi_base[3]) {
41816 printk(KERN_INFO "vesafb: pmi: ports = ");
41817@@ -488,6 +514,11 @@ static int __init vesafb_probe(struct platform_device *dev)
41818 info->node, info->fix.id);
41819 return 0;
41820 err:
41821+
41822+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41823+ module_free_exec(NULL, pmi_code);
41824+#endif
41825+
41826 if (info->screen_base)
41827 iounmap(info->screen_base);
41828 framebuffer_release(info);
41829diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
41830index 88714ae..16c2e11 100644
41831--- a/drivers/video/via/via_clock.h
41832+++ b/drivers/video/via/via_clock.h
41833@@ -56,7 +56,7 @@ struct via_clock {
41834
41835 void (*set_engine_pll_state)(u8 state);
41836 void (*set_engine_pll)(struct via_pll_config config);
41837-};
41838+} __no_const;
41839
41840
41841 static inline u32 get_pll_internal_frequency(u32 ref_freq,
41842diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
41843index e56c934..fc22f4b 100644
41844--- a/drivers/xen/xen-pciback/conf_space.h
41845+++ b/drivers/xen/xen-pciback/conf_space.h
41846@@ -44,15 +44,15 @@ struct config_field {
41847 struct {
41848 conf_dword_write write;
41849 conf_dword_read read;
41850- } dw;
41851+ } __no_const dw;
41852 struct {
41853 conf_word_write write;
41854 conf_word_read read;
41855- } w;
41856+ } __no_const w;
41857 struct {
41858 conf_byte_write write;
41859 conf_byte_read read;
41860- } b;
41861+ } __no_const b;
41862 } u;
41863 struct list_head list;
41864 };
41865diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
41866index 014c8dd..6f3dfe6 100644
41867--- a/fs/9p/vfs_inode.c
41868+++ b/fs/9p/vfs_inode.c
41869@@ -1303,7 +1303,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
41870 void
41871 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
41872 {
41873- char *s = nd_get_link(nd);
41874+ const char *s = nd_get_link(nd);
41875
41876 p9_debug(P9_DEBUG_VFS, " %s %s\n",
41877 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
41878diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
41879index e95d1b6..3454244 100644
41880--- a/fs/Kconfig.binfmt
41881+++ b/fs/Kconfig.binfmt
41882@@ -89,7 +89,7 @@ config HAVE_AOUT
41883
41884 config BINFMT_AOUT
41885 tristate "Kernel support for a.out and ECOFF binaries"
41886- depends on HAVE_AOUT
41887+ depends on HAVE_AOUT && BROKEN
41888 ---help---
41889 A.out (Assembler.OUTput) is a set of formats for libraries and
41890 executables used in the earliest versions of UNIX. Linux used
41891diff --git a/fs/aio.c b/fs/aio.c
41892index b9d64d8..86cb1d5 100644
41893--- a/fs/aio.c
41894+++ b/fs/aio.c
41895@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx *ctx)
41896 size += sizeof(struct io_event) * nr_events;
41897 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
41898
41899- if (nr_pages < 0)
41900+ if (nr_pages <= 0)
41901 return -EINVAL;
41902
41903 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
41904@@ -1461,22 +1461,27 @@ static ssize_t aio_fsync(struct kiocb *iocb)
41905 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
41906 {
41907 ssize_t ret;
41908+ struct iovec iovstack;
41909
41910 #ifdef CONFIG_COMPAT
41911 if (compat)
41912 ret = compat_rw_copy_check_uvector(type,
41913 (struct compat_iovec __user *)kiocb->ki_buf,
41914- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
41915+ kiocb->ki_nbytes, 1, &iovstack,
41916 &kiocb->ki_iovec, 1);
41917 else
41918 #endif
41919 ret = rw_copy_check_uvector(type,
41920 (struct iovec __user *)kiocb->ki_buf,
41921- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
41922+ kiocb->ki_nbytes, 1, &iovstack,
41923 &kiocb->ki_iovec, 1);
41924 if (ret < 0)
41925 goto out;
41926
41927+ if (kiocb->ki_iovec == &iovstack) {
41928+ kiocb->ki_inline_vec = iovstack;
41929+ kiocb->ki_iovec = &kiocb->ki_inline_vec;
41930+ }
41931 kiocb->ki_nr_segs = kiocb->ki_nbytes;
41932 kiocb->ki_cur_seg = 0;
41933 /* ki_nbytes/left now reflect bytes instead of segs */
41934diff --git a/fs/attr.c b/fs/attr.c
41935index 95053ad..2cc93ca 100644
41936--- a/fs/attr.c
41937+++ b/fs/attr.c
41938@@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
41939 unsigned long limit;
41940
41941 limit = rlimit(RLIMIT_FSIZE);
41942+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
41943 if (limit != RLIM_INFINITY && offset > limit)
41944 goto out_sig;
41945 if (offset > inode->i_sb->s_maxbytes)
41946diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
41947index 9c098db..c755da5 100644
41948--- a/fs/autofs4/waitq.c
41949+++ b/fs/autofs4/waitq.c
41950@@ -61,7 +61,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
41951 {
41952 unsigned long sigpipe, flags;
41953 mm_segment_t fs;
41954- const char *data = (const char *)addr;
41955+ const char __user *data = (const char __force_user *)addr;
41956 ssize_t wr = 0;
41957
41958 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
41959diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
41960index 6e6d536..457113a 100644
41961--- a/fs/befs/linuxvfs.c
41962+++ b/fs/befs/linuxvfs.c
41963@@ -502,7 +502,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
41964 {
41965 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
41966 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
41967- char *link = nd_get_link(nd);
41968+ const char *link = nd_get_link(nd);
41969 if (!IS_ERR(link))
41970 kfree(link);
41971 }
41972diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
41973index 1ff9405..f1e376a 100644
41974--- a/fs/binfmt_aout.c
41975+++ b/fs/binfmt_aout.c
41976@@ -16,6 +16,7 @@
41977 #include <linux/string.h>
41978 #include <linux/fs.h>
41979 #include <linux/file.h>
41980+#include <linux/security.h>
41981 #include <linux/stat.h>
41982 #include <linux/fcntl.h>
41983 #include <linux/ptrace.h>
41984@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm)
41985 #endif
41986 # define START_STACK(u) ((void __user *)u.start_stack)
41987
41988+ memset(&dump, 0, sizeof(dump));
41989+
41990 fs = get_fs();
41991 set_fs(KERNEL_DS);
41992 has_dumped = 1;
41993@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredump_params *cprm)
41994
41995 /* If the size of the dump file exceeds the rlimit, then see what would happen
41996 if we wrote the stack, but not the data area. */
41997+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
41998 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
41999 dump.u_dsize = 0;
42000
42001 /* Make sure we have enough room to write the stack and data areas. */
42002+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
42003 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
42004 dump.u_ssize = 0;
42005
42006@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42007 rlim = rlimit(RLIMIT_DATA);
42008 if (rlim >= RLIM_INFINITY)
42009 rlim = ~0;
42010+
42011+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
42012 if (ex.a_data + ex.a_bss > rlim)
42013 return -ENOMEM;
42014
42015@@ -269,6 +276,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42016 install_exec_creds(bprm);
42017 current->flags &= ~PF_FORKNOEXEC;
42018
42019+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42020+ current->mm->pax_flags = 0UL;
42021+#endif
42022+
42023+#ifdef CONFIG_PAX_PAGEEXEC
42024+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
42025+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
42026+
42027+#ifdef CONFIG_PAX_EMUTRAMP
42028+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
42029+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
42030+#endif
42031+
42032+#ifdef CONFIG_PAX_MPROTECT
42033+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
42034+ current->mm->pax_flags |= MF_PAX_MPROTECT;
42035+#endif
42036+
42037+ }
42038+#endif
42039+
42040 if (N_MAGIC(ex) == OMAGIC) {
42041 unsigned long text_addr, map_size;
42042 loff_t pos;
42043@@ -341,7 +369,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42044
42045 down_write(&current->mm->mmap_sem);
42046 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
42047- PROT_READ | PROT_WRITE | PROT_EXEC,
42048+ PROT_READ | PROT_WRITE,
42049 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
42050 fd_offset + ex.a_text);
42051 up_write(&current->mm->mmap_sem);
42052diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
42053index 07d096c..851a18b 100644
42054--- a/fs/binfmt_elf.c
42055+++ b/fs/binfmt_elf.c
42056@@ -32,6 +32,7 @@
42057 #include <linux/elf.h>
42058 #include <linux/utsname.h>
42059 #include <linux/coredump.h>
42060+#include <linux/xattr.h>
42061 #include <asm/uaccess.h>
42062 #include <asm/param.h>
42063 #include <asm/page.h>
42064@@ -51,6 +52,10 @@ static int elf_core_dump(struct coredump_params *cprm);
42065 #define elf_core_dump NULL
42066 #endif
42067
42068+#ifdef CONFIG_PAX_MPROTECT
42069+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
42070+#endif
42071+
42072 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
42073 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
42074 #else
42075@@ -70,6 +75,11 @@ static struct linux_binfmt elf_format = {
42076 .load_binary = load_elf_binary,
42077 .load_shlib = load_elf_library,
42078 .core_dump = elf_core_dump,
42079+
42080+#ifdef CONFIG_PAX_MPROTECT
42081+ .handle_mprotect= elf_handle_mprotect,
42082+#endif
42083+
42084 .min_coredump = ELF_EXEC_PAGESIZE,
42085 };
42086
42087@@ -77,6 +87,8 @@ static struct linux_binfmt elf_format = {
42088
42089 static int set_brk(unsigned long start, unsigned long end)
42090 {
42091+ unsigned long e = end;
42092+
42093 start = ELF_PAGEALIGN(start);
42094 end = ELF_PAGEALIGN(end);
42095 if (end > start) {
42096@@ -87,7 +99,7 @@ static int set_brk(unsigned long start, unsigned long end)
42097 if (BAD_ADDR(addr))
42098 return addr;
42099 }
42100- current->mm->start_brk = current->mm->brk = end;
42101+ current->mm->start_brk = current->mm->brk = e;
42102 return 0;
42103 }
42104
42105@@ -148,12 +160,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42106 elf_addr_t __user *u_rand_bytes;
42107 const char *k_platform = ELF_PLATFORM;
42108 const char *k_base_platform = ELF_BASE_PLATFORM;
42109- unsigned char k_rand_bytes[16];
42110+ u32 k_rand_bytes[4];
42111 int items;
42112 elf_addr_t *elf_info;
42113 int ei_index = 0;
42114 const struct cred *cred = current_cred();
42115 struct vm_area_struct *vma;
42116+ unsigned long saved_auxv[AT_VECTOR_SIZE];
42117
42118 /*
42119 * In some cases (e.g. Hyper-Threading), we want to avoid L1
42120@@ -195,8 +208,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42121 * Generate 16 random bytes for userspace PRNG seeding.
42122 */
42123 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
42124- u_rand_bytes = (elf_addr_t __user *)
42125- STACK_ALLOC(p, sizeof(k_rand_bytes));
42126+ srandom32(k_rand_bytes[0] ^ random32());
42127+ srandom32(k_rand_bytes[1] ^ random32());
42128+ srandom32(k_rand_bytes[2] ^ random32());
42129+ srandom32(k_rand_bytes[3] ^ random32());
42130+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
42131+ u_rand_bytes = (elf_addr_t __user *) p;
42132 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
42133 return -EFAULT;
42134
42135@@ -308,9 +325,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42136 return -EFAULT;
42137 current->mm->env_end = p;
42138
42139+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
42140+
42141 /* Put the elf_info on the stack in the right place. */
42142 sp = (elf_addr_t __user *)envp + 1;
42143- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
42144+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
42145 return -EFAULT;
42146 return 0;
42147 }
42148@@ -381,10 +400,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42149 {
42150 struct elf_phdr *elf_phdata;
42151 struct elf_phdr *eppnt;
42152- unsigned long load_addr = 0;
42153+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
42154 int load_addr_set = 0;
42155 unsigned long last_bss = 0, elf_bss = 0;
42156- unsigned long error = ~0UL;
42157+ unsigned long error = -EINVAL;
42158 unsigned long total_size;
42159 int retval, i, size;
42160
42161@@ -430,6 +449,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42162 goto out_close;
42163 }
42164
42165+#ifdef CONFIG_PAX_SEGMEXEC
42166+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
42167+ pax_task_size = SEGMEXEC_TASK_SIZE;
42168+#endif
42169+
42170 eppnt = elf_phdata;
42171 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
42172 if (eppnt->p_type == PT_LOAD) {
42173@@ -473,8 +497,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42174 k = load_addr + eppnt->p_vaddr;
42175 if (BAD_ADDR(k) ||
42176 eppnt->p_filesz > eppnt->p_memsz ||
42177- eppnt->p_memsz > TASK_SIZE ||
42178- TASK_SIZE - eppnt->p_memsz < k) {
42179+ eppnt->p_memsz > pax_task_size ||
42180+ pax_task_size - eppnt->p_memsz < k) {
42181 error = -ENOMEM;
42182 goto out_close;
42183 }
42184@@ -528,6 +552,351 @@ out:
42185 return error;
42186 }
42187
42188+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
42189+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
42190+{
42191+ unsigned long pax_flags = 0UL;
42192+
42193+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42194+
42195+#ifdef CONFIG_PAX_PAGEEXEC
42196+ if (elf_phdata->p_flags & PF_PAGEEXEC)
42197+ pax_flags |= MF_PAX_PAGEEXEC;
42198+#endif
42199+
42200+#ifdef CONFIG_PAX_SEGMEXEC
42201+ if (elf_phdata->p_flags & PF_SEGMEXEC)
42202+ pax_flags |= MF_PAX_SEGMEXEC;
42203+#endif
42204+
42205+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42206+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42207+ if ((__supported_pte_mask & _PAGE_NX))
42208+ pax_flags &= ~MF_PAX_SEGMEXEC;
42209+ else
42210+ pax_flags &= ~MF_PAX_PAGEEXEC;
42211+ }
42212+#endif
42213+
42214+#ifdef CONFIG_PAX_EMUTRAMP
42215+ if (elf_phdata->p_flags & PF_EMUTRAMP)
42216+ pax_flags |= MF_PAX_EMUTRAMP;
42217+#endif
42218+
42219+#ifdef CONFIG_PAX_MPROTECT
42220+ if (elf_phdata->p_flags & PF_MPROTECT)
42221+ pax_flags |= MF_PAX_MPROTECT;
42222+#endif
42223+
42224+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42225+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
42226+ pax_flags |= MF_PAX_RANDMMAP;
42227+#endif
42228+
42229+#endif
42230+
42231+ return pax_flags;
42232+}
42233+
42234+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
42235+{
42236+ unsigned long pax_flags = 0UL;
42237+
42238+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42239+
42240+#ifdef CONFIG_PAX_PAGEEXEC
42241+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
42242+ pax_flags |= MF_PAX_PAGEEXEC;
42243+#endif
42244+
42245+#ifdef CONFIG_PAX_SEGMEXEC
42246+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
42247+ pax_flags |= MF_PAX_SEGMEXEC;
42248+#endif
42249+
42250+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42251+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42252+ if ((__supported_pte_mask & _PAGE_NX))
42253+ pax_flags &= ~MF_PAX_SEGMEXEC;
42254+ else
42255+ pax_flags &= ~MF_PAX_PAGEEXEC;
42256+ }
42257+#endif
42258+
42259+#ifdef CONFIG_PAX_EMUTRAMP
42260+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
42261+ pax_flags |= MF_PAX_EMUTRAMP;
42262+#endif
42263+
42264+#ifdef CONFIG_PAX_MPROTECT
42265+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
42266+ pax_flags |= MF_PAX_MPROTECT;
42267+#endif
42268+
42269+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42270+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
42271+ pax_flags |= MF_PAX_RANDMMAP;
42272+#endif
42273+
42274+#endif
42275+
42276+ return pax_flags;
42277+}
42278+
42279+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
42280+{
42281+ unsigned long pax_flags = 0UL;
42282+
42283+#ifdef CONFIG_PAX_EI_PAX
42284+
42285+#ifdef CONFIG_PAX_PAGEEXEC
42286+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
42287+ pax_flags |= MF_PAX_PAGEEXEC;
42288+#endif
42289+
42290+#ifdef CONFIG_PAX_SEGMEXEC
42291+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
42292+ pax_flags |= MF_PAX_SEGMEXEC;
42293+#endif
42294+
42295+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42296+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42297+ if ((__supported_pte_mask & _PAGE_NX))
42298+ pax_flags &= ~MF_PAX_SEGMEXEC;
42299+ else
42300+ pax_flags &= ~MF_PAX_PAGEEXEC;
42301+ }
42302+#endif
42303+
42304+#ifdef CONFIG_PAX_EMUTRAMP
42305+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
42306+ pax_flags |= MF_PAX_EMUTRAMP;
42307+#endif
42308+
42309+#ifdef CONFIG_PAX_MPROTECT
42310+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
42311+ pax_flags |= MF_PAX_MPROTECT;
42312+#endif
42313+
42314+#ifdef CONFIG_PAX_ASLR
42315+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
42316+ pax_flags |= MF_PAX_RANDMMAP;
42317+#endif
42318+
42319+#else
42320+
42321+#ifdef CONFIG_PAX_PAGEEXEC
42322+ pax_flags |= MF_PAX_PAGEEXEC;
42323+#endif
42324+
42325+#ifdef CONFIG_PAX_MPROTECT
42326+ pax_flags |= MF_PAX_MPROTECT;
42327+#endif
42328+
42329+#ifdef CONFIG_PAX_RANDMMAP
42330+ pax_flags |= MF_PAX_RANDMMAP;
42331+#endif
42332+
42333+#ifdef CONFIG_PAX_SEGMEXEC
42334+ if (!(pax_flags & MF_PAX_PAGEEXEC) || !(__supported_pte_mask & _PAGE_NX)) {
42335+ pax_flags &= ~MF_PAX_PAGEEXEC;
42336+ pax_flags |= MF_PAX_SEGMEXEC;
42337+ }
42338+#endif
42339+
42340+#endif
42341+
42342+ return pax_flags;
42343+}
42344+
42345+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
42346+{
42347+
42348+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42349+ unsigned long i;
42350+
42351+ for (i = 0UL; i < elf_ex->e_phnum; i++)
42352+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
42353+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
42354+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
42355+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
42356+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
42357+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
42358+ return ~0UL;
42359+
42360+#ifdef CONFIG_PAX_SOFTMODE
42361+ if (pax_softmode)
42362+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
42363+ else
42364+#endif
42365+
42366+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
42367+ break;
42368+ }
42369+#endif
42370+
42371+ return ~0UL;
42372+}
42373+
42374+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42375+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
42376+{
42377+ unsigned long pax_flags = 0UL;
42378+
42379+#ifdef CONFIG_PAX_PAGEEXEC
42380+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
42381+ pax_flags |= MF_PAX_PAGEEXEC;
42382+#endif
42383+
42384+#ifdef CONFIG_PAX_SEGMEXEC
42385+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
42386+ pax_flags |= MF_PAX_SEGMEXEC;
42387+#endif
42388+
42389+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42390+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42391+ if ((__supported_pte_mask & _PAGE_NX))
42392+ pax_flags &= ~MF_PAX_SEGMEXEC;
42393+ else
42394+ pax_flags &= ~MF_PAX_PAGEEXEC;
42395+ }
42396+#endif
42397+
42398+#ifdef CONFIG_PAX_EMUTRAMP
42399+ if (pax_flags_softmode & MF_PAX_EMUTRAMP)
42400+ pax_flags |= MF_PAX_EMUTRAMP;
42401+#endif
42402+
42403+#ifdef CONFIG_PAX_MPROTECT
42404+ if (pax_flags_softmode & MF_PAX_MPROTECT)
42405+ pax_flags |= MF_PAX_MPROTECT;
42406+#endif
42407+
42408+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42409+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
42410+ pax_flags |= MF_PAX_RANDMMAP;
42411+#endif
42412+
42413+ return pax_flags;
42414+}
42415+
42416+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
42417+{
42418+ unsigned long pax_flags = 0UL;
42419+
42420+#ifdef CONFIG_PAX_PAGEEXEC
42421+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
42422+ pax_flags |= MF_PAX_PAGEEXEC;
42423+#endif
42424+
42425+#ifdef CONFIG_PAX_SEGMEXEC
42426+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
42427+ pax_flags |= MF_PAX_SEGMEXEC;
42428+#endif
42429+
42430+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42431+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42432+ if ((__supported_pte_mask & _PAGE_NX))
42433+ pax_flags &= ~MF_PAX_SEGMEXEC;
42434+ else
42435+ pax_flags &= ~MF_PAX_PAGEEXEC;
42436+ }
42437+#endif
42438+
42439+#ifdef CONFIG_PAX_EMUTRAMP
42440+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
42441+ pax_flags |= MF_PAX_EMUTRAMP;
42442+#endif
42443+
42444+#ifdef CONFIG_PAX_MPROTECT
42445+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
42446+ pax_flags |= MF_PAX_MPROTECT;
42447+#endif
42448+
42449+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42450+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
42451+ pax_flags |= MF_PAX_RANDMMAP;
42452+#endif
42453+
42454+ return pax_flags;
42455+}
42456+#endif
42457+
42458+static unsigned long pax_parse_xattr_pax(struct file * const file)
42459+{
42460+
42461+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42462+ ssize_t xattr_size, i;
42463+ unsigned char xattr_value[5];
42464+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
42465+
42466+ xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
42467+ if (xattr_size <= 0)
42468+ return ~0UL;
42469+
42470+ for (i = 0; i < xattr_size; i++)
42471+ switch (xattr_value[i]) {
42472+ default:
42473+ return ~0UL;
42474+
42475+#define parse_flag(option1, option2, flag) \
42476+ case option1: \
42477+ pax_flags_hardmode |= MF_PAX_##flag; \
42478+ break; \
42479+ case option2: \
42480+ pax_flags_softmode |= MF_PAX_##flag; \
42481+ break;
42482+
42483+ parse_flag('p', 'P', PAGEEXEC);
42484+ parse_flag('e', 'E', EMUTRAMP);
42485+ parse_flag('m', 'M', MPROTECT);
42486+ parse_flag('r', 'R', RANDMMAP);
42487+ parse_flag('s', 'S', SEGMEXEC);
42488+
42489+#undef parse_flag
42490+ }
42491+
42492+ if (pax_flags_hardmode & pax_flags_softmode)
42493+ return ~0UL;
42494+
42495+#ifdef CONFIG_PAX_SOFTMODE
42496+ if (pax_softmode)
42497+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
42498+ else
42499+#endif
42500+
42501+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
42502+#else
42503+ return ~0UL;
42504+#endif
42505+
42506+}
42507+
42508+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
42509+{
42510+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
42511+
42512+ pax_flags = pax_parse_ei_pax(elf_ex);
42513+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
42514+ xattr_pax_flags = pax_parse_xattr_pax(file);
42515+
42516+ if (pt_pax_flags == ~0UL)
42517+ pt_pax_flags = xattr_pax_flags;
42518+ else if (xattr_pax_flags == ~0UL)
42519+ xattr_pax_flags = pt_pax_flags;
42520+ if (pt_pax_flags != xattr_pax_flags)
42521+ return -EINVAL;
42522+ if (pt_pax_flags != ~0UL)
42523+ pax_flags = pt_pax_flags;
42524+
42525+ if (0 > pax_check_flags(&pax_flags))
42526+ return -EINVAL;
42527+
42528+ current->mm->pax_flags = pax_flags;
42529+ return 0;
42530+}
42531+#endif
42532+
42533 /*
42534 * These are the functions used to load ELF style executables and shared
42535 * libraries. There is no binary dependent code anywhere else.
42536@@ -544,6 +913,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
42537 {
42538 unsigned int random_variable = 0;
42539
42540+#ifdef CONFIG_PAX_RANDUSTACK
42541+ if (randomize_va_space)
42542+ return stack_top - current->mm->delta_stack;
42543+#endif
42544+
42545 if ((current->flags & PF_RANDOMIZE) &&
42546 !(current->personality & ADDR_NO_RANDOMIZE)) {
42547 random_variable = get_random_int() & STACK_RND_MASK;
42548@@ -562,7 +936,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42549 unsigned long load_addr = 0, load_bias = 0;
42550 int load_addr_set = 0;
42551 char * elf_interpreter = NULL;
42552- unsigned long error;
42553+ unsigned long error = 0;
42554 struct elf_phdr *elf_ppnt, *elf_phdata;
42555 unsigned long elf_bss, elf_brk;
42556 int retval, i;
42557@@ -572,11 +946,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42558 unsigned long start_code, end_code, start_data, end_data;
42559 unsigned long reloc_func_desc __maybe_unused = 0;
42560 int executable_stack = EXSTACK_DEFAULT;
42561- unsigned long def_flags = 0;
42562 struct {
42563 struct elfhdr elf_ex;
42564 struct elfhdr interp_elf_ex;
42565 } *loc;
42566+ unsigned long pax_task_size = TASK_SIZE;
42567
42568 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
42569 if (!loc) {
42570@@ -713,11 +1087,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42571
42572 /* OK, This is the point of no return */
42573 current->flags &= ~PF_FORKNOEXEC;
42574- current->mm->def_flags = def_flags;
42575+
42576+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42577+ current->mm->pax_flags = 0UL;
42578+#endif
42579+
42580+#ifdef CONFIG_PAX_DLRESOLVE
42581+ current->mm->call_dl_resolve = 0UL;
42582+#endif
42583+
42584+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
42585+ current->mm->call_syscall = 0UL;
42586+#endif
42587+
42588+#ifdef CONFIG_PAX_ASLR
42589+ current->mm->delta_mmap = 0UL;
42590+ current->mm->delta_stack = 0UL;
42591+#endif
42592+
42593+ current->mm->def_flags = 0;
42594+
42595+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
42596+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
42597+ send_sig(SIGKILL, current, 0);
42598+ goto out_free_dentry;
42599+ }
42600+#endif
42601+
42602+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
42603+ pax_set_initial_flags(bprm);
42604+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
42605+ if (pax_set_initial_flags_func)
42606+ (pax_set_initial_flags_func)(bprm);
42607+#endif
42608+
42609+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
42610+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
42611+ current->mm->context.user_cs_limit = PAGE_SIZE;
42612+ current->mm->def_flags |= VM_PAGEEXEC;
42613+ }
42614+#endif
42615+
42616+#ifdef CONFIG_PAX_SEGMEXEC
42617+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
42618+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
42619+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
42620+ pax_task_size = SEGMEXEC_TASK_SIZE;
42621+ current->mm->def_flags |= VM_NOHUGEPAGE;
42622+ }
42623+#endif
42624+
42625+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
42626+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42627+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
42628+ put_cpu();
42629+ }
42630+#endif
42631
42632 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
42633 may depend on the personality. */
42634 SET_PERSONALITY(loc->elf_ex);
42635+
42636+#ifdef CONFIG_PAX_ASLR
42637+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
42638+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
42639+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
42640+ }
42641+#endif
42642+
42643+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
42644+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42645+ executable_stack = EXSTACK_DISABLE_X;
42646+ current->personality &= ~READ_IMPLIES_EXEC;
42647+ } else
42648+#endif
42649+
42650 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
42651 current->personality |= READ_IMPLIES_EXEC;
42652
42653@@ -808,6 +1252,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42654 #else
42655 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
42656 #endif
42657+
42658+#ifdef CONFIG_PAX_RANDMMAP
42659+ /* PaX: randomize base address at the default exe base if requested */
42660+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
42661+#ifdef CONFIG_SPARC64
42662+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
42663+#else
42664+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
42665+#endif
42666+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
42667+ elf_flags |= MAP_FIXED;
42668+ }
42669+#endif
42670+
42671 }
42672
42673 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
42674@@ -840,9 +1298,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42675 * allowed task size. Note that p_filesz must always be
42676 * <= p_memsz so it is only necessary to check p_memsz.
42677 */
42678- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
42679- elf_ppnt->p_memsz > TASK_SIZE ||
42680- TASK_SIZE - elf_ppnt->p_memsz < k) {
42681+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
42682+ elf_ppnt->p_memsz > pax_task_size ||
42683+ pax_task_size - elf_ppnt->p_memsz < k) {
42684 /* set_brk can never work. Avoid overflows. */
42685 send_sig(SIGKILL, current, 0);
42686 retval = -EINVAL;
42687@@ -881,11 +1339,36 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42688 goto out_free_dentry;
42689 }
42690 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
42691- send_sig(SIGSEGV, current, 0);
42692- retval = -EFAULT; /* Nobody gets to see this, but.. */
42693- goto out_free_dentry;
42694+ /*
42695+ * This bss-zeroing can fail if the ELF
42696+ * file specifies odd protections. So
42697+ * we don't check the return value
42698+ */
42699 }
42700
42701+#ifdef CONFIG_PAX_RANDMMAP
42702+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
42703+ unsigned long start, size;
42704+
42705+ start = ELF_PAGEALIGN(elf_brk);
42706+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
42707+ down_write(&current->mm->mmap_sem);
42708+ retval = -ENOMEM;
42709+ if (!find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
42710+ current->mm->brk_gap = PAGE_ALIGN(size) >> PAGE_SHIFT;
42711+ start = do_mmap(NULL, start, size, PROT_NONE, MAP_ANONYMOUS | MAP_FIXED | MAP_PRIVATE, 0);
42712+ retval = IS_ERR_VALUE(start) ? start : 0;
42713+ }
42714+ up_write(&current->mm->mmap_sem);
42715+ if (retval == 0)
42716+ retval = set_brk(start + size, start + size + PAGE_SIZE);
42717+ if (retval < 0) {
42718+ send_sig(SIGKILL, current, 0);
42719+ goto out_free_dentry;
42720+ }
42721+ }
42722+#endif
42723+
42724 if (elf_interpreter) {
42725 unsigned long uninitialized_var(interp_map_addr);
42726
42727@@ -1098,7 +1581,7 @@ out:
42728 * Decide what to dump of a segment, part, all or none.
42729 */
42730 static unsigned long vma_dump_size(struct vm_area_struct *vma,
42731- unsigned long mm_flags)
42732+ unsigned long mm_flags, long signr)
42733 {
42734 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
42735
42736@@ -1132,7 +1615,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
42737 if (vma->vm_file == NULL)
42738 return 0;
42739
42740- if (FILTER(MAPPED_PRIVATE))
42741+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
42742 goto whole;
42743
42744 /*
42745@@ -1354,9 +1837,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
42746 {
42747 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
42748 int i = 0;
42749- do
42750+ do {
42751 i += 2;
42752- while (auxv[i - 2] != AT_NULL);
42753+ } while (auxv[i - 2] != AT_NULL);
42754 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
42755 }
42756
42757@@ -1862,14 +2345,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
42758 }
42759
42760 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
42761- unsigned long mm_flags)
42762+ struct coredump_params *cprm)
42763 {
42764 struct vm_area_struct *vma;
42765 size_t size = 0;
42766
42767 for (vma = first_vma(current, gate_vma); vma != NULL;
42768 vma = next_vma(vma, gate_vma))
42769- size += vma_dump_size(vma, mm_flags);
42770+ size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
42771 return size;
42772 }
42773
42774@@ -1963,7 +2446,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42775
42776 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
42777
42778- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
42779+ offset += elf_core_vma_data_size(gate_vma, cprm);
42780 offset += elf_core_extra_data_size();
42781 e_shoff = offset;
42782
42783@@ -1977,10 +2460,12 @@ static int elf_core_dump(struct coredump_params *cprm)
42784 offset = dataoff;
42785
42786 size += sizeof(*elf);
42787+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42788 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
42789 goto end_coredump;
42790
42791 size += sizeof(*phdr4note);
42792+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42793 if (size > cprm->limit
42794 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
42795 goto end_coredump;
42796@@ -1994,7 +2479,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42797 phdr.p_offset = offset;
42798 phdr.p_vaddr = vma->vm_start;
42799 phdr.p_paddr = 0;
42800- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
42801+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
42802 phdr.p_memsz = vma->vm_end - vma->vm_start;
42803 offset += phdr.p_filesz;
42804 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
42805@@ -2005,6 +2490,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42806 phdr.p_align = ELF_EXEC_PAGESIZE;
42807
42808 size += sizeof(phdr);
42809+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42810 if (size > cprm->limit
42811 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
42812 goto end_coredump;
42813@@ -2029,7 +2515,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42814 unsigned long addr;
42815 unsigned long end;
42816
42817- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
42818+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
42819
42820 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
42821 struct page *page;
42822@@ -2038,6 +2524,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42823 page = get_dump_page(addr);
42824 if (page) {
42825 void *kaddr = kmap(page);
42826+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
42827 stop = ((size += PAGE_SIZE) > cprm->limit) ||
42828 !dump_write(cprm->file, kaddr,
42829 PAGE_SIZE);
42830@@ -2055,6 +2542,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42831
42832 if (e_phnum == PN_XNUM) {
42833 size += sizeof(*shdr4extnum);
42834+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42835 if (size > cprm->limit
42836 || !dump_write(cprm->file, shdr4extnum,
42837 sizeof(*shdr4extnum)))
42838@@ -2075,6 +2563,97 @@ out:
42839
42840 #endif /* CONFIG_ELF_CORE */
42841
42842+#ifdef CONFIG_PAX_MPROTECT
42843+/* PaX: non-PIC ELF libraries need relocations on their executable segments
42844+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
42845+ * we'll remove VM_MAYWRITE for good on RELRO segments.
42846+ *
42847+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
42848+ * basis because we want to allow the common case and not the special ones.
42849+ */
42850+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
42851+{
42852+ struct elfhdr elf_h;
42853+ struct elf_phdr elf_p;
42854+ unsigned long i;
42855+ unsigned long oldflags;
42856+ bool is_textrel_rw, is_textrel_rx, is_relro;
42857+
42858+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
42859+ return;
42860+
42861+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
42862+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
42863+
42864+#ifdef CONFIG_PAX_ELFRELOCS
42865+ /* possible TEXTREL */
42866+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
42867+ 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);
42868+#else
42869+ is_textrel_rw = false;
42870+ is_textrel_rx = false;
42871+#endif
42872+
42873+ /* possible RELRO */
42874+ is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
42875+
42876+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
42877+ return;
42878+
42879+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
42880+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
42881+
42882+#ifdef CONFIG_PAX_ETEXECRELOCS
42883+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
42884+#else
42885+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
42886+#endif
42887+
42888+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
42889+ !elf_check_arch(&elf_h) ||
42890+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
42891+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
42892+ return;
42893+
42894+ for (i = 0UL; i < elf_h.e_phnum; i++) {
42895+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
42896+ return;
42897+ switch (elf_p.p_type) {
42898+ case PT_DYNAMIC:
42899+ if (!is_textrel_rw && !is_textrel_rx)
42900+ continue;
42901+ i = 0UL;
42902+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
42903+ elf_dyn dyn;
42904+
42905+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
42906+ return;
42907+ if (dyn.d_tag == DT_NULL)
42908+ return;
42909+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
42910+ gr_log_textrel(vma);
42911+ if (is_textrel_rw)
42912+ vma->vm_flags |= VM_MAYWRITE;
42913+ else
42914+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
42915+ vma->vm_flags &= ~VM_MAYWRITE;
42916+ return;
42917+ }
42918+ i++;
42919+ }
42920+ return;
42921+
42922+ case PT_GNU_RELRO:
42923+ if (!is_relro)
42924+ continue;
42925+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
42926+ vma->vm_flags &= ~VM_MAYWRITE;
42927+ return;
42928+ }
42929+ }
42930+}
42931+#endif
42932+
42933 static int __init init_elf_binfmt(void)
42934 {
42935 return register_binfmt(&elf_format);
42936diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
42937index 1bffbe0..c8c283e 100644
42938--- a/fs/binfmt_flat.c
42939+++ b/fs/binfmt_flat.c
42940@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm,
42941 realdatastart = (unsigned long) -ENOMEM;
42942 printk("Unable to allocate RAM for process data, errno %d\n",
42943 (int)-realdatastart);
42944+ down_write(&current->mm->mmap_sem);
42945 do_munmap(current->mm, textpos, text_len);
42946+ up_write(&current->mm->mmap_sem);
42947 ret = realdatastart;
42948 goto err;
42949 }
42950@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm,
42951 }
42952 if (IS_ERR_VALUE(result)) {
42953 printk("Unable to read data+bss, errno %d\n", (int)-result);
42954+ down_write(&current->mm->mmap_sem);
42955 do_munmap(current->mm, textpos, text_len);
42956 do_munmap(current->mm, realdatastart, len);
42957+ up_write(&current->mm->mmap_sem);
42958 ret = result;
42959 goto err;
42960 }
42961@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm,
42962 }
42963 if (IS_ERR_VALUE(result)) {
42964 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
42965+ down_write(&current->mm->mmap_sem);
42966 do_munmap(current->mm, textpos, text_len + data_len + extra +
42967 MAX_SHARED_LIBS * sizeof(unsigned long));
42968+ up_write(&current->mm->mmap_sem);
42969 ret = result;
42970 goto err;
42971 }
42972diff --git a/fs/bio.c b/fs/bio.c
42973index b980ecd..74800bf 100644
42974--- a/fs/bio.c
42975+++ b/fs/bio.c
42976@@ -833,7 +833,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
42977 /*
42978 * Overflow, abort
42979 */
42980- if (end < start)
42981+ if (end < start || end - start > INT_MAX - nr_pages)
42982 return ERR_PTR(-EINVAL);
42983
42984 nr_pages += end - start;
42985@@ -1229,7 +1229,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
42986 const int read = bio_data_dir(bio) == READ;
42987 struct bio_map_data *bmd = bio->bi_private;
42988 int i;
42989- char *p = bmd->sgvecs[0].iov_base;
42990+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
42991
42992 __bio_for_each_segment(bvec, bio, i, 0) {
42993 char *addr = page_address(bvec->bv_page);
42994diff --git a/fs/block_dev.c b/fs/block_dev.c
42995index 5e9f198..6bf9b1c 100644
42996--- a/fs/block_dev.c
42997+++ b/fs/block_dev.c
42998@@ -703,7 +703,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
42999 else if (bdev->bd_contains == bdev)
43000 return true; /* is a whole device which isn't held */
43001
43002- else if (whole->bd_holder == bd_may_claim)
43003+ else if (whole->bd_holder == (void *)bd_may_claim)
43004 return true; /* is a partition of a device that is being partitioned */
43005 else if (whole->bd_holder != NULL)
43006 return false; /* is a partition of a held device */
43007diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
43008index d986824..af1befd 100644
43009--- a/fs/btrfs/check-integrity.c
43010+++ b/fs/btrfs/check-integrity.c
43011@@ -157,7 +157,7 @@ struct btrfsic_block {
43012 union {
43013 bio_end_io_t *bio;
43014 bh_end_io_t *bh;
43015- } orig_bio_bh_end_io;
43016+ } __no_const orig_bio_bh_end_io;
43017 int submit_bio_bh_rw;
43018 u64 flush_gen; /* only valid if !never_written */
43019 };
43020diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
43021index 0639a55..7d9e07f 100644
43022--- a/fs/btrfs/ctree.c
43023+++ b/fs/btrfs/ctree.c
43024@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
43025 free_extent_buffer(buf);
43026 add_root_to_dirty_list(root);
43027 } else {
43028- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
43029- parent_start = parent->start;
43030- else
43031+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
43032+ if (parent)
43033+ parent_start = parent->start;
43034+ else
43035+ parent_start = 0;
43036+ } else
43037 parent_start = 0;
43038
43039 WARN_ON(trans->transid != btrfs_header_generation(parent));
43040diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
43041index 892b347..b3db246 100644
43042--- a/fs/btrfs/inode.c
43043+++ b/fs/btrfs/inode.c
43044@@ -6930,7 +6930,7 @@ fail:
43045 return -ENOMEM;
43046 }
43047
43048-static int btrfs_getattr(struct vfsmount *mnt,
43049+int btrfs_getattr(struct vfsmount *mnt,
43050 struct dentry *dentry, struct kstat *stat)
43051 {
43052 struct inode *inode = dentry->d_inode;
43053@@ -6944,6 +6944,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
43054 return 0;
43055 }
43056
43057+EXPORT_SYMBOL(btrfs_getattr);
43058+
43059+dev_t get_btrfs_dev_from_inode(struct inode *inode)
43060+{
43061+ return BTRFS_I(inode)->root->anon_dev;
43062+}
43063+EXPORT_SYMBOL(get_btrfs_dev_from_inode);
43064+
43065 /*
43066 * If a file is moved, it will inherit the cow and compression flags of the new
43067 * directory.
43068diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
43069index 1b36f19..5ac7360 100644
43070--- a/fs/btrfs/ioctl.c
43071+++ b/fs/btrfs/ioctl.c
43072@@ -2783,9 +2783,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43073 for (i = 0; i < num_types; i++) {
43074 struct btrfs_space_info *tmp;
43075
43076+ /* Don't copy in more than we allocated */
43077 if (!slot_count)
43078 break;
43079
43080+ slot_count--;
43081+
43082 info = NULL;
43083 rcu_read_lock();
43084 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
43085@@ -2807,15 +2810,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43086 memcpy(dest, &space, sizeof(space));
43087 dest++;
43088 space_args.total_spaces++;
43089- slot_count--;
43090 }
43091- if (!slot_count)
43092- break;
43093 }
43094 up_read(&info->groups_sem);
43095 }
43096
43097- user_dest = (struct btrfs_ioctl_space_info *)
43098+ user_dest = (struct btrfs_ioctl_space_info __user *)
43099 (arg + sizeof(struct btrfs_ioctl_space_args));
43100
43101 if (copy_to_user(user_dest, dest_orig, alloc_size))
43102diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
43103index 8c1aae2..1e46446 100644
43104--- a/fs/btrfs/relocation.c
43105+++ b/fs/btrfs/relocation.c
43106@@ -1244,7 +1244,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
43107 }
43108 spin_unlock(&rc->reloc_root_tree.lock);
43109
43110- BUG_ON((struct btrfs_root *)node->data != root);
43111+ BUG_ON(!node || (struct btrfs_root *)node->data != root);
43112
43113 if (!del) {
43114 spin_lock(&rc->reloc_root_tree.lock);
43115diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
43116index 622f469..e8d2d55 100644
43117--- a/fs/cachefiles/bind.c
43118+++ b/fs/cachefiles/bind.c
43119@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
43120 args);
43121
43122 /* start by checking things over */
43123- ASSERT(cache->fstop_percent >= 0 &&
43124- cache->fstop_percent < cache->fcull_percent &&
43125+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
43126 cache->fcull_percent < cache->frun_percent &&
43127 cache->frun_percent < 100);
43128
43129- ASSERT(cache->bstop_percent >= 0 &&
43130- cache->bstop_percent < cache->bcull_percent &&
43131+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
43132 cache->bcull_percent < cache->brun_percent &&
43133 cache->brun_percent < 100);
43134
43135diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
43136index 0a1467b..6a53245 100644
43137--- a/fs/cachefiles/daemon.c
43138+++ b/fs/cachefiles/daemon.c
43139@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
43140 if (n > buflen)
43141 return -EMSGSIZE;
43142
43143- if (copy_to_user(_buffer, buffer, n) != 0)
43144+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
43145 return -EFAULT;
43146
43147 return n;
43148@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
43149 if (test_bit(CACHEFILES_DEAD, &cache->flags))
43150 return -EIO;
43151
43152- if (datalen < 0 || datalen > PAGE_SIZE - 1)
43153+ if (datalen > PAGE_SIZE - 1)
43154 return -EOPNOTSUPP;
43155
43156 /* drag the command string into the kernel so we can parse it */
43157@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
43158 if (args[0] != '%' || args[1] != '\0')
43159 return -EINVAL;
43160
43161- if (fstop < 0 || fstop >= cache->fcull_percent)
43162+ if (fstop >= cache->fcull_percent)
43163 return cachefiles_daemon_range_error(cache, args);
43164
43165 cache->fstop_percent = fstop;
43166@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
43167 if (args[0] != '%' || args[1] != '\0')
43168 return -EINVAL;
43169
43170- if (bstop < 0 || bstop >= cache->bcull_percent)
43171+ if (bstop >= cache->bcull_percent)
43172 return cachefiles_daemon_range_error(cache, args);
43173
43174 cache->bstop_percent = bstop;
43175diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
43176index bd6bc1b..b627b53 100644
43177--- a/fs/cachefiles/internal.h
43178+++ b/fs/cachefiles/internal.h
43179@@ -57,7 +57,7 @@ struct cachefiles_cache {
43180 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
43181 struct rb_root active_nodes; /* active nodes (can't be culled) */
43182 rwlock_t active_lock; /* lock for active_nodes */
43183- atomic_t gravecounter; /* graveyard uniquifier */
43184+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
43185 unsigned frun_percent; /* when to stop culling (% files) */
43186 unsigned fcull_percent; /* when to start culling (% files) */
43187 unsigned fstop_percent; /* when to stop allocating (% files) */
43188@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
43189 * proc.c
43190 */
43191 #ifdef CONFIG_CACHEFILES_HISTOGRAM
43192-extern atomic_t cachefiles_lookup_histogram[HZ];
43193-extern atomic_t cachefiles_mkdir_histogram[HZ];
43194-extern atomic_t cachefiles_create_histogram[HZ];
43195+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43196+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43197+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
43198
43199 extern int __init cachefiles_proc_init(void);
43200 extern void cachefiles_proc_cleanup(void);
43201 static inline
43202-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
43203+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
43204 {
43205 unsigned long jif = jiffies - start_jif;
43206 if (jif >= HZ)
43207 jif = HZ - 1;
43208- atomic_inc(&histogram[jif]);
43209+ atomic_inc_unchecked(&histogram[jif]);
43210 }
43211
43212 #else
43213diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
43214index a0358c2..d6137f2 100644
43215--- a/fs/cachefiles/namei.c
43216+++ b/fs/cachefiles/namei.c
43217@@ -318,7 +318,7 @@ try_again:
43218 /* first step is to make up a grave dentry in the graveyard */
43219 sprintf(nbuffer, "%08x%08x",
43220 (uint32_t) get_seconds(),
43221- (uint32_t) atomic_inc_return(&cache->gravecounter));
43222+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
43223
43224 /* do the multiway lock magic */
43225 trap = lock_rename(cache->graveyard, dir);
43226diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
43227index eccd339..4c1d995 100644
43228--- a/fs/cachefiles/proc.c
43229+++ b/fs/cachefiles/proc.c
43230@@ -14,9 +14,9 @@
43231 #include <linux/seq_file.h>
43232 #include "internal.h"
43233
43234-atomic_t cachefiles_lookup_histogram[HZ];
43235-atomic_t cachefiles_mkdir_histogram[HZ];
43236-atomic_t cachefiles_create_histogram[HZ];
43237+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43238+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43239+atomic_unchecked_t cachefiles_create_histogram[HZ];
43240
43241 /*
43242 * display the latency histogram
43243@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
43244 return 0;
43245 default:
43246 index = (unsigned long) v - 3;
43247- x = atomic_read(&cachefiles_lookup_histogram[index]);
43248- y = atomic_read(&cachefiles_mkdir_histogram[index]);
43249- z = atomic_read(&cachefiles_create_histogram[index]);
43250+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
43251+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
43252+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
43253 if (x == 0 && y == 0 && z == 0)
43254 return 0;
43255
43256diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
43257index 0e3c092..818480e 100644
43258--- a/fs/cachefiles/rdwr.c
43259+++ b/fs/cachefiles/rdwr.c
43260@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
43261 old_fs = get_fs();
43262 set_fs(KERNEL_DS);
43263 ret = file->f_op->write(
43264- file, (const void __user *) data, len, &pos);
43265+ file, (const void __force_user *) data, len, &pos);
43266 set_fs(old_fs);
43267 kunmap(page);
43268 if (ret != len)
43269diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
43270index 3e8094b..cb3ff3d 100644
43271--- a/fs/ceph/dir.c
43272+++ b/fs/ceph/dir.c
43273@@ -244,7 +244,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
43274 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
43275 struct ceph_mds_client *mdsc = fsc->mdsc;
43276 unsigned frag = fpos_frag(filp->f_pos);
43277- int off = fpos_off(filp->f_pos);
43278+ unsigned int off = fpos_off(filp->f_pos);
43279 int err;
43280 u32 ftype;
43281 struct ceph_mds_reply_info_parsed *rinfo;
43282@@ -598,7 +598,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
43283 if (nd &&
43284 (nd->flags & LOOKUP_OPEN) &&
43285 !(nd->intent.open.flags & O_CREAT)) {
43286- int mode = nd->intent.open.create_mode & ~current->fs->umask;
43287+ int mode = nd->intent.open.create_mode & ~current_umask();
43288 return ceph_lookup_open(dir, dentry, nd, mode, 1);
43289 }
43290
43291diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
43292index cfd1ce3..6b13a74 100644
43293--- a/fs/cifs/asn1.c
43294+++ b/fs/cifs/asn1.c
43295@@ -416,6 +416,9 @@ asn1_subid_decode(struct asn1_ctx *ctx, unsigned long *subid)
43296
43297 static int
43298 asn1_oid_decode(struct asn1_ctx *ctx,
43299+ unsigned char *eoc, unsigned long **oid, unsigned int *len) __size_overflow(2);
43300+static int
43301+asn1_oid_decode(struct asn1_ctx *ctx,
43302 unsigned char *eoc, unsigned long **oid, unsigned int *len)
43303 {
43304 unsigned long subid;
43305diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
43306index 24b3dfc..3cd5454 100644
43307--- a/fs/cifs/cifs_debug.c
43308+++ b/fs/cifs/cifs_debug.c
43309@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43310
43311 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
43312 #ifdef CONFIG_CIFS_STATS2
43313- atomic_set(&totBufAllocCount, 0);
43314- atomic_set(&totSmBufAllocCount, 0);
43315+ atomic_set_unchecked(&totBufAllocCount, 0);
43316+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43317 #endif /* CONFIG_CIFS_STATS2 */
43318 spin_lock(&cifs_tcp_ses_lock);
43319 list_for_each(tmp1, &cifs_tcp_ses_list) {
43320@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43321 tcon = list_entry(tmp3,
43322 struct cifs_tcon,
43323 tcon_list);
43324- atomic_set(&tcon->num_smbs_sent, 0);
43325- atomic_set(&tcon->num_writes, 0);
43326- atomic_set(&tcon->num_reads, 0);
43327- atomic_set(&tcon->num_oplock_brks, 0);
43328- atomic_set(&tcon->num_opens, 0);
43329- atomic_set(&tcon->num_posixopens, 0);
43330- atomic_set(&tcon->num_posixmkdirs, 0);
43331- atomic_set(&tcon->num_closes, 0);
43332- atomic_set(&tcon->num_deletes, 0);
43333- atomic_set(&tcon->num_mkdirs, 0);
43334- atomic_set(&tcon->num_rmdirs, 0);
43335- atomic_set(&tcon->num_renames, 0);
43336- atomic_set(&tcon->num_t2renames, 0);
43337- atomic_set(&tcon->num_ffirst, 0);
43338- atomic_set(&tcon->num_fnext, 0);
43339- atomic_set(&tcon->num_fclose, 0);
43340- atomic_set(&tcon->num_hardlinks, 0);
43341- atomic_set(&tcon->num_symlinks, 0);
43342- atomic_set(&tcon->num_locks, 0);
43343+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
43344+ atomic_set_unchecked(&tcon->num_writes, 0);
43345+ atomic_set_unchecked(&tcon->num_reads, 0);
43346+ atomic_set_unchecked(&tcon->num_oplock_brks, 0);
43347+ atomic_set_unchecked(&tcon->num_opens, 0);
43348+ atomic_set_unchecked(&tcon->num_posixopens, 0);
43349+ atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
43350+ atomic_set_unchecked(&tcon->num_closes, 0);
43351+ atomic_set_unchecked(&tcon->num_deletes, 0);
43352+ atomic_set_unchecked(&tcon->num_mkdirs, 0);
43353+ atomic_set_unchecked(&tcon->num_rmdirs, 0);
43354+ atomic_set_unchecked(&tcon->num_renames, 0);
43355+ atomic_set_unchecked(&tcon->num_t2renames, 0);
43356+ atomic_set_unchecked(&tcon->num_ffirst, 0);
43357+ atomic_set_unchecked(&tcon->num_fnext, 0);
43358+ atomic_set_unchecked(&tcon->num_fclose, 0);
43359+ atomic_set_unchecked(&tcon->num_hardlinks, 0);
43360+ atomic_set_unchecked(&tcon->num_symlinks, 0);
43361+ atomic_set_unchecked(&tcon->num_locks, 0);
43362 }
43363 }
43364 }
43365@@ -327,8 +327,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43366 smBufAllocCount.counter, cifs_min_small);
43367 #ifdef CONFIG_CIFS_STATS2
43368 seq_printf(m, "Total Large %d Small %d Allocations\n",
43369- atomic_read(&totBufAllocCount),
43370- atomic_read(&totSmBufAllocCount));
43371+ atomic_read_unchecked(&totBufAllocCount),
43372+ atomic_read_unchecked(&totSmBufAllocCount));
43373 #endif /* CONFIG_CIFS_STATS2 */
43374
43375 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
43376@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43377 if (tcon->need_reconnect)
43378 seq_puts(m, "\tDISCONNECTED ");
43379 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
43380- atomic_read(&tcon->num_smbs_sent),
43381- atomic_read(&tcon->num_oplock_brks));
43382+ atomic_read_unchecked(&tcon->num_smbs_sent),
43383+ atomic_read_unchecked(&tcon->num_oplock_brks));
43384 seq_printf(m, "\nReads: %d Bytes: %lld",
43385- atomic_read(&tcon->num_reads),
43386+ atomic_read_unchecked(&tcon->num_reads),
43387 (long long)(tcon->bytes_read));
43388 seq_printf(m, "\nWrites: %d Bytes: %lld",
43389- atomic_read(&tcon->num_writes),
43390+ atomic_read_unchecked(&tcon->num_writes),
43391 (long long)(tcon->bytes_written));
43392 seq_printf(m, "\nFlushes: %d",
43393- atomic_read(&tcon->num_flushes));
43394+ atomic_read_unchecked(&tcon->num_flushes));
43395 seq_printf(m, "\nLocks: %d HardLinks: %d "
43396 "Symlinks: %d",
43397- atomic_read(&tcon->num_locks),
43398- atomic_read(&tcon->num_hardlinks),
43399- atomic_read(&tcon->num_symlinks));
43400+ atomic_read_unchecked(&tcon->num_locks),
43401+ atomic_read_unchecked(&tcon->num_hardlinks),
43402+ atomic_read_unchecked(&tcon->num_symlinks));
43403 seq_printf(m, "\nOpens: %d Closes: %d "
43404 "Deletes: %d",
43405- atomic_read(&tcon->num_opens),
43406- atomic_read(&tcon->num_closes),
43407- atomic_read(&tcon->num_deletes));
43408+ atomic_read_unchecked(&tcon->num_opens),
43409+ atomic_read_unchecked(&tcon->num_closes),
43410+ atomic_read_unchecked(&tcon->num_deletes));
43411 seq_printf(m, "\nPosix Opens: %d "
43412 "Posix Mkdirs: %d",
43413- atomic_read(&tcon->num_posixopens),
43414- atomic_read(&tcon->num_posixmkdirs));
43415+ atomic_read_unchecked(&tcon->num_posixopens),
43416+ atomic_read_unchecked(&tcon->num_posixmkdirs));
43417 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
43418- atomic_read(&tcon->num_mkdirs),
43419- atomic_read(&tcon->num_rmdirs));
43420+ atomic_read_unchecked(&tcon->num_mkdirs),
43421+ atomic_read_unchecked(&tcon->num_rmdirs));
43422 seq_printf(m, "\nRenames: %d T2 Renames %d",
43423- atomic_read(&tcon->num_renames),
43424- atomic_read(&tcon->num_t2renames));
43425+ atomic_read_unchecked(&tcon->num_renames),
43426+ atomic_read_unchecked(&tcon->num_t2renames));
43427 seq_printf(m, "\nFindFirst: %d FNext %d "
43428 "FClose %d",
43429- atomic_read(&tcon->num_ffirst),
43430- atomic_read(&tcon->num_fnext),
43431- atomic_read(&tcon->num_fclose));
43432+ atomic_read_unchecked(&tcon->num_ffirst),
43433+ atomic_read_unchecked(&tcon->num_fnext),
43434+ atomic_read_unchecked(&tcon->num_fclose));
43435 }
43436 }
43437 }
43438diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
43439index 6ee1cb4..8443157 100644
43440--- a/fs/cifs/cifsfs.c
43441+++ b/fs/cifs/cifsfs.c
43442@@ -989,7 +989,7 @@ cifs_init_request_bufs(void)
43443 cifs_req_cachep = kmem_cache_create("cifs_request",
43444 CIFSMaxBufSize +
43445 MAX_CIFS_HDR_SIZE, 0,
43446- SLAB_HWCACHE_ALIGN, NULL);
43447+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
43448 if (cifs_req_cachep == NULL)
43449 return -ENOMEM;
43450
43451@@ -1016,7 +1016,7 @@ cifs_init_request_bufs(void)
43452 efficient to alloc 1 per page off the slab compared to 17K (5page)
43453 alloc of large cifs buffers even when page debugging is on */
43454 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
43455- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
43456+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
43457 NULL);
43458 if (cifs_sm_req_cachep == NULL) {
43459 mempool_destroy(cifs_req_poolp);
43460@@ -1101,8 +1101,8 @@ init_cifs(void)
43461 atomic_set(&bufAllocCount, 0);
43462 atomic_set(&smBufAllocCount, 0);
43463 #ifdef CONFIG_CIFS_STATS2
43464- atomic_set(&totBufAllocCount, 0);
43465- atomic_set(&totSmBufAllocCount, 0);
43466+ atomic_set_unchecked(&totBufAllocCount, 0);
43467+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43468 #endif /* CONFIG_CIFS_STATS2 */
43469
43470 atomic_set(&midCount, 0);
43471diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
43472index d47d20a..77e8b33 100644
43473--- a/fs/cifs/cifsglob.h
43474+++ b/fs/cifs/cifsglob.h
43475@@ -388,28 +388,28 @@ struct cifs_tcon {
43476 __u16 Flags; /* optional support bits */
43477 enum statusEnum tidStatus;
43478 #ifdef CONFIG_CIFS_STATS
43479- atomic_t num_smbs_sent;
43480- atomic_t num_writes;
43481- atomic_t num_reads;
43482- atomic_t num_flushes;
43483- atomic_t num_oplock_brks;
43484- atomic_t num_opens;
43485- atomic_t num_closes;
43486- atomic_t num_deletes;
43487- atomic_t num_mkdirs;
43488- atomic_t num_posixopens;
43489- atomic_t num_posixmkdirs;
43490- atomic_t num_rmdirs;
43491- atomic_t num_renames;
43492- atomic_t num_t2renames;
43493- atomic_t num_ffirst;
43494- atomic_t num_fnext;
43495- atomic_t num_fclose;
43496- atomic_t num_hardlinks;
43497- atomic_t num_symlinks;
43498- atomic_t num_locks;
43499- atomic_t num_acl_get;
43500- atomic_t num_acl_set;
43501+ atomic_unchecked_t num_smbs_sent;
43502+ atomic_unchecked_t num_writes;
43503+ atomic_unchecked_t num_reads;
43504+ atomic_unchecked_t num_flushes;
43505+ atomic_unchecked_t num_oplock_brks;
43506+ atomic_unchecked_t num_opens;
43507+ atomic_unchecked_t num_closes;
43508+ atomic_unchecked_t num_deletes;
43509+ atomic_unchecked_t num_mkdirs;
43510+ atomic_unchecked_t num_posixopens;
43511+ atomic_unchecked_t num_posixmkdirs;
43512+ atomic_unchecked_t num_rmdirs;
43513+ atomic_unchecked_t num_renames;
43514+ atomic_unchecked_t num_t2renames;
43515+ atomic_unchecked_t num_ffirst;
43516+ atomic_unchecked_t num_fnext;
43517+ atomic_unchecked_t num_fclose;
43518+ atomic_unchecked_t num_hardlinks;
43519+ atomic_unchecked_t num_symlinks;
43520+ atomic_unchecked_t num_locks;
43521+ atomic_unchecked_t num_acl_get;
43522+ atomic_unchecked_t num_acl_set;
43523 #ifdef CONFIG_CIFS_STATS2
43524 unsigned long long time_writes;
43525 unsigned long long time_reads;
43526@@ -624,7 +624,7 @@ convert_delimiter(char *path, char delim)
43527 }
43528
43529 #ifdef CONFIG_CIFS_STATS
43530-#define cifs_stats_inc atomic_inc
43531+#define cifs_stats_inc atomic_inc_unchecked
43532
43533 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
43534 unsigned int bytes)
43535@@ -983,8 +983,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
43536 /* Various Debug counters */
43537 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
43538 #ifdef CONFIG_CIFS_STATS2
43539-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
43540-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
43541+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
43542+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
43543 #endif
43544 GLOBAL_EXTERN atomic_t smBufAllocCount;
43545 GLOBAL_EXTERN atomic_t midCount;
43546diff --git a/fs/cifs/link.c b/fs/cifs/link.c
43547index 6b0e064..94e6c3c 100644
43548--- a/fs/cifs/link.c
43549+++ b/fs/cifs/link.c
43550@@ -600,7 +600,7 @@ symlink_exit:
43551
43552 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
43553 {
43554- char *p = nd_get_link(nd);
43555+ const char *p = nd_get_link(nd);
43556 if (!IS_ERR(p))
43557 kfree(p);
43558 }
43559diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
43560index 703ef5c..2a44ed5 100644
43561--- a/fs/cifs/misc.c
43562+++ b/fs/cifs/misc.c
43563@@ -156,7 +156,7 @@ cifs_buf_get(void)
43564 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
43565 atomic_inc(&bufAllocCount);
43566 #ifdef CONFIG_CIFS_STATS2
43567- atomic_inc(&totBufAllocCount);
43568+ atomic_inc_unchecked(&totBufAllocCount);
43569 #endif /* CONFIG_CIFS_STATS2 */
43570 }
43571
43572@@ -191,7 +191,7 @@ cifs_small_buf_get(void)
43573 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
43574 atomic_inc(&smBufAllocCount);
43575 #ifdef CONFIG_CIFS_STATS2
43576- atomic_inc(&totSmBufAllocCount);
43577+ atomic_inc_unchecked(&totSmBufAllocCount);
43578 #endif /* CONFIG_CIFS_STATS2 */
43579
43580 }
43581diff --git a/fs/coda/cache.c b/fs/coda/cache.c
43582index 6901578..d402eb5 100644
43583--- a/fs/coda/cache.c
43584+++ b/fs/coda/cache.c
43585@@ -24,7 +24,7 @@
43586 #include "coda_linux.h"
43587 #include "coda_cache.h"
43588
43589-static atomic_t permission_epoch = ATOMIC_INIT(0);
43590+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
43591
43592 /* replace or extend an acl cache hit */
43593 void coda_cache_enter(struct inode *inode, int mask)
43594@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
43595 struct coda_inode_info *cii = ITOC(inode);
43596
43597 spin_lock(&cii->c_lock);
43598- cii->c_cached_epoch = atomic_read(&permission_epoch);
43599+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
43600 if (cii->c_uid != current_fsuid()) {
43601 cii->c_uid = current_fsuid();
43602 cii->c_cached_perm = mask;
43603@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
43604 {
43605 struct coda_inode_info *cii = ITOC(inode);
43606 spin_lock(&cii->c_lock);
43607- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
43608+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
43609 spin_unlock(&cii->c_lock);
43610 }
43611
43612 /* remove all acl caches */
43613 void coda_cache_clear_all(struct super_block *sb)
43614 {
43615- atomic_inc(&permission_epoch);
43616+ atomic_inc_unchecked(&permission_epoch);
43617 }
43618
43619
43620@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
43621 spin_lock(&cii->c_lock);
43622 hit = (mask & cii->c_cached_perm) == mask &&
43623 cii->c_uid == current_fsuid() &&
43624- cii->c_cached_epoch == atomic_read(&permission_epoch);
43625+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
43626 spin_unlock(&cii->c_lock);
43627
43628 return hit;
43629diff --git a/fs/compat.c b/fs/compat.c
43630index 07880ba..3fb2862 100644
43631--- a/fs/compat.c
43632+++ b/fs/compat.c
43633@@ -491,7 +491,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
43634
43635 set_fs(KERNEL_DS);
43636 /* The __user pointer cast is valid because of the set_fs() */
43637- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
43638+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
43639 set_fs(oldfs);
43640 /* truncating is ok because it's a user address */
43641 if (!ret)
43642@@ -549,7 +549,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
43643 goto out;
43644
43645 ret = -EINVAL;
43646- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
43647+ if (nr_segs > UIO_MAXIOV)
43648 goto out;
43649 if (nr_segs > fast_segs) {
43650 ret = -ENOMEM;
43651@@ -832,6 +832,7 @@ struct compat_old_linux_dirent {
43652
43653 struct compat_readdir_callback {
43654 struct compat_old_linux_dirent __user *dirent;
43655+ struct file * file;
43656 int result;
43657 };
43658
43659@@ -849,6 +850,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
43660 buf->result = -EOVERFLOW;
43661 return -EOVERFLOW;
43662 }
43663+
43664+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43665+ return 0;
43666+
43667 buf->result++;
43668 dirent = buf->dirent;
43669 if (!access_ok(VERIFY_WRITE, dirent,
43670@@ -881,6 +886,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
43671
43672 buf.result = 0;
43673 buf.dirent = dirent;
43674+ buf.file = file;
43675
43676 error = vfs_readdir(file, compat_fillonedir, &buf);
43677 if (buf.result)
43678@@ -901,6 +907,7 @@ struct compat_linux_dirent {
43679 struct compat_getdents_callback {
43680 struct compat_linux_dirent __user *current_dir;
43681 struct compat_linux_dirent __user *previous;
43682+ struct file * file;
43683 int count;
43684 int error;
43685 };
43686@@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
43687 buf->error = -EOVERFLOW;
43688 return -EOVERFLOW;
43689 }
43690+
43691+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43692+ return 0;
43693+
43694 dirent = buf->previous;
43695 if (dirent) {
43696 if (__put_user(offset, &dirent->d_off))
43697@@ -969,6 +980,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
43698 buf.previous = NULL;
43699 buf.count = count;
43700 buf.error = 0;
43701+ buf.file = file;
43702
43703 error = vfs_readdir(file, compat_filldir, &buf);
43704 if (error >= 0)
43705@@ -990,6 +1002,7 @@ out:
43706 struct compat_getdents_callback64 {
43707 struct linux_dirent64 __user *current_dir;
43708 struct linux_dirent64 __user *previous;
43709+ struct file * file;
43710 int count;
43711 int error;
43712 };
43713@@ -1006,6 +1019,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
43714 buf->error = -EINVAL; /* only used if we fail.. */
43715 if (reclen > buf->count)
43716 return -EINVAL;
43717+
43718+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43719+ return 0;
43720+
43721 dirent = buf->previous;
43722
43723 if (dirent) {
43724@@ -1057,13 +1074,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
43725 buf.previous = NULL;
43726 buf.count = count;
43727 buf.error = 0;
43728+ buf.file = file;
43729
43730 error = vfs_readdir(file, compat_filldir64, &buf);
43731 if (error >= 0)
43732 error = buf.error;
43733 lastdirent = buf.previous;
43734 if (lastdirent) {
43735- typeof(lastdirent->d_off) d_off = file->f_pos;
43736+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
43737 if (__put_user_unaligned(d_off, &lastdirent->d_off))
43738 error = -EFAULT;
43739 else
43740diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
43741index 112e45a..b59845b 100644
43742--- a/fs/compat_binfmt_elf.c
43743+++ b/fs/compat_binfmt_elf.c
43744@@ -30,11 +30,13 @@
43745 #undef elf_phdr
43746 #undef elf_shdr
43747 #undef elf_note
43748+#undef elf_dyn
43749 #undef elf_addr_t
43750 #define elfhdr elf32_hdr
43751 #define elf_phdr elf32_phdr
43752 #define elf_shdr elf32_shdr
43753 #define elf_note elf32_note
43754+#define elf_dyn Elf32_Dyn
43755 #define elf_addr_t Elf32_Addr
43756
43757 /*
43758diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
43759index a26bea1..ae23e72 100644
43760--- a/fs/compat_ioctl.c
43761+++ b/fs/compat_ioctl.c
43762@@ -211,6 +211,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd,
43763
43764 err = get_user(palp, &up->palette);
43765 err |= get_user(length, &up->length);
43766+ if (err)
43767+ return -EFAULT;
43768
43769 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
43770 err = put_user(compat_ptr(palp), &up_native->palette);
43771@@ -622,7 +624,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
43772 return -EFAULT;
43773 if (__get_user(udata, &ss32->iomem_base))
43774 return -EFAULT;
43775- ss.iomem_base = compat_ptr(udata);
43776+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
43777 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
43778 __get_user(ss.port_high, &ss32->port_high))
43779 return -EFAULT;
43780@@ -797,7 +799,7 @@ static int compat_ioctl_preallocate(struct file *file,
43781 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
43782 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
43783 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
43784- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
43785+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
43786 return -EFAULT;
43787
43788 return ioctl_preallocate(file, p);
43789@@ -1611,8 +1613,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
43790 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
43791 {
43792 unsigned int a, b;
43793- a = *(unsigned int *)p;
43794- b = *(unsigned int *)q;
43795+ a = *(const unsigned int *)p;
43796+ b = *(const unsigned int *)q;
43797 if (a > b)
43798 return 1;
43799 if (a < b)
43800diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
43801index 5ddd7eb..c18bf04 100644
43802--- a/fs/configfs/dir.c
43803+++ b/fs/configfs/dir.c
43804@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
43805 }
43806 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
43807 struct configfs_dirent *next;
43808- const char * name;
43809+ const unsigned char * name;
43810+ char d_name[sizeof(next->s_dentry->d_iname)];
43811 int len;
43812 struct inode *inode = NULL;
43813
43814@@ -1585,7 +1586,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
43815 continue;
43816
43817 name = configfs_get_name(next);
43818- len = strlen(name);
43819+ if (next->s_dentry && name == next->s_dentry->d_iname) {
43820+ len = next->s_dentry->d_name.len;
43821+ memcpy(d_name, name, len);
43822+ name = d_name;
43823+ } else
43824+ len = strlen(name);
43825
43826 /*
43827 * We'll have a dentry and an inode for
43828diff --git a/fs/configfs/file.c b/fs/configfs/file.c
43829index 2b6cb23..d76e879 100644
43830--- a/fs/configfs/file.c
43831+++ b/fs/configfs/file.c
43832@@ -135,6 +135,8 @@ out:
43833 */
43834
43835 static int
43836+fill_write_buffer(struct configfs_buffer * buffer, const char __user * buf, size_t count) __size_overflow(3);
43837+static int
43838 fill_write_buffer(struct configfs_buffer * buffer, const char __user * buf, size_t count)
43839 {
43840 int error;
43841diff --git a/fs/dcache.c b/fs/dcache.c
43842index 2576d14..0cec38d 100644
43843--- a/fs/dcache.c
43844+++ b/fs/dcache.c
43845@@ -105,10 +105,10 @@ static unsigned int d_hash_shift __read_mostly;
43846 static struct hlist_bl_head *dentry_hashtable __read_mostly;
43847
43848 static inline struct hlist_bl_head *d_hash(const struct dentry *parent,
43849- unsigned long hash)
43850+ unsigned int hash)
43851 {
43852- hash += ((unsigned long) parent ^ GOLDEN_RATIO_PRIME) / L1_CACHE_BYTES;
43853- hash = hash ^ ((hash ^ GOLDEN_RATIO_PRIME) >> D_HASHBITS);
43854+ hash += (unsigned long) parent / L1_CACHE_BYTES;
43855+ hash = hash + (hash >> D_HASHBITS);
43856 return dentry_hashtable + (hash & D_HASHMASK);
43857 }
43858
43859@@ -3067,7 +3067,7 @@ void __init vfs_caches_init(unsigned long mempages)
43860 mempages -= reserve;
43861
43862 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
43863- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
43864+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
43865
43866 dcache_init();
43867 inode_init();
43868diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
43869index 956d5dd..e755e04 100644
43870--- a/fs/debugfs/inode.c
43871+++ b/fs/debugfs/inode.c
43872@@ -261,7 +261,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
43873 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
43874 {
43875 return debugfs_create_file(name,
43876+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
43877+ S_IFDIR | S_IRWXU,
43878+#else
43879 S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
43880+#endif
43881 parent, NULL, NULL);
43882 }
43883 EXPORT_SYMBOL_GPL(debugfs_create_dir);
43884diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
43885index ab35b11..b30af66 100644
43886--- a/fs/ecryptfs/inode.c
43887+++ b/fs/ecryptfs/inode.c
43888@@ -672,7 +672,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
43889 old_fs = get_fs();
43890 set_fs(get_ds());
43891 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
43892- (char __user *)lower_buf,
43893+ (char __force_user *)lower_buf,
43894 lower_bufsiz);
43895 set_fs(old_fs);
43896 if (rc < 0)
43897@@ -718,7 +718,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
43898 }
43899 old_fs = get_fs();
43900 set_fs(get_ds());
43901- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
43902+ rc = dentry->d_inode->i_op->readlink(dentry, (char __force_user *)buf, len);
43903 set_fs(old_fs);
43904 if (rc < 0) {
43905 kfree(buf);
43906@@ -733,7 +733,7 @@ out:
43907 static void
43908 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
43909 {
43910- char *buf = nd_get_link(nd);
43911+ const char *buf = nd_get_link(nd);
43912 if (!IS_ERR(buf)) {
43913 /* Free the char* */
43914 kfree(buf);
43915diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
43916index 3a06f40..f7af544 100644
43917--- a/fs/ecryptfs/miscdev.c
43918+++ b/fs/ecryptfs/miscdev.c
43919@@ -345,7 +345,7 @@ check_list:
43920 goto out_unlock_msg_ctx;
43921 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
43922 if (msg_ctx->msg) {
43923- if (copy_to_user(&buf[i], packet_length, packet_length_size))
43924+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
43925 goto out_unlock_msg_ctx;
43926 i += packet_length_size;
43927 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
43928diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
43929index b2a34a1..162fa69 100644
43930--- a/fs/ecryptfs/read_write.c
43931+++ b/fs/ecryptfs/read_write.c
43932@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
43933 return -EIO;
43934 fs_save = get_fs();
43935 set_fs(get_ds());
43936- rc = vfs_write(lower_file, data, size, &offset);
43937+ rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
43938 set_fs(fs_save);
43939 mark_inode_dirty_sync(ecryptfs_inode);
43940 return rc;
43941@@ -244,7 +244,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
43942 return -EIO;
43943 fs_save = get_fs();
43944 set_fs(get_ds());
43945- rc = vfs_read(lower_file, data, size, &offset);
43946+ rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
43947 set_fs(fs_save);
43948 return rc;
43949 }
43950diff --git a/fs/exec.c b/fs/exec.c
43951index 153dee1..ab4ebe9 100644
43952--- a/fs/exec.c
43953+++ b/fs/exec.c
43954@@ -55,6 +55,13 @@
43955 #include <linux/pipe_fs_i.h>
43956 #include <linux/oom.h>
43957 #include <linux/compat.h>
43958+#include <linux/random.h>
43959+#include <linux/seq_file.h>
43960+
43961+#ifdef CONFIG_PAX_REFCOUNT
43962+#include <linux/kallsyms.h>
43963+#include <linux/kdebug.h>
43964+#endif
43965
43966 #include <asm/uaccess.h>
43967 #include <asm/mmu_context.h>
43968@@ -63,6 +70,15 @@
43969 #include <trace/events/task.h>
43970 #include "internal.h"
43971
43972+#ifndef CONFIG_PAX_HAVE_ACL_FLAGS
43973+void __weak pax_set_initial_flags(struct linux_binprm *bprm) {}
43974+#endif
43975+
43976+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
43977+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
43978+EXPORT_SYMBOL(pax_set_initial_flags_func);
43979+#endif
43980+
43981 int core_uses_pid;
43982 char core_pattern[CORENAME_MAX_SIZE] = "core";
43983 unsigned int core_pipe_limit;
43984@@ -72,7 +88,7 @@ struct core_name {
43985 char *corename;
43986 int used, size;
43987 };
43988-static atomic_t call_count = ATOMIC_INIT(1);
43989+static atomic_unchecked_t call_count = ATOMIC_INIT(1);
43990
43991 /* The maximal length of core_pattern is also specified in sysctl.c */
43992
43993@@ -190,18 +206,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
43994 int write)
43995 {
43996 struct page *page;
43997- int ret;
43998
43999-#ifdef CONFIG_STACK_GROWSUP
44000- if (write) {
44001- ret = expand_downwards(bprm->vma, pos);
44002- if (ret < 0)
44003- return NULL;
44004- }
44005-#endif
44006- ret = get_user_pages(current, bprm->mm, pos,
44007- 1, write, 1, &page, NULL);
44008- if (ret <= 0)
44009+ if (0 > expand_downwards(bprm->vma, pos))
44010+ return NULL;
44011+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
44012 return NULL;
44013
44014 if (write) {
44015@@ -217,6 +225,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44016 if (size <= ARG_MAX)
44017 return page;
44018
44019+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44020+ // only allow 512KB for argv+env on suid/sgid binaries
44021+ // to prevent easy ASLR exhaustion
44022+ if (((bprm->cred->euid != current_euid()) ||
44023+ (bprm->cred->egid != current_egid())) &&
44024+ (size > (512 * 1024))) {
44025+ put_page(page);
44026+ return NULL;
44027+ }
44028+#endif
44029+
44030 /*
44031 * Limit to 1/4-th the stack size for the argv+env strings.
44032 * This ensures that:
44033@@ -276,6 +295,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44034 vma->vm_end = STACK_TOP_MAX;
44035 vma->vm_start = vma->vm_end - PAGE_SIZE;
44036 vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
44037+
44038+#ifdef CONFIG_PAX_SEGMEXEC
44039+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
44040+#endif
44041+
44042 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
44043 INIT_LIST_HEAD(&vma->anon_vma_chain);
44044
44045@@ -290,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44046 mm->stack_vm = mm->total_vm = 1;
44047 up_write(&mm->mmap_sem);
44048 bprm->p = vma->vm_end - sizeof(void *);
44049+
44050+#ifdef CONFIG_PAX_RANDUSTACK
44051+ if (randomize_va_space)
44052+ bprm->p ^= random32() & ~PAGE_MASK;
44053+#endif
44054+
44055 return 0;
44056 err:
44057 up_write(&mm->mmap_sem);
44058@@ -398,19 +428,7 @@ err:
44059 return err;
44060 }
44061
44062-struct user_arg_ptr {
44063-#ifdef CONFIG_COMPAT
44064- bool is_compat;
44065-#endif
44066- union {
44067- const char __user *const __user *native;
44068-#ifdef CONFIG_COMPAT
44069- compat_uptr_t __user *compat;
44070-#endif
44071- } ptr;
44072-};
44073-
44074-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44075+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44076 {
44077 const char __user *native;
44078
44079@@ -419,14 +437,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44080 compat_uptr_t compat;
44081
44082 if (get_user(compat, argv.ptr.compat + nr))
44083- return ERR_PTR(-EFAULT);
44084+ return (const char __force_user *)ERR_PTR(-EFAULT);
44085
44086 return compat_ptr(compat);
44087 }
44088 #endif
44089
44090 if (get_user(native, argv.ptr.native + nr))
44091- return ERR_PTR(-EFAULT);
44092+ return (const char __force_user *)ERR_PTR(-EFAULT);
44093
44094 return native;
44095 }
44096@@ -445,7 +463,7 @@ static int count(struct user_arg_ptr argv, int max)
44097 if (!p)
44098 break;
44099
44100- if (IS_ERR(p))
44101+ if (IS_ERR((const char __force_kernel *)p))
44102 return -EFAULT;
44103
44104 if (i++ >= max)
44105@@ -479,7 +497,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
44106
44107 ret = -EFAULT;
44108 str = get_user_arg_ptr(argv, argc);
44109- if (IS_ERR(str))
44110+ if (IS_ERR((const char __force_kernel *)str))
44111 goto out;
44112
44113 len = strnlen_user(str, MAX_ARG_STRLEN);
44114@@ -561,7 +579,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
44115 int r;
44116 mm_segment_t oldfs = get_fs();
44117 struct user_arg_ptr argv = {
44118- .ptr.native = (const char __user *const __user *)__argv,
44119+ .ptr.native = (const char __force_user *const __force_user *)__argv,
44120 };
44121
44122 set_fs(KERNEL_DS);
44123@@ -596,7 +614,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44124 unsigned long new_end = old_end - shift;
44125 struct mmu_gather tlb;
44126
44127- BUG_ON(new_start > new_end);
44128+ if (new_start >= new_end || new_start < mmap_min_addr)
44129+ return -ENOMEM;
44130
44131 /*
44132 * ensure there are no vmas between where we want to go
44133@@ -605,6 +624,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44134 if (vma != find_vma(mm, new_start))
44135 return -EFAULT;
44136
44137+#ifdef CONFIG_PAX_SEGMEXEC
44138+ BUG_ON(pax_find_mirror_vma(vma));
44139+#endif
44140+
44141 /*
44142 * cover the whole range: [new_start, old_end)
44143 */
44144@@ -685,10 +708,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44145 stack_top = arch_align_stack(stack_top);
44146 stack_top = PAGE_ALIGN(stack_top);
44147
44148- if (unlikely(stack_top < mmap_min_addr) ||
44149- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
44150- return -ENOMEM;
44151-
44152 stack_shift = vma->vm_end - stack_top;
44153
44154 bprm->p -= stack_shift;
44155@@ -700,8 +719,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
44156 bprm->exec -= stack_shift;
44157
44158 down_write(&mm->mmap_sem);
44159+
44160+ /* Move stack pages down in memory. */
44161+ if (stack_shift) {
44162+ ret = shift_arg_pages(vma, stack_shift);
44163+ if (ret)
44164+ goto out_unlock;
44165+ }
44166+
44167 vm_flags = VM_STACK_FLAGS;
44168
44169+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44170+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
44171+ vm_flags &= ~VM_EXEC;
44172+
44173+#ifdef CONFIG_PAX_MPROTECT
44174+ if (mm->pax_flags & MF_PAX_MPROTECT)
44175+ vm_flags &= ~VM_MAYEXEC;
44176+#endif
44177+
44178+ }
44179+#endif
44180+
44181 /*
44182 * Adjust stack execute permissions; explicitly enable for
44183 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
44184@@ -720,13 +759,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44185 goto out_unlock;
44186 BUG_ON(prev != vma);
44187
44188- /* Move stack pages down in memory. */
44189- if (stack_shift) {
44190- ret = shift_arg_pages(vma, stack_shift);
44191- if (ret)
44192- goto out_unlock;
44193- }
44194-
44195 /* mprotect_fixup is overkill to remove the temporary stack flags */
44196 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
44197
44198@@ -807,7 +839,7 @@ int kernel_read(struct file *file, loff_t offset,
44199 old_fs = get_fs();
44200 set_fs(get_ds());
44201 /* The cast to a user pointer is valid due to the set_fs() */
44202- result = vfs_read(file, (void __user *)addr, count, &pos);
44203+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
44204 set_fs(old_fs);
44205 return result;
44206 }
44207@@ -1252,7 +1284,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
44208 }
44209 rcu_read_unlock();
44210
44211- if (p->fs->users > n_fs) {
44212+ if (atomic_read(&p->fs->users) > n_fs) {
44213 bprm->unsafe |= LSM_UNSAFE_SHARE;
44214 } else {
44215 res = -EAGAIN;
44216@@ -1447,6 +1479,28 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
44217
44218 EXPORT_SYMBOL(search_binary_handler);
44219
44220+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44221+static DEFINE_PER_CPU(u64, exec_counter);
44222+static int __init init_exec_counters(void)
44223+{
44224+ unsigned int cpu;
44225+
44226+ for_each_possible_cpu(cpu) {
44227+ per_cpu(exec_counter, cpu) = (u64)cpu;
44228+ }
44229+
44230+ return 0;
44231+}
44232+early_initcall(init_exec_counters);
44233+static inline void increment_exec_counter(void)
44234+{
44235+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
44236+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
44237+}
44238+#else
44239+static inline void increment_exec_counter(void) {}
44240+#endif
44241+
44242 /*
44243 * sys_execve() executes a new program.
44244 */
44245@@ -1455,6 +1509,11 @@ static int do_execve_common(const char *filename,
44246 struct user_arg_ptr envp,
44247 struct pt_regs *regs)
44248 {
44249+#ifdef CONFIG_GRKERNSEC
44250+ struct file *old_exec_file;
44251+ struct acl_subject_label *old_acl;
44252+ struct rlimit old_rlim[RLIM_NLIMITS];
44253+#endif
44254 struct linux_binprm *bprm;
44255 struct file *file;
44256 struct files_struct *displaced;
44257@@ -1462,6 +1521,8 @@ static int do_execve_common(const char *filename,
44258 int retval;
44259 const struct cred *cred = current_cred();
44260
44261+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
44262+
44263 /*
44264 * We move the actual failure in case of RLIMIT_NPROC excess from
44265 * set*uid() to execve() because too many poorly written programs
44266@@ -1502,12 +1563,27 @@ static int do_execve_common(const char *filename,
44267 if (IS_ERR(file))
44268 goto out_unmark;
44269
44270+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
44271+ retval = -EPERM;
44272+ goto out_file;
44273+ }
44274+
44275 sched_exec();
44276
44277 bprm->file = file;
44278 bprm->filename = filename;
44279 bprm->interp = filename;
44280
44281+ if (gr_process_user_ban()) {
44282+ retval = -EPERM;
44283+ goto out_file;
44284+ }
44285+
44286+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
44287+ retval = -EACCES;
44288+ goto out_file;
44289+ }
44290+
44291 retval = bprm_mm_init(bprm);
44292 if (retval)
44293 goto out_file;
44294@@ -1524,24 +1600,65 @@ static int do_execve_common(const char *filename,
44295 if (retval < 0)
44296 goto out;
44297
44298+#ifdef CONFIG_GRKERNSEC
44299+ old_acl = current->acl;
44300+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
44301+ old_exec_file = current->exec_file;
44302+ get_file(file);
44303+ current->exec_file = file;
44304+#endif
44305+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44306+ /* limit suid stack to 8MB
44307+ we saved the old limits above and will restore them if this exec fails
44308+ */
44309+ if (((bprm->cred->euid != current_euid()) || (bprm->cred->egid != current_egid())) &&
44310+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
44311+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
44312+#endif
44313+
44314+ if (!gr_tpe_allow(file)) {
44315+ retval = -EACCES;
44316+ goto out_fail;
44317+ }
44318+
44319+ if (gr_check_crash_exec(file)) {
44320+ retval = -EACCES;
44321+ goto out_fail;
44322+ }
44323+
44324+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
44325+ bprm->unsafe);
44326+ if (retval < 0)
44327+ goto out_fail;
44328+
44329 retval = copy_strings_kernel(1, &bprm->filename, bprm);
44330 if (retval < 0)
44331- goto out;
44332+ goto out_fail;
44333
44334 bprm->exec = bprm->p;
44335 retval = copy_strings(bprm->envc, envp, bprm);
44336 if (retval < 0)
44337- goto out;
44338+ goto out_fail;
44339
44340 retval = copy_strings(bprm->argc, argv, bprm);
44341 if (retval < 0)
44342- goto out;
44343+ goto out_fail;
44344+
44345+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
44346+
44347+ gr_handle_exec_args(bprm, argv);
44348
44349 retval = search_binary_handler(bprm,regs);
44350 if (retval < 0)
44351- goto out;
44352+ goto out_fail;
44353+#ifdef CONFIG_GRKERNSEC
44354+ if (old_exec_file)
44355+ fput(old_exec_file);
44356+#endif
44357
44358 /* execve succeeded */
44359+
44360+ increment_exec_counter();
44361 current->fs->in_exec = 0;
44362 current->in_execve = 0;
44363 acct_update_integrals(current);
44364@@ -1550,6 +1667,14 @@ static int do_execve_common(const char *filename,
44365 put_files_struct(displaced);
44366 return retval;
44367
44368+out_fail:
44369+#ifdef CONFIG_GRKERNSEC
44370+ current->acl = old_acl;
44371+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
44372+ fput(current->exec_file);
44373+ current->exec_file = old_exec_file;
44374+#endif
44375+
44376 out:
44377 if (bprm->mm) {
44378 acct_arg_size(bprm, 0);
44379@@ -1623,7 +1748,7 @@ static int expand_corename(struct core_name *cn)
44380 {
44381 char *old_corename = cn->corename;
44382
44383- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
44384+ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
44385 cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
44386
44387 if (!cn->corename) {
44388@@ -1720,7 +1845,7 @@ static int format_corename(struct core_name *cn, long signr)
44389 int pid_in_pattern = 0;
44390 int err = 0;
44391
44392- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
44393+ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
44394 cn->corename = kmalloc(cn->size, GFP_KERNEL);
44395 cn->used = 0;
44396
44397@@ -1817,6 +1942,228 @@ out:
44398 return ispipe;
44399 }
44400
44401+int pax_check_flags(unsigned long *flags)
44402+{
44403+ int retval = 0;
44404+
44405+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
44406+ if (*flags & MF_PAX_SEGMEXEC)
44407+ {
44408+ *flags &= ~MF_PAX_SEGMEXEC;
44409+ retval = -EINVAL;
44410+ }
44411+#endif
44412+
44413+ if ((*flags & MF_PAX_PAGEEXEC)
44414+
44415+#ifdef CONFIG_PAX_PAGEEXEC
44416+ && (*flags & MF_PAX_SEGMEXEC)
44417+#endif
44418+
44419+ )
44420+ {
44421+ *flags &= ~MF_PAX_PAGEEXEC;
44422+ retval = -EINVAL;
44423+ }
44424+
44425+ if ((*flags & MF_PAX_MPROTECT)
44426+
44427+#ifdef CONFIG_PAX_MPROTECT
44428+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44429+#endif
44430+
44431+ )
44432+ {
44433+ *flags &= ~MF_PAX_MPROTECT;
44434+ retval = -EINVAL;
44435+ }
44436+
44437+ if ((*flags & MF_PAX_EMUTRAMP)
44438+
44439+#ifdef CONFIG_PAX_EMUTRAMP
44440+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44441+#endif
44442+
44443+ )
44444+ {
44445+ *flags &= ~MF_PAX_EMUTRAMP;
44446+ retval = -EINVAL;
44447+ }
44448+
44449+ return retval;
44450+}
44451+
44452+EXPORT_SYMBOL(pax_check_flags);
44453+
44454+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44455+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
44456+{
44457+ struct task_struct *tsk = current;
44458+ struct mm_struct *mm = current->mm;
44459+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
44460+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
44461+ char *path_exec = NULL;
44462+ char *path_fault = NULL;
44463+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
44464+
44465+ if (buffer_exec && buffer_fault) {
44466+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
44467+
44468+ down_read(&mm->mmap_sem);
44469+ vma = mm->mmap;
44470+ while (vma && (!vma_exec || !vma_fault)) {
44471+ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
44472+ vma_exec = vma;
44473+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
44474+ vma_fault = vma;
44475+ vma = vma->vm_next;
44476+ }
44477+ if (vma_exec) {
44478+ path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
44479+ if (IS_ERR(path_exec))
44480+ path_exec = "<path too long>";
44481+ else {
44482+ path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
44483+ if (path_exec) {
44484+ *path_exec = 0;
44485+ path_exec = buffer_exec;
44486+ } else
44487+ path_exec = "<path too long>";
44488+ }
44489+ }
44490+ if (vma_fault) {
44491+ start = vma_fault->vm_start;
44492+ end = vma_fault->vm_end;
44493+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
44494+ if (vma_fault->vm_file) {
44495+ path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
44496+ if (IS_ERR(path_fault))
44497+ path_fault = "<path too long>";
44498+ else {
44499+ path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
44500+ if (path_fault) {
44501+ *path_fault = 0;
44502+ path_fault = buffer_fault;
44503+ } else
44504+ path_fault = "<path too long>";
44505+ }
44506+ } else
44507+ path_fault = "<anonymous mapping>";
44508+ }
44509+ up_read(&mm->mmap_sem);
44510+ }
44511+ if (tsk->signal->curr_ip)
44512+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
44513+ else
44514+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
44515+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
44516+ "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
44517+ task_uid(tsk), task_euid(tsk), pc, sp);
44518+ free_page((unsigned long)buffer_exec);
44519+ free_page((unsigned long)buffer_fault);
44520+ pax_report_insns(regs, pc, sp);
44521+ do_coredump(SIGKILL, SIGKILL, regs);
44522+}
44523+#endif
44524+
44525+#ifdef CONFIG_PAX_REFCOUNT
44526+void pax_report_refcount_overflow(struct pt_regs *regs)
44527+{
44528+ if (current->signal->curr_ip)
44529+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44530+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
44531+ else
44532+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44533+ current->comm, task_pid_nr(current), current_uid(), current_euid());
44534+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
44535+ show_regs(regs);
44536+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
44537+}
44538+#endif
44539+
44540+#ifdef CONFIG_PAX_USERCOPY
44541+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
44542+int object_is_on_stack(const void *obj, unsigned long len)
44543+{
44544+ const void * const stack = task_stack_page(current);
44545+ const void * const stackend = stack + THREAD_SIZE;
44546+
44547+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44548+ const void *frame = NULL;
44549+ const void *oldframe;
44550+#endif
44551+
44552+ if (obj + len < obj)
44553+ return -1;
44554+
44555+ if (obj + len <= stack || stackend <= obj)
44556+ return 0;
44557+
44558+ if (obj < stack || stackend < obj + len)
44559+ return -1;
44560+
44561+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44562+ oldframe = __builtin_frame_address(1);
44563+ if (oldframe)
44564+ frame = __builtin_frame_address(2);
44565+ /*
44566+ low ----------------------------------------------> high
44567+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
44568+ ^----------------^
44569+ allow copies only within here
44570+ */
44571+ while (stack <= frame && frame < stackend) {
44572+ /* if obj + len extends past the last frame, this
44573+ check won't pass and the next frame will be 0,
44574+ causing us to bail out and correctly report
44575+ the copy as invalid
44576+ */
44577+ if (obj + len <= frame)
44578+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
44579+ oldframe = frame;
44580+ frame = *(const void * const *)frame;
44581+ }
44582+ return -1;
44583+#else
44584+ return 1;
44585+#endif
44586+}
44587+
44588+__noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
44589+{
44590+ if (current->signal->curr_ip)
44591+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44592+ &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44593+ else
44594+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44595+ to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44596+ dump_stack();
44597+ gr_handle_kernel_exploit();
44598+ do_group_exit(SIGKILL);
44599+}
44600+#endif
44601+
44602+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
44603+void pax_track_stack(void)
44604+{
44605+ unsigned long sp = (unsigned long)&sp;
44606+ if (sp < current_thread_info()->lowest_stack &&
44607+ sp > (unsigned long)task_stack_page(current))
44608+ current_thread_info()->lowest_stack = sp;
44609+}
44610+EXPORT_SYMBOL(pax_track_stack);
44611+#endif
44612+
44613+#ifdef CONFIG_PAX_SIZE_OVERFLOW
44614+void report_size_overflow(const char *file, unsigned int line, const char *func)
44615+{
44616+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u\n", func, file, line);
44617+ dump_stack();
44618+ do_group_exit(SIGKILL);
44619+}
44620+EXPORT_SYMBOL(report_size_overflow);
44621+#endif
44622+
44623 static int zap_process(struct task_struct *start, int exit_code)
44624 {
44625 struct task_struct *t;
44626@@ -2014,17 +2361,17 @@ static void wait_for_dump_helpers(struct file *file)
44627 pipe = file->f_path.dentry->d_inode->i_pipe;
44628
44629 pipe_lock(pipe);
44630- pipe->readers++;
44631- pipe->writers--;
44632+ atomic_inc(&pipe->readers);
44633+ atomic_dec(&pipe->writers);
44634
44635- while ((pipe->readers > 1) && (!signal_pending(current))) {
44636+ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
44637 wake_up_interruptible_sync(&pipe->wait);
44638 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
44639 pipe_wait(pipe);
44640 }
44641
44642- pipe->readers--;
44643- pipe->writers++;
44644+ atomic_dec(&pipe->readers);
44645+ atomic_inc(&pipe->writers);
44646 pipe_unlock(pipe);
44647
44648 }
44649@@ -2085,7 +2432,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44650 int retval = 0;
44651 int flag = 0;
44652 int ispipe;
44653- static atomic_t core_dump_count = ATOMIC_INIT(0);
44654+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
44655 struct coredump_params cprm = {
44656 .signr = signr,
44657 .regs = regs,
44658@@ -2100,6 +2447,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44659
44660 audit_core_dumps(signr);
44661
44662+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
44663+ gr_handle_brute_attach(current, cprm.mm_flags);
44664+
44665 binfmt = mm->binfmt;
44666 if (!binfmt || !binfmt->core_dump)
44667 goto fail;
44668@@ -2167,7 +2517,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44669 }
44670 cprm.limit = RLIM_INFINITY;
44671
44672- dump_count = atomic_inc_return(&core_dump_count);
44673+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
44674 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
44675 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
44676 task_tgid_vnr(current), current->comm);
44677@@ -2194,6 +2544,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44678 } else {
44679 struct inode *inode;
44680
44681+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
44682+
44683 if (cprm.limit < binfmt->min_coredump)
44684 goto fail_unlock;
44685
44686@@ -2237,7 +2589,7 @@ close_fail:
44687 filp_close(cprm.file, NULL);
44688 fail_dropcount:
44689 if (ispipe)
44690- atomic_dec(&core_dump_count);
44691+ atomic_dec_unchecked(&core_dump_count);
44692 fail_unlock:
44693 kfree(cn.corename);
44694 fail_corename:
44695@@ -2256,7 +2608,7 @@ fail:
44696 */
44697 int dump_write(struct file *file, const void *addr, int nr)
44698 {
44699- return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
44700+ return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
44701 }
44702 EXPORT_SYMBOL(dump_write);
44703
44704diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
44705index a8cbe1b..fed04cb 100644
44706--- a/fs/ext2/balloc.c
44707+++ b/fs/ext2/balloc.c
44708@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
44709
44710 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
44711 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
44712- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
44713+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
44714 sbi->s_resuid != current_fsuid() &&
44715 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
44716 return 0;
44717diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
44718index a203892..4e64db5 100644
44719--- a/fs/ext3/balloc.c
44720+++ b/fs/ext3/balloc.c
44721@@ -1446,9 +1446,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
44722
44723 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
44724 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
44725- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
44726+ if (free_blocks < root_blocks + 1 &&
44727 !use_reservation && sbi->s_resuid != current_fsuid() &&
44728- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
44729+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)) &&
44730+ !capable_nolog(CAP_SYS_RESOURCE)) {
44731 return 0;
44732 }
44733 return 1;
44734diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
44735index f9e2cd8..bfdc476 100644
44736--- a/fs/ext4/balloc.c
44737+++ b/fs/ext4/balloc.c
44738@@ -438,8 +438,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
44739 /* Hm, nope. Are (enough) root reserved clusters available? */
44740 if (sbi->s_resuid == current_fsuid() ||
44741 ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
44742- capable(CAP_SYS_RESOURCE) ||
44743- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
44744+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
44745+ capable_nolog(CAP_SYS_RESOURCE)) {
44746
44747 if (free_clusters >= (nclusters + dirty_clusters))
44748 return 1;
44749diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
44750index 9983ba8..2a5272c 100644
44751--- a/fs/ext4/ext4.h
44752+++ b/fs/ext4/ext4.h
44753@@ -1217,19 +1217,19 @@ struct ext4_sb_info {
44754 unsigned long s_mb_last_start;
44755
44756 /* stats for buddy allocator */
44757- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
44758- atomic_t s_bal_success; /* we found long enough chunks */
44759- atomic_t s_bal_allocated; /* in blocks */
44760- atomic_t s_bal_ex_scanned; /* total extents scanned */
44761- atomic_t s_bal_goals; /* goal hits */
44762- atomic_t s_bal_breaks; /* too long searches */
44763- atomic_t s_bal_2orders; /* 2^order hits */
44764+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
44765+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
44766+ atomic_unchecked_t s_bal_allocated; /* in blocks */
44767+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
44768+ atomic_unchecked_t s_bal_goals; /* goal hits */
44769+ atomic_unchecked_t s_bal_breaks; /* too long searches */
44770+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
44771 spinlock_t s_bal_lock;
44772 unsigned long s_mb_buddies_generated;
44773 unsigned long long s_mb_generation_time;
44774- atomic_t s_mb_lost_chunks;
44775- atomic_t s_mb_preallocated;
44776- atomic_t s_mb_discarded;
44777+ atomic_unchecked_t s_mb_lost_chunks;
44778+ atomic_unchecked_t s_mb_preallocated;
44779+ atomic_unchecked_t s_mb_discarded;
44780 atomic_t s_lock_busy;
44781
44782 /* locality groups */
44783diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
44784index cb990b2..4820141 100644
44785--- a/fs/ext4/mballoc.c
44786+++ b/fs/ext4/mballoc.c
44787@@ -1794,7 +1794,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
44788 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
44789
44790 if (EXT4_SB(sb)->s_mb_stats)
44791- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
44792+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
44793
44794 break;
44795 }
44796@@ -2088,7 +2088,7 @@ repeat:
44797 ac->ac_status = AC_STATUS_CONTINUE;
44798 ac->ac_flags |= EXT4_MB_HINT_FIRST;
44799 cr = 3;
44800- atomic_inc(&sbi->s_mb_lost_chunks);
44801+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
44802 goto repeat;
44803 }
44804 }
44805@@ -2592,25 +2592,25 @@ int ext4_mb_release(struct super_block *sb)
44806 if (sbi->s_mb_stats) {
44807 ext4_msg(sb, KERN_INFO,
44808 "mballoc: %u blocks %u reqs (%u success)",
44809- atomic_read(&sbi->s_bal_allocated),
44810- atomic_read(&sbi->s_bal_reqs),
44811- atomic_read(&sbi->s_bal_success));
44812+ atomic_read_unchecked(&sbi->s_bal_allocated),
44813+ atomic_read_unchecked(&sbi->s_bal_reqs),
44814+ atomic_read_unchecked(&sbi->s_bal_success));
44815 ext4_msg(sb, KERN_INFO,
44816 "mballoc: %u extents scanned, %u goal hits, "
44817 "%u 2^N hits, %u breaks, %u lost",
44818- atomic_read(&sbi->s_bal_ex_scanned),
44819- atomic_read(&sbi->s_bal_goals),
44820- atomic_read(&sbi->s_bal_2orders),
44821- atomic_read(&sbi->s_bal_breaks),
44822- atomic_read(&sbi->s_mb_lost_chunks));
44823+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
44824+ atomic_read_unchecked(&sbi->s_bal_goals),
44825+ atomic_read_unchecked(&sbi->s_bal_2orders),
44826+ atomic_read_unchecked(&sbi->s_bal_breaks),
44827+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
44828 ext4_msg(sb, KERN_INFO,
44829 "mballoc: %lu generated and it took %Lu",
44830 sbi->s_mb_buddies_generated,
44831 sbi->s_mb_generation_time);
44832 ext4_msg(sb, KERN_INFO,
44833 "mballoc: %u preallocated, %u discarded",
44834- atomic_read(&sbi->s_mb_preallocated),
44835- atomic_read(&sbi->s_mb_discarded));
44836+ atomic_read_unchecked(&sbi->s_mb_preallocated),
44837+ atomic_read_unchecked(&sbi->s_mb_discarded));
44838 }
44839
44840 free_percpu(sbi->s_locality_groups);
44841@@ -3096,16 +3096,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
44842 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
44843
44844 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
44845- atomic_inc(&sbi->s_bal_reqs);
44846- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
44847+ atomic_inc_unchecked(&sbi->s_bal_reqs);
44848+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
44849 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
44850- atomic_inc(&sbi->s_bal_success);
44851- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
44852+ atomic_inc_unchecked(&sbi->s_bal_success);
44853+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
44854 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
44855 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
44856- atomic_inc(&sbi->s_bal_goals);
44857+ atomic_inc_unchecked(&sbi->s_bal_goals);
44858 if (ac->ac_found > sbi->s_mb_max_to_scan)
44859- atomic_inc(&sbi->s_bal_breaks);
44860+ atomic_inc_unchecked(&sbi->s_bal_breaks);
44861 }
44862
44863 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
44864@@ -3509,7 +3509,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
44865 trace_ext4_mb_new_inode_pa(ac, pa);
44866
44867 ext4_mb_use_inode_pa(ac, pa);
44868- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
44869+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
44870
44871 ei = EXT4_I(ac->ac_inode);
44872 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
44873@@ -3569,7 +3569,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
44874 trace_ext4_mb_new_group_pa(ac, pa);
44875
44876 ext4_mb_use_group_pa(ac, pa);
44877- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
44878+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
44879
44880 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
44881 lg = ac->ac_lg;
44882@@ -3658,7 +3658,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
44883 * from the bitmap and continue.
44884 */
44885 }
44886- atomic_add(free, &sbi->s_mb_discarded);
44887+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
44888
44889 return err;
44890 }
44891@@ -3676,7 +3676,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
44892 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
44893 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
44894 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
44895- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
44896+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
44897 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
44898
44899 return 0;
44900diff --git a/fs/fcntl.c b/fs/fcntl.c
44901index 22764c7..86372c9 100644
44902--- a/fs/fcntl.c
44903+++ b/fs/fcntl.c
44904@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
44905 if (err)
44906 return err;
44907
44908+ if (gr_handle_chroot_fowner(pid, type))
44909+ return -ENOENT;
44910+ if (gr_check_protected_task_fowner(pid, type))
44911+ return -EACCES;
44912+
44913 f_modown(filp, pid, type, force);
44914 return 0;
44915 }
44916@@ -266,7 +271,7 @@ pid_t f_getown(struct file *filp)
44917
44918 static int f_setown_ex(struct file *filp, unsigned long arg)
44919 {
44920- struct f_owner_ex * __user owner_p = (void * __user)arg;
44921+ struct f_owner_ex __user *owner_p = (void __user *)arg;
44922 struct f_owner_ex owner;
44923 struct pid *pid;
44924 int type;
44925@@ -306,7 +311,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
44926
44927 static int f_getown_ex(struct file *filp, unsigned long arg)
44928 {
44929- struct f_owner_ex * __user owner_p = (void * __user)arg;
44930+ struct f_owner_ex __user *owner_p = (void __user *)arg;
44931 struct f_owner_ex owner;
44932 int ret = 0;
44933
44934@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
44935 switch (cmd) {
44936 case F_DUPFD:
44937 case F_DUPFD_CLOEXEC:
44938+ gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
44939 if (arg >= rlimit(RLIMIT_NOFILE))
44940 break;
44941 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
44942diff --git a/fs/fifo.c b/fs/fifo.c
44943index b1a524d..4ee270e 100644
44944--- a/fs/fifo.c
44945+++ b/fs/fifo.c
44946@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
44947 */
44948 filp->f_op = &read_pipefifo_fops;
44949 pipe->r_counter++;
44950- if (pipe->readers++ == 0)
44951+ if (atomic_inc_return(&pipe->readers) == 1)
44952 wake_up_partner(inode);
44953
44954- if (!pipe->writers) {
44955+ if (!atomic_read(&pipe->writers)) {
44956 if ((filp->f_flags & O_NONBLOCK)) {
44957 /* suppress POLLHUP until we have
44958 * seen a writer */
44959@@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
44960 * errno=ENXIO when there is no process reading the FIFO.
44961 */
44962 ret = -ENXIO;
44963- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
44964+ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
44965 goto err;
44966
44967 filp->f_op = &write_pipefifo_fops;
44968 pipe->w_counter++;
44969- if (!pipe->writers++)
44970+ if (atomic_inc_return(&pipe->writers) == 1)
44971 wake_up_partner(inode);
44972
44973- if (!pipe->readers) {
44974+ if (!atomic_read(&pipe->readers)) {
44975 wait_for_partner(inode, &pipe->r_counter);
44976 if (signal_pending(current))
44977 goto err_wr;
44978@@ -105,11 +105,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
44979 */
44980 filp->f_op = &rdwr_pipefifo_fops;
44981
44982- pipe->readers++;
44983- pipe->writers++;
44984+ atomic_inc(&pipe->readers);
44985+ atomic_inc(&pipe->writers);
44986 pipe->r_counter++;
44987 pipe->w_counter++;
44988- if (pipe->readers == 1 || pipe->writers == 1)
44989+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
44990 wake_up_partner(inode);
44991 break;
44992
44993@@ -123,19 +123,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
44994 return 0;
44995
44996 err_rd:
44997- if (!--pipe->readers)
44998+ if (atomic_dec_and_test(&pipe->readers))
44999 wake_up_interruptible(&pipe->wait);
45000 ret = -ERESTARTSYS;
45001 goto err;
45002
45003 err_wr:
45004- if (!--pipe->writers)
45005+ if (atomic_dec_and_test(&pipe->writers))
45006 wake_up_interruptible(&pipe->wait);
45007 ret = -ERESTARTSYS;
45008 goto err;
45009
45010 err:
45011- if (!pipe->readers && !pipe->writers)
45012+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
45013 free_pipe_info(inode);
45014
45015 err_nocleanup:
45016diff --git a/fs/file.c b/fs/file.c
45017index 4c6992d..104cdea 100644
45018--- a/fs/file.c
45019+++ b/fs/file.c
45020@@ -15,6 +15,7 @@
45021 #include <linux/slab.h>
45022 #include <linux/vmalloc.h>
45023 #include <linux/file.h>
45024+#include <linux/security.h>
45025 #include <linux/fdtable.h>
45026 #include <linux/bitops.h>
45027 #include <linux/interrupt.h>
45028@@ -254,6 +255,7 @@ int expand_files(struct files_struct *files, int nr)
45029 * N.B. For clone tasks sharing a files structure, this test
45030 * will limit the total number of files that can be opened.
45031 */
45032+ gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
45033 if (nr >= rlimit(RLIMIT_NOFILE))
45034 return -EMFILE;
45035
45036diff --git a/fs/filesystems.c b/fs/filesystems.c
45037index 96f2428..f5eeb8e 100644
45038--- a/fs/filesystems.c
45039+++ b/fs/filesystems.c
45040@@ -273,7 +273,12 @@ struct file_system_type *get_fs_type(const char *name)
45041 int len = dot ? dot - name : strlen(name);
45042
45043 fs = __get_fs_type(name, len);
45044+
45045+#ifdef CONFIG_GRKERNSEC_MODHARDEN
45046+ if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
45047+#else
45048 if (!fs && (request_module("%.*s", len, name) == 0))
45049+#endif
45050 fs = __get_fs_type(name, len);
45051
45052 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
45053diff --git a/fs/fs_struct.c b/fs/fs_struct.c
45054index 78b519c..a8b4979 100644
45055--- a/fs/fs_struct.c
45056+++ b/fs/fs_struct.c
45057@@ -4,6 +4,7 @@
45058 #include <linux/path.h>
45059 #include <linux/slab.h>
45060 #include <linux/fs_struct.h>
45061+#include <linux/grsecurity.h>
45062 #include "internal.h"
45063
45064 static inline void path_get_longterm(struct path *path)
45065@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
45066 old_root = fs->root;
45067 fs->root = *path;
45068 path_get_longterm(path);
45069+ gr_set_chroot_entries(current, path);
45070 write_seqcount_end(&fs->seq);
45071 spin_unlock(&fs->lock);
45072 if (old_root.dentry)
45073@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
45074 && fs->root.mnt == old_root->mnt) {
45075 path_get_longterm(new_root);
45076 fs->root = *new_root;
45077+ gr_set_chroot_entries(p, new_root);
45078 count++;
45079 }
45080 if (fs->pwd.dentry == old_root->dentry
45081@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk)
45082 spin_lock(&fs->lock);
45083 write_seqcount_begin(&fs->seq);
45084 tsk->fs = NULL;
45085- kill = !--fs->users;
45086+ gr_clear_chroot_entries(tsk);
45087+ kill = !atomic_dec_return(&fs->users);
45088 write_seqcount_end(&fs->seq);
45089 spin_unlock(&fs->lock);
45090 task_unlock(tsk);
45091@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45092 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
45093 /* We don't need to lock fs - think why ;-) */
45094 if (fs) {
45095- fs->users = 1;
45096+ atomic_set(&fs->users, 1);
45097 fs->in_exec = 0;
45098 spin_lock_init(&fs->lock);
45099 seqcount_init(&fs->seq);
45100@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45101 spin_lock(&old->lock);
45102 fs->root = old->root;
45103 path_get_longterm(&fs->root);
45104+ /* instead of calling gr_set_chroot_entries here,
45105+ we call it from every caller of this function
45106+ */
45107 fs->pwd = old->pwd;
45108 path_get_longterm(&fs->pwd);
45109 spin_unlock(&old->lock);
45110@@ -150,8 +157,9 @@ int unshare_fs_struct(void)
45111
45112 task_lock(current);
45113 spin_lock(&fs->lock);
45114- kill = !--fs->users;
45115+ kill = !atomic_dec_return(&fs->users);
45116 current->fs = new_fs;
45117+ gr_set_chroot_entries(current, &new_fs->root);
45118 spin_unlock(&fs->lock);
45119 task_unlock(current);
45120
45121@@ -164,13 +172,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
45122
45123 int current_umask(void)
45124 {
45125- return current->fs->umask;
45126+ return current->fs->umask | gr_acl_umask();
45127 }
45128 EXPORT_SYMBOL(current_umask);
45129
45130 /* to be mentioned only in INIT_TASK */
45131 struct fs_struct init_fs = {
45132- .users = 1,
45133+ .users = ATOMIC_INIT(1),
45134 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
45135 .seq = SEQCNT_ZERO,
45136 .umask = 0022,
45137@@ -186,12 +194,13 @@ void daemonize_fs_struct(void)
45138 task_lock(current);
45139
45140 spin_lock(&init_fs.lock);
45141- init_fs.users++;
45142+ atomic_inc(&init_fs.users);
45143 spin_unlock(&init_fs.lock);
45144
45145 spin_lock(&fs->lock);
45146 current->fs = &init_fs;
45147- kill = !--fs->users;
45148+ gr_set_chroot_entries(current, &current->fs->root);
45149+ kill = !atomic_dec_return(&fs->users);
45150 spin_unlock(&fs->lock);
45151
45152 task_unlock(current);
45153diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
45154index 9905350..02eaec4 100644
45155--- a/fs/fscache/cookie.c
45156+++ b/fs/fscache/cookie.c
45157@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
45158 parent ? (char *) parent->def->name : "<no-parent>",
45159 def->name, netfs_data);
45160
45161- fscache_stat(&fscache_n_acquires);
45162+ fscache_stat_unchecked(&fscache_n_acquires);
45163
45164 /* if there's no parent cookie, then we don't create one here either */
45165 if (!parent) {
45166- fscache_stat(&fscache_n_acquires_null);
45167+ fscache_stat_unchecked(&fscache_n_acquires_null);
45168 _leave(" [no parent]");
45169 return NULL;
45170 }
45171@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
45172 /* allocate and initialise a cookie */
45173 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
45174 if (!cookie) {
45175- fscache_stat(&fscache_n_acquires_oom);
45176+ fscache_stat_unchecked(&fscache_n_acquires_oom);
45177 _leave(" [ENOMEM]");
45178 return NULL;
45179 }
45180@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45181
45182 switch (cookie->def->type) {
45183 case FSCACHE_COOKIE_TYPE_INDEX:
45184- fscache_stat(&fscache_n_cookie_index);
45185+ fscache_stat_unchecked(&fscache_n_cookie_index);
45186 break;
45187 case FSCACHE_COOKIE_TYPE_DATAFILE:
45188- fscache_stat(&fscache_n_cookie_data);
45189+ fscache_stat_unchecked(&fscache_n_cookie_data);
45190 break;
45191 default:
45192- fscache_stat(&fscache_n_cookie_special);
45193+ fscache_stat_unchecked(&fscache_n_cookie_special);
45194 break;
45195 }
45196
45197@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45198 if (fscache_acquire_non_index_cookie(cookie) < 0) {
45199 atomic_dec(&parent->n_children);
45200 __fscache_cookie_put(cookie);
45201- fscache_stat(&fscache_n_acquires_nobufs);
45202+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
45203 _leave(" = NULL");
45204 return NULL;
45205 }
45206 }
45207
45208- fscache_stat(&fscache_n_acquires_ok);
45209+ fscache_stat_unchecked(&fscache_n_acquires_ok);
45210 _leave(" = %p", cookie);
45211 return cookie;
45212 }
45213@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
45214 cache = fscache_select_cache_for_object(cookie->parent);
45215 if (!cache) {
45216 up_read(&fscache_addremove_sem);
45217- fscache_stat(&fscache_n_acquires_no_cache);
45218+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
45219 _leave(" = -ENOMEDIUM [no cache]");
45220 return -ENOMEDIUM;
45221 }
45222@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
45223 object = cache->ops->alloc_object(cache, cookie);
45224 fscache_stat_d(&fscache_n_cop_alloc_object);
45225 if (IS_ERR(object)) {
45226- fscache_stat(&fscache_n_object_no_alloc);
45227+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
45228 ret = PTR_ERR(object);
45229 goto error;
45230 }
45231
45232- fscache_stat(&fscache_n_object_alloc);
45233+ fscache_stat_unchecked(&fscache_n_object_alloc);
45234
45235 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
45236
45237@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
45238 struct fscache_object *object;
45239 struct hlist_node *_p;
45240
45241- fscache_stat(&fscache_n_updates);
45242+ fscache_stat_unchecked(&fscache_n_updates);
45243
45244 if (!cookie) {
45245- fscache_stat(&fscache_n_updates_null);
45246+ fscache_stat_unchecked(&fscache_n_updates_null);
45247 _leave(" [no cookie]");
45248 return;
45249 }
45250@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45251 struct fscache_object *object;
45252 unsigned long event;
45253
45254- fscache_stat(&fscache_n_relinquishes);
45255+ fscache_stat_unchecked(&fscache_n_relinquishes);
45256 if (retire)
45257- fscache_stat(&fscache_n_relinquishes_retire);
45258+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
45259
45260 if (!cookie) {
45261- fscache_stat(&fscache_n_relinquishes_null);
45262+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
45263 _leave(" [no cookie]");
45264 return;
45265 }
45266@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45267
45268 /* wait for the cookie to finish being instantiated (or to fail) */
45269 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
45270- fscache_stat(&fscache_n_relinquishes_waitcrt);
45271+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
45272 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
45273 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
45274 }
45275diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
45276index f6aad48..88dcf26 100644
45277--- a/fs/fscache/internal.h
45278+++ b/fs/fscache/internal.h
45279@@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
45280 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
45281 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
45282
45283-extern atomic_t fscache_n_op_pend;
45284-extern atomic_t fscache_n_op_run;
45285-extern atomic_t fscache_n_op_enqueue;
45286-extern atomic_t fscache_n_op_deferred_release;
45287-extern atomic_t fscache_n_op_release;
45288-extern atomic_t fscache_n_op_gc;
45289-extern atomic_t fscache_n_op_cancelled;
45290-extern atomic_t fscache_n_op_rejected;
45291+extern atomic_unchecked_t fscache_n_op_pend;
45292+extern atomic_unchecked_t fscache_n_op_run;
45293+extern atomic_unchecked_t fscache_n_op_enqueue;
45294+extern atomic_unchecked_t fscache_n_op_deferred_release;
45295+extern atomic_unchecked_t fscache_n_op_release;
45296+extern atomic_unchecked_t fscache_n_op_gc;
45297+extern atomic_unchecked_t fscache_n_op_cancelled;
45298+extern atomic_unchecked_t fscache_n_op_rejected;
45299
45300-extern atomic_t fscache_n_attr_changed;
45301-extern atomic_t fscache_n_attr_changed_ok;
45302-extern atomic_t fscache_n_attr_changed_nobufs;
45303-extern atomic_t fscache_n_attr_changed_nomem;
45304-extern atomic_t fscache_n_attr_changed_calls;
45305+extern atomic_unchecked_t fscache_n_attr_changed;
45306+extern atomic_unchecked_t fscache_n_attr_changed_ok;
45307+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
45308+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
45309+extern atomic_unchecked_t fscache_n_attr_changed_calls;
45310
45311-extern atomic_t fscache_n_allocs;
45312-extern atomic_t fscache_n_allocs_ok;
45313-extern atomic_t fscache_n_allocs_wait;
45314-extern atomic_t fscache_n_allocs_nobufs;
45315-extern atomic_t fscache_n_allocs_intr;
45316-extern atomic_t fscache_n_allocs_object_dead;
45317-extern atomic_t fscache_n_alloc_ops;
45318-extern atomic_t fscache_n_alloc_op_waits;
45319+extern atomic_unchecked_t fscache_n_allocs;
45320+extern atomic_unchecked_t fscache_n_allocs_ok;
45321+extern atomic_unchecked_t fscache_n_allocs_wait;
45322+extern atomic_unchecked_t fscache_n_allocs_nobufs;
45323+extern atomic_unchecked_t fscache_n_allocs_intr;
45324+extern atomic_unchecked_t fscache_n_allocs_object_dead;
45325+extern atomic_unchecked_t fscache_n_alloc_ops;
45326+extern atomic_unchecked_t fscache_n_alloc_op_waits;
45327
45328-extern atomic_t fscache_n_retrievals;
45329-extern atomic_t fscache_n_retrievals_ok;
45330-extern atomic_t fscache_n_retrievals_wait;
45331-extern atomic_t fscache_n_retrievals_nodata;
45332-extern atomic_t fscache_n_retrievals_nobufs;
45333-extern atomic_t fscache_n_retrievals_intr;
45334-extern atomic_t fscache_n_retrievals_nomem;
45335-extern atomic_t fscache_n_retrievals_object_dead;
45336-extern atomic_t fscache_n_retrieval_ops;
45337-extern atomic_t fscache_n_retrieval_op_waits;
45338+extern atomic_unchecked_t fscache_n_retrievals;
45339+extern atomic_unchecked_t fscache_n_retrievals_ok;
45340+extern atomic_unchecked_t fscache_n_retrievals_wait;
45341+extern atomic_unchecked_t fscache_n_retrievals_nodata;
45342+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
45343+extern atomic_unchecked_t fscache_n_retrievals_intr;
45344+extern atomic_unchecked_t fscache_n_retrievals_nomem;
45345+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
45346+extern atomic_unchecked_t fscache_n_retrieval_ops;
45347+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
45348
45349-extern atomic_t fscache_n_stores;
45350-extern atomic_t fscache_n_stores_ok;
45351-extern atomic_t fscache_n_stores_again;
45352-extern atomic_t fscache_n_stores_nobufs;
45353-extern atomic_t fscache_n_stores_oom;
45354-extern atomic_t fscache_n_store_ops;
45355-extern atomic_t fscache_n_store_calls;
45356-extern atomic_t fscache_n_store_pages;
45357-extern atomic_t fscache_n_store_radix_deletes;
45358-extern atomic_t fscache_n_store_pages_over_limit;
45359+extern atomic_unchecked_t fscache_n_stores;
45360+extern atomic_unchecked_t fscache_n_stores_ok;
45361+extern atomic_unchecked_t fscache_n_stores_again;
45362+extern atomic_unchecked_t fscache_n_stores_nobufs;
45363+extern atomic_unchecked_t fscache_n_stores_oom;
45364+extern atomic_unchecked_t fscache_n_store_ops;
45365+extern atomic_unchecked_t fscache_n_store_calls;
45366+extern atomic_unchecked_t fscache_n_store_pages;
45367+extern atomic_unchecked_t fscache_n_store_radix_deletes;
45368+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
45369
45370-extern atomic_t fscache_n_store_vmscan_not_storing;
45371-extern atomic_t fscache_n_store_vmscan_gone;
45372-extern atomic_t fscache_n_store_vmscan_busy;
45373-extern atomic_t fscache_n_store_vmscan_cancelled;
45374+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
45375+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
45376+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
45377+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
45378
45379-extern atomic_t fscache_n_marks;
45380-extern atomic_t fscache_n_uncaches;
45381+extern atomic_unchecked_t fscache_n_marks;
45382+extern atomic_unchecked_t fscache_n_uncaches;
45383
45384-extern atomic_t fscache_n_acquires;
45385-extern atomic_t fscache_n_acquires_null;
45386-extern atomic_t fscache_n_acquires_no_cache;
45387-extern atomic_t fscache_n_acquires_ok;
45388-extern atomic_t fscache_n_acquires_nobufs;
45389-extern atomic_t fscache_n_acquires_oom;
45390+extern atomic_unchecked_t fscache_n_acquires;
45391+extern atomic_unchecked_t fscache_n_acquires_null;
45392+extern atomic_unchecked_t fscache_n_acquires_no_cache;
45393+extern atomic_unchecked_t fscache_n_acquires_ok;
45394+extern atomic_unchecked_t fscache_n_acquires_nobufs;
45395+extern atomic_unchecked_t fscache_n_acquires_oom;
45396
45397-extern atomic_t fscache_n_updates;
45398-extern atomic_t fscache_n_updates_null;
45399-extern atomic_t fscache_n_updates_run;
45400+extern atomic_unchecked_t fscache_n_updates;
45401+extern atomic_unchecked_t fscache_n_updates_null;
45402+extern atomic_unchecked_t fscache_n_updates_run;
45403
45404-extern atomic_t fscache_n_relinquishes;
45405-extern atomic_t fscache_n_relinquishes_null;
45406-extern atomic_t fscache_n_relinquishes_waitcrt;
45407-extern atomic_t fscache_n_relinquishes_retire;
45408+extern atomic_unchecked_t fscache_n_relinquishes;
45409+extern atomic_unchecked_t fscache_n_relinquishes_null;
45410+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
45411+extern atomic_unchecked_t fscache_n_relinquishes_retire;
45412
45413-extern atomic_t fscache_n_cookie_index;
45414-extern atomic_t fscache_n_cookie_data;
45415-extern atomic_t fscache_n_cookie_special;
45416+extern atomic_unchecked_t fscache_n_cookie_index;
45417+extern atomic_unchecked_t fscache_n_cookie_data;
45418+extern atomic_unchecked_t fscache_n_cookie_special;
45419
45420-extern atomic_t fscache_n_object_alloc;
45421-extern atomic_t fscache_n_object_no_alloc;
45422-extern atomic_t fscache_n_object_lookups;
45423-extern atomic_t fscache_n_object_lookups_negative;
45424-extern atomic_t fscache_n_object_lookups_positive;
45425-extern atomic_t fscache_n_object_lookups_timed_out;
45426-extern atomic_t fscache_n_object_created;
45427-extern atomic_t fscache_n_object_avail;
45428-extern atomic_t fscache_n_object_dead;
45429+extern atomic_unchecked_t fscache_n_object_alloc;
45430+extern atomic_unchecked_t fscache_n_object_no_alloc;
45431+extern atomic_unchecked_t fscache_n_object_lookups;
45432+extern atomic_unchecked_t fscache_n_object_lookups_negative;
45433+extern atomic_unchecked_t fscache_n_object_lookups_positive;
45434+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
45435+extern atomic_unchecked_t fscache_n_object_created;
45436+extern atomic_unchecked_t fscache_n_object_avail;
45437+extern atomic_unchecked_t fscache_n_object_dead;
45438
45439-extern atomic_t fscache_n_checkaux_none;
45440-extern atomic_t fscache_n_checkaux_okay;
45441-extern atomic_t fscache_n_checkaux_update;
45442-extern atomic_t fscache_n_checkaux_obsolete;
45443+extern atomic_unchecked_t fscache_n_checkaux_none;
45444+extern atomic_unchecked_t fscache_n_checkaux_okay;
45445+extern atomic_unchecked_t fscache_n_checkaux_update;
45446+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
45447
45448 extern atomic_t fscache_n_cop_alloc_object;
45449 extern atomic_t fscache_n_cop_lookup_object;
45450@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
45451 atomic_inc(stat);
45452 }
45453
45454+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
45455+{
45456+ atomic_inc_unchecked(stat);
45457+}
45458+
45459 static inline void fscache_stat_d(atomic_t *stat)
45460 {
45461 atomic_dec(stat);
45462@@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
45463
45464 #define __fscache_stat(stat) (NULL)
45465 #define fscache_stat(stat) do {} while (0)
45466+#define fscache_stat_unchecked(stat) do {} while (0)
45467 #define fscache_stat_d(stat) do {} while (0)
45468 #endif
45469
45470diff --git a/fs/fscache/object.c b/fs/fscache/object.c
45471index b6b897c..0ffff9c 100644
45472--- a/fs/fscache/object.c
45473+++ b/fs/fscache/object.c
45474@@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45475 /* update the object metadata on disk */
45476 case FSCACHE_OBJECT_UPDATING:
45477 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
45478- fscache_stat(&fscache_n_updates_run);
45479+ fscache_stat_unchecked(&fscache_n_updates_run);
45480 fscache_stat(&fscache_n_cop_update_object);
45481 object->cache->ops->update_object(object);
45482 fscache_stat_d(&fscache_n_cop_update_object);
45483@@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45484 spin_lock(&object->lock);
45485 object->state = FSCACHE_OBJECT_DEAD;
45486 spin_unlock(&object->lock);
45487- fscache_stat(&fscache_n_object_dead);
45488+ fscache_stat_unchecked(&fscache_n_object_dead);
45489 goto terminal_transit;
45490
45491 /* handle the parent cache of this object being withdrawn from
45492@@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45493 spin_lock(&object->lock);
45494 object->state = FSCACHE_OBJECT_DEAD;
45495 spin_unlock(&object->lock);
45496- fscache_stat(&fscache_n_object_dead);
45497+ fscache_stat_unchecked(&fscache_n_object_dead);
45498 goto terminal_transit;
45499
45500 /* complain about the object being woken up once it is
45501@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45502 parent->cookie->def->name, cookie->def->name,
45503 object->cache->tag->name);
45504
45505- fscache_stat(&fscache_n_object_lookups);
45506+ fscache_stat_unchecked(&fscache_n_object_lookups);
45507 fscache_stat(&fscache_n_cop_lookup_object);
45508 ret = object->cache->ops->lookup_object(object);
45509 fscache_stat_d(&fscache_n_cop_lookup_object);
45510@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45511 if (ret == -ETIMEDOUT) {
45512 /* probably stuck behind another object, so move this one to
45513 * the back of the queue */
45514- fscache_stat(&fscache_n_object_lookups_timed_out);
45515+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
45516 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45517 }
45518
45519@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
45520
45521 spin_lock(&object->lock);
45522 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45523- fscache_stat(&fscache_n_object_lookups_negative);
45524+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
45525
45526 /* transit here to allow write requests to begin stacking up
45527 * and read requests to begin returning ENODATA */
45528@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
45529 * result, in which case there may be data available */
45530 spin_lock(&object->lock);
45531 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45532- fscache_stat(&fscache_n_object_lookups_positive);
45533+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
45534
45535 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
45536
45537@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
45538 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45539 } else {
45540 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
45541- fscache_stat(&fscache_n_object_created);
45542+ fscache_stat_unchecked(&fscache_n_object_created);
45543
45544 object->state = FSCACHE_OBJECT_AVAILABLE;
45545 spin_unlock(&object->lock);
45546@@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
45547 fscache_enqueue_dependents(object);
45548
45549 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
45550- fscache_stat(&fscache_n_object_avail);
45551+ fscache_stat_unchecked(&fscache_n_object_avail);
45552
45553 _leave("");
45554 }
45555@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45556 enum fscache_checkaux result;
45557
45558 if (!object->cookie->def->check_aux) {
45559- fscache_stat(&fscache_n_checkaux_none);
45560+ fscache_stat_unchecked(&fscache_n_checkaux_none);
45561 return FSCACHE_CHECKAUX_OKAY;
45562 }
45563
45564@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45565 switch (result) {
45566 /* entry okay as is */
45567 case FSCACHE_CHECKAUX_OKAY:
45568- fscache_stat(&fscache_n_checkaux_okay);
45569+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
45570 break;
45571
45572 /* entry requires update */
45573 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
45574- fscache_stat(&fscache_n_checkaux_update);
45575+ fscache_stat_unchecked(&fscache_n_checkaux_update);
45576 break;
45577
45578 /* entry requires deletion */
45579 case FSCACHE_CHECKAUX_OBSOLETE:
45580- fscache_stat(&fscache_n_checkaux_obsolete);
45581+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
45582 break;
45583
45584 default:
45585diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
45586index 30afdfa..2256596 100644
45587--- a/fs/fscache/operation.c
45588+++ b/fs/fscache/operation.c
45589@@ -17,7 +17,7 @@
45590 #include <linux/slab.h>
45591 #include "internal.h"
45592
45593-atomic_t fscache_op_debug_id;
45594+atomic_unchecked_t fscache_op_debug_id;
45595 EXPORT_SYMBOL(fscache_op_debug_id);
45596
45597 /**
45598@@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
45599 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
45600 ASSERTCMP(atomic_read(&op->usage), >, 0);
45601
45602- fscache_stat(&fscache_n_op_enqueue);
45603+ fscache_stat_unchecked(&fscache_n_op_enqueue);
45604 switch (op->flags & FSCACHE_OP_TYPE) {
45605 case FSCACHE_OP_ASYNC:
45606 _debug("queue async");
45607@@ -69,7 +69,7 @@ static void fscache_run_op(struct fscache_object *object,
45608 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
45609 if (op->processor)
45610 fscache_enqueue_operation(op);
45611- fscache_stat(&fscache_n_op_run);
45612+ fscache_stat_unchecked(&fscache_n_op_run);
45613 }
45614
45615 /*
45616@@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
45617 if (object->n_ops > 1) {
45618 atomic_inc(&op->usage);
45619 list_add_tail(&op->pend_link, &object->pending_ops);
45620- fscache_stat(&fscache_n_op_pend);
45621+ fscache_stat_unchecked(&fscache_n_op_pend);
45622 } else if (!list_empty(&object->pending_ops)) {
45623 atomic_inc(&op->usage);
45624 list_add_tail(&op->pend_link, &object->pending_ops);
45625- fscache_stat(&fscache_n_op_pend);
45626+ fscache_stat_unchecked(&fscache_n_op_pend);
45627 fscache_start_operations(object);
45628 } else {
45629 ASSERTCMP(object->n_in_progress, ==, 0);
45630@@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
45631 object->n_exclusive++; /* reads and writes must wait */
45632 atomic_inc(&op->usage);
45633 list_add_tail(&op->pend_link, &object->pending_ops);
45634- fscache_stat(&fscache_n_op_pend);
45635+ fscache_stat_unchecked(&fscache_n_op_pend);
45636 ret = 0;
45637 } else {
45638 /* not allowed to submit ops in any other state */
45639@@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_object *object,
45640 if (object->n_exclusive > 0) {
45641 atomic_inc(&op->usage);
45642 list_add_tail(&op->pend_link, &object->pending_ops);
45643- fscache_stat(&fscache_n_op_pend);
45644+ fscache_stat_unchecked(&fscache_n_op_pend);
45645 } else if (!list_empty(&object->pending_ops)) {
45646 atomic_inc(&op->usage);
45647 list_add_tail(&op->pend_link, &object->pending_ops);
45648- fscache_stat(&fscache_n_op_pend);
45649+ fscache_stat_unchecked(&fscache_n_op_pend);
45650 fscache_start_operations(object);
45651 } else {
45652 ASSERTCMP(object->n_exclusive, ==, 0);
45653@@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_object *object,
45654 object->n_ops++;
45655 atomic_inc(&op->usage);
45656 list_add_tail(&op->pend_link, &object->pending_ops);
45657- fscache_stat(&fscache_n_op_pend);
45658+ fscache_stat_unchecked(&fscache_n_op_pend);
45659 ret = 0;
45660 } else if (object->state == FSCACHE_OBJECT_DYING ||
45661 object->state == FSCACHE_OBJECT_LC_DYING ||
45662 object->state == FSCACHE_OBJECT_WITHDRAWING) {
45663- fscache_stat(&fscache_n_op_rejected);
45664+ fscache_stat_unchecked(&fscache_n_op_rejected);
45665 ret = -ENOBUFS;
45666 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
45667 fscache_report_unexpected_submission(object, op, ostate);
45668@@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_operation *op)
45669
45670 ret = -EBUSY;
45671 if (!list_empty(&op->pend_link)) {
45672- fscache_stat(&fscache_n_op_cancelled);
45673+ fscache_stat_unchecked(&fscache_n_op_cancelled);
45674 list_del_init(&op->pend_link);
45675 object->n_ops--;
45676 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
45677@@ -331,7 +331,7 @@ void fscache_put_operation(struct fscache_operation *op)
45678 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
45679 BUG();
45680
45681- fscache_stat(&fscache_n_op_release);
45682+ fscache_stat_unchecked(&fscache_n_op_release);
45683
45684 if (op->release) {
45685 op->release(op);
45686@@ -348,7 +348,7 @@ void fscache_put_operation(struct fscache_operation *op)
45687 * lock, and defer it otherwise */
45688 if (!spin_trylock(&object->lock)) {
45689 _debug("defer put");
45690- fscache_stat(&fscache_n_op_deferred_release);
45691+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
45692
45693 cache = object->cache;
45694 spin_lock(&cache->op_gc_list_lock);
45695@@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_struct *work)
45696
45697 _debug("GC DEFERRED REL OBJ%x OP%x",
45698 object->debug_id, op->debug_id);
45699- fscache_stat(&fscache_n_op_gc);
45700+ fscache_stat_unchecked(&fscache_n_op_gc);
45701
45702 ASSERTCMP(atomic_read(&op->usage), ==, 0);
45703
45704diff --git a/fs/fscache/page.c b/fs/fscache/page.c
45705index 3f7a59b..cf196cc 100644
45706--- a/fs/fscache/page.c
45707+++ b/fs/fscache/page.c
45708@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
45709 val = radix_tree_lookup(&cookie->stores, page->index);
45710 if (!val) {
45711 rcu_read_unlock();
45712- fscache_stat(&fscache_n_store_vmscan_not_storing);
45713+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
45714 __fscache_uncache_page(cookie, page);
45715 return true;
45716 }
45717@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
45718 spin_unlock(&cookie->stores_lock);
45719
45720 if (xpage) {
45721- fscache_stat(&fscache_n_store_vmscan_cancelled);
45722- fscache_stat(&fscache_n_store_radix_deletes);
45723+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
45724+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
45725 ASSERTCMP(xpage, ==, page);
45726 } else {
45727- fscache_stat(&fscache_n_store_vmscan_gone);
45728+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
45729 }
45730
45731 wake_up_bit(&cookie->flags, 0);
45732@@ -107,7 +107,7 @@ page_busy:
45733 /* we might want to wait here, but that could deadlock the allocator as
45734 * the work threads writing to the cache may all end up sleeping
45735 * on memory allocation */
45736- fscache_stat(&fscache_n_store_vmscan_busy);
45737+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
45738 return false;
45739 }
45740 EXPORT_SYMBOL(__fscache_maybe_release_page);
45741@@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
45742 FSCACHE_COOKIE_STORING_TAG);
45743 if (!radix_tree_tag_get(&cookie->stores, page->index,
45744 FSCACHE_COOKIE_PENDING_TAG)) {
45745- fscache_stat(&fscache_n_store_radix_deletes);
45746+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
45747 xpage = radix_tree_delete(&cookie->stores, page->index);
45748 }
45749 spin_unlock(&cookie->stores_lock);
45750@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
45751
45752 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
45753
45754- fscache_stat(&fscache_n_attr_changed_calls);
45755+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
45756
45757 if (fscache_object_is_active(object)) {
45758 fscache_stat(&fscache_n_cop_attr_changed);
45759@@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
45760
45761 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
45762
45763- fscache_stat(&fscache_n_attr_changed);
45764+ fscache_stat_unchecked(&fscache_n_attr_changed);
45765
45766 op = kzalloc(sizeof(*op), GFP_KERNEL);
45767 if (!op) {
45768- fscache_stat(&fscache_n_attr_changed_nomem);
45769+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
45770 _leave(" = -ENOMEM");
45771 return -ENOMEM;
45772 }
45773@@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
45774 if (fscache_submit_exclusive_op(object, op) < 0)
45775 goto nobufs;
45776 spin_unlock(&cookie->lock);
45777- fscache_stat(&fscache_n_attr_changed_ok);
45778+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
45779 fscache_put_operation(op);
45780 _leave(" = 0");
45781 return 0;
45782@@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
45783 nobufs:
45784 spin_unlock(&cookie->lock);
45785 kfree(op);
45786- fscache_stat(&fscache_n_attr_changed_nobufs);
45787+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
45788 _leave(" = %d", -ENOBUFS);
45789 return -ENOBUFS;
45790 }
45791@@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
45792 /* allocate a retrieval operation and attempt to submit it */
45793 op = kzalloc(sizeof(*op), GFP_NOIO);
45794 if (!op) {
45795- fscache_stat(&fscache_n_retrievals_nomem);
45796+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
45797 return NULL;
45798 }
45799
45800@@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
45801 return 0;
45802 }
45803
45804- fscache_stat(&fscache_n_retrievals_wait);
45805+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
45806
45807 jif = jiffies;
45808 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
45809 fscache_wait_bit_interruptible,
45810 TASK_INTERRUPTIBLE) != 0) {
45811- fscache_stat(&fscache_n_retrievals_intr);
45812+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
45813 _leave(" = -ERESTARTSYS");
45814 return -ERESTARTSYS;
45815 }
45816@@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
45817 */
45818 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
45819 struct fscache_retrieval *op,
45820- atomic_t *stat_op_waits,
45821- atomic_t *stat_object_dead)
45822+ atomic_unchecked_t *stat_op_waits,
45823+ atomic_unchecked_t *stat_object_dead)
45824 {
45825 int ret;
45826
45827@@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
45828 goto check_if_dead;
45829
45830 _debug(">>> WT");
45831- fscache_stat(stat_op_waits);
45832+ fscache_stat_unchecked(stat_op_waits);
45833 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
45834 fscache_wait_bit_interruptible,
45835 TASK_INTERRUPTIBLE) < 0) {
45836@@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
45837
45838 check_if_dead:
45839 if (unlikely(fscache_object_is_dead(object))) {
45840- fscache_stat(stat_object_dead);
45841+ fscache_stat_unchecked(stat_object_dead);
45842 return -ENOBUFS;
45843 }
45844 return 0;
45845@@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
45846
45847 _enter("%p,%p,,,", cookie, page);
45848
45849- fscache_stat(&fscache_n_retrievals);
45850+ fscache_stat_unchecked(&fscache_n_retrievals);
45851
45852 if (hlist_empty(&cookie->backing_objects))
45853 goto nobufs;
45854@@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
45855 goto nobufs_unlock;
45856 spin_unlock(&cookie->lock);
45857
45858- fscache_stat(&fscache_n_retrieval_ops);
45859+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
45860
45861 /* pin the netfs read context in case we need to do the actual netfs
45862 * read because we've encountered a cache read failure */
45863@@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
45864
45865 error:
45866 if (ret == -ENOMEM)
45867- fscache_stat(&fscache_n_retrievals_nomem);
45868+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
45869 else if (ret == -ERESTARTSYS)
45870- fscache_stat(&fscache_n_retrievals_intr);
45871+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
45872 else if (ret == -ENODATA)
45873- fscache_stat(&fscache_n_retrievals_nodata);
45874+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
45875 else if (ret < 0)
45876- fscache_stat(&fscache_n_retrievals_nobufs);
45877+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
45878 else
45879- fscache_stat(&fscache_n_retrievals_ok);
45880+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
45881
45882 fscache_put_retrieval(op);
45883 _leave(" = %d", ret);
45884@@ -429,7 +429,7 @@ nobufs_unlock:
45885 spin_unlock(&cookie->lock);
45886 kfree(op);
45887 nobufs:
45888- fscache_stat(&fscache_n_retrievals_nobufs);
45889+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
45890 _leave(" = -ENOBUFS");
45891 return -ENOBUFS;
45892 }
45893@@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
45894
45895 _enter("%p,,%d,,,", cookie, *nr_pages);
45896
45897- fscache_stat(&fscache_n_retrievals);
45898+ fscache_stat_unchecked(&fscache_n_retrievals);
45899
45900 if (hlist_empty(&cookie->backing_objects))
45901 goto nobufs;
45902@@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
45903 goto nobufs_unlock;
45904 spin_unlock(&cookie->lock);
45905
45906- fscache_stat(&fscache_n_retrieval_ops);
45907+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
45908
45909 /* pin the netfs read context in case we need to do the actual netfs
45910 * read because we've encountered a cache read failure */
45911@@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
45912
45913 error:
45914 if (ret == -ENOMEM)
45915- fscache_stat(&fscache_n_retrievals_nomem);
45916+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
45917 else if (ret == -ERESTARTSYS)
45918- fscache_stat(&fscache_n_retrievals_intr);
45919+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
45920 else if (ret == -ENODATA)
45921- fscache_stat(&fscache_n_retrievals_nodata);
45922+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
45923 else if (ret < 0)
45924- fscache_stat(&fscache_n_retrievals_nobufs);
45925+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
45926 else
45927- fscache_stat(&fscache_n_retrievals_ok);
45928+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
45929
45930 fscache_put_retrieval(op);
45931 _leave(" = %d", ret);
45932@@ -545,7 +545,7 @@ nobufs_unlock:
45933 spin_unlock(&cookie->lock);
45934 kfree(op);
45935 nobufs:
45936- fscache_stat(&fscache_n_retrievals_nobufs);
45937+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
45938 _leave(" = -ENOBUFS");
45939 return -ENOBUFS;
45940 }
45941@@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
45942
45943 _enter("%p,%p,,,", cookie, page);
45944
45945- fscache_stat(&fscache_n_allocs);
45946+ fscache_stat_unchecked(&fscache_n_allocs);
45947
45948 if (hlist_empty(&cookie->backing_objects))
45949 goto nobufs;
45950@@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
45951 goto nobufs_unlock;
45952 spin_unlock(&cookie->lock);
45953
45954- fscache_stat(&fscache_n_alloc_ops);
45955+ fscache_stat_unchecked(&fscache_n_alloc_ops);
45956
45957 ret = fscache_wait_for_retrieval_activation(
45958 object, op,
45959@@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
45960
45961 error:
45962 if (ret == -ERESTARTSYS)
45963- fscache_stat(&fscache_n_allocs_intr);
45964+ fscache_stat_unchecked(&fscache_n_allocs_intr);
45965 else if (ret < 0)
45966- fscache_stat(&fscache_n_allocs_nobufs);
45967+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
45968 else
45969- fscache_stat(&fscache_n_allocs_ok);
45970+ fscache_stat_unchecked(&fscache_n_allocs_ok);
45971
45972 fscache_put_retrieval(op);
45973 _leave(" = %d", ret);
45974@@ -625,7 +625,7 @@ nobufs_unlock:
45975 spin_unlock(&cookie->lock);
45976 kfree(op);
45977 nobufs:
45978- fscache_stat(&fscache_n_allocs_nobufs);
45979+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
45980 _leave(" = -ENOBUFS");
45981 return -ENOBUFS;
45982 }
45983@@ -666,7 +666,7 @@ static void fscache_write_op(struct fscache_operation *_op)
45984
45985 spin_lock(&cookie->stores_lock);
45986
45987- fscache_stat(&fscache_n_store_calls);
45988+ fscache_stat_unchecked(&fscache_n_store_calls);
45989
45990 /* find a page to store */
45991 page = NULL;
45992@@ -677,7 +677,7 @@ static void fscache_write_op(struct fscache_operation *_op)
45993 page = results[0];
45994 _debug("gang %d [%lx]", n, page->index);
45995 if (page->index > op->store_limit) {
45996- fscache_stat(&fscache_n_store_pages_over_limit);
45997+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
45998 goto superseded;
45999 }
46000
46001@@ -689,7 +689,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46002 spin_unlock(&cookie->stores_lock);
46003 spin_unlock(&object->lock);
46004
46005- fscache_stat(&fscache_n_store_pages);
46006+ fscache_stat_unchecked(&fscache_n_store_pages);
46007 fscache_stat(&fscache_n_cop_write_page);
46008 ret = object->cache->ops->write_page(op, page);
46009 fscache_stat_d(&fscache_n_cop_write_page);
46010@@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46011 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46012 ASSERT(PageFsCache(page));
46013
46014- fscache_stat(&fscache_n_stores);
46015+ fscache_stat_unchecked(&fscache_n_stores);
46016
46017 op = kzalloc(sizeof(*op), GFP_NOIO);
46018 if (!op)
46019@@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46020 spin_unlock(&cookie->stores_lock);
46021 spin_unlock(&object->lock);
46022
46023- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
46024+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
46025 op->store_limit = object->store_limit;
46026
46027 if (fscache_submit_op(object, &op->op) < 0)
46028@@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46029
46030 spin_unlock(&cookie->lock);
46031 radix_tree_preload_end();
46032- fscache_stat(&fscache_n_store_ops);
46033- fscache_stat(&fscache_n_stores_ok);
46034+ fscache_stat_unchecked(&fscache_n_store_ops);
46035+ fscache_stat_unchecked(&fscache_n_stores_ok);
46036
46037 /* the work queue now carries its own ref on the object */
46038 fscache_put_operation(&op->op);
46039@@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46040 return 0;
46041
46042 already_queued:
46043- fscache_stat(&fscache_n_stores_again);
46044+ fscache_stat_unchecked(&fscache_n_stores_again);
46045 already_pending:
46046 spin_unlock(&cookie->stores_lock);
46047 spin_unlock(&object->lock);
46048 spin_unlock(&cookie->lock);
46049 radix_tree_preload_end();
46050 kfree(op);
46051- fscache_stat(&fscache_n_stores_ok);
46052+ fscache_stat_unchecked(&fscache_n_stores_ok);
46053 _leave(" = 0");
46054 return 0;
46055
46056@@ -851,14 +851,14 @@ nobufs:
46057 spin_unlock(&cookie->lock);
46058 radix_tree_preload_end();
46059 kfree(op);
46060- fscache_stat(&fscache_n_stores_nobufs);
46061+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
46062 _leave(" = -ENOBUFS");
46063 return -ENOBUFS;
46064
46065 nomem_free:
46066 kfree(op);
46067 nomem:
46068- fscache_stat(&fscache_n_stores_oom);
46069+ fscache_stat_unchecked(&fscache_n_stores_oom);
46070 _leave(" = -ENOMEM");
46071 return -ENOMEM;
46072 }
46073@@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
46074 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46075 ASSERTCMP(page, !=, NULL);
46076
46077- fscache_stat(&fscache_n_uncaches);
46078+ fscache_stat_unchecked(&fscache_n_uncaches);
46079
46080 /* cache withdrawal may beat us to it */
46081 if (!PageFsCache(page))
46082@@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
46083 unsigned long loop;
46084
46085 #ifdef CONFIG_FSCACHE_STATS
46086- atomic_add(pagevec->nr, &fscache_n_marks);
46087+ atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
46088 #endif
46089
46090 for (loop = 0; loop < pagevec->nr; loop++) {
46091diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
46092index 4765190..2a067f2 100644
46093--- a/fs/fscache/stats.c
46094+++ b/fs/fscache/stats.c
46095@@ -18,95 +18,95 @@
46096 /*
46097 * operation counters
46098 */
46099-atomic_t fscache_n_op_pend;
46100-atomic_t fscache_n_op_run;
46101-atomic_t fscache_n_op_enqueue;
46102-atomic_t fscache_n_op_requeue;
46103-atomic_t fscache_n_op_deferred_release;
46104-atomic_t fscache_n_op_release;
46105-atomic_t fscache_n_op_gc;
46106-atomic_t fscache_n_op_cancelled;
46107-atomic_t fscache_n_op_rejected;
46108+atomic_unchecked_t fscache_n_op_pend;
46109+atomic_unchecked_t fscache_n_op_run;
46110+atomic_unchecked_t fscache_n_op_enqueue;
46111+atomic_unchecked_t fscache_n_op_requeue;
46112+atomic_unchecked_t fscache_n_op_deferred_release;
46113+atomic_unchecked_t fscache_n_op_release;
46114+atomic_unchecked_t fscache_n_op_gc;
46115+atomic_unchecked_t fscache_n_op_cancelled;
46116+atomic_unchecked_t fscache_n_op_rejected;
46117
46118-atomic_t fscache_n_attr_changed;
46119-atomic_t fscache_n_attr_changed_ok;
46120-atomic_t fscache_n_attr_changed_nobufs;
46121-atomic_t fscache_n_attr_changed_nomem;
46122-atomic_t fscache_n_attr_changed_calls;
46123+atomic_unchecked_t fscache_n_attr_changed;
46124+atomic_unchecked_t fscache_n_attr_changed_ok;
46125+atomic_unchecked_t fscache_n_attr_changed_nobufs;
46126+atomic_unchecked_t fscache_n_attr_changed_nomem;
46127+atomic_unchecked_t fscache_n_attr_changed_calls;
46128
46129-atomic_t fscache_n_allocs;
46130-atomic_t fscache_n_allocs_ok;
46131-atomic_t fscache_n_allocs_wait;
46132-atomic_t fscache_n_allocs_nobufs;
46133-atomic_t fscache_n_allocs_intr;
46134-atomic_t fscache_n_allocs_object_dead;
46135-atomic_t fscache_n_alloc_ops;
46136-atomic_t fscache_n_alloc_op_waits;
46137+atomic_unchecked_t fscache_n_allocs;
46138+atomic_unchecked_t fscache_n_allocs_ok;
46139+atomic_unchecked_t fscache_n_allocs_wait;
46140+atomic_unchecked_t fscache_n_allocs_nobufs;
46141+atomic_unchecked_t fscache_n_allocs_intr;
46142+atomic_unchecked_t fscache_n_allocs_object_dead;
46143+atomic_unchecked_t fscache_n_alloc_ops;
46144+atomic_unchecked_t fscache_n_alloc_op_waits;
46145
46146-atomic_t fscache_n_retrievals;
46147-atomic_t fscache_n_retrievals_ok;
46148-atomic_t fscache_n_retrievals_wait;
46149-atomic_t fscache_n_retrievals_nodata;
46150-atomic_t fscache_n_retrievals_nobufs;
46151-atomic_t fscache_n_retrievals_intr;
46152-atomic_t fscache_n_retrievals_nomem;
46153-atomic_t fscache_n_retrievals_object_dead;
46154-atomic_t fscache_n_retrieval_ops;
46155-atomic_t fscache_n_retrieval_op_waits;
46156+atomic_unchecked_t fscache_n_retrievals;
46157+atomic_unchecked_t fscache_n_retrievals_ok;
46158+atomic_unchecked_t fscache_n_retrievals_wait;
46159+atomic_unchecked_t fscache_n_retrievals_nodata;
46160+atomic_unchecked_t fscache_n_retrievals_nobufs;
46161+atomic_unchecked_t fscache_n_retrievals_intr;
46162+atomic_unchecked_t fscache_n_retrievals_nomem;
46163+atomic_unchecked_t fscache_n_retrievals_object_dead;
46164+atomic_unchecked_t fscache_n_retrieval_ops;
46165+atomic_unchecked_t fscache_n_retrieval_op_waits;
46166
46167-atomic_t fscache_n_stores;
46168-atomic_t fscache_n_stores_ok;
46169-atomic_t fscache_n_stores_again;
46170-atomic_t fscache_n_stores_nobufs;
46171-atomic_t fscache_n_stores_oom;
46172-atomic_t fscache_n_store_ops;
46173-atomic_t fscache_n_store_calls;
46174-atomic_t fscache_n_store_pages;
46175-atomic_t fscache_n_store_radix_deletes;
46176-atomic_t fscache_n_store_pages_over_limit;
46177+atomic_unchecked_t fscache_n_stores;
46178+atomic_unchecked_t fscache_n_stores_ok;
46179+atomic_unchecked_t fscache_n_stores_again;
46180+atomic_unchecked_t fscache_n_stores_nobufs;
46181+atomic_unchecked_t fscache_n_stores_oom;
46182+atomic_unchecked_t fscache_n_store_ops;
46183+atomic_unchecked_t fscache_n_store_calls;
46184+atomic_unchecked_t fscache_n_store_pages;
46185+atomic_unchecked_t fscache_n_store_radix_deletes;
46186+atomic_unchecked_t fscache_n_store_pages_over_limit;
46187
46188-atomic_t fscache_n_store_vmscan_not_storing;
46189-atomic_t fscache_n_store_vmscan_gone;
46190-atomic_t fscache_n_store_vmscan_busy;
46191-atomic_t fscache_n_store_vmscan_cancelled;
46192+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
46193+atomic_unchecked_t fscache_n_store_vmscan_gone;
46194+atomic_unchecked_t fscache_n_store_vmscan_busy;
46195+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
46196
46197-atomic_t fscache_n_marks;
46198-atomic_t fscache_n_uncaches;
46199+atomic_unchecked_t fscache_n_marks;
46200+atomic_unchecked_t fscache_n_uncaches;
46201
46202-atomic_t fscache_n_acquires;
46203-atomic_t fscache_n_acquires_null;
46204-atomic_t fscache_n_acquires_no_cache;
46205-atomic_t fscache_n_acquires_ok;
46206-atomic_t fscache_n_acquires_nobufs;
46207-atomic_t fscache_n_acquires_oom;
46208+atomic_unchecked_t fscache_n_acquires;
46209+atomic_unchecked_t fscache_n_acquires_null;
46210+atomic_unchecked_t fscache_n_acquires_no_cache;
46211+atomic_unchecked_t fscache_n_acquires_ok;
46212+atomic_unchecked_t fscache_n_acquires_nobufs;
46213+atomic_unchecked_t fscache_n_acquires_oom;
46214
46215-atomic_t fscache_n_updates;
46216-atomic_t fscache_n_updates_null;
46217-atomic_t fscache_n_updates_run;
46218+atomic_unchecked_t fscache_n_updates;
46219+atomic_unchecked_t fscache_n_updates_null;
46220+atomic_unchecked_t fscache_n_updates_run;
46221
46222-atomic_t fscache_n_relinquishes;
46223-atomic_t fscache_n_relinquishes_null;
46224-atomic_t fscache_n_relinquishes_waitcrt;
46225-atomic_t fscache_n_relinquishes_retire;
46226+atomic_unchecked_t fscache_n_relinquishes;
46227+atomic_unchecked_t fscache_n_relinquishes_null;
46228+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
46229+atomic_unchecked_t fscache_n_relinquishes_retire;
46230
46231-atomic_t fscache_n_cookie_index;
46232-atomic_t fscache_n_cookie_data;
46233-atomic_t fscache_n_cookie_special;
46234+atomic_unchecked_t fscache_n_cookie_index;
46235+atomic_unchecked_t fscache_n_cookie_data;
46236+atomic_unchecked_t fscache_n_cookie_special;
46237
46238-atomic_t fscache_n_object_alloc;
46239-atomic_t fscache_n_object_no_alloc;
46240-atomic_t fscache_n_object_lookups;
46241-atomic_t fscache_n_object_lookups_negative;
46242-atomic_t fscache_n_object_lookups_positive;
46243-atomic_t fscache_n_object_lookups_timed_out;
46244-atomic_t fscache_n_object_created;
46245-atomic_t fscache_n_object_avail;
46246-atomic_t fscache_n_object_dead;
46247+atomic_unchecked_t fscache_n_object_alloc;
46248+atomic_unchecked_t fscache_n_object_no_alloc;
46249+atomic_unchecked_t fscache_n_object_lookups;
46250+atomic_unchecked_t fscache_n_object_lookups_negative;
46251+atomic_unchecked_t fscache_n_object_lookups_positive;
46252+atomic_unchecked_t fscache_n_object_lookups_timed_out;
46253+atomic_unchecked_t fscache_n_object_created;
46254+atomic_unchecked_t fscache_n_object_avail;
46255+atomic_unchecked_t fscache_n_object_dead;
46256
46257-atomic_t fscache_n_checkaux_none;
46258-atomic_t fscache_n_checkaux_okay;
46259-atomic_t fscache_n_checkaux_update;
46260-atomic_t fscache_n_checkaux_obsolete;
46261+atomic_unchecked_t fscache_n_checkaux_none;
46262+atomic_unchecked_t fscache_n_checkaux_okay;
46263+atomic_unchecked_t fscache_n_checkaux_update;
46264+atomic_unchecked_t fscache_n_checkaux_obsolete;
46265
46266 atomic_t fscache_n_cop_alloc_object;
46267 atomic_t fscache_n_cop_lookup_object;
46268@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
46269 seq_puts(m, "FS-Cache statistics\n");
46270
46271 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
46272- atomic_read(&fscache_n_cookie_index),
46273- atomic_read(&fscache_n_cookie_data),
46274- atomic_read(&fscache_n_cookie_special));
46275+ atomic_read_unchecked(&fscache_n_cookie_index),
46276+ atomic_read_unchecked(&fscache_n_cookie_data),
46277+ atomic_read_unchecked(&fscache_n_cookie_special));
46278
46279 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
46280- atomic_read(&fscache_n_object_alloc),
46281- atomic_read(&fscache_n_object_no_alloc),
46282- atomic_read(&fscache_n_object_avail),
46283- atomic_read(&fscache_n_object_dead));
46284+ atomic_read_unchecked(&fscache_n_object_alloc),
46285+ atomic_read_unchecked(&fscache_n_object_no_alloc),
46286+ atomic_read_unchecked(&fscache_n_object_avail),
46287+ atomic_read_unchecked(&fscache_n_object_dead));
46288 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
46289- atomic_read(&fscache_n_checkaux_none),
46290- atomic_read(&fscache_n_checkaux_okay),
46291- atomic_read(&fscache_n_checkaux_update),
46292- atomic_read(&fscache_n_checkaux_obsolete));
46293+ atomic_read_unchecked(&fscache_n_checkaux_none),
46294+ atomic_read_unchecked(&fscache_n_checkaux_okay),
46295+ atomic_read_unchecked(&fscache_n_checkaux_update),
46296+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
46297
46298 seq_printf(m, "Pages : mrk=%u unc=%u\n",
46299- atomic_read(&fscache_n_marks),
46300- atomic_read(&fscache_n_uncaches));
46301+ atomic_read_unchecked(&fscache_n_marks),
46302+ atomic_read_unchecked(&fscache_n_uncaches));
46303
46304 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
46305 " oom=%u\n",
46306- atomic_read(&fscache_n_acquires),
46307- atomic_read(&fscache_n_acquires_null),
46308- atomic_read(&fscache_n_acquires_no_cache),
46309- atomic_read(&fscache_n_acquires_ok),
46310- atomic_read(&fscache_n_acquires_nobufs),
46311- atomic_read(&fscache_n_acquires_oom));
46312+ atomic_read_unchecked(&fscache_n_acquires),
46313+ atomic_read_unchecked(&fscache_n_acquires_null),
46314+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
46315+ atomic_read_unchecked(&fscache_n_acquires_ok),
46316+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
46317+ atomic_read_unchecked(&fscache_n_acquires_oom));
46318
46319 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
46320- atomic_read(&fscache_n_object_lookups),
46321- atomic_read(&fscache_n_object_lookups_negative),
46322- atomic_read(&fscache_n_object_lookups_positive),
46323- atomic_read(&fscache_n_object_created),
46324- atomic_read(&fscache_n_object_lookups_timed_out));
46325+ atomic_read_unchecked(&fscache_n_object_lookups),
46326+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
46327+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
46328+ atomic_read_unchecked(&fscache_n_object_created),
46329+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
46330
46331 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
46332- atomic_read(&fscache_n_updates),
46333- atomic_read(&fscache_n_updates_null),
46334- atomic_read(&fscache_n_updates_run));
46335+ atomic_read_unchecked(&fscache_n_updates),
46336+ atomic_read_unchecked(&fscache_n_updates_null),
46337+ atomic_read_unchecked(&fscache_n_updates_run));
46338
46339 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
46340- atomic_read(&fscache_n_relinquishes),
46341- atomic_read(&fscache_n_relinquishes_null),
46342- atomic_read(&fscache_n_relinquishes_waitcrt),
46343- atomic_read(&fscache_n_relinquishes_retire));
46344+ atomic_read_unchecked(&fscache_n_relinquishes),
46345+ atomic_read_unchecked(&fscache_n_relinquishes_null),
46346+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
46347+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
46348
46349 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
46350- atomic_read(&fscache_n_attr_changed),
46351- atomic_read(&fscache_n_attr_changed_ok),
46352- atomic_read(&fscache_n_attr_changed_nobufs),
46353- atomic_read(&fscache_n_attr_changed_nomem),
46354- atomic_read(&fscache_n_attr_changed_calls));
46355+ atomic_read_unchecked(&fscache_n_attr_changed),
46356+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
46357+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
46358+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
46359+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
46360
46361 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
46362- atomic_read(&fscache_n_allocs),
46363- atomic_read(&fscache_n_allocs_ok),
46364- atomic_read(&fscache_n_allocs_wait),
46365- atomic_read(&fscache_n_allocs_nobufs),
46366- atomic_read(&fscache_n_allocs_intr));
46367+ atomic_read_unchecked(&fscache_n_allocs),
46368+ atomic_read_unchecked(&fscache_n_allocs_ok),
46369+ atomic_read_unchecked(&fscache_n_allocs_wait),
46370+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
46371+ atomic_read_unchecked(&fscache_n_allocs_intr));
46372 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
46373- atomic_read(&fscache_n_alloc_ops),
46374- atomic_read(&fscache_n_alloc_op_waits),
46375- atomic_read(&fscache_n_allocs_object_dead));
46376+ atomic_read_unchecked(&fscache_n_alloc_ops),
46377+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
46378+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
46379
46380 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
46381 " int=%u oom=%u\n",
46382- atomic_read(&fscache_n_retrievals),
46383- atomic_read(&fscache_n_retrievals_ok),
46384- atomic_read(&fscache_n_retrievals_wait),
46385- atomic_read(&fscache_n_retrievals_nodata),
46386- atomic_read(&fscache_n_retrievals_nobufs),
46387- atomic_read(&fscache_n_retrievals_intr),
46388- atomic_read(&fscache_n_retrievals_nomem));
46389+ atomic_read_unchecked(&fscache_n_retrievals),
46390+ atomic_read_unchecked(&fscache_n_retrievals_ok),
46391+ atomic_read_unchecked(&fscache_n_retrievals_wait),
46392+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
46393+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
46394+ atomic_read_unchecked(&fscache_n_retrievals_intr),
46395+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
46396 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
46397- atomic_read(&fscache_n_retrieval_ops),
46398- atomic_read(&fscache_n_retrieval_op_waits),
46399- atomic_read(&fscache_n_retrievals_object_dead));
46400+ atomic_read_unchecked(&fscache_n_retrieval_ops),
46401+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
46402+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
46403
46404 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
46405- atomic_read(&fscache_n_stores),
46406- atomic_read(&fscache_n_stores_ok),
46407- atomic_read(&fscache_n_stores_again),
46408- atomic_read(&fscache_n_stores_nobufs),
46409- atomic_read(&fscache_n_stores_oom));
46410+ atomic_read_unchecked(&fscache_n_stores),
46411+ atomic_read_unchecked(&fscache_n_stores_ok),
46412+ atomic_read_unchecked(&fscache_n_stores_again),
46413+ atomic_read_unchecked(&fscache_n_stores_nobufs),
46414+ atomic_read_unchecked(&fscache_n_stores_oom));
46415 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
46416- atomic_read(&fscache_n_store_ops),
46417- atomic_read(&fscache_n_store_calls),
46418- atomic_read(&fscache_n_store_pages),
46419- atomic_read(&fscache_n_store_radix_deletes),
46420- atomic_read(&fscache_n_store_pages_over_limit));
46421+ atomic_read_unchecked(&fscache_n_store_ops),
46422+ atomic_read_unchecked(&fscache_n_store_calls),
46423+ atomic_read_unchecked(&fscache_n_store_pages),
46424+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
46425+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
46426
46427 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
46428- atomic_read(&fscache_n_store_vmscan_not_storing),
46429- atomic_read(&fscache_n_store_vmscan_gone),
46430- atomic_read(&fscache_n_store_vmscan_busy),
46431- atomic_read(&fscache_n_store_vmscan_cancelled));
46432+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
46433+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
46434+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
46435+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
46436
46437 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
46438- atomic_read(&fscache_n_op_pend),
46439- atomic_read(&fscache_n_op_run),
46440- atomic_read(&fscache_n_op_enqueue),
46441- atomic_read(&fscache_n_op_cancelled),
46442- atomic_read(&fscache_n_op_rejected));
46443+ atomic_read_unchecked(&fscache_n_op_pend),
46444+ atomic_read_unchecked(&fscache_n_op_run),
46445+ atomic_read_unchecked(&fscache_n_op_enqueue),
46446+ atomic_read_unchecked(&fscache_n_op_cancelled),
46447+ atomic_read_unchecked(&fscache_n_op_rejected));
46448 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
46449- atomic_read(&fscache_n_op_deferred_release),
46450- atomic_read(&fscache_n_op_release),
46451- atomic_read(&fscache_n_op_gc));
46452+ atomic_read_unchecked(&fscache_n_op_deferred_release),
46453+ atomic_read_unchecked(&fscache_n_op_release),
46454+ atomic_read_unchecked(&fscache_n_op_gc));
46455
46456 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
46457 atomic_read(&fscache_n_cop_alloc_object),
46458diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
46459index 3426521..3b75162 100644
46460--- a/fs/fuse/cuse.c
46461+++ b/fs/fuse/cuse.c
46462@@ -587,10 +587,12 @@ static int __init cuse_init(void)
46463 INIT_LIST_HEAD(&cuse_conntbl[i]);
46464
46465 /* inherit and extend fuse_dev_operations */
46466- cuse_channel_fops = fuse_dev_operations;
46467- cuse_channel_fops.owner = THIS_MODULE;
46468- cuse_channel_fops.open = cuse_channel_open;
46469- cuse_channel_fops.release = cuse_channel_release;
46470+ pax_open_kernel();
46471+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
46472+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
46473+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
46474+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
46475+ pax_close_kernel();
46476
46477 cuse_class = class_create(THIS_MODULE, "cuse");
46478 if (IS_ERR(cuse_class))
46479diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
46480index 5f3368a..8306426 100644
46481--- a/fs/fuse/dev.c
46482+++ b/fs/fuse/dev.c
46483@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
46484 ret = 0;
46485 pipe_lock(pipe);
46486
46487- if (!pipe->readers) {
46488+ if (!atomic_read(&pipe->readers)) {
46489 send_sig(SIGPIPE, current, 0);
46490 if (!ret)
46491 ret = -EPIPE;
46492diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
46493index 2066328..f5add3b 100644
46494--- a/fs/fuse/dir.c
46495+++ b/fs/fuse/dir.c
46496@@ -1175,7 +1175,7 @@ static char *read_link(struct dentry *dentry)
46497 return link;
46498 }
46499
46500-static void free_link(char *link)
46501+static void free_link(const char *link)
46502 {
46503 if (!IS_ERR(link))
46504 free_page((unsigned long) link);
46505diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
46506index 5698746..6086012 100644
46507--- a/fs/gfs2/inode.c
46508+++ b/fs/gfs2/inode.c
46509@@ -1487,7 +1487,7 @@ out:
46510
46511 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
46512 {
46513- char *s = nd_get_link(nd);
46514+ const char *s = nd_get_link(nd);
46515 if (!IS_ERR(s))
46516 kfree(s);
46517 }
46518diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
46519index 3645cd3..786809c 100644
46520--- a/fs/hugetlbfs/inode.c
46521+++ b/fs/hugetlbfs/inode.c
46522@@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs_fs_type = {
46523 .kill_sb = kill_litter_super,
46524 };
46525
46526-static struct vfsmount *hugetlbfs_vfsmount;
46527+struct vfsmount *hugetlbfs_vfsmount;
46528
46529 static int can_do_hugetlb_shm(void)
46530 {
46531diff --git a/fs/inode.c b/fs/inode.c
46532index 83ab215..8842101 100644
46533--- a/fs/inode.c
46534+++ b/fs/inode.c
46535@@ -870,8 +870,8 @@ unsigned int get_next_ino(void)
46536
46537 #ifdef CONFIG_SMP
46538 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
46539- static atomic_t shared_last_ino;
46540- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
46541+ static atomic_unchecked_t shared_last_ino;
46542+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
46543
46544 res = next - LAST_INO_BATCH;
46545 }
46546diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
46547index eafb8d3..f423d37 100644
46548--- a/fs/jffs2/erase.c
46549+++ b/fs/jffs2/erase.c
46550@@ -438,7 +438,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
46551 struct jffs2_unknown_node marker = {
46552 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
46553 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
46554- .totlen = cpu_to_je32(c->cleanmarker_size)
46555+ .totlen = cpu_to_je32(c->cleanmarker_size),
46556+ .hdr_crc = cpu_to_je32(0)
46557 };
46558
46559 jffs2_prealloc_raw_node_refs(c, jeb, 1);
46560diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
46561index 30e8f47..21f600c 100644
46562--- a/fs/jffs2/wbuf.c
46563+++ b/fs/jffs2/wbuf.c
46564@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
46565 {
46566 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
46567 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
46568- .totlen = constant_cpu_to_je32(8)
46569+ .totlen = constant_cpu_to_je32(8),
46570+ .hdr_crc = constant_cpu_to_je32(0)
46571 };
46572
46573 /*
46574diff --git a/fs/jfs/super.c b/fs/jfs/super.c
46575index 682bca6..86b8e6e 100644
46576--- a/fs/jfs/super.c
46577+++ b/fs/jfs/super.c
46578@@ -801,7 +801,7 @@ static int __init init_jfs_fs(void)
46579
46580 jfs_inode_cachep =
46581 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
46582- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
46583+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
46584 init_once);
46585 if (jfs_inode_cachep == NULL)
46586 return -ENOMEM;
46587diff --git a/fs/libfs.c b/fs/libfs.c
46588index 5b2dbb3..7442d54 100644
46589--- a/fs/libfs.c
46590+++ b/fs/libfs.c
46591@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
46592
46593 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
46594 struct dentry *next;
46595+ char d_name[sizeof(next->d_iname)];
46596+ const unsigned char *name;
46597+
46598 next = list_entry(p, struct dentry, d_u.d_child);
46599 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
46600 if (!simple_positive(next)) {
46601@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
46602
46603 spin_unlock(&next->d_lock);
46604 spin_unlock(&dentry->d_lock);
46605- if (filldir(dirent, next->d_name.name,
46606+ name = next->d_name.name;
46607+ if (name == next->d_iname) {
46608+ memcpy(d_name, name, next->d_name.len);
46609+ name = d_name;
46610+ }
46611+ if (filldir(dirent, name,
46612 next->d_name.len, filp->f_pos,
46613 next->d_inode->i_ino,
46614 dt_type(next->d_inode)) < 0)
46615diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
46616index 8392cb8..80d6193 100644
46617--- a/fs/lockd/clntproc.c
46618+++ b/fs/lockd/clntproc.c
46619@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
46620 /*
46621 * Cookie counter for NLM requests
46622 */
46623-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
46624+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
46625
46626 void nlmclnt_next_cookie(struct nlm_cookie *c)
46627 {
46628- u32 cookie = atomic_inc_return(&nlm_cookie);
46629+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
46630
46631 memcpy(c->data, &cookie, 4);
46632 c->len=4;
46633diff --git a/fs/locks.c b/fs/locks.c
46634index 0d68f1f..f216b79 100644
46635--- a/fs/locks.c
46636+++ b/fs/locks.c
46637@@ -2075,16 +2075,16 @@ void locks_remove_flock(struct file *filp)
46638 return;
46639
46640 if (filp->f_op && filp->f_op->flock) {
46641- struct file_lock fl = {
46642+ struct file_lock flock = {
46643 .fl_pid = current->tgid,
46644 .fl_file = filp,
46645 .fl_flags = FL_FLOCK,
46646 .fl_type = F_UNLCK,
46647 .fl_end = OFFSET_MAX,
46648 };
46649- filp->f_op->flock(filp, F_SETLKW, &fl);
46650- if (fl.fl_ops && fl.fl_ops->fl_release_private)
46651- fl.fl_ops->fl_release_private(&fl);
46652+ filp->f_op->flock(filp, F_SETLKW, &flock);
46653+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
46654+ flock.fl_ops->fl_release_private(&flock);
46655 }
46656
46657 lock_flocks();
46658diff --git a/fs/namei.c b/fs/namei.c
46659index 46ea9cc..c7cf3a3 100644
46660--- a/fs/namei.c
46661+++ b/fs/namei.c
46662@@ -278,16 +278,32 @@ int generic_permission(struct inode *inode, int mask)
46663 if (ret != -EACCES)
46664 return ret;
46665
46666+#ifdef CONFIG_GRKERNSEC
46667+ /* we'll block if we have to log due to a denied capability use */
46668+ if (mask & MAY_NOT_BLOCK)
46669+ return -ECHILD;
46670+#endif
46671+
46672 if (S_ISDIR(inode->i_mode)) {
46673 /* DACs are overridable for directories */
46674- if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46675- return 0;
46676 if (!(mask & MAY_WRITE))
46677- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46678+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
46679+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46680 return 0;
46681+ if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46682+ return 0;
46683 return -EACCES;
46684 }
46685 /*
46686+ * Searching includes executable on directories, else just read.
46687+ */
46688+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
46689+ if (mask == MAY_READ)
46690+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
46691+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46692+ return 0;
46693+
46694+ /*
46695 * Read/write DACs are always overridable.
46696 * Executable DACs are overridable when there is
46697 * at least one exec bit set.
46698@@ -296,14 +312,6 @@ int generic_permission(struct inode *inode, int mask)
46699 if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46700 return 0;
46701
46702- /*
46703- * Searching includes executable on directories, else just read.
46704- */
46705- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
46706- if (mask == MAY_READ)
46707- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46708- return 0;
46709-
46710 return -EACCES;
46711 }
46712
46713@@ -652,11 +660,19 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
46714 return error;
46715 }
46716
46717+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
46718+ dentry->d_inode, dentry, nd->path.mnt)) {
46719+ error = -EACCES;
46720+ *p = ERR_PTR(error); /* no ->put_link(), please */
46721+ path_put(&nd->path);
46722+ return error;
46723+ }
46724+
46725 nd->last_type = LAST_BIND;
46726 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
46727 error = PTR_ERR(*p);
46728 if (!IS_ERR(*p)) {
46729- char *s = nd_get_link(nd);
46730+ const char *s = nd_get_link(nd);
46731 error = 0;
46732 if (s)
46733 error = __vfs_follow_link(nd, s);
46734@@ -1650,6 +1666,21 @@ static int path_lookupat(int dfd, const char *name,
46735 if (!err)
46736 err = complete_walk(nd);
46737
46738+ if (!(nd->flags & LOOKUP_PARENT)) {
46739+#ifdef CONFIG_GRKERNSEC
46740+ if (flags & LOOKUP_RCU) {
46741+ if (!err)
46742+ path_put(&nd->path);
46743+ err = -ECHILD;
46744+ } else
46745+#endif
46746+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
46747+ if (!err)
46748+ path_put(&nd->path);
46749+ err = -ENOENT;
46750+ }
46751+ }
46752+
46753 if (!err && nd->flags & LOOKUP_DIRECTORY) {
46754 if (!nd->inode->i_op->lookup) {
46755 path_put(&nd->path);
46756@@ -1677,6 +1708,15 @@ static int do_path_lookup(int dfd, const char *name,
46757 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
46758
46759 if (likely(!retval)) {
46760+ if (*name != '/' && nd->path.dentry && nd->inode) {
46761+#ifdef CONFIG_GRKERNSEC
46762+ if (flags & LOOKUP_RCU)
46763+ return -ECHILD;
46764+#endif
46765+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
46766+ return -ENOENT;
46767+ }
46768+
46769 if (unlikely(!audit_dummy_context())) {
46770 if (nd->path.dentry && nd->inode)
46771 audit_inode(name, nd->path.dentry);
46772@@ -2071,6 +2111,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
46773 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
46774 return -EPERM;
46775
46776+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
46777+ return -EPERM;
46778+ if (gr_handle_rawio(inode))
46779+ return -EPERM;
46780+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
46781+ return -EACCES;
46782+
46783 return 0;
46784 }
46785
46786@@ -2132,6 +2179,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46787 error = complete_walk(nd);
46788 if (error)
46789 return ERR_PTR(error);
46790+#ifdef CONFIG_GRKERNSEC
46791+ if (nd->flags & LOOKUP_RCU) {
46792+ error = -ECHILD;
46793+ goto exit;
46794+ }
46795+#endif
46796+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
46797+ error = -ENOENT;
46798+ goto exit;
46799+ }
46800 audit_inode(pathname, nd->path.dentry);
46801 if (open_flag & O_CREAT) {
46802 error = -EISDIR;
46803@@ -2142,6 +2199,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46804 error = complete_walk(nd);
46805 if (error)
46806 return ERR_PTR(error);
46807+#ifdef CONFIG_GRKERNSEC
46808+ if (nd->flags & LOOKUP_RCU) {
46809+ error = -ECHILD;
46810+ goto exit;
46811+ }
46812+#endif
46813+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
46814+ error = -ENOENT;
46815+ goto exit;
46816+ }
46817 audit_inode(pathname, dir);
46818 goto ok;
46819 }
46820@@ -2163,6 +2230,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46821 error = complete_walk(nd);
46822 if (error)
46823 return ERR_PTR(error);
46824+#ifdef CONFIG_GRKERNSEC
46825+ if (nd->flags & LOOKUP_RCU) {
46826+ error = -ECHILD;
46827+ goto exit;
46828+ }
46829+#endif
46830+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
46831+ error = -ENOENT;
46832+ goto exit;
46833+ }
46834
46835 error = -ENOTDIR;
46836 if (nd->flags & LOOKUP_DIRECTORY) {
46837@@ -2203,6 +2280,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46838 /* Negative dentry, just create the file */
46839 if (!dentry->d_inode) {
46840 umode_t mode = op->mode;
46841+
46842+ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
46843+ error = -EACCES;
46844+ goto exit_mutex_unlock;
46845+ }
46846+
46847 if (!IS_POSIXACL(dir->d_inode))
46848 mode &= ~current_umask();
46849 /*
46850@@ -2226,6 +2309,8 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46851 error = vfs_create(dir->d_inode, dentry, mode, nd);
46852 if (error)
46853 goto exit_mutex_unlock;
46854+ else
46855+ gr_handle_create(path->dentry, path->mnt);
46856 mutex_unlock(&dir->d_inode->i_mutex);
46857 dput(nd->path.dentry);
46858 nd->path.dentry = dentry;
46859@@ -2235,6 +2320,19 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46860 /*
46861 * It already exists.
46862 */
46863+
46864+ if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
46865+ error = -ENOENT;
46866+ goto exit_mutex_unlock;
46867+ }
46868+
46869+ /* only check if O_CREAT is specified, all other checks need to go
46870+ into may_open */
46871+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
46872+ error = -EACCES;
46873+ goto exit_mutex_unlock;
46874+ }
46875+
46876 mutex_unlock(&dir->d_inode->i_mutex);
46877 audit_inode(pathname, path->dentry);
46878
46879@@ -2447,6 +2545,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
46880 *path = nd.path;
46881 return dentry;
46882 eexist:
46883+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
46884+ dput(dentry);
46885+ dentry = ERR_PTR(-ENOENT);
46886+ goto fail;
46887+ }
46888 dput(dentry);
46889 dentry = ERR_PTR(-EEXIST);
46890 fail:
46891@@ -2469,6 +2572,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
46892 }
46893 EXPORT_SYMBOL(user_path_create);
46894
46895+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
46896+{
46897+ char *tmp = getname(pathname);
46898+ struct dentry *res;
46899+ if (IS_ERR(tmp))
46900+ return ERR_CAST(tmp);
46901+ res = kern_path_create(dfd, tmp, path, is_dir);
46902+ if (IS_ERR(res))
46903+ putname(tmp);
46904+ else
46905+ *to = tmp;
46906+ return res;
46907+}
46908+
46909 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
46910 {
46911 int error = may_create(dir, dentry);
46912@@ -2536,6 +2653,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
46913 error = mnt_want_write(path.mnt);
46914 if (error)
46915 goto out_dput;
46916+
46917+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
46918+ error = -EPERM;
46919+ goto out_drop_write;
46920+ }
46921+
46922+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
46923+ error = -EACCES;
46924+ goto out_drop_write;
46925+ }
46926+
46927 error = security_path_mknod(&path, dentry, mode, dev);
46928 if (error)
46929 goto out_drop_write;
46930@@ -2553,6 +2681,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
46931 }
46932 out_drop_write:
46933 mnt_drop_write(path.mnt);
46934+
46935+ if (!error)
46936+ gr_handle_create(dentry, path.mnt);
46937 out_dput:
46938 dput(dentry);
46939 mutex_unlock(&path.dentry->d_inode->i_mutex);
46940@@ -2602,12 +2733,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode)
46941 error = mnt_want_write(path.mnt);
46942 if (error)
46943 goto out_dput;
46944+
46945+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
46946+ error = -EACCES;
46947+ goto out_drop_write;
46948+ }
46949+
46950 error = security_path_mkdir(&path, dentry, mode);
46951 if (error)
46952 goto out_drop_write;
46953 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
46954 out_drop_write:
46955 mnt_drop_write(path.mnt);
46956+
46957+ if (!error)
46958+ gr_handle_create(dentry, path.mnt);
46959 out_dput:
46960 dput(dentry);
46961 mutex_unlock(&path.dentry->d_inode->i_mutex);
46962@@ -2687,6 +2827,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
46963 char * name;
46964 struct dentry *dentry;
46965 struct nameidata nd;
46966+ ino_t saved_ino = 0;
46967+ dev_t saved_dev = 0;
46968
46969 error = user_path_parent(dfd, pathname, &nd, &name);
46970 if (error)
46971@@ -2715,6 +2857,15 @@ static long do_rmdir(int dfd, const char __user *pathname)
46972 error = -ENOENT;
46973 goto exit3;
46974 }
46975+
46976+ saved_ino = dentry->d_inode->i_ino;
46977+ saved_dev = gr_get_dev_from_dentry(dentry);
46978+
46979+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
46980+ error = -EACCES;
46981+ goto exit3;
46982+ }
46983+
46984 error = mnt_want_write(nd.path.mnt);
46985 if (error)
46986 goto exit3;
46987@@ -2722,6 +2873,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
46988 if (error)
46989 goto exit4;
46990 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
46991+ if (!error && (saved_dev || saved_ino))
46992+ gr_handle_delete(saved_ino, saved_dev);
46993 exit4:
46994 mnt_drop_write(nd.path.mnt);
46995 exit3:
46996@@ -2784,6 +2937,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
46997 struct dentry *dentry;
46998 struct nameidata nd;
46999 struct inode *inode = NULL;
47000+ ino_t saved_ino = 0;
47001+ dev_t saved_dev = 0;
47002
47003 error = user_path_parent(dfd, pathname, &nd, &name);
47004 if (error)
47005@@ -2806,6 +2961,16 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47006 if (!inode)
47007 goto slashes;
47008 ihold(inode);
47009+
47010+ if (inode->i_nlink <= 1) {
47011+ saved_ino = inode->i_ino;
47012+ saved_dev = gr_get_dev_from_dentry(dentry);
47013+ }
47014+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
47015+ error = -EACCES;
47016+ goto exit2;
47017+ }
47018+
47019 error = mnt_want_write(nd.path.mnt);
47020 if (error)
47021 goto exit2;
47022@@ -2813,6 +2978,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47023 if (error)
47024 goto exit3;
47025 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
47026+ if (!error && (saved_ino || saved_dev))
47027+ gr_handle_delete(saved_ino, saved_dev);
47028 exit3:
47029 mnt_drop_write(nd.path.mnt);
47030 exit2:
47031@@ -2888,10 +3055,18 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
47032 error = mnt_want_write(path.mnt);
47033 if (error)
47034 goto out_dput;
47035+
47036+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
47037+ error = -EACCES;
47038+ goto out_drop_write;
47039+ }
47040+
47041 error = security_path_symlink(&path, dentry, from);
47042 if (error)
47043 goto out_drop_write;
47044 error = vfs_symlink(path.dentry->d_inode, dentry, from);
47045+ if (!error)
47046+ gr_handle_create(dentry, path.mnt);
47047 out_drop_write:
47048 mnt_drop_write(path.mnt);
47049 out_dput:
47050@@ -2963,6 +3138,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47051 {
47052 struct dentry *new_dentry;
47053 struct path old_path, new_path;
47054+ char *to = NULL;
47055 int how = 0;
47056 int error;
47057
47058@@ -2986,7 +3162,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47059 if (error)
47060 return error;
47061
47062- new_dentry = user_path_create(newdfd, newname, &new_path, 0);
47063+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
47064 error = PTR_ERR(new_dentry);
47065 if (IS_ERR(new_dentry))
47066 goto out;
47067@@ -2997,13 +3173,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47068 error = mnt_want_write(new_path.mnt);
47069 if (error)
47070 goto out_dput;
47071+
47072+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
47073+ old_path.dentry->d_inode,
47074+ old_path.dentry->d_inode->i_mode, to)) {
47075+ error = -EACCES;
47076+ goto out_drop_write;
47077+ }
47078+
47079+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
47080+ old_path.dentry, old_path.mnt, to)) {
47081+ error = -EACCES;
47082+ goto out_drop_write;
47083+ }
47084+
47085 error = security_path_link(old_path.dentry, &new_path, new_dentry);
47086 if (error)
47087 goto out_drop_write;
47088 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
47089+ if (!error)
47090+ gr_handle_create(new_dentry, new_path.mnt);
47091 out_drop_write:
47092 mnt_drop_write(new_path.mnt);
47093 out_dput:
47094+ putname(to);
47095 dput(new_dentry);
47096 mutex_unlock(&new_path.dentry->d_inode->i_mutex);
47097 path_put(&new_path);
47098@@ -3231,6 +3424,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47099 if (new_dentry == trap)
47100 goto exit5;
47101
47102+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
47103+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
47104+ to);
47105+ if (error)
47106+ goto exit5;
47107+
47108 error = mnt_want_write(oldnd.path.mnt);
47109 if (error)
47110 goto exit5;
47111@@ -3240,6 +3439,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47112 goto exit6;
47113 error = vfs_rename(old_dir->d_inode, old_dentry,
47114 new_dir->d_inode, new_dentry);
47115+ if (!error)
47116+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
47117+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
47118 exit6:
47119 mnt_drop_write(oldnd.path.mnt);
47120 exit5:
47121@@ -3265,6 +3467,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
47122
47123 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
47124 {
47125+ char tmpbuf[64];
47126+ const char *newlink;
47127 int len;
47128
47129 len = PTR_ERR(link);
47130@@ -3274,7 +3478,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
47131 len = strlen(link);
47132 if (len > (unsigned) buflen)
47133 len = buflen;
47134- if (copy_to_user(buffer, link, len))
47135+
47136+ if (len < sizeof(tmpbuf)) {
47137+ memcpy(tmpbuf, link, len);
47138+ newlink = tmpbuf;
47139+ } else
47140+ newlink = link;
47141+
47142+ if (copy_to_user(buffer, newlink, len))
47143 len = -EFAULT;
47144 out:
47145 return len;
47146diff --git a/fs/namespace.c b/fs/namespace.c
47147index e608199..9609cb9 100644
47148--- a/fs/namespace.c
47149+++ b/fs/namespace.c
47150@@ -1155,6 +1155,9 @@ static int do_umount(struct mount *mnt, int flags)
47151 if (!(sb->s_flags & MS_RDONLY))
47152 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
47153 up_write(&sb->s_umount);
47154+
47155+ gr_log_remount(mnt->mnt_devname, retval);
47156+
47157 return retval;
47158 }
47159
47160@@ -1174,6 +1177,9 @@ static int do_umount(struct mount *mnt, int flags)
47161 br_write_unlock(vfsmount_lock);
47162 up_write(&namespace_sem);
47163 release_mounts(&umount_list);
47164+
47165+ gr_log_unmount(mnt->mnt_devname, retval);
47166+
47167 return retval;
47168 }
47169
47170@@ -2175,6 +2181,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47171 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
47172 MS_STRICTATIME);
47173
47174+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
47175+ retval = -EPERM;
47176+ goto dput_out;
47177+ }
47178+
47179+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
47180+ retval = -EPERM;
47181+ goto dput_out;
47182+ }
47183+
47184 if (flags & MS_REMOUNT)
47185 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
47186 data_page);
47187@@ -2189,6 +2205,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47188 dev_name, data_page);
47189 dput_out:
47190 path_put(&path);
47191+
47192+ gr_log_mount(dev_name, dir_name, retval);
47193+
47194 return retval;
47195 }
47196
47197@@ -2470,6 +2489,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
47198 if (error)
47199 goto out2;
47200
47201+ if (gr_handle_chroot_pivot()) {
47202+ error = -EPERM;
47203+ goto out2;
47204+ }
47205+
47206 get_fs_root(current->fs, &root);
47207 error = lock_mount(&old);
47208 if (error)
47209diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h
47210index 32c0658..b1c2045e 100644
47211--- a/fs/ncpfs/ncplib_kernel.h
47212+++ b/fs/ncpfs/ncplib_kernel.h
47213@@ -130,7 +130,7 @@ static inline int ncp_is_nfs_extras(struct ncp_server* server, unsigned int voln
47214 int ncp__io2vol(struct ncp_server *, unsigned char *, unsigned int *,
47215 const unsigned char *, unsigned int, int);
47216 int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *,
47217- const unsigned char *, unsigned int, int);
47218+ const unsigned char *, unsigned int, int) __size_overflow(5);
47219
47220 #define NCP_ESC ':'
47221 #define NCP_IO_TABLE(sb) (NCP_SBP(sb)->nls_io)
47222@@ -146,7 +146,7 @@ int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *,
47223 int ncp__io2vol(unsigned char *, unsigned int *,
47224 const unsigned char *, unsigned int, int);
47225 int ncp__vol2io(unsigned char *, unsigned int *,
47226- const unsigned char *, unsigned int, int);
47227+ const unsigned char *, unsigned int, int) __size_overflow(5);
47228
47229 #define NCP_IO_TABLE(sb) NULL
47230 #define ncp_tolower(t, c) tolower(c)
47231diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
47232index f649fba..236bf92 100644
47233--- a/fs/nfs/inode.c
47234+++ b/fs/nfs/inode.c
47235@@ -151,7 +151,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
47236 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
47237 nfsi->attrtimeo_timestamp = jiffies;
47238
47239- memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
47240+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
47241 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
47242 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
47243 else
47244@@ -1003,16 +1003,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
47245 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
47246 }
47247
47248-static atomic_long_t nfs_attr_generation_counter;
47249+static atomic_long_unchecked_t nfs_attr_generation_counter;
47250
47251 static unsigned long nfs_read_attr_generation_counter(void)
47252 {
47253- return atomic_long_read(&nfs_attr_generation_counter);
47254+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
47255 }
47256
47257 unsigned long nfs_inc_attr_generation_counter(void)
47258 {
47259- return atomic_long_inc_return(&nfs_attr_generation_counter);
47260+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
47261 }
47262
47263 void nfs_fattr_init(struct nfs_fattr *fattr)
47264diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
47265index edf6d3e..bdd1da7 100644
47266--- a/fs/nfsd/vfs.c
47267+++ b/fs/nfsd/vfs.c
47268@@ -925,7 +925,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47269 } else {
47270 oldfs = get_fs();
47271 set_fs(KERNEL_DS);
47272- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
47273+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
47274 set_fs(oldfs);
47275 }
47276
47277@@ -1029,7 +1029,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47278
47279 /* Write the data. */
47280 oldfs = get_fs(); set_fs(KERNEL_DS);
47281- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
47282+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
47283 set_fs(oldfs);
47284 if (host_err < 0)
47285 goto out_nfserr;
47286@@ -1564,7 +1564,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
47287 */
47288
47289 oldfs = get_fs(); set_fs(KERNEL_DS);
47290- host_err = inode->i_op->readlink(dentry, buf, *lenp);
47291+ host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
47292 set_fs(oldfs);
47293
47294 if (host_err < 0)
47295diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
47296index 3568c8a..e0240d8 100644
47297--- a/fs/notify/fanotify/fanotify_user.c
47298+++ b/fs/notify/fanotify/fanotify_user.c
47299@@ -278,7 +278,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
47300 goto out_close_fd;
47301
47302 ret = -EFAULT;
47303- if (copy_to_user(buf, &fanotify_event_metadata,
47304+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
47305+ copy_to_user(buf, &fanotify_event_metadata,
47306 fanotify_event_metadata.event_len))
47307 goto out_kill_access_response;
47308
47309diff --git a/fs/notify/notification.c b/fs/notify/notification.c
47310index ee18815..7aa5d01 100644
47311--- a/fs/notify/notification.c
47312+++ b/fs/notify/notification.c
47313@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
47314 * get set to 0 so it will never get 'freed'
47315 */
47316 static struct fsnotify_event *q_overflow_event;
47317-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47318+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47319
47320 /**
47321 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
47322@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47323 */
47324 u32 fsnotify_get_cookie(void)
47325 {
47326- return atomic_inc_return(&fsnotify_sync_cookie);
47327+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
47328 }
47329 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
47330
47331diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
47332index 99e3610..02c1068 100644
47333--- a/fs/ntfs/dir.c
47334+++ b/fs/ntfs/dir.c
47335@@ -1329,7 +1329,7 @@ find_next_index_buffer:
47336 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
47337 ~(s64)(ndir->itype.index.block_size - 1)));
47338 /* Bounds checks. */
47339- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47340+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47341 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
47342 "inode 0x%lx or driver bug.", vdir->i_ino);
47343 goto err_out;
47344diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
47345index c587e2d..3641eaa 100644
47346--- a/fs/ntfs/file.c
47347+++ b/fs/ntfs/file.c
47348@@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_inode_ops = {
47349 #endif /* NTFS_RW */
47350 };
47351
47352-const struct file_operations ntfs_empty_file_ops = {};
47353+const struct file_operations ntfs_empty_file_ops __read_only;
47354
47355-const struct inode_operations ntfs_empty_inode_ops = {};
47356+const struct inode_operations ntfs_empty_inode_ops __read_only;
47357diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
47358index 210c352..a174f83 100644
47359--- a/fs/ocfs2/localalloc.c
47360+++ b/fs/ocfs2/localalloc.c
47361@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
47362 goto bail;
47363 }
47364
47365- atomic_inc(&osb->alloc_stats.moves);
47366+ atomic_inc_unchecked(&osb->alloc_stats.moves);
47367
47368 bail:
47369 if (handle)
47370diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
47371index d355e6e..578d905 100644
47372--- a/fs/ocfs2/ocfs2.h
47373+++ b/fs/ocfs2/ocfs2.h
47374@@ -235,11 +235,11 @@ enum ocfs2_vol_state
47375
47376 struct ocfs2_alloc_stats
47377 {
47378- atomic_t moves;
47379- atomic_t local_data;
47380- atomic_t bitmap_data;
47381- atomic_t bg_allocs;
47382- atomic_t bg_extends;
47383+ atomic_unchecked_t moves;
47384+ atomic_unchecked_t local_data;
47385+ atomic_unchecked_t bitmap_data;
47386+ atomic_unchecked_t bg_allocs;
47387+ atomic_unchecked_t bg_extends;
47388 };
47389
47390 enum ocfs2_local_alloc_state
47391diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
47392index f169da4..9112253 100644
47393--- a/fs/ocfs2/suballoc.c
47394+++ b/fs/ocfs2/suballoc.c
47395@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
47396 mlog_errno(status);
47397 goto bail;
47398 }
47399- atomic_inc(&osb->alloc_stats.bg_extends);
47400+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
47401
47402 /* You should never ask for this much metadata */
47403 BUG_ON(bits_wanted >
47404@@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handle,
47405 mlog_errno(status);
47406 goto bail;
47407 }
47408- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47409+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47410
47411 *suballoc_loc = res.sr_bg_blkno;
47412 *suballoc_bit_start = res.sr_bit_offset;
47413@@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
47414 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
47415 res->sr_bits);
47416
47417- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47418+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47419
47420 BUG_ON(res->sr_bits != 1);
47421
47422@@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
47423 mlog_errno(status);
47424 goto bail;
47425 }
47426- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47427+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47428
47429 BUG_ON(res.sr_bits != 1);
47430
47431@@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47432 cluster_start,
47433 num_clusters);
47434 if (!status)
47435- atomic_inc(&osb->alloc_stats.local_data);
47436+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
47437 } else {
47438 if (min_clusters > (osb->bitmap_cpg - 1)) {
47439 /* The only paths asking for contiguousness
47440@@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47441 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
47442 res.sr_bg_blkno,
47443 res.sr_bit_offset);
47444- atomic_inc(&osb->alloc_stats.bitmap_data);
47445+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
47446 *num_clusters = res.sr_bits;
47447 }
47448 }
47449diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
47450index 604e12c..8426483 100644
47451--- a/fs/ocfs2/super.c
47452+++ b/fs/ocfs2/super.c
47453@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
47454 "%10s => GlobalAllocs: %d LocalAllocs: %d "
47455 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
47456 "Stats",
47457- atomic_read(&osb->alloc_stats.bitmap_data),
47458- atomic_read(&osb->alloc_stats.local_data),
47459- atomic_read(&osb->alloc_stats.bg_allocs),
47460- atomic_read(&osb->alloc_stats.moves),
47461- atomic_read(&osb->alloc_stats.bg_extends));
47462+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
47463+ atomic_read_unchecked(&osb->alloc_stats.local_data),
47464+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
47465+ atomic_read_unchecked(&osb->alloc_stats.moves),
47466+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
47467
47468 out += snprintf(buf + out, len - out,
47469 "%10s => State: %u Descriptor: %llu Size: %u bits "
47470@@ -2117,11 +2117,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
47471 spin_lock_init(&osb->osb_xattr_lock);
47472 ocfs2_init_steal_slots(osb);
47473
47474- atomic_set(&osb->alloc_stats.moves, 0);
47475- atomic_set(&osb->alloc_stats.local_data, 0);
47476- atomic_set(&osb->alloc_stats.bitmap_data, 0);
47477- atomic_set(&osb->alloc_stats.bg_allocs, 0);
47478- atomic_set(&osb->alloc_stats.bg_extends, 0);
47479+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
47480+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
47481+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
47482+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
47483+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
47484
47485 /* Copy the blockcheck stats from the superblock probe */
47486 osb->osb_ecc_stats = *stats;
47487diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
47488index 5d22872..523db20 100644
47489--- a/fs/ocfs2/symlink.c
47490+++ b/fs/ocfs2/symlink.c
47491@@ -142,7 +142,7 @@ bail:
47492
47493 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
47494 {
47495- char *link = nd_get_link(nd);
47496+ const char *link = nd_get_link(nd);
47497 if (!IS_ERR(link))
47498 kfree(link);
47499 }
47500diff --git a/fs/open.c b/fs/open.c
47501index 77becc0..aad7bd9 100644
47502--- a/fs/open.c
47503+++ b/fs/open.c
47504@@ -112,6 +112,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
47505 error = locks_verify_truncate(inode, NULL, length);
47506 if (!error)
47507 error = security_path_truncate(&path);
47508+
47509+ if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
47510+ error = -EACCES;
47511+
47512 if (!error)
47513 error = do_truncate(path.dentry, length, 0, NULL);
47514
47515@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
47516 if (__mnt_is_readonly(path.mnt))
47517 res = -EROFS;
47518
47519+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
47520+ res = -EACCES;
47521+
47522 out_path_release:
47523 path_put(&path);
47524 out:
47525@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
47526 if (error)
47527 goto dput_and_out;
47528
47529+ gr_log_chdir(path.dentry, path.mnt);
47530+
47531 set_fs_pwd(current->fs, &path);
47532
47533 dput_and_out:
47534@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
47535 goto out_putf;
47536
47537 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
47538+
47539+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
47540+ error = -EPERM;
47541+
47542+ if (!error)
47543+ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
47544+
47545 if (!error)
47546 set_fs_pwd(current->fs, &file->f_path);
47547 out_putf:
47548@@ -438,7 +454,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
47549 if (error)
47550 goto dput_and_out;
47551
47552+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
47553+ goto dput_and_out;
47554+
47555 set_fs_root(current->fs, &path);
47556+
47557+ gr_handle_chroot_chdir(&path);
47558+
47559 error = 0;
47560 dput_and_out:
47561 path_put(&path);
47562@@ -456,6 +478,16 @@ static int chmod_common(struct path *path, umode_t mode)
47563 if (error)
47564 return error;
47565 mutex_lock(&inode->i_mutex);
47566+
47567+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
47568+ error = -EACCES;
47569+ goto out_unlock;
47570+ }
47571+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
47572+ error = -EACCES;
47573+ goto out_unlock;
47574+ }
47575+
47576 error = security_path_chmod(path, mode);
47577 if (error)
47578 goto out_unlock;
47579@@ -506,6 +538,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
47580 int error;
47581 struct iattr newattrs;
47582
47583+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
47584+ return -EACCES;
47585+
47586 newattrs.ia_valid = ATTR_CTIME;
47587 if (user != (uid_t) -1) {
47588 newattrs.ia_valid |= ATTR_UID;
47589diff --git a/fs/pipe.c b/fs/pipe.c
47590index a932ced..6495412 100644
47591--- a/fs/pipe.c
47592+++ b/fs/pipe.c
47593@@ -420,9 +420,9 @@ redo:
47594 }
47595 if (bufs) /* More to do? */
47596 continue;
47597- if (!pipe->writers)
47598+ if (!atomic_read(&pipe->writers))
47599 break;
47600- if (!pipe->waiting_writers) {
47601+ if (!atomic_read(&pipe->waiting_writers)) {
47602 /* syscall merging: Usually we must not sleep
47603 * if O_NONBLOCK is set, or if we got some data.
47604 * But if a writer sleeps in kernel space, then
47605@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
47606 mutex_lock(&inode->i_mutex);
47607 pipe = inode->i_pipe;
47608
47609- if (!pipe->readers) {
47610+ if (!atomic_read(&pipe->readers)) {
47611 send_sig(SIGPIPE, current, 0);
47612 ret = -EPIPE;
47613 goto out;
47614@@ -530,7 +530,7 @@ redo1:
47615 for (;;) {
47616 int bufs;
47617
47618- if (!pipe->readers) {
47619+ if (!atomic_read(&pipe->readers)) {
47620 send_sig(SIGPIPE, current, 0);
47621 if (!ret)
47622 ret = -EPIPE;
47623@@ -616,9 +616,9 @@ redo2:
47624 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
47625 do_wakeup = 0;
47626 }
47627- pipe->waiting_writers++;
47628+ atomic_inc(&pipe->waiting_writers);
47629 pipe_wait(pipe);
47630- pipe->waiting_writers--;
47631+ atomic_dec(&pipe->waiting_writers);
47632 }
47633 out:
47634 mutex_unlock(&inode->i_mutex);
47635@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table *wait)
47636 mask = 0;
47637 if (filp->f_mode & FMODE_READ) {
47638 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
47639- if (!pipe->writers && filp->f_version != pipe->w_counter)
47640+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
47641 mask |= POLLHUP;
47642 }
47643
47644@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table *wait)
47645 * Most Unices do not set POLLERR for FIFOs but on Linux they
47646 * behave exactly like pipes for poll().
47647 */
47648- if (!pipe->readers)
47649+ if (!atomic_read(&pipe->readers))
47650 mask |= POLLERR;
47651 }
47652
47653@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int decr, int decw)
47654
47655 mutex_lock(&inode->i_mutex);
47656 pipe = inode->i_pipe;
47657- pipe->readers -= decr;
47658- pipe->writers -= decw;
47659+ atomic_sub(decr, &pipe->readers);
47660+ atomic_sub(decw, &pipe->writers);
47661
47662- if (!pipe->readers && !pipe->writers) {
47663+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
47664 free_pipe_info(inode);
47665 } else {
47666 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
47667@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
47668
47669 if (inode->i_pipe) {
47670 ret = 0;
47671- inode->i_pipe->readers++;
47672+ atomic_inc(&inode->i_pipe->readers);
47673 }
47674
47675 mutex_unlock(&inode->i_mutex);
47676@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
47677
47678 if (inode->i_pipe) {
47679 ret = 0;
47680- inode->i_pipe->writers++;
47681+ atomic_inc(&inode->i_pipe->writers);
47682 }
47683
47684 mutex_unlock(&inode->i_mutex);
47685@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
47686 if (inode->i_pipe) {
47687 ret = 0;
47688 if (filp->f_mode & FMODE_READ)
47689- inode->i_pipe->readers++;
47690+ atomic_inc(&inode->i_pipe->readers);
47691 if (filp->f_mode & FMODE_WRITE)
47692- inode->i_pipe->writers++;
47693+ atomic_inc(&inode->i_pipe->writers);
47694 }
47695
47696 mutex_unlock(&inode->i_mutex);
47697@@ -931,7 +931,7 @@ void free_pipe_info(struct inode *inode)
47698 inode->i_pipe = NULL;
47699 }
47700
47701-static struct vfsmount *pipe_mnt __read_mostly;
47702+struct vfsmount *pipe_mnt __read_mostly;
47703
47704 /*
47705 * pipefs_dname() is called from d_path().
47706@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(void)
47707 goto fail_iput;
47708 inode->i_pipe = pipe;
47709
47710- pipe->readers = pipe->writers = 1;
47711+ atomic_set(&pipe->readers, 1);
47712+ atomic_set(&pipe->writers, 1);
47713 inode->i_fop = &rdwr_pipefifo_fops;
47714
47715 /*
47716diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
47717index 15af622..0e9f4467 100644
47718--- a/fs/proc/Kconfig
47719+++ b/fs/proc/Kconfig
47720@@ -30,12 +30,12 @@ config PROC_FS
47721
47722 config PROC_KCORE
47723 bool "/proc/kcore support" if !ARM
47724- depends on PROC_FS && MMU
47725+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
47726
47727 config PROC_VMCORE
47728 bool "/proc/vmcore support"
47729- depends on PROC_FS && CRASH_DUMP
47730- default y
47731+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
47732+ default n
47733 help
47734 Exports the dump image of crashed kernel in ELF format.
47735
47736@@ -59,8 +59,8 @@ config PROC_SYSCTL
47737 limited in memory.
47738
47739 config PROC_PAGE_MONITOR
47740- default y
47741- depends on PROC_FS && MMU
47742+ default n
47743+ depends on PROC_FS && MMU && !GRKERNSEC
47744 bool "Enable /proc page monitoring" if EXPERT
47745 help
47746 Various /proc files exist to monitor process memory utilization:
47747diff --git a/fs/proc/array.c b/fs/proc/array.c
47748index c602b8d..a7de642 100644
47749--- a/fs/proc/array.c
47750+++ b/fs/proc/array.c
47751@@ -60,6 +60,7 @@
47752 #include <linux/tty.h>
47753 #include <linux/string.h>
47754 #include <linux/mman.h>
47755+#include <linux/grsecurity.h>
47756 #include <linux/proc_fs.h>
47757 #include <linux/ioport.h>
47758 #include <linux/uaccess.h>
47759@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
47760 seq_putc(m, '\n');
47761 }
47762
47763+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
47764+static inline void task_pax(struct seq_file *m, struct task_struct *p)
47765+{
47766+ if (p->mm)
47767+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
47768+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
47769+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
47770+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
47771+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
47772+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
47773+ else
47774+ seq_printf(m, "PaX:\t-----\n");
47775+}
47776+#endif
47777+
47778 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
47779 struct pid *pid, struct task_struct *task)
47780 {
47781@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
47782 task_cpus_allowed(m, task);
47783 cpuset_task_status_allowed(m, task);
47784 task_context_switch_counts(m, task);
47785+
47786+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
47787+ task_pax(m, task);
47788+#endif
47789+
47790+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
47791+ task_grsec_rbac(m, task);
47792+#endif
47793+
47794 return 0;
47795 }
47796
47797+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47798+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
47799+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
47800+ _mm->pax_flags & MF_PAX_SEGMEXEC))
47801+#endif
47802+
47803 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
47804 struct pid *pid, struct task_struct *task, int whole)
47805 {
47806@@ -378,6 +409,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
47807 char tcomm[sizeof(task->comm)];
47808 unsigned long flags;
47809
47810+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47811+ if (current->exec_id != m->exec_id) {
47812+ gr_log_badprocpid("stat");
47813+ return 0;
47814+ }
47815+#endif
47816+
47817 state = *get_task_state(task);
47818 vsize = eip = esp = 0;
47819 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
47820@@ -449,6 +487,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
47821 gtime = task->gtime;
47822 }
47823
47824+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47825+ if (PAX_RAND_FLAGS(mm)) {
47826+ eip = 0;
47827+ esp = 0;
47828+ wchan = 0;
47829+ }
47830+#endif
47831+#ifdef CONFIG_GRKERNSEC_HIDESYM
47832+ wchan = 0;
47833+ eip =0;
47834+ esp =0;
47835+#endif
47836+
47837 /* scale priority and nice values from timeslices to -20..20 */
47838 /* to make it look like a "normal" Unix priority/nice value */
47839 priority = task_prio(task);
47840@@ -489,9 +540,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
47841 vsize,
47842 mm ? get_mm_rss(mm) : 0,
47843 rsslim,
47844+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47845+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
47846+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
47847+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
47848+#else
47849 mm ? (permitted ? mm->start_code : 1) : 0,
47850 mm ? (permitted ? mm->end_code : 1) : 0,
47851 (permitted && mm) ? mm->start_stack : 0,
47852+#endif
47853 esp,
47854 eip,
47855 /* The signal information here is obsolete.
47856@@ -536,8 +593,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
47857 struct pid *pid, struct task_struct *task)
47858 {
47859 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
47860- struct mm_struct *mm = get_task_mm(task);
47861+ struct mm_struct *mm;
47862
47863+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47864+ if (current->exec_id != m->exec_id) {
47865+ gr_log_badprocpid("statm");
47866+ return 0;
47867+ }
47868+#endif
47869+ mm = get_task_mm(task);
47870 if (mm) {
47871 size = task_statm(mm, &shared, &text, &data, &resident);
47872 mmput(mm);
47873@@ -547,3 +611,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
47874
47875 return 0;
47876 }
47877+
47878+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
47879+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
47880+{
47881+ u32 curr_ip = 0;
47882+ unsigned long flags;
47883+
47884+ if (lock_task_sighand(task, &flags)) {
47885+ curr_ip = task->signal->curr_ip;
47886+ unlock_task_sighand(task, &flags);
47887+ }
47888+
47889+ return sprintf(buffer, "%pI4\n", &curr_ip);
47890+}
47891+#endif
47892diff --git a/fs/proc/base.c b/fs/proc/base.c
47893index d4548dd..d101f84 100644
47894--- a/fs/proc/base.c
47895+++ b/fs/proc/base.c
47896@@ -109,6 +109,14 @@ struct pid_entry {
47897 union proc_op op;
47898 };
47899
47900+struct getdents_callback {
47901+ struct linux_dirent __user * current_dir;
47902+ struct linux_dirent __user * previous;
47903+ struct file * file;
47904+ int count;
47905+ int error;
47906+};
47907+
47908 #define NOD(NAME, MODE, IOP, FOP, OP) { \
47909 .name = (NAME), \
47910 .len = sizeof(NAME) - 1, \
47911@@ -213,6 +221,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
47912 if (!mm->arg_end)
47913 goto out_mm; /* Shh! No looking before we're done */
47914
47915+ if (gr_acl_handle_procpidmem(task))
47916+ goto out_mm;
47917+
47918 len = mm->arg_end - mm->arg_start;
47919
47920 if (len > PAGE_SIZE)
47921@@ -240,12 +251,28 @@ out:
47922 return res;
47923 }
47924
47925+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47926+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
47927+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
47928+ _mm->pax_flags & MF_PAX_SEGMEXEC))
47929+#endif
47930+
47931 static int proc_pid_auxv(struct task_struct *task, char *buffer)
47932 {
47933 struct mm_struct *mm = mm_for_maps(task);
47934 int res = PTR_ERR(mm);
47935 if (mm && !IS_ERR(mm)) {
47936 unsigned int nwords = 0;
47937+
47938+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47939+ /* allow if we're currently ptracing this task */
47940+ if (PAX_RAND_FLAGS(mm) &&
47941+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
47942+ mmput(mm);
47943+ return 0;
47944+ }
47945+#endif
47946+
47947 do {
47948 nwords += 2;
47949 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
47950@@ -259,7 +286,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
47951 }
47952
47953
47954-#ifdef CONFIG_KALLSYMS
47955+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
47956 /*
47957 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
47958 * Returns the resolved symbol. If that fails, simply return the address.
47959@@ -298,7 +325,7 @@ static void unlock_trace(struct task_struct *task)
47960 mutex_unlock(&task->signal->cred_guard_mutex);
47961 }
47962
47963-#ifdef CONFIG_STACKTRACE
47964+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
47965
47966 #define MAX_STACK_TRACE_DEPTH 64
47967
47968@@ -489,7 +516,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
47969 return count;
47970 }
47971
47972-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
47973+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
47974 static int proc_pid_syscall(struct task_struct *task, char *buffer)
47975 {
47976 long nr;
47977@@ -518,7 +545,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
47978 /************************************************************************/
47979
47980 /* permission checks */
47981-static int proc_fd_access_allowed(struct inode *inode)
47982+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
47983 {
47984 struct task_struct *task;
47985 int allowed = 0;
47986@@ -528,7 +555,10 @@ static int proc_fd_access_allowed(struct inode *inode)
47987 */
47988 task = get_proc_task(inode);
47989 if (task) {
47990- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
47991+ if (log)
47992+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
47993+ else
47994+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
47995 put_task_struct(task);
47996 }
47997 return allowed;
47998@@ -566,10 +596,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
47999 struct task_struct *task,
48000 int hide_pid_min)
48001 {
48002+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48003+ return false;
48004+
48005+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48006+ rcu_read_lock();
48007+ {
48008+ const struct cred *tmpcred = current_cred();
48009+ const struct cred *cred = __task_cred(task);
48010+
48011+ if (!tmpcred->uid || (tmpcred->uid == cred->uid)
48012+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48013+ || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48014+#endif
48015+ ) {
48016+ rcu_read_unlock();
48017+ return true;
48018+ }
48019+ }
48020+ rcu_read_unlock();
48021+
48022+ if (!pid->hide_pid)
48023+ return false;
48024+#endif
48025+
48026 if (pid->hide_pid < hide_pid_min)
48027 return true;
48028 if (in_group_p(pid->pid_gid))
48029 return true;
48030+
48031 return ptrace_may_access(task, PTRACE_MODE_READ);
48032 }
48033
48034@@ -587,7 +642,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
48035 put_task_struct(task);
48036
48037 if (!has_perms) {
48038+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48039+ {
48040+#else
48041 if (pid->hide_pid == 2) {
48042+#endif
48043 /*
48044 * Let's make getdents(), stat(), and open()
48045 * consistent with each other. If a process
48046@@ -702,6 +761,10 @@ static int mem_open(struct inode* inode, struct file* file)
48047 file->f_mode |= FMODE_UNSIGNED_OFFSET;
48048 file->private_data = mm;
48049
48050+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48051+ file->f_version = current->exec_id;
48052+#endif
48053+
48054 return 0;
48055 }
48056
48057@@ -713,6 +776,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
48058 ssize_t copied;
48059 char *page;
48060
48061+#ifdef CONFIG_GRKERNSEC
48062+ if (write)
48063+ return -EPERM;
48064+#endif
48065+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48066+ if (file->f_version != current->exec_id) {
48067+ gr_log_badprocpid("mem");
48068+ return 0;
48069+ }
48070+#endif
48071+
48072 if (!mm)
48073 return 0;
48074
48075@@ -813,6 +887,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
48076 if (!task)
48077 goto out_no_task;
48078
48079+ if (gr_acl_handle_procpidmem(task))
48080+ goto out;
48081+
48082 ret = -ENOMEM;
48083 page = (char *)__get_free_page(GFP_TEMPORARY);
48084 if (!page)
48085@@ -1434,7 +1511,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
48086 path_put(&nd->path);
48087
48088 /* Are we allowed to snoop on the tasks file descriptors? */
48089- if (!proc_fd_access_allowed(inode))
48090+ if (!proc_fd_access_allowed(inode, 0))
48091 goto out;
48092
48093 error = PROC_I(inode)->op.proc_get_link(dentry, &nd->path);
48094@@ -1473,8 +1550,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
48095 struct path path;
48096
48097 /* Are we allowed to snoop on the tasks file descriptors? */
48098- if (!proc_fd_access_allowed(inode))
48099- goto out;
48100+ /* logging this is needed for learning on chromium to work properly,
48101+ but we don't want to flood the logs from 'ps' which does a readlink
48102+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
48103+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
48104+ */
48105+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
48106+ if (!proc_fd_access_allowed(inode,0))
48107+ goto out;
48108+ } else {
48109+ if (!proc_fd_access_allowed(inode,1))
48110+ goto out;
48111+ }
48112
48113 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
48114 if (error)
48115@@ -1539,7 +1626,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
48116 rcu_read_lock();
48117 cred = __task_cred(task);
48118 inode->i_uid = cred->euid;
48119+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48120+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48121+#else
48122 inode->i_gid = cred->egid;
48123+#endif
48124 rcu_read_unlock();
48125 }
48126 security_task_to_inode(task, inode);
48127@@ -1575,10 +1666,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
48128 return -ENOENT;
48129 }
48130 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48131+#ifdef CONFIG_GRKERNSEC_PROC_USER
48132+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48133+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48134+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48135+#endif
48136 task_dumpable(task)) {
48137 cred = __task_cred(task);
48138 stat->uid = cred->euid;
48139+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48140+ stat->gid = CONFIG_GRKERNSEC_PROC_GID;
48141+#else
48142 stat->gid = cred->egid;
48143+#endif
48144 }
48145 }
48146 rcu_read_unlock();
48147@@ -1616,11 +1716,20 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
48148
48149 if (task) {
48150 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48151+#ifdef CONFIG_GRKERNSEC_PROC_USER
48152+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48153+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48154+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48155+#endif
48156 task_dumpable(task)) {
48157 rcu_read_lock();
48158 cred = __task_cred(task);
48159 inode->i_uid = cred->euid;
48160+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48161+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48162+#else
48163 inode->i_gid = cred->egid;
48164+#endif
48165 rcu_read_unlock();
48166 } else {
48167 inode->i_uid = 0;
48168@@ -1738,7 +1847,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
48169 int fd = proc_fd(inode);
48170
48171 if (task) {
48172- files = get_files_struct(task);
48173+ if (!gr_acl_handle_procpidmem(task))
48174+ files = get_files_struct(task);
48175 put_task_struct(task);
48176 }
48177 if (files) {
48178@@ -2355,11 +2465,21 @@ static const struct file_operations proc_map_files_operations = {
48179 */
48180 static int proc_fd_permission(struct inode *inode, int mask)
48181 {
48182+ struct task_struct *task;
48183 int rv = generic_permission(inode, mask);
48184- if (rv == 0)
48185- return 0;
48186+
48187 if (task_pid(current) == proc_pid(inode))
48188 rv = 0;
48189+
48190+ task = get_proc_task(inode);
48191+ if (task == NULL)
48192+ return rv;
48193+
48194+ if (gr_acl_handle_procpidmem(task))
48195+ rv = -EACCES;
48196+
48197+ put_task_struct(task);
48198+
48199 return rv;
48200 }
48201
48202@@ -2469,6 +2589,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
48203 if (!task)
48204 goto out_no_task;
48205
48206+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48207+ goto out;
48208+
48209 /*
48210 * Yes, it does not scale. And it should not. Don't add
48211 * new entries into /proc/<tgid>/ without very good reasons.
48212@@ -2513,6 +2636,9 @@ static int proc_pident_readdir(struct file *filp,
48213 if (!task)
48214 goto out_no_task;
48215
48216+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48217+ goto out;
48218+
48219 ret = 0;
48220 i = filp->f_pos;
48221 switch (i) {
48222@@ -2783,7 +2909,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
48223 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
48224 void *cookie)
48225 {
48226- char *s = nd_get_link(nd);
48227+ const char *s = nd_get_link(nd);
48228 if (!IS_ERR(s))
48229 __putname(s);
48230 }
48231@@ -2984,7 +3110,7 @@ static const struct pid_entry tgid_base_stuff[] = {
48232 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
48233 #endif
48234 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48235-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48236+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48237 INF("syscall", S_IRUGO, proc_pid_syscall),
48238 #endif
48239 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48240@@ -3009,10 +3135,10 @@ static const struct pid_entry tgid_base_stuff[] = {
48241 #ifdef CONFIG_SECURITY
48242 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48243 #endif
48244-#ifdef CONFIG_KALLSYMS
48245+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48246 INF("wchan", S_IRUGO, proc_pid_wchan),
48247 #endif
48248-#ifdef CONFIG_STACKTRACE
48249+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48250 ONE("stack", S_IRUGO, proc_pid_stack),
48251 #endif
48252 #ifdef CONFIG_SCHEDSTATS
48253@@ -3046,6 +3172,9 @@ static const struct pid_entry tgid_base_stuff[] = {
48254 #ifdef CONFIG_HARDWALL
48255 INF("hardwall", S_IRUGO, proc_pid_hardwall),
48256 #endif
48257+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48258+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
48259+#endif
48260 };
48261
48262 static int proc_tgid_base_readdir(struct file * filp,
48263@@ -3172,7 +3301,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
48264 if (!inode)
48265 goto out;
48266
48267+#ifdef CONFIG_GRKERNSEC_PROC_USER
48268+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
48269+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48270+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48271+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
48272+#else
48273 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
48274+#endif
48275 inode->i_op = &proc_tgid_base_inode_operations;
48276 inode->i_fop = &proc_tgid_base_operations;
48277 inode->i_flags|=S_IMMUTABLE;
48278@@ -3214,7 +3350,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
48279 if (!task)
48280 goto out;
48281
48282+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48283+ goto out_put_task;
48284+
48285 result = proc_pid_instantiate(dir, dentry, task, NULL);
48286+out_put_task:
48287 put_task_struct(task);
48288 out:
48289 return result;
48290@@ -3277,6 +3417,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
48291 static int fake_filldir(void *buf, const char *name, int namelen,
48292 loff_t offset, u64 ino, unsigned d_type)
48293 {
48294+ struct getdents_callback * __buf = (struct getdents_callback *) buf;
48295+ __buf->error = -EINVAL;
48296 return 0;
48297 }
48298
48299@@ -3343,7 +3485,7 @@ static const struct pid_entry tid_base_stuff[] = {
48300 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
48301 #endif
48302 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48303-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48304+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48305 INF("syscall", S_IRUGO, proc_pid_syscall),
48306 #endif
48307 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48308@@ -3367,10 +3509,10 @@ static const struct pid_entry tid_base_stuff[] = {
48309 #ifdef CONFIG_SECURITY
48310 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48311 #endif
48312-#ifdef CONFIG_KALLSYMS
48313+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48314 INF("wchan", S_IRUGO, proc_pid_wchan),
48315 #endif
48316-#ifdef CONFIG_STACKTRACE
48317+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48318 ONE("stack", S_IRUGO, proc_pid_stack),
48319 #endif
48320 #ifdef CONFIG_SCHEDSTATS
48321diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
48322index 82676e3..5f8518a 100644
48323--- a/fs/proc/cmdline.c
48324+++ b/fs/proc/cmdline.c
48325@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
48326
48327 static int __init proc_cmdline_init(void)
48328 {
48329+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48330+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
48331+#else
48332 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
48333+#endif
48334 return 0;
48335 }
48336 module_init(proc_cmdline_init);
48337diff --git a/fs/proc/devices.c b/fs/proc/devices.c
48338index b143471..bb105e5 100644
48339--- a/fs/proc/devices.c
48340+++ b/fs/proc/devices.c
48341@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
48342
48343 static int __init proc_devices_init(void)
48344 {
48345+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48346+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
48347+#else
48348 proc_create("devices", 0, NULL, &proc_devinfo_operations);
48349+#endif
48350 return 0;
48351 }
48352 module_init(proc_devices_init);
48353diff --git a/fs/proc/inode.c b/fs/proc/inode.c
48354index 84fd323..f698a32 100644
48355--- a/fs/proc/inode.c
48356+++ b/fs/proc/inode.c
48357@@ -21,12 +21,18 @@
48358 #include <linux/seq_file.h>
48359 #include <linux/slab.h>
48360 #include <linux/mount.h>
48361+#include <linux/grsecurity.h>
48362
48363 #include <asm/system.h>
48364 #include <asm/uaccess.h>
48365
48366 #include "internal.h"
48367
48368+#ifdef CONFIG_PROC_SYSCTL
48369+extern const struct inode_operations proc_sys_inode_operations;
48370+extern const struct inode_operations proc_sys_dir_operations;
48371+#endif
48372+
48373 static void proc_evict_inode(struct inode *inode)
48374 {
48375 struct proc_dir_entry *de;
48376@@ -52,6 +58,13 @@ static void proc_evict_inode(struct inode *inode)
48377 ns_ops = PROC_I(inode)->ns_ops;
48378 if (ns_ops && ns_ops->put)
48379 ns_ops->put(PROC_I(inode)->ns);
48380+
48381+#ifdef CONFIG_PROC_SYSCTL
48382+ if (inode->i_op == &proc_sys_inode_operations ||
48383+ inode->i_op == &proc_sys_dir_operations)
48384+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
48385+#endif
48386+
48387 }
48388
48389 static struct kmem_cache * proc_inode_cachep;
48390@@ -457,7 +470,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
48391 if (de->mode) {
48392 inode->i_mode = de->mode;
48393 inode->i_uid = de->uid;
48394+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48395+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48396+#else
48397 inode->i_gid = de->gid;
48398+#endif
48399 }
48400 if (de->size)
48401 inode->i_size = de->size;
48402diff --git a/fs/proc/internal.h b/fs/proc/internal.h
48403index 2925775..4f08fae 100644
48404--- a/fs/proc/internal.h
48405+++ b/fs/proc/internal.h
48406@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48407 struct pid *pid, struct task_struct *task);
48408 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48409 struct pid *pid, struct task_struct *task);
48410+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48411+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
48412+#endif
48413 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
48414
48415 extern const struct file_operations proc_maps_operations;
48416diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
48417index d245cb2..f4e8498 100644
48418--- a/fs/proc/kcore.c
48419+++ b/fs/proc/kcore.c
48420@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48421 * the addresses in the elf_phdr on our list.
48422 */
48423 start = kc_offset_to_vaddr(*fpos - elf_buflen);
48424- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
48425+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
48426+ if (tsz > buflen)
48427 tsz = buflen;
48428-
48429+
48430 while (buflen) {
48431 struct kcore_list *m;
48432
48433@@ -509,20 +510,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48434 kfree(elf_buf);
48435 } else {
48436 if (kern_addr_valid(start)) {
48437- unsigned long n;
48438+ char *elf_buf;
48439+ mm_segment_t oldfs;
48440
48441- n = copy_to_user(buffer, (char *)start, tsz);
48442- /*
48443- * We cannot distingush between fault on source
48444- * and fault on destination. When this happens
48445- * we clear too and hope it will trigger the
48446- * EFAULT again.
48447- */
48448- if (n) {
48449- if (clear_user(buffer + tsz - n,
48450- n))
48451+ elf_buf = kmalloc(tsz, GFP_KERNEL);
48452+ if (!elf_buf)
48453+ return -ENOMEM;
48454+ oldfs = get_fs();
48455+ set_fs(KERNEL_DS);
48456+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
48457+ set_fs(oldfs);
48458+ if (copy_to_user(buffer, elf_buf, tsz)) {
48459+ kfree(elf_buf);
48460 return -EFAULT;
48461+ }
48462 }
48463+ set_fs(oldfs);
48464+ kfree(elf_buf);
48465 } else {
48466 if (clear_user(buffer, tsz))
48467 return -EFAULT;
48468@@ -542,6 +546,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48469
48470 static int open_kcore(struct inode *inode, struct file *filp)
48471 {
48472+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
48473+ return -EPERM;
48474+#endif
48475 if (!capable(CAP_SYS_RAWIO))
48476 return -EPERM;
48477 if (kcore_need_update)
48478diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
48479index 80e4645..53e5fcf 100644
48480--- a/fs/proc/meminfo.c
48481+++ b/fs/proc/meminfo.c
48482@@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
48483 vmi.used >> 10,
48484 vmi.largest_chunk >> 10
48485 #ifdef CONFIG_MEMORY_FAILURE
48486- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
48487+ ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
48488 #endif
48489 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
48490 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
48491diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
48492index b1822dd..df622cb 100644
48493--- a/fs/proc/nommu.c
48494+++ b/fs/proc/nommu.c
48495@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
48496 if (len < 1)
48497 len = 1;
48498 seq_printf(m, "%*c", len, ' ');
48499- seq_path(m, &file->f_path, "");
48500+ seq_path(m, &file->f_path, "\n\\");
48501 }
48502
48503 seq_putc(m, '\n');
48504diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
48505index 06e1cc1..177cd98 100644
48506--- a/fs/proc/proc_net.c
48507+++ b/fs/proc/proc_net.c
48508@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
48509 struct task_struct *task;
48510 struct nsproxy *ns;
48511 struct net *net = NULL;
48512+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48513+ const struct cred *cred = current_cred();
48514+#endif
48515+
48516+#ifdef CONFIG_GRKERNSEC_PROC_USER
48517+ if (cred->fsuid)
48518+ return net;
48519+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48520+ if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
48521+ return net;
48522+#endif
48523
48524 rcu_read_lock();
48525 task = pid_task(proc_pid(dir), PIDTYPE_PID);
48526diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
48527index 53c3bce..10ad159 100644
48528--- a/fs/proc/proc_sysctl.c
48529+++ b/fs/proc/proc_sysctl.c
48530@@ -9,11 +9,13 @@
48531 #include <linux/namei.h>
48532 #include "internal.h"
48533
48534+extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
48535+
48536 static const struct dentry_operations proc_sys_dentry_operations;
48537 static const struct file_operations proc_sys_file_operations;
48538-static const struct inode_operations proc_sys_inode_operations;
48539+const struct inode_operations proc_sys_inode_operations;
48540 static const struct file_operations proc_sys_dir_file_operations;
48541-static const struct inode_operations proc_sys_dir_operations;
48542+const struct inode_operations proc_sys_dir_operations;
48543
48544 void proc_sys_poll_notify(struct ctl_table_poll *poll)
48545 {
48546@@ -131,8 +133,14 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
48547
48548 err = NULL;
48549 d_set_d_op(dentry, &proc_sys_dentry_operations);
48550+
48551+ gr_handle_proc_create(dentry, inode);
48552+
48553 d_add(dentry, inode);
48554
48555+ if (gr_handle_sysctl(p, MAY_EXEC))
48556+ err = ERR_PTR(-ENOENT);
48557+
48558 out:
48559 sysctl_head_finish(head);
48560 return err;
48561@@ -163,6 +171,12 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
48562 if (!table->proc_handler)
48563 goto out;
48564
48565+#ifdef CONFIG_GRKERNSEC
48566+ error = -EPERM;
48567+ if (write && !capable(CAP_SYS_ADMIN))
48568+ goto out;
48569+#endif
48570+
48571 /* careful: calling conventions are nasty here */
48572 res = count;
48573 error = table->proc_handler(table, write, buf, &res, ppos);
48574@@ -260,6 +274,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
48575 return -ENOMEM;
48576 } else {
48577 d_set_d_op(child, &proc_sys_dentry_operations);
48578+
48579+ gr_handle_proc_create(child, inode);
48580+
48581 d_add(child, inode);
48582 }
48583 } else {
48584@@ -288,6 +305,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
48585 if (*pos < file->f_pos)
48586 continue;
48587
48588+ if (gr_handle_sysctl(table, 0))
48589+ continue;
48590+
48591 res = proc_sys_fill_cache(file, dirent, filldir, head, table);
48592 if (res)
48593 return res;
48594@@ -413,6 +433,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
48595 if (IS_ERR(head))
48596 return PTR_ERR(head);
48597
48598+ if (table && gr_handle_sysctl(table, MAY_EXEC))
48599+ return -ENOENT;
48600+
48601 generic_fillattr(inode, stat);
48602 if (table)
48603 stat->mode = (stat->mode & S_IFMT) | table->mode;
48604@@ -435,13 +458,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
48605 .llseek = generic_file_llseek,
48606 };
48607
48608-static const struct inode_operations proc_sys_inode_operations = {
48609+const struct inode_operations proc_sys_inode_operations = {
48610 .permission = proc_sys_permission,
48611 .setattr = proc_sys_setattr,
48612 .getattr = proc_sys_getattr,
48613 };
48614
48615-static const struct inode_operations proc_sys_dir_operations = {
48616+const struct inode_operations proc_sys_dir_operations = {
48617 .lookup = proc_sys_lookup,
48618 .permission = proc_sys_permission,
48619 .setattr = proc_sys_setattr,
48620diff --git a/fs/proc/root.c b/fs/proc/root.c
48621index 46a15d8..335631a 100644
48622--- a/fs/proc/root.c
48623+++ b/fs/proc/root.c
48624@@ -187,7 +187,15 @@ void __init proc_root_init(void)
48625 #ifdef CONFIG_PROC_DEVICETREE
48626 proc_device_tree_init();
48627 #endif
48628+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48629+#ifdef CONFIG_GRKERNSEC_PROC_USER
48630+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
48631+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48632+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
48633+#endif
48634+#else
48635 proc_mkdir("bus", NULL);
48636+#endif
48637 proc_sys_init();
48638 }
48639
48640diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
48641index 3efa725..23c925b 100644
48642--- a/fs/proc/task_mmu.c
48643+++ b/fs/proc/task_mmu.c
48644@@ -11,6 +11,7 @@
48645 #include <linux/rmap.h>
48646 #include <linux/swap.h>
48647 #include <linux/swapops.h>
48648+#include <linux/grsecurity.h>
48649
48650 #include <asm/elf.h>
48651 #include <asm/uaccess.h>
48652@@ -52,8 +53,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
48653 "VmExe:\t%8lu kB\n"
48654 "VmLib:\t%8lu kB\n"
48655 "VmPTE:\t%8lu kB\n"
48656- "VmSwap:\t%8lu kB\n",
48657- hiwater_vm << (PAGE_SHIFT-10),
48658+ "VmSwap:\t%8lu kB\n"
48659+
48660+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
48661+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
48662+#endif
48663+
48664+ ,hiwater_vm << (PAGE_SHIFT-10),
48665 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
48666 mm->locked_vm << (PAGE_SHIFT-10),
48667 mm->pinned_vm << (PAGE_SHIFT-10),
48668@@ -62,7 +68,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
48669 data << (PAGE_SHIFT-10),
48670 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
48671 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
48672- swap << (PAGE_SHIFT-10));
48673+ swap << (PAGE_SHIFT-10)
48674+
48675+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
48676+ , mm->context.user_cs_base, mm->context.user_cs_limit
48677+#endif
48678+
48679+ );
48680 }
48681
48682 unsigned long task_vsize(struct mm_struct *mm)
48683@@ -209,6 +221,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
48684 return ret;
48685 }
48686
48687+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48688+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48689+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48690+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48691+#endif
48692+
48693 static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48694 {
48695 struct mm_struct *mm = vma->vm_mm;
48696@@ -227,13 +245,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48697 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
48698 }
48699
48700- /* We don't show the stack guard page in /proc/maps */
48701+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48702+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
48703+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
48704+#else
48705 start = vma->vm_start;
48706- if (stack_guard_page_start(vma, start))
48707- start += PAGE_SIZE;
48708 end = vma->vm_end;
48709- if (stack_guard_page_end(vma, end))
48710- end -= PAGE_SIZE;
48711+#endif
48712
48713 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
48714 start,
48715@@ -242,7 +260,11 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48716 flags & VM_WRITE ? 'w' : '-',
48717 flags & VM_EXEC ? 'x' : '-',
48718 flags & VM_MAYSHARE ? 's' : 'p',
48719+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48720+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
48721+#else
48722 pgoff,
48723+#endif
48724 MAJOR(dev), MINOR(dev), ino, &len);
48725
48726 /*
48727@@ -251,7 +273,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48728 */
48729 if (file) {
48730 pad_len_spaces(m, len);
48731- seq_path(m, &file->f_path, "\n");
48732+ seq_path(m, &file->f_path, "\n\\");
48733 } else {
48734 const char *name = arch_vma_name(vma);
48735 if (!name) {
48736@@ -259,8 +281,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48737 if (vma->vm_start <= mm->brk &&
48738 vma->vm_end >= mm->start_brk) {
48739 name = "[heap]";
48740- } else if (vma->vm_start <= mm->start_stack &&
48741- vma->vm_end >= mm->start_stack) {
48742+ } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
48743+ (vma->vm_start <= mm->start_stack &&
48744+ vma->vm_end >= mm->start_stack)) {
48745 name = "[stack]";
48746 }
48747 } else {
48748@@ -281,6 +304,13 @@ static int show_map(struct seq_file *m, void *v)
48749 struct proc_maps_private *priv = m->private;
48750 struct task_struct *task = priv->task;
48751
48752+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48753+ if (current->exec_id != m->exec_id) {
48754+ gr_log_badprocpid("maps");
48755+ return 0;
48756+ }
48757+#endif
48758+
48759 show_map_vma(m, vma);
48760
48761 if (m->count < m->size) /* vma is copied successfully */
48762@@ -437,12 +467,23 @@ static int show_smap(struct seq_file *m, void *v)
48763 .private = &mss,
48764 };
48765
48766+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48767+ if (current->exec_id != m->exec_id) {
48768+ gr_log_badprocpid("smaps");
48769+ return 0;
48770+ }
48771+#endif
48772 memset(&mss, 0, sizeof mss);
48773- mss.vma = vma;
48774- /* mmap_sem is held in m_start */
48775- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
48776- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
48777-
48778+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48779+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
48780+#endif
48781+ mss.vma = vma;
48782+ /* mmap_sem is held in m_start */
48783+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
48784+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
48785+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48786+ }
48787+#endif
48788 show_map_vma(m, vma);
48789
48790 seq_printf(m,
48791@@ -460,7 +501,11 @@ static int show_smap(struct seq_file *m, void *v)
48792 "KernelPageSize: %8lu kB\n"
48793 "MMUPageSize: %8lu kB\n"
48794 "Locked: %8lu kB\n",
48795+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48796+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
48797+#else
48798 (vma->vm_end - vma->vm_start) >> 10,
48799+#endif
48800 mss.resident >> 10,
48801 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
48802 mss.shared_clean >> 10,
48803@@ -1024,6 +1069,13 @@ static int show_numa_map(struct seq_file *m, void *v)
48804 int n;
48805 char buffer[50];
48806
48807+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48808+ if (current->exec_id != m->exec_id) {
48809+ gr_log_badprocpid("numa_maps");
48810+ return 0;
48811+ }
48812+#endif
48813+
48814 if (!mm)
48815 return 0;
48816
48817@@ -1041,11 +1093,15 @@ static int show_numa_map(struct seq_file *m, void *v)
48818 mpol_to_str(buffer, sizeof(buffer), pol, 0);
48819 mpol_cond_put(pol);
48820
48821+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48822+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
48823+#else
48824 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
48825+#endif
48826
48827 if (file) {
48828 seq_printf(m, " file=");
48829- seq_path(m, &file->f_path, "\n\t= ");
48830+ seq_path(m, &file->f_path, "\n\t\\= ");
48831 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
48832 seq_printf(m, " heap");
48833 } else if (vma->vm_start <= mm->start_stack &&
48834diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
48835index 980de54..2a4db5f 100644
48836--- a/fs/proc/task_nommu.c
48837+++ b/fs/proc/task_nommu.c
48838@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
48839 else
48840 bytes += kobjsize(mm);
48841
48842- if (current->fs && current->fs->users > 1)
48843+ if (current->fs && atomic_read(&current->fs->users) > 1)
48844 sbytes += kobjsize(current->fs);
48845 else
48846 bytes += kobjsize(current->fs);
48847@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
48848
48849 if (file) {
48850 pad_len_spaces(m, len);
48851- seq_path(m, &file->f_path, "");
48852+ seq_path(m, &file->f_path, "\n\\");
48853 } else if (mm) {
48854 if (vma->vm_start <= mm->start_stack &&
48855 vma->vm_end >= mm->start_stack) {
48856diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
48857index d67908b..d13f6a6 100644
48858--- a/fs/quota/netlink.c
48859+++ b/fs/quota/netlink.c
48860@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
48861 void quota_send_warning(short type, unsigned int id, dev_t dev,
48862 const char warntype)
48863 {
48864- static atomic_t seq;
48865+ static atomic_unchecked_t seq;
48866 struct sk_buff *skb;
48867 void *msg_head;
48868 int ret;
48869@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
48870 "VFS: Not enough memory to send quota warning.\n");
48871 return;
48872 }
48873- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
48874+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
48875 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
48876 if (!msg_head) {
48877 printk(KERN_ERR
48878diff --git a/fs/readdir.c b/fs/readdir.c
48879index 356f715..c918d38 100644
48880--- a/fs/readdir.c
48881+++ b/fs/readdir.c
48882@@ -17,6 +17,7 @@
48883 #include <linux/security.h>
48884 #include <linux/syscalls.h>
48885 #include <linux/unistd.h>
48886+#include <linux/namei.h>
48887
48888 #include <asm/uaccess.h>
48889
48890@@ -67,6 +68,7 @@ struct old_linux_dirent {
48891
48892 struct readdir_callback {
48893 struct old_linux_dirent __user * dirent;
48894+ struct file * file;
48895 int result;
48896 };
48897
48898@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
48899 buf->result = -EOVERFLOW;
48900 return -EOVERFLOW;
48901 }
48902+
48903+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
48904+ return 0;
48905+
48906 buf->result++;
48907 dirent = buf->dirent;
48908 if (!access_ok(VERIFY_WRITE, dirent,
48909@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
48910
48911 buf.result = 0;
48912 buf.dirent = dirent;
48913+ buf.file = file;
48914
48915 error = vfs_readdir(file, fillonedir, &buf);
48916 if (buf.result)
48917@@ -142,6 +149,7 @@ struct linux_dirent {
48918 struct getdents_callback {
48919 struct linux_dirent __user * current_dir;
48920 struct linux_dirent __user * previous;
48921+ struct file * file;
48922 int count;
48923 int error;
48924 };
48925@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
48926 buf->error = -EOVERFLOW;
48927 return -EOVERFLOW;
48928 }
48929+
48930+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
48931+ return 0;
48932+
48933 dirent = buf->previous;
48934 if (dirent) {
48935 if (__put_user(offset, &dirent->d_off))
48936@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
48937 buf.previous = NULL;
48938 buf.count = count;
48939 buf.error = 0;
48940+ buf.file = file;
48941
48942 error = vfs_readdir(file, filldir, &buf);
48943 if (error >= 0)
48944@@ -229,6 +242,7 @@ out:
48945 struct getdents_callback64 {
48946 struct linux_dirent64 __user * current_dir;
48947 struct linux_dirent64 __user * previous;
48948+ struct file *file;
48949 int count;
48950 int error;
48951 };
48952@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
48953 buf->error = -EINVAL; /* only used if we fail.. */
48954 if (reclen > buf->count)
48955 return -EINVAL;
48956+
48957+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
48958+ return 0;
48959+
48960 dirent = buf->previous;
48961 if (dirent) {
48962 if (__put_user(offset, &dirent->d_off))
48963@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
48964
48965 buf.current_dir = dirent;
48966 buf.previous = NULL;
48967+ buf.file = file;
48968 buf.count = count;
48969 buf.error = 0;
48970
48971@@ -299,7 +318,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
48972 error = buf.error;
48973 lastdirent = buf.previous;
48974 if (lastdirent) {
48975- typeof(lastdirent->d_off) d_off = file->f_pos;
48976+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
48977 if (__put_user(d_off, &lastdirent->d_off))
48978 error = -EFAULT;
48979 else
48980diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
48981index 60c0804..d814f98 100644
48982--- a/fs/reiserfs/do_balan.c
48983+++ b/fs/reiserfs/do_balan.c
48984@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
48985 return;
48986 }
48987
48988- atomic_inc(&(fs_generation(tb->tb_sb)));
48989+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
48990 do_balance_starts(tb);
48991
48992 /* balance leaf returns 0 except if combining L R and S into
48993diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
48994index 7a99811..a7c96c4 100644
48995--- a/fs/reiserfs/procfs.c
48996+++ b/fs/reiserfs/procfs.c
48997@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
48998 "SMALL_TAILS " : "NO_TAILS ",
48999 replay_only(sb) ? "REPLAY_ONLY " : "",
49000 convert_reiserfs(sb) ? "CONV " : "",
49001- atomic_read(&r->s_generation_counter),
49002+ atomic_read_unchecked(&r->s_generation_counter),
49003 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
49004 SF(s_do_balance), SF(s_unneeded_left_neighbor),
49005 SF(s_good_search_by_key_reada), SF(s_bmaps),
49006diff --git a/fs/select.c b/fs/select.c
49007index e782258..3b4b44c 100644
49008--- a/fs/select.c
49009+++ b/fs/select.c
49010@@ -20,6 +20,7 @@
49011 #include <linux/module.h>
49012 #include <linux/slab.h>
49013 #include <linux/poll.h>
49014+#include <linux/security.h>
49015 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
49016 #include <linux/file.h>
49017 #include <linux/fdtable.h>
49018@@ -837,6 +838,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
49019 struct poll_list *walk = head;
49020 unsigned long todo = nfds;
49021
49022+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
49023 if (nfds > rlimit(RLIMIT_NOFILE))
49024 return -EINVAL;
49025
49026diff --git a/fs/seq_file.c b/fs/seq_file.c
49027index 4023d6b..ab46c6a 100644
49028--- a/fs/seq_file.c
49029+++ b/fs/seq_file.c
49030@@ -9,6 +9,7 @@
49031 #include <linux/module.h>
49032 #include <linux/seq_file.h>
49033 #include <linux/slab.h>
49034+#include <linux/sched.h>
49035
49036 #include <asm/uaccess.h>
49037 #include <asm/page.h>
49038@@ -40,6 +41,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
49039 memset(p, 0, sizeof(*p));
49040 mutex_init(&p->lock);
49041 p->op = op;
49042+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49043+ p->exec_id = current->exec_id;
49044+#endif
49045
49046 /*
49047 * Wrappers around seq_open(e.g. swaps_open) need to be
49048@@ -549,7 +553,7 @@ static void single_stop(struct seq_file *p, void *v)
49049 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
49050 void *data)
49051 {
49052- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
49053+ seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
49054 int res = -ENOMEM;
49055
49056 if (op) {
49057diff --git a/fs/splice.c b/fs/splice.c
49058index 96d7b28..fd465ac 100644
49059--- a/fs/splice.c
49060+++ b/fs/splice.c
49061@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49062 pipe_lock(pipe);
49063
49064 for (;;) {
49065- if (!pipe->readers) {
49066+ if (!atomic_read(&pipe->readers)) {
49067 send_sig(SIGPIPE, current, 0);
49068 if (!ret)
49069 ret = -EPIPE;
49070@@ -248,9 +248,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49071 do_wakeup = 0;
49072 }
49073
49074- pipe->waiting_writers++;
49075+ atomic_inc(&pipe->waiting_writers);
49076 pipe_wait(pipe);
49077- pipe->waiting_writers--;
49078+ atomic_dec(&pipe->waiting_writers);
49079 }
49080
49081 pipe_unlock(pipe);
49082@@ -560,7 +560,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
49083 old_fs = get_fs();
49084 set_fs(get_ds());
49085 /* The cast to a user pointer is valid due to the set_fs() */
49086- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
49087+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
49088 set_fs(old_fs);
49089
49090 return res;
49091@@ -575,7 +575,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
49092 old_fs = get_fs();
49093 set_fs(get_ds());
49094 /* The cast to a user pointer is valid due to the set_fs() */
49095- res = vfs_write(file, (const char __user *)buf, count, &pos);
49096+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
49097 set_fs(old_fs);
49098
49099 return res;
49100@@ -626,7 +626,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
49101 goto err;
49102
49103 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
49104- vec[i].iov_base = (void __user *) page_address(page);
49105+ vec[i].iov_base = (void __force_user *) page_address(page);
49106 vec[i].iov_len = this_len;
49107 spd.pages[i] = page;
49108 spd.nr_pages++;
49109@@ -848,10 +848,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
49110 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
49111 {
49112 while (!pipe->nrbufs) {
49113- if (!pipe->writers)
49114+ if (!atomic_read(&pipe->writers))
49115 return 0;
49116
49117- if (!pipe->waiting_writers && sd->num_spliced)
49118+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
49119 return 0;
49120
49121 if (sd->flags & SPLICE_F_NONBLOCK)
49122@@ -1184,7 +1184,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
49123 * out of the pipe right after the splice_to_pipe(). So set
49124 * PIPE_READERS appropriately.
49125 */
49126- pipe->readers = 1;
49127+ atomic_set(&pipe->readers, 1);
49128
49129 current->splice_pipe = pipe;
49130 }
49131@@ -1736,9 +1736,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49132 ret = -ERESTARTSYS;
49133 break;
49134 }
49135- if (!pipe->writers)
49136+ if (!atomic_read(&pipe->writers))
49137 break;
49138- if (!pipe->waiting_writers) {
49139+ if (!atomic_read(&pipe->waiting_writers)) {
49140 if (flags & SPLICE_F_NONBLOCK) {
49141 ret = -EAGAIN;
49142 break;
49143@@ -1770,7 +1770,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49144 pipe_lock(pipe);
49145
49146 while (pipe->nrbufs >= pipe->buffers) {
49147- if (!pipe->readers) {
49148+ if (!atomic_read(&pipe->readers)) {
49149 send_sig(SIGPIPE, current, 0);
49150 ret = -EPIPE;
49151 break;
49152@@ -1783,9 +1783,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49153 ret = -ERESTARTSYS;
49154 break;
49155 }
49156- pipe->waiting_writers++;
49157+ atomic_inc(&pipe->waiting_writers);
49158 pipe_wait(pipe);
49159- pipe->waiting_writers--;
49160+ atomic_dec(&pipe->waiting_writers);
49161 }
49162
49163 pipe_unlock(pipe);
49164@@ -1821,14 +1821,14 @@ retry:
49165 pipe_double_lock(ipipe, opipe);
49166
49167 do {
49168- if (!opipe->readers) {
49169+ if (!atomic_read(&opipe->readers)) {
49170 send_sig(SIGPIPE, current, 0);
49171 if (!ret)
49172 ret = -EPIPE;
49173 break;
49174 }
49175
49176- if (!ipipe->nrbufs && !ipipe->writers)
49177+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
49178 break;
49179
49180 /*
49181@@ -1925,7 +1925,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49182 pipe_double_lock(ipipe, opipe);
49183
49184 do {
49185- if (!opipe->readers) {
49186+ if (!atomic_read(&opipe->readers)) {
49187 send_sig(SIGPIPE, current, 0);
49188 if (!ret)
49189 ret = -EPIPE;
49190@@ -1970,7 +1970,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49191 * return EAGAIN if we have the potential of some data in the
49192 * future, otherwise just return 0
49193 */
49194- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
49195+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
49196 ret = -EAGAIN;
49197
49198 pipe_unlock(ipipe);
49199diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
49200index a475983..9c6a1f0 100644
49201--- a/fs/sysfs/bin.c
49202+++ b/fs/sysfs/bin.c
49203@@ -67,6 +67,8 @@ fill_read(struct file *file, char *buffer, loff_t off, size_t count)
49204 }
49205
49206 static ssize_t
49207+read(struct file *file, char __user *userbuf, size_t bytes, loff_t *off) __size_overflow(3);
49208+static ssize_t
49209 read(struct file *file, char __user *userbuf, size_t bytes, loff_t *off)
49210 {
49211 struct bin_buffer *bb = file->private_data;
49212diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
49213index 7fdf6a7..e6cd8ad 100644
49214--- a/fs/sysfs/dir.c
49215+++ b/fs/sysfs/dir.c
49216@@ -642,6 +642,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
49217 struct sysfs_dirent *sd;
49218 int rc;
49219
49220+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
49221+ const char *parent_name = parent_sd->s_name;
49222+
49223+ mode = S_IFDIR | S_IRWXU;
49224+
49225+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
49226+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
49227+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse"))) ||
49228+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
49229+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
49230+#endif
49231+
49232 /* allocate */
49233 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
49234 if (!sd)
49235diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
49236index 00012e3..8392349 100644
49237--- a/fs/sysfs/file.c
49238+++ b/fs/sysfs/file.c
49239@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
49240
49241 struct sysfs_open_dirent {
49242 atomic_t refcnt;
49243- atomic_t event;
49244+ atomic_unchecked_t event;
49245 wait_queue_head_t poll;
49246 struct list_head buffers; /* goes through sysfs_buffer.list */
49247 };
49248@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
49249 if (!sysfs_get_active(attr_sd))
49250 return -ENODEV;
49251
49252- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
49253+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
49254 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
49255
49256 sysfs_put_active(attr_sd);
49257@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
49258 return -ENOMEM;
49259
49260 atomic_set(&new_od->refcnt, 0);
49261- atomic_set(&new_od->event, 1);
49262+ atomic_set_unchecked(&new_od->event, 1);
49263 init_waitqueue_head(&new_od->poll);
49264 INIT_LIST_HEAD(&new_od->buffers);
49265 goto retry;
49266@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
49267
49268 sysfs_put_active(attr_sd);
49269
49270- if (buffer->event != atomic_read(&od->event))
49271+ if (buffer->event != atomic_read_unchecked(&od->event))
49272 goto trigger;
49273
49274 return DEFAULT_POLLMASK;
49275@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
49276
49277 od = sd->s_attr.open;
49278 if (od) {
49279- atomic_inc(&od->event);
49280+ atomic_inc_unchecked(&od->event);
49281 wake_up_interruptible(&od->poll);
49282 }
49283
49284diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
49285index a7ac78f..02158e1 100644
49286--- a/fs/sysfs/symlink.c
49287+++ b/fs/sysfs/symlink.c
49288@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
49289
49290 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
49291 {
49292- char *page = nd_get_link(nd);
49293+ const char *page = nd_get_link(nd);
49294 if (!IS_ERR(page))
49295 free_page((unsigned long)page);
49296 }
49297diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
49298index f922cba..062fb02 100644
49299--- a/fs/ubifs/debug.c
49300+++ b/fs/ubifs/debug.c
49301@@ -2819,6 +2819,7 @@ static ssize_t dfs_file_read(struct file *file, char __user *u, size_t count,
49302 * debugfs file. Returns %0 or %1 in case of success and a negative error code
49303 * in case of failure.
49304 */
49305+static int interpret_user_input(const char __user *u, size_t count) __size_overflow(2);
49306 static int interpret_user_input(const char __user *u, size_t count)
49307 {
49308 size_t buf_size;
49309@@ -2837,6 +2838,8 @@ static int interpret_user_input(const char __user *u, size_t count)
49310 }
49311
49312 static ssize_t dfs_file_write(struct file *file, const char __user *u,
49313+ size_t count, loff_t *ppos) __size_overflow(3);
49314+static ssize_t dfs_file_write(struct file *file, const char __user *u,
49315 size_t count, loff_t *ppos)
49316 {
49317 struct ubifs_info *c = file->private_data;
49318diff --git a/fs/udf/misc.c b/fs/udf/misc.c
49319index c175b4d..8f36a16 100644
49320--- a/fs/udf/misc.c
49321+++ b/fs/udf/misc.c
49322@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
49323
49324 u8 udf_tag_checksum(const struct tag *t)
49325 {
49326- u8 *data = (u8 *)t;
49327+ const u8 *data = (const u8 *)t;
49328 u8 checksum = 0;
49329 int i;
49330 for (i = 0; i < sizeof(struct tag); ++i)
49331diff --git a/fs/utimes.c b/fs/utimes.c
49332index ba653f3..06ea4b1 100644
49333--- a/fs/utimes.c
49334+++ b/fs/utimes.c
49335@@ -1,6 +1,7 @@
49336 #include <linux/compiler.h>
49337 #include <linux/file.h>
49338 #include <linux/fs.h>
49339+#include <linux/security.h>
49340 #include <linux/linkage.h>
49341 #include <linux/mount.h>
49342 #include <linux/namei.h>
49343@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
49344 goto mnt_drop_write_and_out;
49345 }
49346 }
49347+
49348+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
49349+ error = -EACCES;
49350+ goto mnt_drop_write_and_out;
49351+ }
49352+
49353 mutex_lock(&inode->i_mutex);
49354 error = notify_change(path->dentry, &newattrs);
49355 mutex_unlock(&inode->i_mutex);
49356diff --git a/fs/xattr.c b/fs/xattr.c
49357index 82f4337..236473c 100644
49358--- a/fs/xattr.c
49359+++ b/fs/xattr.c
49360@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
49361 * Extended attribute SET operations
49362 */
49363 static long
49364-setxattr(struct dentry *d, const char __user *name, const void __user *value,
49365+setxattr(struct path *path, const char __user *name, const void __user *value,
49366 size_t size, int flags)
49367 {
49368 int error;
49369@@ -339,7 +339,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
49370 return PTR_ERR(kvalue);
49371 }
49372
49373- error = vfs_setxattr(d, kname, kvalue, size, flags);
49374+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
49375+ error = -EACCES;
49376+ goto out;
49377+ }
49378+
49379+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
49380+out:
49381 kfree(kvalue);
49382 return error;
49383 }
49384@@ -356,7 +362,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
49385 return error;
49386 error = mnt_want_write(path.mnt);
49387 if (!error) {
49388- error = setxattr(path.dentry, name, value, size, flags);
49389+ error = setxattr(&path, name, value, size, flags);
49390 mnt_drop_write(path.mnt);
49391 }
49392 path_put(&path);
49393@@ -375,7 +381,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
49394 return error;
49395 error = mnt_want_write(path.mnt);
49396 if (!error) {
49397- error = setxattr(path.dentry, name, value, size, flags);
49398+ error = setxattr(&path, name, value, size, flags);
49399 mnt_drop_write(path.mnt);
49400 }
49401 path_put(&path);
49402@@ -386,17 +392,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
49403 const void __user *,value, size_t, size, int, flags)
49404 {
49405 struct file *f;
49406- struct dentry *dentry;
49407 int error = -EBADF;
49408
49409 f = fget(fd);
49410 if (!f)
49411 return error;
49412- dentry = f->f_path.dentry;
49413- audit_inode(NULL, dentry);
49414+ audit_inode(NULL, f->f_path.dentry);
49415 error = mnt_want_write_file(f);
49416 if (!error) {
49417- error = setxattr(dentry, name, value, size, flags);
49418+ error = setxattr(&f->f_path, name, value, size, flags);
49419 mnt_drop_write_file(f);
49420 }
49421 fput(f);
49422diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
49423index 8d5a506..7f62712 100644
49424--- a/fs/xattr_acl.c
49425+++ b/fs/xattr_acl.c
49426@@ -17,8 +17,8 @@
49427 struct posix_acl *
49428 posix_acl_from_xattr(const void *value, size_t size)
49429 {
49430- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
49431- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
49432+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
49433+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
49434 int count;
49435 struct posix_acl *acl;
49436 struct posix_acl_entry *acl_e;
49437diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
49438index 188ef2f..adcf864 100644
49439--- a/fs/xfs/xfs_bmap.c
49440+++ b/fs/xfs/xfs_bmap.c
49441@@ -190,7 +190,7 @@ xfs_bmap_validate_ret(
49442 int nmap,
49443 int ret_nmap);
49444 #else
49445-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
49446+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
49447 #endif /* DEBUG */
49448
49449 STATIC int
49450diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
49451index 79d05e8..e3e5861 100644
49452--- a/fs/xfs/xfs_dir2_sf.c
49453+++ b/fs/xfs/xfs_dir2_sf.c
49454@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
49455 }
49456
49457 ino = xfs_dir2_sfe_get_ino(sfp, sfep);
49458- if (filldir(dirent, (char *)sfep->name, sfep->namelen,
49459+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
49460+ char name[sfep->namelen];
49461+ memcpy(name, sfep->name, sfep->namelen);
49462+ if (filldir(dirent, name, sfep->namelen,
49463+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
49464+ *offset = off & 0x7fffffff;
49465+ return 0;
49466+ }
49467+ } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
49468 off & 0x7fffffff, ino, DT_UNKNOWN)) {
49469 *offset = off & 0x7fffffff;
49470 return 0;
49471diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
49472index 76f3ca5..f57f712 100644
49473--- a/fs/xfs/xfs_ioctl.c
49474+++ b/fs/xfs/xfs_ioctl.c
49475@@ -128,7 +128,7 @@ xfs_find_handle(
49476 }
49477
49478 error = -EFAULT;
49479- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
49480+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
49481 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
49482 goto out_put;
49483
49484diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
49485index ab30253..4d86958 100644
49486--- a/fs/xfs/xfs_iops.c
49487+++ b/fs/xfs/xfs_iops.c
49488@@ -447,7 +447,7 @@ xfs_vn_put_link(
49489 struct nameidata *nd,
49490 void *p)
49491 {
49492- char *s = nd_get_link(nd);
49493+ const char *s = nd_get_link(nd);
49494
49495 if (!IS_ERR(s))
49496 kfree(s);
49497diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
49498new file mode 100644
49499index 0000000..4089e05
49500--- /dev/null
49501+++ b/grsecurity/Kconfig
49502@@ -0,0 +1,1078 @@
49503+#
49504+# grecurity configuration
49505+#
49506+
49507+menu "Grsecurity"
49508+
49509+config GRKERNSEC
49510+ bool "Grsecurity"
49511+ select CRYPTO
49512+ select CRYPTO_SHA256
49513+ help
49514+ If you say Y here, you will be able to configure many features
49515+ that will enhance the security of your system. It is highly
49516+ recommended that you say Y here and read through the help
49517+ for each option so that you fully understand the features and
49518+ can evaluate their usefulness for your machine.
49519+
49520+choice
49521+ prompt "Security Level"
49522+ depends on GRKERNSEC
49523+ default GRKERNSEC_CUSTOM
49524+
49525+config GRKERNSEC_LOW
49526+ bool "Low"
49527+ select GRKERNSEC_LINK
49528+ select GRKERNSEC_FIFO
49529+ select GRKERNSEC_RANDNET
49530+ select GRKERNSEC_DMESG
49531+ select GRKERNSEC_CHROOT
49532+ select GRKERNSEC_CHROOT_CHDIR
49533+
49534+ help
49535+ If you choose this option, several of the grsecurity options will
49536+ be enabled that will give you greater protection against a number
49537+ of attacks, while assuring that none of your software will have any
49538+ conflicts with the additional security measures. If you run a lot
49539+ of unusual software, or you are having problems with the higher
49540+ security levels, you should say Y here. With this option, the
49541+ following features are enabled:
49542+
49543+ - Linking restrictions
49544+ - FIFO restrictions
49545+ - Restricted dmesg
49546+ - Enforced chdir("/") on chroot
49547+ - Runtime module disabling
49548+
49549+config GRKERNSEC_MEDIUM
49550+ bool "Medium"
49551+ select PAX
49552+ select PAX_EI_PAX
49553+ select PAX_PT_PAX_FLAGS
49554+ select PAX_HAVE_ACL_FLAGS
49555+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
49556+ select GRKERNSEC_CHROOT
49557+ select GRKERNSEC_CHROOT_SYSCTL
49558+ select GRKERNSEC_LINK
49559+ select GRKERNSEC_FIFO
49560+ select GRKERNSEC_DMESG
49561+ select GRKERNSEC_RANDNET
49562+ select GRKERNSEC_FORKFAIL
49563+ select GRKERNSEC_TIME
49564+ select GRKERNSEC_SIGNAL
49565+ select GRKERNSEC_CHROOT
49566+ select GRKERNSEC_CHROOT_UNIX
49567+ select GRKERNSEC_CHROOT_MOUNT
49568+ select GRKERNSEC_CHROOT_PIVOT
49569+ select GRKERNSEC_CHROOT_DOUBLE
49570+ select GRKERNSEC_CHROOT_CHDIR
49571+ select GRKERNSEC_CHROOT_MKNOD
49572+ select GRKERNSEC_PROC
49573+ select GRKERNSEC_PROC_USERGROUP
49574+ select PAX_RANDUSTACK
49575+ select PAX_ASLR
49576+ select PAX_RANDMMAP
49577+ select PAX_REFCOUNT if (X86 || SPARC64)
49578+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
49579+
49580+ help
49581+ If you say Y here, several features in addition to those included
49582+ in the low additional security level will be enabled. These
49583+ features provide even more security to your system, though in rare
49584+ cases they may be incompatible with very old or poorly written
49585+ software. If you enable this option, make sure that your auth
49586+ service (identd) is running as gid 1001. With this option,
49587+ the following features (in addition to those provided in the
49588+ low additional security level) will be enabled:
49589+
49590+ - Failed fork logging
49591+ - Time change logging
49592+ - Signal logging
49593+ - Deny mounts in chroot
49594+ - Deny double chrooting
49595+ - Deny sysctl writes in chroot
49596+ - Deny mknod in chroot
49597+ - Deny access to abstract AF_UNIX sockets out of chroot
49598+ - Deny pivot_root in chroot
49599+ - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
49600+ - /proc restrictions with special GID set to 10 (usually wheel)
49601+ - Address Space Layout Randomization (ASLR)
49602+ - Prevent exploitation of most refcount overflows
49603+ - Bounds checking of copying between the kernel and userland
49604+
49605+config GRKERNSEC_HIGH
49606+ bool "High"
49607+ select GRKERNSEC_LINK
49608+ select GRKERNSEC_FIFO
49609+ select GRKERNSEC_DMESG
49610+ select GRKERNSEC_FORKFAIL
49611+ select GRKERNSEC_TIME
49612+ select GRKERNSEC_SIGNAL
49613+ select GRKERNSEC_CHROOT
49614+ select GRKERNSEC_CHROOT_SHMAT
49615+ select GRKERNSEC_CHROOT_UNIX
49616+ select GRKERNSEC_CHROOT_MOUNT
49617+ select GRKERNSEC_CHROOT_FCHDIR
49618+ select GRKERNSEC_CHROOT_PIVOT
49619+ select GRKERNSEC_CHROOT_DOUBLE
49620+ select GRKERNSEC_CHROOT_CHDIR
49621+ select GRKERNSEC_CHROOT_MKNOD
49622+ select GRKERNSEC_CHROOT_CAPS
49623+ select GRKERNSEC_CHROOT_SYSCTL
49624+ select GRKERNSEC_CHROOT_FINDTASK
49625+ select GRKERNSEC_SYSFS_RESTRICT
49626+ select GRKERNSEC_PROC
49627+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
49628+ select GRKERNSEC_HIDESYM
49629+ select GRKERNSEC_BRUTE
49630+ select GRKERNSEC_PROC_USERGROUP
49631+ select GRKERNSEC_KMEM
49632+ select GRKERNSEC_RESLOG
49633+ select GRKERNSEC_RANDNET
49634+ select GRKERNSEC_PROC_ADD
49635+ select GRKERNSEC_CHROOT_CHMOD
49636+ select GRKERNSEC_CHROOT_NICE
49637+ select GRKERNSEC_SETXID
49638+ select GRKERNSEC_AUDIT_MOUNT
49639+ select GRKERNSEC_MODHARDEN if (MODULES)
49640+ select GRKERNSEC_HARDEN_PTRACE
49641+ select GRKERNSEC_PTRACE_READEXEC
49642+ select GRKERNSEC_VM86 if (X86_32)
49643+ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
49644+ select PAX
49645+ select PAX_RANDUSTACK
49646+ select PAX_ASLR
49647+ select PAX_RANDMMAP
49648+ select PAX_NOEXEC
49649+ select PAX_MPROTECT
49650+ select PAX_EI_PAX
49651+ select PAX_PT_PAX_FLAGS
49652+ select PAX_HAVE_ACL_FLAGS
49653+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
49654+ select PAX_MEMORY_UDEREF if (X86 && !XEN)
49655+ select PAX_RANDKSTACK if (X86_TSC && X86)
49656+ select PAX_SEGMEXEC if (X86_32)
49657+ select PAX_PAGEEXEC
49658+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
49659+ select PAX_EMUTRAMP if (PARISC)
49660+ select PAX_EMUSIGRT if (PARISC)
49661+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
49662+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
49663+ select PAX_REFCOUNT if (X86 || SPARC64)
49664+ select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
49665+ help
49666+ If you say Y here, many of the features of grsecurity will be
49667+ enabled, which will protect you against many kinds of attacks
49668+ against your system. The heightened security comes at a cost
49669+ of an increased chance of incompatibilities with rare software
49670+ on your machine. Since this security level enables PaX, you should
49671+ view <http://pax.grsecurity.net> and read about the PaX
49672+ project. While you are there, download chpax and run it on
49673+ binaries that cause problems with PaX. Also remember that
49674+ since the /proc restrictions are enabled, you must run your
49675+ identd as gid 1001. This security level enables the following
49676+ features in addition to those listed in the low and medium
49677+ security levels:
49678+
49679+ - Additional /proc restrictions
49680+ - Chmod restrictions in chroot
49681+ - No signals, ptrace, or viewing of processes outside of chroot
49682+ - Capability restrictions in chroot
49683+ - Deny fchdir out of chroot
49684+ - Priority restrictions in chroot
49685+ - Segmentation-based implementation of PaX
49686+ - Mprotect restrictions
49687+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
49688+ - Kernel stack randomization
49689+ - Mount/unmount/remount logging
49690+ - Kernel symbol hiding
49691+ - Hardening of module auto-loading
49692+ - Ptrace restrictions
49693+ - Restricted vm86 mode
49694+ - Restricted sysfs/debugfs
49695+ - Active kernel exploit response
49696+
49697+config GRKERNSEC_CUSTOM
49698+ bool "Custom"
49699+ help
49700+ If you say Y here, you will be able to configure every grsecurity
49701+ option, which allows you to enable many more features that aren't
49702+ covered in the basic security levels. These additional features
49703+ include TPE, socket restrictions, and the sysctl system for
49704+ grsecurity. It is advised that you read through the help for
49705+ each option to determine its usefulness in your situation.
49706+
49707+endchoice
49708+
49709+menu "Memory Protections"
49710+depends on GRKERNSEC
49711+
49712+config GRKERNSEC_KMEM
49713+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
49714+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
49715+ help
49716+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
49717+ be written to or read from to modify or leak the contents of the running
49718+ kernel. /dev/port will also not be allowed to be opened. If you have module
49719+ support disabled, enabling this will close up four ways that are
49720+ currently used to insert malicious code into the running kernel.
49721+ Even with all these features enabled, we still highly recommend that
49722+ you use the RBAC system, as it is still possible for an attacker to
49723+ modify the running kernel through privileged I/O granted by ioperm/iopl.
49724+ If you are not using XFree86, you may be able to stop this additional
49725+ case by enabling the 'Disable privileged I/O' option. Though nothing
49726+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
49727+ but only to video memory, which is the only writing we allow in this
49728+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
49729+ not be allowed to mprotect it with PROT_WRITE later.
49730+ It is highly recommended that you say Y here if you meet all the
49731+ conditions above.
49732+
49733+config GRKERNSEC_VM86
49734+ bool "Restrict VM86 mode"
49735+ depends on X86_32
49736+
49737+ help
49738+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
49739+ make use of a special execution mode on 32bit x86 processors called
49740+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
49741+ video cards and will still work with this option enabled. The purpose
49742+ of the option is to prevent exploitation of emulation errors in
49743+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
49744+ Nearly all users should be able to enable this option.
49745+
49746+config GRKERNSEC_IO
49747+ bool "Disable privileged I/O"
49748+ depends on X86
49749+ select RTC_CLASS
49750+ select RTC_INTF_DEV
49751+ select RTC_DRV_CMOS
49752+
49753+ help
49754+ If you say Y here, all ioperm and iopl calls will return an error.
49755+ Ioperm and iopl can be used to modify the running kernel.
49756+ Unfortunately, some programs need this access to operate properly,
49757+ the most notable of which are XFree86 and hwclock. hwclock can be
49758+ remedied by having RTC support in the kernel, so real-time
49759+ clock support is enabled if this option is enabled, to ensure
49760+ that hwclock operates correctly. XFree86 still will not
49761+ operate correctly with this option enabled, so DO NOT CHOOSE Y
49762+ IF YOU USE XFree86. If you use XFree86 and you still want to
49763+ protect your kernel against modification, use the RBAC system.
49764+
49765+config GRKERNSEC_PROC_MEMMAP
49766+ bool "Harden ASLR against information leaks and entropy reduction"
49767+ default y if (PAX_NOEXEC || PAX_ASLR)
49768+ depends on PAX_NOEXEC || PAX_ASLR
49769+ help
49770+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
49771+ give no information about the addresses of its mappings if
49772+ PaX features that rely on random addresses are enabled on the task.
49773+ In addition to sanitizing this information and disabling other
49774+ dangerous sources of information, this option causes reads of sensitive
49775+ /proc/<pid> entries where the file descriptor was opened in a different
49776+ task than the one performing the read. Such attempts are logged.
49777+ This option also limits argv/env strings for suid/sgid binaries
49778+ to 512KB to prevent a complete exhaustion of the stack entropy provided
49779+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
49780+ binaries to prevent alternative mmap layouts from being abused.
49781+
49782+ If you use PaX it is essential that you say Y here as it closes up
49783+ several holes that make full ASLR useless locally.
49784+
49785+config GRKERNSEC_BRUTE
49786+ bool "Deter exploit bruteforcing"
49787+ help
49788+ If you say Y here, attempts to bruteforce exploits against forking
49789+ daemons such as apache or sshd, as well as against suid/sgid binaries
49790+ will be deterred. When a child of a forking daemon is killed by PaX
49791+ or crashes due to an illegal instruction or other suspicious signal,
49792+ the parent process will be delayed 30 seconds upon every subsequent
49793+ fork until the administrator is able to assess the situation and
49794+ restart the daemon.
49795+ In the suid/sgid case, the attempt is logged, the user has all their
49796+ processes terminated, and they are prevented from executing any further
49797+ processes for 15 minutes.
49798+ It is recommended that you also enable signal logging in the auditing
49799+ section so that logs are generated when a process triggers a suspicious
49800+ signal.
49801+ If the sysctl option is enabled, a sysctl option with name
49802+ "deter_bruteforce" is created.
49803+
49804+
49805+config GRKERNSEC_MODHARDEN
49806+ bool "Harden module auto-loading"
49807+ depends on MODULES
49808+ help
49809+ If you say Y here, module auto-loading in response to use of some
49810+ feature implemented by an unloaded module will be restricted to
49811+ root users. Enabling this option helps defend against attacks
49812+ by unprivileged users who abuse the auto-loading behavior to
49813+ cause a vulnerable module to load that is then exploited.
49814+
49815+ If this option prevents a legitimate use of auto-loading for a
49816+ non-root user, the administrator can execute modprobe manually
49817+ with the exact name of the module mentioned in the alert log.
49818+ Alternatively, the administrator can add the module to the list
49819+ of modules loaded at boot by modifying init scripts.
49820+
49821+ Modification of init scripts will most likely be needed on
49822+ Ubuntu servers with encrypted home directory support enabled,
49823+ as the first non-root user logging in will cause the ecb(aes),
49824+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
49825+
49826+config GRKERNSEC_HIDESYM
49827+ bool "Hide kernel symbols"
49828+ help
49829+ If you say Y here, getting information on loaded modules, and
49830+ displaying all kernel symbols through a syscall will be restricted
49831+ to users with CAP_SYS_MODULE. For software compatibility reasons,
49832+ /proc/kallsyms will be restricted to the root user. The RBAC
49833+ system can hide that entry even from root.
49834+
49835+ This option also prevents leaking of kernel addresses through
49836+ several /proc entries.
49837+
49838+ Note that this option is only effective provided the following
49839+ conditions are met:
49840+ 1) The kernel using grsecurity is not precompiled by some distribution
49841+ 2) You have also enabled GRKERNSEC_DMESG
49842+ 3) You are using the RBAC system and hiding other files such as your
49843+ kernel image and System.map. Alternatively, enabling this option
49844+ causes the permissions on /boot, /lib/modules, and the kernel
49845+ source directory to change at compile time to prevent
49846+ reading by non-root users.
49847+ If the above conditions are met, this option will aid in providing a
49848+ useful protection against local kernel exploitation of overflows
49849+ and arbitrary read/write vulnerabilities.
49850+
49851+config GRKERNSEC_KERN_LOCKOUT
49852+ bool "Active kernel exploit response"
49853+ depends on X86 || ARM || PPC || SPARC
49854+ help
49855+ If you say Y here, when a PaX alert is triggered due to suspicious
49856+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
49857+ or an OOPs occurs due to bad memory accesses, instead of just
49858+ terminating the offending process (and potentially allowing
49859+ a subsequent exploit from the same user), we will take one of two
49860+ actions:
49861+ If the user was root, we will panic the system
49862+ If the user was non-root, we will log the attempt, terminate
49863+ all processes owned by the user, then prevent them from creating
49864+ any new processes until the system is restarted
49865+ This deters repeated kernel exploitation/bruteforcing attempts
49866+ and is useful for later forensics.
49867+
49868+endmenu
49869+menu "Role Based Access Control Options"
49870+depends on GRKERNSEC
49871+
49872+config GRKERNSEC_RBAC_DEBUG
49873+ bool
49874+
49875+config GRKERNSEC_NO_RBAC
49876+ bool "Disable RBAC system"
49877+ help
49878+ If you say Y here, the /dev/grsec device will be removed from the kernel,
49879+ preventing the RBAC system from being enabled. You should only say Y
49880+ here if you have no intention of using the RBAC system, so as to prevent
49881+ an attacker with root access from misusing the RBAC system to hide files
49882+ and processes when loadable module support and /dev/[k]mem have been
49883+ locked down.
49884+
49885+config GRKERNSEC_ACL_HIDEKERN
49886+ bool "Hide kernel processes"
49887+ help
49888+ If you say Y here, all kernel threads will be hidden to all
49889+ processes but those whose subject has the "view hidden processes"
49890+ flag.
49891+
49892+config GRKERNSEC_ACL_MAXTRIES
49893+ int "Maximum tries before password lockout"
49894+ default 3
49895+ help
49896+ This option enforces the maximum number of times a user can attempt
49897+ to authorize themselves with the grsecurity RBAC system before being
49898+ denied the ability to attempt authorization again for a specified time.
49899+ The lower the number, the harder it will be to brute-force a password.
49900+
49901+config GRKERNSEC_ACL_TIMEOUT
49902+ int "Time to wait after max password tries, in seconds"
49903+ default 30
49904+ help
49905+ This option specifies the time the user must wait after attempting to
49906+ authorize to the RBAC system with the maximum number of invalid
49907+ passwords. The higher the number, the harder it will be to brute-force
49908+ a password.
49909+
49910+endmenu
49911+menu "Filesystem Protections"
49912+depends on GRKERNSEC
49913+
49914+config GRKERNSEC_PROC
49915+ bool "Proc restrictions"
49916+ help
49917+ If you say Y here, the permissions of the /proc filesystem
49918+ will be altered to enhance system security and privacy. You MUST
49919+ choose either a user only restriction or a user and group restriction.
49920+ Depending upon the option you choose, you can either restrict users to
49921+ see only the processes they themselves run, or choose a group that can
49922+ view all processes and files normally restricted to root if you choose
49923+ the "restrict to user only" option. NOTE: If you're running identd or
49924+ ntpd as a non-root user, you will have to run it as the group you
49925+ specify here.
49926+
49927+config GRKERNSEC_PROC_USER
49928+ bool "Restrict /proc to user only"
49929+ depends on GRKERNSEC_PROC
49930+ help
49931+ If you say Y here, non-root users will only be able to view their own
49932+ processes, and restricts them from viewing network-related information,
49933+ and viewing kernel symbol and module information.
49934+
49935+config GRKERNSEC_PROC_USERGROUP
49936+ bool "Allow special group"
49937+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
49938+ help
49939+ If you say Y here, you will be able to select a group that will be
49940+ able to view all processes and network-related information. If you've
49941+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
49942+ remain hidden. This option is useful if you want to run identd as
49943+ a non-root user.
49944+
49945+config GRKERNSEC_PROC_GID
49946+ int "GID for special group"
49947+ depends on GRKERNSEC_PROC_USERGROUP
49948+ default 1001
49949+
49950+config GRKERNSEC_PROC_ADD
49951+ bool "Additional restrictions"
49952+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
49953+ help
49954+ If you say Y here, additional restrictions will be placed on
49955+ /proc that keep normal users from viewing device information and
49956+ slabinfo information that could be useful for exploits.
49957+
49958+config GRKERNSEC_LINK
49959+ bool "Linking restrictions"
49960+ help
49961+ If you say Y here, /tmp race exploits will be prevented, since users
49962+ will no longer be able to follow symlinks owned by other users in
49963+ world-writable +t directories (e.g. /tmp), unless the owner of the
49964+ symlink is the owner of the directory. users will also not be
49965+ able to hardlink to files they do not own. If the sysctl option is
49966+ enabled, a sysctl option with name "linking_restrictions" is created.
49967+
49968+config GRKERNSEC_FIFO
49969+ bool "FIFO restrictions"
49970+ help
49971+ If you say Y here, users will not be able to write to FIFOs they don't
49972+ own in world-writable +t directories (e.g. /tmp), unless the owner of
49973+ the FIFO is the same owner of the directory it's held in. If the sysctl
49974+ option is enabled, a sysctl option with name "fifo_restrictions" is
49975+ created.
49976+
49977+config GRKERNSEC_SYSFS_RESTRICT
49978+ bool "Sysfs/debugfs restriction"
49979+ depends on SYSFS
49980+ help
49981+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
49982+ any filesystem normally mounted under it (e.g. debugfs) will be
49983+ mostly accessible only by root. These filesystems generally provide access
49984+ to hardware and debug information that isn't appropriate for unprivileged
49985+ users of the system. Sysfs and debugfs have also become a large source
49986+ of new vulnerabilities, ranging from infoleaks to local compromise.
49987+ There has been very little oversight with an eye toward security involved
49988+ in adding new exporters of information to these filesystems, so their
49989+ use is discouraged.
49990+ For reasons of compatibility, a few directories have been whitelisted
49991+ for access by non-root users:
49992+ /sys/fs/selinux
49993+ /sys/fs/fuse
49994+ /sys/devices/system/cpu
49995+
49996+config GRKERNSEC_ROFS
49997+ bool "Runtime read-only mount protection"
49998+ help
49999+ If you say Y here, a sysctl option with name "romount_protect" will
50000+ be created. By setting this option to 1 at runtime, filesystems
50001+ will be protected in the following ways:
50002+ * No new writable mounts will be allowed
50003+ * Existing read-only mounts won't be able to be remounted read/write
50004+ * Write operations will be denied on all block devices
50005+ This option acts independently of grsec_lock: once it is set to 1,
50006+ it cannot be turned off. Therefore, please be mindful of the resulting
50007+ behavior if this option is enabled in an init script on a read-only
50008+ filesystem. This feature is mainly intended for secure embedded systems.
50009+
50010+config GRKERNSEC_CHROOT
50011+ bool "Chroot jail restrictions"
50012+ help
50013+ If you say Y here, you will be able to choose several options that will
50014+ make breaking out of a chrooted jail much more difficult. If you
50015+ encounter no software incompatibilities with the following options, it
50016+ is recommended that you enable each one.
50017+
50018+config GRKERNSEC_CHROOT_MOUNT
50019+ bool "Deny mounts"
50020+ depends on GRKERNSEC_CHROOT
50021+ help
50022+ If you say Y here, processes inside a chroot will not be able to
50023+ mount or remount filesystems. If the sysctl option is enabled, a
50024+ sysctl option with name "chroot_deny_mount" is created.
50025+
50026+config GRKERNSEC_CHROOT_DOUBLE
50027+ bool "Deny double-chroots"
50028+ depends on GRKERNSEC_CHROOT
50029+ help
50030+ If you say Y here, processes inside a chroot will not be able to chroot
50031+ again outside the chroot. This is a widely used method of breaking
50032+ out of a chroot jail and should not be allowed. If the sysctl
50033+ option is enabled, a sysctl option with name
50034+ "chroot_deny_chroot" is created.
50035+
50036+config GRKERNSEC_CHROOT_PIVOT
50037+ bool "Deny pivot_root in chroot"
50038+ depends on GRKERNSEC_CHROOT
50039+ help
50040+ If you say Y here, processes inside a chroot will not be able to use
50041+ a function called pivot_root() that was introduced in Linux 2.3.41. It
50042+ works similar to chroot in that it changes the root filesystem. This
50043+ function could be misused in a chrooted process to attempt to break out
50044+ of the chroot, and therefore should not be allowed. If the sysctl
50045+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
50046+ created.
50047+
50048+config GRKERNSEC_CHROOT_CHDIR
50049+ bool "Enforce chdir(\"/\") on all chroots"
50050+ depends on GRKERNSEC_CHROOT
50051+ help
50052+ If you say Y here, the current working directory of all newly-chrooted
50053+ applications will be set to the the root directory of the chroot.
50054+ The man page on chroot(2) states:
50055+ Note that this call does not change the current working
50056+ directory, so that `.' can be outside the tree rooted at
50057+ `/'. In particular, the super-user can escape from a
50058+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
50059+
50060+ It is recommended that you say Y here, since it's not known to break
50061+ any software. If the sysctl option is enabled, a sysctl option with
50062+ name "chroot_enforce_chdir" is created.
50063+
50064+config GRKERNSEC_CHROOT_CHMOD
50065+ bool "Deny (f)chmod +s"
50066+ depends on GRKERNSEC_CHROOT
50067+ help
50068+ If you say Y here, processes inside a chroot will not be able to chmod
50069+ or fchmod files to make them have suid or sgid bits. This protects
50070+ against another published method of breaking a chroot. If the sysctl
50071+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
50072+ created.
50073+
50074+config GRKERNSEC_CHROOT_FCHDIR
50075+ bool "Deny fchdir out of chroot"
50076+ depends on GRKERNSEC_CHROOT
50077+ help
50078+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
50079+ to a file descriptor of the chrooting process that points to a directory
50080+ outside the filesystem will be stopped. If the sysctl option
50081+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
50082+
50083+config GRKERNSEC_CHROOT_MKNOD
50084+ bool "Deny mknod"
50085+ depends on GRKERNSEC_CHROOT
50086+ help
50087+ If you say Y here, processes inside a chroot will not be allowed to
50088+ mknod. The problem with using mknod inside a chroot is that it
50089+ would allow an attacker to create a device entry that is the same
50090+ as one on the physical root of your system, which could range from
50091+ anything from the console device to a device for your harddrive (which
50092+ they could then use to wipe the drive or steal data). It is recommended
50093+ that you say Y here, unless you run into software incompatibilities.
50094+ If the sysctl option is enabled, a sysctl option with name
50095+ "chroot_deny_mknod" is created.
50096+
50097+config GRKERNSEC_CHROOT_SHMAT
50098+ bool "Deny shmat() out of chroot"
50099+ depends on GRKERNSEC_CHROOT
50100+ help
50101+ If you say Y here, processes inside a chroot will not be able to attach
50102+ to shared memory segments that were created outside of the chroot jail.
50103+ It is recommended that you say Y here. If the sysctl option is enabled,
50104+ a sysctl option with name "chroot_deny_shmat" is created.
50105+
50106+config GRKERNSEC_CHROOT_UNIX
50107+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
50108+ depends on GRKERNSEC_CHROOT
50109+ help
50110+ If you say Y here, processes inside a chroot will not be able to
50111+ connect to abstract (meaning not belonging to a filesystem) Unix
50112+ domain sockets that were bound outside of a chroot. It is recommended
50113+ that you say Y here. If the sysctl option is enabled, a sysctl option
50114+ with name "chroot_deny_unix" is created.
50115+
50116+config GRKERNSEC_CHROOT_FINDTASK
50117+ bool "Protect outside processes"
50118+ depends on GRKERNSEC_CHROOT
50119+ help
50120+ If you say Y here, processes inside a chroot will not be able to
50121+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
50122+ getsid, or view any process outside of the chroot. If the sysctl
50123+ option is enabled, a sysctl option with name "chroot_findtask" is
50124+ created.
50125+
50126+config GRKERNSEC_CHROOT_NICE
50127+ bool "Restrict priority changes"
50128+ depends on GRKERNSEC_CHROOT
50129+ help
50130+ If you say Y here, processes inside a chroot will not be able to raise
50131+ the priority of processes in the chroot, or alter the priority of
50132+ processes outside the chroot. This provides more security than simply
50133+ removing CAP_SYS_NICE from the process' capability set. If the
50134+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
50135+ is created.
50136+
50137+config GRKERNSEC_CHROOT_SYSCTL
50138+ bool "Deny sysctl writes"
50139+ depends on GRKERNSEC_CHROOT
50140+ help
50141+ If you say Y here, an attacker in a chroot will not be able to
50142+ write to sysctl entries, either by sysctl(2) or through a /proc
50143+ interface. It is strongly recommended that you say Y here. If the
50144+ sysctl option is enabled, a sysctl option with name
50145+ "chroot_deny_sysctl" is created.
50146+
50147+config GRKERNSEC_CHROOT_CAPS
50148+ bool "Capability restrictions"
50149+ depends on GRKERNSEC_CHROOT
50150+ help
50151+ If you say Y here, the capabilities on all processes within a
50152+ chroot jail will be lowered to stop module insertion, raw i/o,
50153+ system and net admin tasks, rebooting the system, modifying immutable
50154+ files, modifying IPC owned by another, and changing the system time.
50155+ This is left an option because it can break some apps. Disable this
50156+ if your chrooted apps are having problems performing those kinds of
50157+ tasks. If the sysctl option is enabled, a sysctl option with
50158+ name "chroot_caps" is created.
50159+
50160+endmenu
50161+menu "Kernel Auditing"
50162+depends on GRKERNSEC
50163+
50164+config GRKERNSEC_AUDIT_GROUP
50165+ bool "Single group for auditing"
50166+ help
50167+ If you say Y here, the exec, chdir, and (un)mount logging features
50168+ will only operate on a group you specify. This option is recommended
50169+ if you only want to watch certain users instead of having a large
50170+ amount of logs from the entire system. If the sysctl option is enabled,
50171+ a sysctl option with name "audit_group" is created.
50172+
50173+config GRKERNSEC_AUDIT_GID
50174+ int "GID for auditing"
50175+ depends on GRKERNSEC_AUDIT_GROUP
50176+ default 1007
50177+
50178+config GRKERNSEC_EXECLOG
50179+ bool "Exec logging"
50180+ help
50181+ If you say Y here, all execve() calls will be logged (since the
50182+ other exec*() calls are frontends to execve(), all execution
50183+ will be logged). Useful for shell-servers that like to keep track
50184+ of their users. If the sysctl option is enabled, a sysctl option with
50185+ name "exec_logging" is created.
50186+ WARNING: This option when enabled will produce a LOT of logs, especially
50187+ on an active system.
50188+
50189+config GRKERNSEC_RESLOG
50190+ bool "Resource logging"
50191+ help
50192+ If you say Y here, all attempts to overstep resource limits will
50193+ be logged with the resource name, the requested size, and the current
50194+ limit. It is highly recommended that you say Y here. If the sysctl
50195+ option is enabled, a sysctl option with name "resource_logging" is
50196+ created. If the RBAC system is enabled, the sysctl value is ignored.
50197+
50198+config GRKERNSEC_CHROOT_EXECLOG
50199+ bool "Log execs within chroot"
50200+ help
50201+ If you say Y here, all executions inside a chroot jail will be logged
50202+ to syslog. This can cause a large amount of logs if certain
50203+ applications (eg. djb's daemontools) are installed on the system, and
50204+ is therefore left as an option. If the sysctl option is enabled, a
50205+ sysctl option with name "chroot_execlog" is created.
50206+
50207+config GRKERNSEC_AUDIT_PTRACE
50208+ bool "Ptrace logging"
50209+ help
50210+ If you say Y here, all attempts to attach to a process via ptrace
50211+ will be logged. If the sysctl option is enabled, a sysctl option
50212+ with name "audit_ptrace" is created.
50213+
50214+config GRKERNSEC_AUDIT_CHDIR
50215+ bool "Chdir logging"
50216+ help
50217+ If you say Y here, all chdir() calls will be logged. If the sysctl
50218+ option is enabled, a sysctl option with name "audit_chdir" is created.
50219+
50220+config GRKERNSEC_AUDIT_MOUNT
50221+ bool "(Un)Mount logging"
50222+ help
50223+ If you say Y here, all mounts and unmounts will be logged. If the
50224+ sysctl option is enabled, a sysctl option with name "audit_mount" is
50225+ created.
50226+
50227+config GRKERNSEC_SIGNAL
50228+ bool "Signal logging"
50229+ help
50230+ If you say Y here, certain important signals will be logged, such as
50231+ SIGSEGV, which will as a result inform you of when a error in a program
50232+ occurred, which in some cases could mean a possible exploit attempt.
50233+ If the sysctl option is enabled, a sysctl option with name
50234+ "signal_logging" is created.
50235+
50236+config GRKERNSEC_FORKFAIL
50237+ bool "Fork failure logging"
50238+ help
50239+ If you say Y here, all failed fork() attempts will be logged.
50240+ This could suggest a fork bomb, or someone attempting to overstep
50241+ their process limit. If the sysctl option is enabled, a sysctl option
50242+ with name "forkfail_logging" is created.
50243+
50244+config GRKERNSEC_TIME
50245+ bool "Time change logging"
50246+ help
50247+ If you say Y here, any changes of the system clock will be logged.
50248+ If the sysctl option is enabled, a sysctl option with name
50249+ "timechange_logging" is created.
50250+
50251+config GRKERNSEC_PROC_IPADDR
50252+ bool "/proc/<pid>/ipaddr support"
50253+ help
50254+ If you say Y here, a new entry will be added to each /proc/<pid>
50255+ directory that contains the IP address of the person using the task.
50256+ The IP is carried across local TCP and AF_UNIX stream sockets.
50257+ This information can be useful for IDS/IPSes to perform remote response
50258+ to a local attack. The entry is readable by only the owner of the
50259+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
50260+ the RBAC system), and thus does not create privacy concerns.
50261+
50262+config GRKERNSEC_RWXMAP_LOG
50263+ bool 'Denied RWX mmap/mprotect logging'
50264+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
50265+ help
50266+ If you say Y here, calls to mmap() and mprotect() with explicit
50267+ usage of PROT_WRITE and PROT_EXEC together will be logged when
50268+ denied by the PAX_MPROTECT feature. If the sysctl option is
50269+ enabled, a sysctl option with name "rwxmap_logging" is created.
50270+
50271+config GRKERNSEC_AUDIT_TEXTREL
50272+ bool 'ELF text relocations logging (READ HELP)'
50273+ depends on PAX_MPROTECT
50274+ help
50275+ If you say Y here, text relocations will be logged with the filename
50276+ of the offending library or binary. The purpose of the feature is
50277+ to help Linux distribution developers get rid of libraries and
50278+ binaries that need text relocations which hinder the future progress
50279+ of PaX. Only Linux distribution developers should say Y here, and
50280+ never on a production machine, as this option creates an information
50281+ leak that could aid an attacker in defeating the randomization of
50282+ a single memory region. If the sysctl option is enabled, a sysctl
50283+ option with name "audit_textrel" is created.
50284+
50285+endmenu
50286+
50287+menu "Executable Protections"
50288+depends on GRKERNSEC
50289+
50290+config GRKERNSEC_DMESG
50291+ bool "Dmesg(8) restriction"
50292+ help
50293+ If you say Y here, non-root users will not be able to use dmesg(8)
50294+ to view up to the last 4kb of messages in the kernel's log buffer.
50295+ The kernel's log buffer often contains kernel addresses and other
50296+ identifying information useful to an attacker in fingerprinting a
50297+ system for a targeted exploit.
50298+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
50299+ created.
50300+
50301+config GRKERNSEC_HARDEN_PTRACE
50302+ bool "Deter ptrace-based process snooping"
50303+ help
50304+ If you say Y here, TTY sniffers and other malicious monitoring
50305+ programs implemented through ptrace will be defeated. If you
50306+ have been using the RBAC system, this option has already been
50307+ enabled for several years for all users, with the ability to make
50308+ fine-grained exceptions.
50309+
50310+ This option only affects the ability of non-root users to ptrace
50311+ processes that are not a descendent of the ptracing process.
50312+ This means that strace ./binary and gdb ./binary will still work,
50313+ but attaching to arbitrary processes will not. If the sysctl
50314+ option is enabled, a sysctl option with name "harden_ptrace" is
50315+ created.
50316+
50317+config GRKERNSEC_PTRACE_READEXEC
50318+ bool "Require read access to ptrace sensitive binaries"
50319+ help
50320+ If you say Y here, unprivileged users will not be able to ptrace unreadable
50321+ binaries. This option is useful in environments that
50322+ remove the read bits (e.g. file mode 4711) from suid binaries to
50323+ prevent infoleaking of their contents. This option adds
50324+ consistency to the use of that file mode, as the binary could normally
50325+ be read out when run without privileges while ptracing.
50326+
50327+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
50328+ is created.
50329+
50330+config GRKERNSEC_SETXID
50331+ bool "Enforce consistent multithreaded privileges"
50332+ help
50333+ If you say Y here, a change from a root uid to a non-root uid
50334+ in a multithreaded application will cause the resulting uids,
50335+ gids, supplementary groups, and capabilities in that thread
50336+ to be propagated to the other threads of the process. In most
50337+ cases this is unnecessary, as glibc will emulate this behavior
50338+ on behalf of the application. Other libcs do not act in the
50339+ same way, allowing the other threads of the process to continue
50340+ running with root privileges. If the sysctl option is enabled,
50341+ a sysctl option with name "consistent_setxid" is created.
50342+
50343+config GRKERNSEC_TPE
50344+ bool "Trusted Path Execution (TPE)"
50345+ help
50346+ If you say Y here, you will be able to choose a gid to add to the
50347+ supplementary groups of users you want to mark as "untrusted."
50348+ These users will not be able to execute any files that are not in
50349+ root-owned directories writable only by root. If the sysctl option
50350+ is enabled, a sysctl option with name "tpe" is created.
50351+
50352+config GRKERNSEC_TPE_ALL
50353+ bool "Partially restrict all non-root users"
50354+ depends on GRKERNSEC_TPE
50355+ help
50356+ If you say Y here, all non-root users will be covered under
50357+ a weaker TPE restriction. This is separate from, and in addition to,
50358+ the main TPE options that you have selected elsewhere. Thus, if a
50359+ "trusted" GID is chosen, this restriction applies to even that GID.
50360+ Under this restriction, all non-root users will only be allowed to
50361+ execute files in directories they own that are not group or
50362+ world-writable, or in directories owned by root and writable only by
50363+ root. If the sysctl option is enabled, a sysctl option with name
50364+ "tpe_restrict_all" is created.
50365+
50366+config GRKERNSEC_TPE_INVERT
50367+ bool "Invert GID option"
50368+ depends on GRKERNSEC_TPE
50369+ help
50370+ If you say Y here, the group you specify in the TPE configuration will
50371+ decide what group TPE restrictions will be *disabled* for. This
50372+ option is useful if you want TPE restrictions to be applied to most
50373+ users on the system. If the sysctl option is enabled, a sysctl option
50374+ with name "tpe_invert" is created. Unlike other sysctl options, this
50375+ entry will default to on for backward-compatibility.
50376+
50377+config GRKERNSEC_TPE_GID
50378+ int "GID for untrusted users"
50379+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
50380+ default 1005
50381+ help
50382+ Setting this GID determines what group TPE restrictions will be
50383+ *enabled* for. If the sysctl option is enabled, a sysctl option
50384+ with name "tpe_gid" is created.
50385+
50386+config GRKERNSEC_TPE_GID
50387+ int "GID for trusted users"
50388+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
50389+ default 1005
50390+ help
50391+ Setting this GID determines what group TPE restrictions will be
50392+ *disabled* for. If the sysctl option is enabled, a sysctl option
50393+ with name "tpe_gid" is created.
50394+
50395+endmenu
50396+menu "Network Protections"
50397+depends on GRKERNSEC
50398+
50399+config GRKERNSEC_RANDNET
50400+ bool "Larger entropy pools"
50401+ help
50402+ If you say Y here, the entropy pools used for many features of Linux
50403+ and grsecurity will be doubled in size. Since several grsecurity
50404+ features use additional randomness, it is recommended that you say Y
50405+ here. Saying Y here has a similar effect as modifying
50406+ /proc/sys/kernel/random/poolsize.
50407+
50408+config GRKERNSEC_BLACKHOLE
50409+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
50410+ depends on NET
50411+ help
50412+ If you say Y here, neither TCP resets nor ICMP
50413+ destination-unreachable packets will be sent in response to packets
50414+ sent to ports for which no associated listening process exists.
50415+ This feature supports both IPV4 and IPV6 and exempts the
50416+ loopback interface from blackholing. Enabling this feature
50417+ makes a host more resilient to DoS attacks and reduces network
50418+ visibility against scanners.
50419+
50420+ The blackhole feature as-implemented is equivalent to the FreeBSD
50421+ blackhole feature, as it prevents RST responses to all packets, not
50422+ just SYNs. Under most application behavior this causes no
50423+ problems, but applications (like haproxy) may not close certain
50424+ connections in a way that cleanly terminates them on the remote
50425+ end, leaving the remote host in LAST_ACK state. Because of this
50426+ side-effect and to prevent intentional LAST_ACK DoSes, this
50427+ feature also adds automatic mitigation against such attacks.
50428+ The mitigation drastically reduces the amount of time a socket
50429+ can spend in LAST_ACK state. If you're using haproxy and not
50430+ all servers it connects to have this option enabled, consider
50431+ disabling this feature on the haproxy host.
50432+
50433+ If the sysctl option is enabled, two sysctl options with names
50434+ "ip_blackhole" and "lastack_retries" will be created.
50435+ While "ip_blackhole" takes the standard zero/non-zero on/off
50436+ toggle, "lastack_retries" uses the same kinds of values as
50437+ "tcp_retries1" and "tcp_retries2". The default value of 4
50438+ prevents a socket from lasting more than 45 seconds in LAST_ACK
50439+ state.
50440+
50441+config GRKERNSEC_SOCKET
50442+ bool "Socket restrictions"
50443+ depends on NET
50444+ help
50445+ If you say Y here, you will be able to choose from several options.
50446+ If you assign a GID on your system and add it to the supplementary
50447+ groups of users you want to restrict socket access to, this patch
50448+ will perform up to three things, based on the option(s) you choose.
50449+
50450+config GRKERNSEC_SOCKET_ALL
50451+ bool "Deny any sockets to group"
50452+ depends on GRKERNSEC_SOCKET
50453+ help
50454+ If you say Y here, you will be able to choose a GID of whose users will
50455+ be unable to connect to other hosts from your machine or run server
50456+ applications from your machine. If the sysctl option is enabled, a
50457+ sysctl option with name "socket_all" is created.
50458+
50459+config GRKERNSEC_SOCKET_ALL_GID
50460+ int "GID to deny all sockets for"
50461+ depends on GRKERNSEC_SOCKET_ALL
50462+ default 1004
50463+ help
50464+ Here you can choose the GID to disable socket access for. Remember to
50465+ add the users you want socket access disabled for to the GID
50466+ specified here. If the sysctl option is enabled, a sysctl option
50467+ with name "socket_all_gid" is created.
50468+
50469+config GRKERNSEC_SOCKET_CLIENT
50470+ bool "Deny client sockets to group"
50471+ depends on GRKERNSEC_SOCKET
50472+ help
50473+ If you say Y here, you will be able to choose a GID of whose users will
50474+ be unable to connect to other hosts from your machine, but will be
50475+ able to run servers. If this option is enabled, all users in the group
50476+ you specify will have to use passive mode when initiating ftp transfers
50477+ from the shell on your machine. If the sysctl option is enabled, a
50478+ sysctl option with name "socket_client" is created.
50479+
50480+config GRKERNSEC_SOCKET_CLIENT_GID
50481+ int "GID to deny client sockets for"
50482+ depends on GRKERNSEC_SOCKET_CLIENT
50483+ default 1003
50484+ help
50485+ Here you can choose the GID to disable client socket access for.
50486+ Remember to add the users you want client socket access disabled for to
50487+ the GID specified here. If the sysctl option is enabled, a sysctl
50488+ option with name "socket_client_gid" is created.
50489+
50490+config GRKERNSEC_SOCKET_SERVER
50491+ bool "Deny server sockets to group"
50492+ depends on GRKERNSEC_SOCKET
50493+ help
50494+ If you say Y here, you will be able to choose a GID of whose users will
50495+ be unable to run server applications from your machine. If the sysctl
50496+ option is enabled, a sysctl option with name "socket_server" is created.
50497+
50498+config GRKERNSEC_SOCKET_SERVER_GID
50499+ int "GID to deny server sockets for"
50500+ depends on GRKERNSEC_SOCKET_SERVER
50501+ default 1002
50502+ help
50503+ Here you can choose the GID to disable server socket access for.
50504+ Remember to add the users you want server socket access disabled for to
50505+ the GID specified here. If the sysctl option is enabled, a sysctl
50506+ option with name "socket_server_gid" is created.
50507+
50508+endmenu
50509+menu "Sysctl support"
50510+depends on GRKERNSEC && SYSCTL
50511+
50512+config GRKERNSEC_SYSCTL
50513+ bool "Sysctl support"
50514+ help
50515+ If you say Y here, you will be able to change the options that
50516+ grsecurity runs with at bootup, without having to recompile your
50517+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
50518+ to enable (1) or disable (0) various features. All the sysctl entries
50519+ are mutable until the "grsec_lock" entry is set to a non-zero value.
50520+ All features enabled in the kernel configuration are disabled at boot
50521+ if you do not say Y to the "Turn on features by default" option.
50522+ All options should be set at startup, and the grsec_lock entry should
50523+ be set to a non-zero value after all the options are set.
50524+ *THIS IS EXTREMELY IMPORTANT*
50525+
50526+config GRKERNSEC_SYSCTL_DISTRO
50527+ bool "Extra sysctl support for distro makers (READ HELP)"
50528+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
50529+ help
50530+ If you say Y here, additional sysctl options will be created
50531+ for features that affect processes running as root. Therefore,
50532+ it is critical when using this option that the grsec_lock entry be
50533+ enabled after boot. Only distros with prebuilt kernel packages
50534+ with this option enabled that can ensure grsec_lock is enabled
50535+ after boot should use this option.
50536+ *Failure to set grsec_lock after boot makes all grsec features
50537+ this option covers useless*
50538+
50539+ Currently this option creates the following sysctl entries:
50540+ "Disable Privileged I/O": "disable_priv_io"
50541+
50542+config GRKERNSEC_SYSCTL_ON
50543+ bool "Turn on features by default"
50544+ depends on GRKERNSEC_SYSCTL
50545+ help
50546+ If you say Y here, instead of having all features enabled in the
50547+ kernel configuration disabled at boot time, the features will be
50548+ enabled at boot time. It is recommended you say Y here unless
50549+ there is some reason you would want all sysctl-tunable features to
50550+ be disabled by default. As mentioned elsewhere, it is important
50551+ to enable the grsec_lock entry once you have finished modifying
50552+ the sysctl entries.
50553+
50554+endmenu
50555+menu "Logging Options"
50556+depends on GRKERNSEC
50557+
50558+config GRKERNSEC_FLOODTIME
50559+ int "Seconds in between log messages (minimum)"
50560+ default 10
50561+ help
50562+ This option allows you to enforce the number of seconds between
50563+ grsecurity log messages. The default should be suitable for most
50564+ people, however, if you choose to change it, choose a value small enough
50565+ to allow informative logs to be produced, but large enough to
50566+ prevent flooding.
50567+
50568+config GRKERNSEC_FLOODBURST
50569+ int "Number of messages in a burst (maximum)"
50570+ default 6
50571+ help
50572+ This option allows you to choose the maximum number of messages allowed
50573+ within the flood time interval you chose in a separate option. The
50574+ default should be suitable for most people, however if you find that
50575+ many of your logs are being interpreted as flooding, you may want to
50576+ raise this value.
50577+
50578+endmenu
50579+
50580+endmenu
50581diff --git a/grsecurity/Makefile b/grsecurity/Makefile
50582new file mode 100644
50583index 0000000..1b9afa9
50584--- /dev/null
50585+++ b/grsecurity/Makefile
50586@@ -0,0 +1,38 @@
50587+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
50588+# during 2001-2009 it has been completely redesigned by Brad Spengler
50589+# into an RBAC system
50590+#
50591+# All code in this directory and various hooks inserted throughout the kernel
50592+# are copyright Brad Spengler - Open Source Security, Inc., and released
50593+# under the GPL v2 or higher
50594+
50595+KBUILD_CFLAGS += -Werror
50596+
50597+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
50598+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
50599+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
50600+
50601+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
50602+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
50603+ gracl_learn.o grsec_log.o
50604+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
50605+
50606+ifdef CONFIG_NET
50607+obj-y += grsec_sock.o
50608+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
50609+endif
50610+
50611+ifndef CONFIG_GRKERNSEC
50612+obj-y += grsec_disabled.o
50613+endif
50614+
50615+ifdef CONFIG_GRKERNSEC_HIDESYM
50616+extra-y := grsec_hidesym.o
50617+$(obj)/grsec_hidesym.o:
50618+ @-chmod -f 500 /boot
50619+ @-chmod -f 500 /lib/modules
50620+ @-chmod -f 500 /lib64/modules
50621+ @-chmod -f 500 /lib32/modules
50622+ @-chmod -f 700 .
50623+ @echo ' grsec: protected kernel image paths'
50624+endif
50625diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
50626new file mode 100644
50627index 0000000..42813ac
50628--- /dev/null
50629+++ b/grsecurity/gracl.c
50630@@ -0,0 +1,4192 @@
50631+#include <linux/kernel.h>
50632+#include <linux/module.h>
50633+#include <linux/sched.h>
50634+#include <linux/mm.h>
50635+#include <linux/file.h>
50636+#include <linux/fs.h>
50637+#include <linux/namei.h>
50638+#include <linux/mount.h>
50639+#include <linux/tty.h>
50640+#include <linux/proc_fs.h>
50641+#include <linux/lglock.h>
50642+#include <linux/slab.h>
50643+#include <linux/vmalloc.h>
50644+#include <linux/types.h>
50645+#include <linux/sysctl.h>
50646+#include <linux/netdevice.h>
50647+#include <linux/ptrace.h>
50648+#include <linux/gracl.h>
50649+#include <linux/gralloc.h>
50650+#include <linux/security.h>
50651+#include <linux/grinternal.h>
50652+#include <linux/pid_namespace.h>
50653+#include <linux/fdtable.h>
50654+#include <linux/percpu.h>
50655+#include "../fs/mount.h"
50656+
50657+#include <asm/uaccess.h>
50658+#include <asm/errno.h>
50659+#include <asm/mman.h>
50660+
50661+static struct acl_role_db acl_role_set;
50662+static struct name_db name_set;
50663+static struct inodev_db inodev_set;
50664+
50665+/* for keeping track of userspace pointers used for subjects, so we
50666+ can share references in the kernel as well
50667+*/
50668+
50669+static struct path real_root;
50670+
50671+static struct acl_subj_map_db subj_map_set;
50672+
50673+static struct acl_role_label *default_role;
50674+
50675+static struct acl_role_label *role_list;
50676+
50677+static u16 acl_sp_role_value;
50678+
50679+extern char *gr_shared_page[4];
50680+static DEFINE_MUTEX(gr_dev_mutex);
50681+DEFINE_RWLOCK(gr_inode_lock);
50682+
50683+struct gr_arg *gr_usermode;
50684+
50685+static unsigned int gr_status __read_only = GR_STATUS_INIT;
50686+
50687+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
50688+extern void gr_clear_learn_entries(void);
50689+
50690+#ifdef CONFIG_GRKERNSEC_RESLOG
50691+extern void gr_log_resource(const struct task_struct *task,
50692+ const int res, const unsigned long wanted, const int gt);
50693+#endif
50694+
50695+unsigned char *gr_system_salt;
50696+unsigned char *gr_system_sum;
50697+
50698+static struct sprole_pw **acl_special_roles = NULL;
50699+static __u16 num_sprole_pws = 0;
50700+
50701+static struct acl_role_label *kernel_role = NULL;
50702+
50703+static unsigned int gr_auth_attempts = 0;
50704+static unsigned long gr_auth_expires = 0UL;
50705+
50706+#ifdef CONFIG_NET
50707+extern struct vfsmount *sock_mnt;
50708+#endif
50709+
50710+extern struct vfsmount *pipe_mnt;
50711+extern struct vfsmount *shm_mnt;
50712+#ifdef CONFIG_HUGETLBFS
50713+extern struct vfsmount *hugetlbfs_vfsmount;
50714+#endif
50715+
50716+static struct acl_object_label *fakefs_obj_rw;
50717+static struct acl_object_label *fakefs_obj_rwx;
50718+
50719+extern int gr_init_uidset(void);
50720+extern void gr_free_uidset(void);
50721+extern void gr_remove_uid(uid_t uid);
50722+extern int gr_find_uid(uid_t uid);
50723+
50724+DECLARE_BRLOCK(vfsmount_lock);
50725+
50726+__inline__ int
50727+gr_acl_is_enabled(void)
50728+{
50729+ return (gr_status & GR_READY);
50730+}
50731+
50732+#ifdef CONFIG_BTRFS_FS
50733+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
50734+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
50735+#endif
50736+
50737+static inline dev_t __get_dev(const struct dentry *dentry)
50738+{
50739+#ifdef CONFIG_BTRFS_FS
50740+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
50741+ return get_btrfs_dev_from_inode(dentry->d_inode);
50742+ else
50743+#endif
50744+ return dentry->d_inode->i_sb->s_dev;
50745+}
50746+
50747+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
50748+{
50749+ return __get_dev(dentry);
50750+}
50751+
50752+static char gr_task_roletype_to_char(struct task_struct *task)
50753+{
50754+ switch (task->role->roletype &
50755+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
50756+ GR_ROLE_SPECIAL)) {
50757+ case GR_ROLE_DEFAULT:
50758+ return 'D';
50759+ case GR_ROLE_USER:
50760+ return 'U';
50761+ case GR_ROLE_GROUP:
50762+ return 'G';
50763+ case GR_ROLE_SPECIAL:
50764+ return 'S';
50765+ }
50766+
50767+ return 'X';
50768+}
50769+
50770+char gr_roletype_to_char(void)
50771+{
50772+ return gr_task_roletype_to_char(current);
50773+}
50774+
50775+__inline__ int
50776+gr_acl_tpe_check(void)
50777+{
50778+ if (unlikely(!(gr_status & GR_READY)))
50779+ return 0;
50780+ if (current->role->roletype & GR_ROLE_TPE)
50781+ return 1;
50782+ else
50783+ return 0;
50784+}
50785+
50786+int
50787+gr_handle_rawio(const struct inode *inode)
50788+{
50789+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
50790+ if (inode && S_ISBLK(inode->i_mode) &&
50791+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
50792+ !capable(CAP_SYS_RAWIO))
50793+ return 1;
50794+#endif
50795+ return 0;
50796+}
50797+
50798+static int
50799+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
50800+{
50801+ if (likely(lena != lenb))
50802+ return 0;
50803+
50804+ return !memcmp(a, b, lena);
50805+}
50806+
50807+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
50808+{
50809+ *buflen -= namelen;
50810+ if (*buflen < 0)
50811+ return -ENAMETOOLONG;
50812+ *buffer -= namelen;
50813+ memcpy(*buffer, str, namelen);
50814+ return 0;
50815+}
50816+
50817+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
50818+{
50819+ return prepend(buffer, buflen, name->name, name->len);
50820+}
50821+
50822+static int prepend_path(const struct path *path, struct path *root,
50823+ char **buffer, int *buflen)
50824+{
50825+ struct dentry *dentry = path->dentry;
50826+ struct vfsmount *vfsmnt = path->mnt;
50827+ struct mount *mnt = real_mount(vfsmnt);
50828+ bool slash = false;
50829+ int error = 0;
50830+
50831+ while (dentry != root->dentry || vfsmnt != root->mnt) {
50832+ struct dentry * parent;
50833+
50834+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
50835+ /* Global root? */
50836+ if (!mnt_has_parent(mnt)) {
50837+ goto out;
50838+ }
50839+ dentry = mnt->mnt_mountpoint;
50840+ mnt = mnt->mnt_parent;
50841+ vfsmnt = &mnt->mnt;
50842+ continue;
50843+ }
50844+ parent = dentry->d_parent;
50845+ prefetch(parent);
50846+ spin_lock(&dentry->d_lock);
50847+ error = prepend_name(buffer, buflen, &dentry->d_name);
50848+ spin_unlock(&dentry->d_lock);
50849+ if (!error)
50850+ error = prepend(buffer, buflen, "/", 1);
50851+ if (error)
50852+ break;
50853+
50854+ slash = true;
50855+ dentry = parent;
50856+ }
50857+
50858+out:
50859+ if (!error && !slash)
50860+ error = prepend(buffer, buflen, "/", 1);
50861+
50862+ return error;
50863+}
50864+
50865+/* this must be called with vfsmount_lock and rename_lock held */
50866+
50867+static char *__our_d_path(const struct path *path, struct path *root,
50868+ char *buf, int buflen)
50869+{
50870+ char *res = buf + buflen;
50871+ int error;
50872+
50873+ prepend(&res, &buflen, "\0", 1);
50874+ error = prepend_path(path, root, &res, &buflen);
50875+ if (error)
50876+ return ERR_PTR(error);
50877+
50878+ return res;
50879+}
50880+
50881+static char *
50882+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
50883+{
50884+ char *retval;
50885+
50886+ retval = __our_d_path(path, root, buf, buflen);
50887+ if (unlikely(IS_ERR(retval)))
50888+ retval = strcpy(buf, "<path too long>");
50889+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
50890+ retval[1] = '\0';
50891+
50892+ return retval;
50893+}
50894+
50895+static char *
50896+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
50897+ char *buf, int buflen)
50898+{
50899+ struct path path;
50900+ char *res;
50901+
50902+ path.dentry = (struct dentry *)dentry;
50903+ path.mnt = (struct vfsmount *)vfsmnt;
50904+
50905+ /* we can use real_root.dentry, real_root.mnt, because this is only called
50906+ by the RBAC system */
50907+ res = gen_full_path(&path, &real_root, buf, buflen);
50908+
50909+ return res;
50910+}
50911+
50912+static char *
50913+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
50914+ char *buf, int buflen)
50915+{
50916+ char *res;
50917+ struct path path;
50918+ struct path root;
50919+ struct task_struct *reaper = &init_task;
50920+
50921+ path.dentry = (struct dentry *)dentry;
50922+ path.mnt = (struct vfsmount *)vfsmnt;
50923+
50924+ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
50925+ get_fs_root(reaper->fs, &root);
50926+
50927+ write_seqlock(&rename_lock);
50928+ br_read_lock(vfsmount_lock);
50929+ res = gen_full_path(&path, &root, buf, buflen);
50930+ br_read_unlock(vfsmount_lock);
50931+ write_sequnlock(&rename_lock);
50932+
50933+ path_put(&root);
50934+ return res;
50935+}
50936+
50937+static char *
50938+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
50939+{
50940+ char *ret;
50941+ write_seqlock(&rename_lock);
50942+ br_read_lock(vfsmount_lock);
50943+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
50944+ PAGE_SIZE);
50945+ br_read_unlock(vfsmount_lock);
50946+ write_sequnlock(&rename_lock);
50947+ return ret;
50948+}
50949+
50950+static char *
50951+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
50952+{
50953+ char *ret;
50954+ char *buf;
50955+ int buflen;
50956+
50957+ write_seqlock(&rename_lock);
50958+ br_read_lock(vfsmount_lock);
50959+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
50960+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
50961+ buflen = (int)(ret - buf);
50962+ if (buflen >= 5)
50963+ prepend(&ret, &buflen, "/proc", 5);
50964+ else
50965+ ret = strcpy(buf, "<path too long>");
50966+ br_read_unlock(vfsmount_lock);
50967+ write_sequnlock(&rename_lock);
50968+ return ret;
50969+}
50970+
50971+char *
50972+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
50973+{
50974+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
50975+ PAGE_SIZE);
50976+}
50977+
50978+char *
50979+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
50980+{
50981+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
50982+ PAGE_SIZE);
50983+}
50984+
50985+char *
50986+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
50987+{
50988+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
50989+ PAGE_SIZE);
50990+}
50991+
50992+char *
50993+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
50994+{
50995+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
50996+ PAGE_SIZE);
50997+}
50998+
50999+char *
51000+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
51001+{
51002+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
51003+ PAGE_SIZE);
51004+}
51005+
51006+__inline__ __u32
51007+to_gr_audit(const __u32 reqmode)
51008+{
51009+ /* masks off auditable permission flags, then shifts them to create
51010+ auditing flags, and adds the special case of append auditing if
51011+ we're requesting write */
51012+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
51013+}
51014+
51015+struct acl_subject_label *
51016+lookup_subject_map(const struct acl_subject_label *userp)
51017+{
51018+ unsigned int index = shash(userp, subj_map_set.s_size);
51019+ struct subject_map *match;
51020+
51021+ match = subj_map_set.s_hash[index];
51022+
51023+ while (match && match->user != userp)
51024+ match = match->next;
51025+
51026+ if (match != NULL)
51027+ return match->kernel;
51028+ else
51029+ return NULL;
51030+}
51031+
51032+static void
51033+insert_subj_map_entry(struct subject_map *subjmap)
51034+{
51035+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
51036+ struct subject_map **curr;
51037+
51038+ subjmap->prev = NULL;
51039+
51040+ curr = &subj_map_set.s_hash[index];
51041+ if (*curr != NULL)
51042+ (*curr)->prev = subjmap;
51043+
51044+ subjmap->next = *curr;
51045+ *curr = subjmap;
51046+
51047+ return;
51048+}
51049+
51050+static struct acl_role_label *
51051+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
51052+ const gid_t gid)
51053+{
51054+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
51055+ struct acl_role_label *match;
51056+ struct role_allowed_ip *ipp;
51057+ unsigned int x;
51058+ u32 curr_ip = task->signal->curr_ip;
51059+
51060+ task->signal->saved_ip = curr_ip;
51061+
51062+ match = acl_role_set.r_hash[index];
51063+
51064+ while (match) {
51065+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
51066+ for (x = 0; x < match->domain_child_num; x++) {
51067+ if (match->domain_children[x] == uid)
51068+ goto found;
51069+ }
51070+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
51071+ break;
51072+ match = match->next;
51073+ }
51074+found:
51075+ if (match == NULL) {
51076+ try_group:
51077+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
51078+ match = acl_role_set.r_hash[index];
51079+
51080+ while (match) {
51081+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
51082+ for (x = 0; x < match->domain_child_num; x++) {
51083+ if (match->domain_children[x] == gid)
51084+ goto found2;
51085+ }
51086+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
51087+ break;
51088+ match = match->next;
51089+ }
51090+found2:
51091+ if (match == NULL)
51092+ match = default_role;
51093+ if (match->allowed_ips == NULL)
51094+ return match;
51095+ else {
51096+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51097+ if (likely
51098+ ((ntohl(curr_ip) & ipp->netmask) ==
51099+ (ntohl(ipp->addr) & ipp->netmask)))
51100+ return match;
51101+ }
51102+ match = default_role;
51103+ }
51104+ } else if (match->allowed_ips == NULL) {
51105+ return match;
51106+ } else {
51107+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51108+ if (likely
51109+ ((ntohl(curr_ip) & ipp->netmask) ==
51110+ (ntohl(ipp->addr) & ipp->netmask)))
51111+ return match;
51112+ }
51113+ goto try_group;
51114+ }
51115+
51116+ return match;
51117+}
51118+
51119+struct acl_subject_label *
51120+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
51121+ const struct acl_role_label *role)
51122+{
51123+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51124+ struct acl_subject_label *match;
51125+
51126+ match = role->subj_hash[index];
51127+
51128+ while (match && (match->inode != ino || match->device != dev ||
51129+ (match->mode & GR_DELETED))) {
51130+ match = match->next;
51131+ }
51132+
51133+ if (match && !(match->mode & GR_DELETED))
51134+ return match;
51135+ else
51136+ return NULL;
51137+}
51138+
51139+struct acl_subject_label *
51140+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
51141+ const struct acl_role_label *role)
51142+{
51143+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51144+ struct acl_subject_label *match;
51145+
51146+ match = role->subj_hash[index];
51147+
51148+ while (match && (match->inode != ino || match->device != dev ||
51149+ !(match->mode & GR_DELETED))) {
51150+ match = match->next;
51151+ }
51152+
51153+ if (match && (match->mode & GR_DELETED))
51154+ return match;
51155+ else
51156+ return NULL;
51157+}
51158+
51159+static struct acl_object_label *
51160+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
51161+ const struct acl_subject_label *subj)
51162+{
51163+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51164+ struct acl_object_label *match;
51165+
51166+ match = subj->obj_hash[index];
51167+
51168+ while (match && (match->inode != ino || match->device != dev ||
51169+ (match->mode & GR_DELETED))) {
51170+ match = match->next;
51171+ }
51172+
51173+ if (match && !(match->mode & GR_DELETED))
51174+ return match;
51175+ else
51176+ return NULL;
51177+}
51178+
51179+static struct acl_object_label *
51180+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
51181+ const struct acl_subject_label *subj)
51182+{
51183+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51184+ struct acl_object_label *match;
51185+
51186+ match = subj->obj_hash[index];
51187+
51188+ while (match && (match->inode != ino || match->device != dev ||
51189+ !(match->mode & GR_DELETED))) {
51190+ match = match->next;
51191+ }
51192+
51193+ if (match && (match->mode & GR_DELETED))
51194+ return match;
51195+
51196+ match = subj->obj_hash[index];
51197+
51198+ while (match && (match->inode != ino || match->device != dev ||
51199+ (match->mode & GR_DELETED))) {
51200+ match = match->next;
51201+ }
51202+
51203+ if (match && !(match->mode & GR_DELETED))
51204+ return match;
51205+ else
51206+ return NULL;
51207+}
51208+
51209+static struct name_entry *
51210+lookup_name_entry(const char *name)
51211+{
51212+ unsigned int len = strlen(name);
51213+ unsigned int key = full_name_hash(name, len);
51214+ unsigned int index = key % name_set.n_size;
51215+ struct name_entry *match;
51216+
51217+ match = name_set.n_hash[index];
51218+
51219+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
51220+ match = match->next;
51221+
51222+ return match;
51223+}
51224+
51225+static struct name_entry *
51226+lookup_name_entry_create(const char *name)
51227+{
51228+ unsigned int len = strlen(name);
51229+ unsigned int key = full_name_hash(name, len);
51230+ unsigned int index = key % name_set.n_size;
51231+ struct name_entry *match;
51232+
51233+ match = name_set.n_hash[index];
51234+
51235+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51236+ !match->deleted))
51237+ match = match->next;
51238+
51239+ if (match && match->deleted)
51240+ return match;
51241+
51242+ match = name_set.n_hash[index];
51243+
51244+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51245+ match->deleted))
51246+ match = match->next;
51247+
51248+ if (match && !match->deleted)
51249+ return match;
51250+ else
51251+ return NULL;
51252+}
51253+
51254+static struct inodev_entry *
51255+lookup_inodev_entry(const ino_t ino, const dev_t dev)
51256+{
51257+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
51258+ struct inodev_entry *match;
51259+
51260+ match = inodev_set.i_hash[index];
51261+
51262+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
51263+ match = match->next;
51264+
51265+ return match;
51266+}
51267+
51268+static void
51269+insert_inodev_entry(struct inodev_entry *entry)
51270+{
51271+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
51272+ inodev_set.i_size);
51273+ struct inodev_entry **curr;
51274+
51275+ entry->prev = NULL;
51276+
51277+ curr = &inodev_set.i_hash[index];
51278+ if (*curr != NULL)
51279+ (*curr)->prev = entry;
51280+
51281+ entry->next = *curr;
51282+ *curr = entry;
51283+
51284+ return;
51285+}
51286+
51287+static void
51288+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
51289+{
51290+ unsigned int index =
51291+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
51292+ struct acl_role_label **curr;
51293+ struct acl_role_label *tmp, *tmp2;
51294+
51295+ curr = &acl_role_set.r_hash[index];
51296+
51297+ /* simple case, slot is empty, just set it to our role */
51298+ if (*curr == NULL) {
51299+ *curr = role;
51300+ } else {
51301+ /* example:
51302+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
51303+ 2 -> 3
51304+ */
51305+ /* first check to see if we can already be reached via this slot */
51306+ tmp = *curr;
51307+ while (tmp && tmp != role)
51308+ tmp = tmp->next;
51309+ if (tmp == role) {
51310+ /* we don't need to add ourselves to this slot's chain */
51311+ return;
51312+ }
51313+ /* we need to add ourselves to this chain, two cases */
51314+ if (role->next == NULL) {
51315+ /* simple case, append the current chain to our role */
51316+ role->next = *curr;
51317+ *curr = role;
51318+ } else {
51319+ /* 1 -> 2 -> 3 -> 4
51320+ 2 -> 3 -> 4
51321+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
51322+ */
51323+ /* trickier case: walk our role's chain until we find
51324+ the role for the start of the current slot's chain */
51325+ tmp = role;
51326+ tmp2 = *curr;
51327+ while (tmp->next && tmp->next != tmp2)
51328+ tmp = tmp->next;
51329+ if (tmp->next == tmp2) {
51330+ /* from example above, we found 3, so just
51331+ replace this slot's chain with ours */
51332+ *curr = role;
51333+ } else {
51334+ /* we didn't find a subset of our role's chain
51335+ in the current slot's chain, so append their
51336+ chain to ours, and set us as the first role in
51337+ the slot's chain
51338+
51339+ we could fold this case with the case above,
51340+ but making it explicit for clarity
51341+ */
51342+ tmp->next = tmp2;
51343+ *curr = role;
51344+ }
51345+ }
51346+ }
51347+
51348+ return;
51349+}
51350+
51351+static void
51352+insert_acl_role_label(struct acl_role_label *role)
51353+{
51354+ int i;
51355+
51356+ if (role_list == NULL) {
51357+ role_list = role;
51358+ role->prev = NULL;
51359+ } else {
51360+ role->prev = role_list;
51361+ role_list = role;
51362+ }
51363+
51364+ /* used for hash chains */
51365+ role->next = NULL;
51366+
51367+ if (role->roletype & GR_ROLE_DOMAIN) {
51368+ for (i = 0; i < role->domain_child_num; i++)
51369+ __insert_acl_role_label(role, role->domain_children[i]);
51370+ } else
51371+ __insert_acl_role_label(role, role->uidgid);
51372+}
51373+
51374+static int
51375+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
51376+{
51377+ struct name_entry **curr, *nentry;
51378+ struct inodev_entry *ientry;
51379+ unsigned int len = strlen(name);
51380+ unsigned int key = full_name_hash(name, len);
51381+ unsigned int index = key % name_set.n_size;
51382+
51383+ curr = &name_set.n_hash[index];
51384+
51385+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
51386+ curr = &((*curr)->next);
51387+
51388+ if (*curr != NULL)
51389+ return 1;
51390+
51391+ nentry = acl_alloc(sizeof (struct name_entry));
51392+ if (nentry == NULL)
51393+ return 0;
51394+ ientry = acl_alloc(sizeof (struct inodev_entry));
51395+ if (ientry == NULL)
51396+ return 0;
51397+ ientry->nentry = nentry;
51398+
51399+ nentry->key = key;
51400+ nentry->name = name;
51401+ nentry->inode = inode;
51402+ nentry->device = device;
51403+ nentry->len = len;
51404+ nentry->deleted = deleted;
51405+
51406+ nentry->prev = NULL;
51407+ curr = &name_set.n_hash[index];
51408+ if (*curr != NULL)
51409+ (*curr)->prev = nentry;
51410+ nentry->next = *curr;
51411+ *curr = nentry;
51412+
51413+ /* insert us into the table searchable by inode/dev */
51414+ insert_inodev_entry(ientry);
51415+
51416+ return 1;
51417+}
51418+
51419+static void
51420+insert_acl_obj_label(struct acl_object_label *obj,
51421+ struct acl_subject_label *subj)
51422+{
51423+ unsigned int index =
51424+ fhash(obj->inode, obj->device, subj->obj_hash_size);
51425+ struct acl_object_label **curr;
51426+
51427+
51428+ obj->prev = NULL;
51429+
51430+ curr = &subj->obj_hash[index];
51431+ if (*curr != NULL)
51432+ (*curr)->prev = obj;
51433+
51434+ obj->next = *curr;
51435+ *curr = obj;
51436+
51437+ return;
51438+}
51439+
51440+static void
51441+insert_acl_subj_label(struct acl_subject_label *obj,
51442+ struct acl_role_label *role)
51443+{
51444+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
51445+ struct acl_subject_label **curr;
51446+
51447+ obj->prev = NULL;
51448+
51449+ curr = &role->subj_hash[index];
51450+ if (*curr != NULL)
51451+ (*curr)->prev = obj;
51452+
51453+ obj->next = *curr;
51454+ *curr = obj;
51455+
51456+ return;
51457+}
51458+
51459+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
51460+
51461+static void *
51462+create_table(__u32 * len, int elementsize)
51463+{
51464+ unsigned int table_sizes[] = {
51465+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
51466+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
51467+ 4194301, 8388593, 16777213, 33554393, 67108859
51468+ };
51469+ void *newtable = NULL;
51470+ unsigned int pwr = 0;
51471+
51472+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
51473+ table_sizes[pwr] <= *len)
51474+ pwr++;
51475+
51476+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
51477+ return newtable;
51478+
51479+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
51480+ newtable =
51481+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
51482+ else
51483+ newtable = vmalloc(table_sizes[pwr] * elementsize);
51484+
51485+ *len = table_sizes[pwr];
51486+
51487+ return newtable;
51488+}
51489+
51490+static int
51491+init_variables(const struct gr_arg *arg)
51492+{
51493+ struct task_struct *reaper = &init_task;
51494+ unsigned int stacksize;
51495+
51496+ subj_map_set.s_size = arg->role_db.num_subjects;
51497+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
51498+ name_set.n_size = arg->role_db.num_objects;
51499+ inodev_set.i_size = arg->role_db.num_objects;
51500+
51501+ if (!subj_map_set.s_size || !acl_role_set.r_size ||
51502+ !name_set.n_size || !inodev_set.i_size)
51503+ return 1;
51504+
51505+ if (!gr_init_uidset())
51506+ return 1;
51507+
51508+ /* set up the stack that holds allocation info */
51509+
51510+ stacksize = arg->role_db.num_pointers + 5;
51511+
51512+ if (!acl_alloc_stack_init(stacksize))
51513+ return 1;
51514+
51515+ /* grab reference for the real root dentry and vfsmount */
51516+ get_fs_root(reaper->fs, &real_root);
51517+
51518+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51519+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
51520+#endif
51521+
51522+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
51523+ if (fakefs_obj_rw == NULL)
51524+ return 1;
51525+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
51526+
51527+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
51528+ if (fakefs_obj_rwx == NULL)
51529+ return 1;
51530+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
51531+
51532+ subj_map_set.s_hash =
51533+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
51534+ acl_role_set.r_hash =
51535+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
51536+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
51537+ inodev_set.i_hash =
51538+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
51539+
51540+ if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
51541+ !name_set.n_hash || !inodev_set.i_hash)
51542+ return 1;
51543+
51544+ memset(subj_map_set.s_hash, 0,
51545+ sizeof(struct subject_map *) * subj_map_set.s_size);
51546+ memset(acl_role_set.r_hash, 0,
51547+ sizeof (struct acl_role_label *) * acl_role_set.r_size);
51548+ memset(name_set.n_hash, 0,
51549+ sizeof (struct name_entry *) * name_set.n_size);
51550+ memset(inodev_set.i_hash, 0,
51551+ sizeof (struct inodev_entry *) * inodev_set.i_size);
51552+
51553+ return 0;
51554+}
51555+
51556+/* free information not needed after startup
51557+ currently contains user->kernel pointer mappings for subjects
51558+*/
51559+
51560+static void
51561+free_init_variables(void)
51562+{
51563+ __u32 i;
51564+
51565+ if (subj_map_set.s_hash) {
51566+ for (i = 0; i < subj_map_set.s_size; i++) {
51567+ if (subj_map_set.s_hash[i]) {
51568+ kfree(subj_map_set.s_hash[i]);
51569+ subj_map_set.s_hash[i] = NULL;
51570+ }
51571+ }
51572+
51573+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
51574+ PAGE_SIZE)
51575+ kfree(subj_map_set.s_hash);
51576+ else
51577+ vfree(subj_map_set.s_hash);
51578+ }
51579+
51580+ return;
51581+}
51582+
51583+static void
51584+free_variables(void)
51585+{
51586+ struct acl_subject_label *s;
51587+ struct acl_role_label *r;
51588+ struct task_struct *task, *task2;
51589+ unsigned int x;
51590+
51591+ gr_clear_learn_entries();
51592+
51593+ read_lock(&tasklist_lock);
51594+ do_each_thread(task2, task) {
51595+ task->acl_sp_role = 0;
51596+ task->acl_role_id = 0;
51597+ task->acl = NULL;
51598+ task->role = NULL;
51599+ } while_each_thread(task2, task);
51600+ read_unlock(&tasklist_lock);
51601+
51602+ /* release the reference to the real root dentry and vfsmount */
51603+ path_put(&real_root);
51604+ memset(&real_root, 0, sizeof(real_root));
51605+
51606+ /* free all object hash tables */
51607+
51608+ FOR_EACH_ROLE_START(r)
51609+ if (r->subj_hash == NULL)
51610+ goto next_role;
51611+ FOR_EACH_SUBJECT_START(r, s, x)
51612+ if (s->obj_hash == NULL)
51613+ break;
51614+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
51615+ kfree(s->obj_hash);
51616+ else
51617+ vfree(s->obj_hash);
51618+ FOR_EACH_SUBJECT_END(s, x)
51619+ FOR_EACH_NESTED_SUBJECT_START(r, s)
51620+ if (s->obj_hash == NULL)
51621+ break;
51622+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
51623+ kfree(s->obj_hash);
51624+ else
51625+ vfree(s->obj_hash);
51626+ FOR_EACH_NESTED_SUBJECT_END(s)
51627+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
51628+ kfree(r->subj_hash);
51629+ else
51630+ vfree(r->subj_hash);
51631+ r->subj_hash = NULL;
51632+next_role:
51633+ FOR_EACH_ROLE_END(r)
51634+
51635+ acl_free_all();
51636+
51637+ if (acl_role_set.r_hash) {
51638+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
51639+ PAGE_SIZE)
51640+ kfree(acl_role_set.r_hash);
51641+ else
51642+ vfree(acl_role_set.r_hash);
51643+ }
51644+ if (name_set.n_hash) {
51645+ if ((name_set.n_size * sizeof (struct name_entry *)) <=
51646+ PAGE_SIZE)
51647+ kfree(name_set.n_hash);
51648+ else
51649+ vfree(name_set.n_hash);
51650+ }
51651+
51652+ if (inodev_set.i_hash) {
51653+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
51654+ PAGE_SIZE)
51655+ kfree(inodev_set.i_hash);
51656+ else
51657+ vfree(inodev_set.i_hash);
51658+ }
51659+
51660+ gr_free_uidset();
51661+
51662+ memset(&name_set, 0, sizeof (struct name_db));
51663+ memset(&inodev_set, 0, sizeof (struct inodev_db));
51664+ memset(&acl_role_set, 0, sizeof (struct acl_role_db));
51665+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
51666+
51667+ default_role = NULL;
51668+ kernel_role = NULL;
51669+ role_list = NULL;
51670+
51671+ return;
51672+}
51673+
51674+static __u32
51675+count_user_objs(struct acl_object_label *userp)
51676+{
51677+ struct acl_object_label o_tmp;
51678+ __u32 num = 0;
51679+
51680+ while (userp) {
51681+ if (copy_from_user(&o_tmp, userp,
51682+ sizeof (struct acl_object_label)))
51683+ break;
51684+
51685+ userp = o_tmp.prev;
51686+ num++;
51687+ }
51688+
51689+ return num;
51690+}
51691+
51692+static struct acl_subject_label *
51693+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
51694+
51695+static int
51696+copy_user_glob(struct acl_object_label *obj)
51697+{
51698+ struct acl_object_label *g_tmp, **guser;
51699+ unsigned int len;
51700+ char *tmp;
51701+
51702+ if (obj->globbed == NULL)
51703+ return 0;
51704+
51705+ guser = &obj->globbed;
51706+ while (*guser) {
51707+ g_tmp = (struct acl_object_label *)
51708+ acl_alloc(sizeof (struct acl_object_label));
51709+ if (g_tmp == NULL)
51710+ return -ENOMEM;
51711+
51712+ if (copy_from_user(g_tmp, *guser,
51713+ sizeof (struct acl_object_label)))
51714+ return -EFAULT;
51715+
51716+ len = strnlen_user(g_tmp->filename, PATH_MAX);
51717+
51718+ if (!len || len >= PATH_MAX)
51719+ return -EINVAL;
51720+
51721+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51722+ return -ENOMEM;
51723+
51724+ if (copy_from_user(tmp, g_tmp->filename, len))
51725+ return -EFAULT;
51726+ tmp[len-1] = '\0';
51727+ g_tmp->filename = tmp;
51728+
51729+ *guser = g_tmp;
51730+ guser = &(g_tmp->next);
51731+ }
51732+
51733+ return 0;
51734+}
51735+
51736+static int
51737+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
51738+ struct acl_role_label *role)
51739+{
51740+ struct acl_object_label *o_tmp;
51741+ unsigned int len;
51742+ int ret;
51743+ char *tmp;
51744+
51745+ while (userp) {
51746+ if ((o_tmp = (struct acl_object_label *)
51747+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
51748+ return -ENOMEM;
51749+
51750+ if (copy_from_user(o_tmp, userp,
51751+ sizeof (struct acl_object_label)))
51752+ return -EFAULT;
51753+
51754+ userp = o_tmp->prev;
51755+
51756+ len = strnlen_user(o_tmp->filename, PATH_MAX);
51757+
51758+ if (!len || len >= PATH_MAX)
51759+ return -EINVAL;
51760+
51761+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51762+ return -ENOMEM;
51763+
51764+ if (copy_from_user(tmp, o_tmp->filename, len))
51765+ return -EFAULT;
51766+ tmp[len-1] = '\0';
51767+ o_tmp->filename = tmp;
51768+
51769+ insert_acl_obj_label(o_tmp, subj);
51770+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
51771+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
51772+ return -ENOMEM;
51773+
51774+ ret = copy_user_glob(o_tmp);
51775+ if (ret)
51776+ return ret;
51777+
51778+ if (o_tmp->nested) {
51779+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
51780+ if (IS_ERR(o_tmp->nested))
51781+ return PTR_ERR(o_tmp->nested);
51782+
51783+ /* insert into nested subject list */
51784+ o_tmp->nested->next = role->hash->first;
51785+ role->hash->first = o_tmp->nested;
51786+ }
51787+ }
51788+
51789+ return 0;
51790+}
51791+
51792+static __u32
51793+count_user_subjs(struct acl_subject_label *userp)
51794+{
51795+ struct acl_subject_label s_tmp;
51796+ __u32 num = 0;
51797+
51798+ while (userp) {
51799+ if (copy_from_user(&s_tmp, userp,
51800+ sizeof (struct acl_subject_label)))
51801+ break;
51802+
51803+ userp = s_tmp.prev;
51804+ /* do not count nested subjects against this count, since
51805+ they are not included in the hash table, but are
51806+ attached to objects. We have already counted
51807+ the subjects in userspace for the allocation
51808+ stack
51809+ */
51810+ if (!(s_tmp.mode & GR_NESTED))
51811+ num++;
51812+ }
51813+
51814+ return num;
51815+}
51816+
51817+static int
51818+copy_user_allowedips(struct acl_role_label *rolep)
51819+{
51820+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
51821+
51822+ ruserip = rolep->allowed_ips;
51823+
51824+ while (ruserip) {
51825+ rlast = rtmp;
51826+
51827+ if ((rtmp = (struct role_allowed_ip *)
51828+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
51829+ return -ENOMEM;
51830+
51831+ if (copy_from_user(rtmp, ruserip,
51832+ sizeof (struct role_allowed_ip)))
51833+ return -EFAULT;
51834+
51835+ ruserip = rtmp->prev;
51836+
51837+ if (!rlast) {
51838+ rtmp->prev = NULL;
51839+ rolep->allowed_ips = rtmp;
51840+ } else {
51841+ rlast->next = rtmp;
51842+ rtmp->prev = rlast;
51843+ }
51844+
51845+ if (!ruserip)
51846+ rtmp->next = NULL;
51847+ }
51848+
51849+ return 0;
51850+}
51851+
51852+static int
51853+copy_user_transitions(struct acl_role_label *rolep)
51854+{
51855+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
51856+
51857+ unsigned int len;
51858+ char *tmp;
51859+
51860+ rusertp = rolep->transitions;
51861+
51862+ while (rusertp) {
51863+ rlast = rtmp;
51864+
51865+ if ((rtmp = (struct role_transition *)
51866+ acl_alloc(sizeof (struct role_transition))) == NULL)
51867+ return -ENOMEM;
51868+
51869+ if (copy_from_user(rtmp, rusertp,
51870+ sizeof (struct role_transition)))
51871+ return -EFAULT;
51872+
51873+ rusertp = rtmp->prev;
51874+
51875+ len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
51876+
51877+ if (!len || len >= GR_SPROLE_LEN)
51878+ return -EINVAL;
51879+
51880+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51881+ return -ENOMEM;
51882+
51883+ if (copy_from_user(tmp, rtmp->rolename, len))
51884+ return -EFAULT;
51885+ tmp[len-1] = '\0';
51886+ rtmp->rolename = tmp;
51887+
51888+ if (!rlast) {
51889+ rtmp->prev = NULL;
51890+ rolep->transitions = rtmp;
51891+ } else {
51892+ rlast->next = rtmp;
51893+ rtmp->prev = rlast;
51894+ }
51895+
51896+ if (!rusertp)
51897+ rtmp->next = NULL;
51898+ }
51899+
51900+ return 0;
51901+}
51902+
51903+static struct acl_subject_label *
51904+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
51905+{
51906+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
51907+ unsigned int len;
51908+ char *tmp;
51909+ __u32 num_objs;
51910+ struct acl_ip_label **i_tmp, *i_utmp2;
51911+ struct gr_hash_struct ghash;
51912+ struct subject_map *subjmap;
51913+ unsigned int i_num;
51914+ int err;
51915+
51916+ s_tmp = lookup_subject_map(userp);
51917+
51918+ /* we've already copied this subject into the kernel, just return
51919+ the reference to it, and don't copy it over again
51920+ */
51921+ if (s_tmp)
51922+ return(s_tmp);
51923+
51924+ if ((s_tmp = (struct acl_subject_label *)
51925+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
51926+ return ERR_PTR(-ENOMEM);
51927+
51928+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
51929+ if (subjmap == NULL)
51930+ return ERR_PTR(-ENOMEM);
51931+
51932+ subjmap->user = userp;
51933+ subjmap->kernel = s_tmp;
51934+ insert_subj_map_entry(subjmap);
51935+
51936+ if (copy_from_user(s_tmp, userp,
51937+ sizeof (struct acl_subject_label)))
51938+ return ERR_PTR(-EFAULT);
51939+
51940+ len = strnlen_user(s_tmp->filename, PATH_MAX);
51941+
51942+ if (!len || len >= PATH_MAX)
51943+ return ERR_PTR(-EINVAL);
51944+
51945+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51946+ return ERR_PTR(-ENOMEM);
51947+
51948+ if (copy_from_user(tmp, s_tmp->filename, len))
51949+ return ERR_PTR(-EFAULT);
51950+ tmp[len-1] = '\0';
51951+ s_tmp->filename = tmp;
51952+
51953+ if (!strcmp(s_tmp->filename, "/"))
51954+ role->root_label = s_tmp;
51955+
51956+ if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
51957+ return ERR_PTR(-EFAULT);
51958+
51959+ /* copy user and group transition tables */
51960+
51961+ if (s_tmp->user_trans_num) {
51962+ uid_t *uidlist;
51963+
51964+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
51965+ if (uidlist == NULL)
51966+ return ERR_PTR(-ENOMEM);
51967+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
51968+ return ERR_PTR(-EFAULT);
51969+
51970+ s_tmp->user_transitions = uidlist;
51971+ }
51972+
51973+ if (s_tmp->group_trans_num) {
51974+ gid_t *gidlist;
51975+
51976+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
51977+ if (gidlist == NULL)
51978+ return ERR_PTR(-ENOMEM);
51979+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
51980+ return ERR_PTR(-EFAULT);
51981+
51982+ s_tmp->group_transitions = gidlist;
51983+ }
51984+
51985+ /* set up object hash table */
51986+ num_objs = count_user_objs(ghash.first);
51987+
51988+ s_tmp->obj_hash_size = num_objs;
51989+ s_tmp->obj_hash =
51990+ (struct acl_object_label **)
51991+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
51992+
51993+ if (!s_tmp->obj_hash)
51994+ return ERR_PTR(-ENOMEM);
51995+
51996+ memset(s_tmp->obj_hash, 0,
51997+ s_tmp->obj_hash_size *
51998+ sizeof (struct acl_object_label *));
51999+
52000+ /* add in objects */
52001+ err = copy_user_objs(ghash.first, s_tmp, role);
52002+
52003+ if (err)
52004+ return ERR_PTR(err);
52005+
52006+ /* set pointer for parent subject */
52007+ if (s_tmp->parent_subject) {
52008+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
52009+
52010+ if (IS_ERR(s_tmp2))
52011+ return s_tmp2;
52012+
52013+ s_tmp->parent_subject = s_tmp2;
52014+ }
52015+
52016+ /* add in ip acls */
52017+
52018+ if (!s_tmp->ip_num) {
52019+ s_tmp->ips = NULL;
52020+ goto insert;
52021+ }
52022+
52023+ i_tmp =
52024+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
52025+ sizeof (struct acl_ip_label *));
52026+
52027+ if (!i_tmp)
52028+ return ERR_PTR(-ENOMEM);
52029+
52030+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
52031+ *(i_tmp + i_num) =
52032+ (struct acl_ip_label *)
52033+ acl_alloc(sizeof (struct acl_ip_label));
52034+ if (!*(i_tmp + i_num))
52035+ return ERR_PTR(-ENOMEM);
52036+
52037+ if (copy_from_user
52038+ (&i_utmp2, s_tmp->ips + i_num,
52039+ sizeof (struct acl_ip_label *)))
52040+ return ERR_PTR(-EFAULT);
52041+
52042+ if (copy_from_user
52043+ (*(i_tmp + i_num), i_utmp2,
52044+ sizeof (struct acl_ip_label)))
52045+ return ERR_PTR(-EFAULT);
52046+
52047+ if ((*(i_tmp + i_num))->iface == NULL)
52048+ continue;
52049+
52050+ len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
52051+ if (!len || len >= IFNAMSIZ)
52052+ return ERR_PTR(-EINVAL);
52053+ tmp = acl_alloc(len);
52054+ if (tmp == NULL)
52055+ return ERR_PTR(-ENOMEM);
52056+ if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
52057+ return ERR_PTR(-EFAULT);
52058+ (*(i_tmp + i_num))->iface = tmp;
52059+ }
52060+
52061+ s_tmp->ips = i_tmp;
52062+
52063+insert:
52064+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
52065+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
52066+ return ERR_PTR(-ENOMEM);
52067+
52068+ return s_tmp;
52069+}
52070+
52071+static int
52072+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
52073+{
52074+ struct acl_subject_label s_pre;
52075+ struct acl_subject_label * ret;
52076+ int err;
52077+
52078+ while (userp) {
52079+ if (copy_from_user(&s_pre, userp,
52080+ sizeof (struct acl_subject_label)))
52081+ return -EFAULT;
52082+
52083+ /* do not add nested subjects here, add
52084+ while parsing objects
52085+ */
52086+
52087+ if (s_pre.mode & GR_NESTED) {
52088+ userp = s_pre.prev;
52089+ continue;
52090+ }
52091+
52092+ ret = do_copy_user_subj(userp, role);
52093+
52094+ err = PTR_ERR(ret);
52095+ if (IS_ERR(ret))
52096+ return err;
52097+
52098+ insert_acl_subj_label(ret, role);
52099+
52100+ userp = s_pre.prev;
52101+ }
52102+
52103+ return 0;
52104+}
52105+
52106+static int
52107+copy_user_acl(struct gr_arg *arg)
52108+{
52109+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
52110+ struct sprole_pw *sptmp;
52111+ struct gr_hash_struct *ghash;
52112+ uid_t *domainlist;
52113+ unsigned int r_num;
52114+ unsigned int len;
52115+ char *tmp;
52116+ int err = 0;
52117+ __u16 i;
52118+ __u32 num_subjs;
52119+
52120+ /* we need a default and kernel role */
52121+ if (arg->role_db.num_roles < 2)
52122+ return -EINVAL;
52123+
52124+ /* copy special role authentication info from userspace */
52125+
52126+ num_sprole_pws = arg->num_sprole_pws;
52127+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
52128+
52129+ if (!acl_special_roles && num_sprole_pws)
52130+ return -ENOMEM;
52131+
52132+ for (i = 0; i < num_sprole_pws; i++) {
52133+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
52134+ if (!sptmp)
52135+ return -ENOMEM;
52136+ if (copy_from_user(sptmp, arg->sprole_pws + i,
52137+ sizeof (struct sprole_pw)))
52138+ return -EFAULT;
52139+
52140+ len = strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
52141+
52142+ if (!len || len >= GR_SPROLE_LEN)
52143+ return -EINVAL;
52144+
52145+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52146+ return -ENOMEM;
52147+
52148+ if (copy_from_user(tmp, sptmp->rolename, len))
52149+ return -EFAULT;
52150+
52151+ tmp[len-1] = '\0';
52152+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
52153+ printk(KERN_ALERT "Copying special role %s\n", tmp);
52154+#endif
52155+ sptmp->rolename = tmp;
52156+ acl_special_roles[i] = sptmp;
52157+ }
52158+
52159+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
52160+
52161+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
52162+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
52163+
52164+ if (!r_tmp)
52165+ return -ENOMEM;
52166+
52167+ if (copy_from_user(&r_utmp2, r_utmp + r_num,
52168+ sizeof (struct acl_role_label *)))
52169+ return -EFAULT;
52170+
52171+ if (copy_from_user(r_tmp, r_utmp2,
52172+ sizeof (struct acl_role_label)))
52173+ return -EFAULT;
52174+
52175+ len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
52176+
52177+ if (!len || len >= PATH_MAX)
52178+ return -EINVAL;
52179+
52180+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52181+ return -ENOMEM;
52182+
52183+ if (copy_from_user(tmp, r_tmp->rolename, len))
52184+ return -EFAULT;
52185+
52186+ tmp[len-1] = '\0';
52187+ r_tmp->rolename = tmp;
52188+
52189+ if (!strcmp(r_tmp->rolename, "default")
52190+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
52191+ default_role = r_tmp;
52192+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
52193+ kernel_role = r_tmp;
52194+ }
52195+
52196+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
52197+ return -ENOMEM;
52198+
52199+ if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct)))
52200+ return -EFAULT;
52201+
52202+ r_tmp->hash = ghash;
52203+
52204+ num_subjs = count_user_subjs(r_tmp->hash->first);
52205+
52206+ r_tmp->subj_hash_size = num_subjs;
52207+ r_tmp->subj_hash =
52208+ (struct acl_subject_label **)
52209+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
52210+
52211+ if (!r_tmp->subj_hash)
52212+ return -ENOMEM;
52213+
52214+ err = copy_user_allowedips(r_tmp);
52215+ if (err)
52216+ return err;
52217+
52218+ /* copy domain info */
52219+ if (r_tmp->domain_children != NULL) {
52220+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
52221+ if (domainlist == NULL)
52222+ return -ENOMEM;
52223+
52224+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
52225+ return -EFAULT;
52226+
52227+ r_tmp->domain_children = domainlist;
52228+ }
52229+
52230+ err = copy_user_transitions(r_tmp);
52231+ if (err)
52232+ return err;
52233+
52234+ memset(r_tmp->subj_hash, 0,
52235+ r_tmp->subj_hash_size *
52236+ sizeof (struct acl_subject_label *));
52237+
52238+ err = copy_user_subjs(r_tmp->hash->first, r_tmp);
52239+
52240+ if (err)
52241+ return err;
52242+
52243+ /* set nested subject list to null */
52244+ r_tmp->hash->first = NULL;
52245+
52246+ insert_acl_role_label(r_tmp);
52247+ }
52248+
52249+ if (default_role == NULL || kernel_role == NULL)
52250+ return -EINVAL;
52251+
52252+ return err;
52253+}
52254+
52255+static int
52256+gracl_init(struct gr_arg *args)
52257+{
52258+ int error = 0;
52259+
52260+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
52261+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
52262+
52263+ if (init_variables(args)) {
52264+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
52265+ error = -ENOMEM;
52266+ free_variables();
52267+ goto out;
52268+ }
52269+
52270+ error = copy_user_acl(args);
52271+ free_init_variables();
52272+ if (error) {
52273+ free_variables();
52274+ goto out;
52275+ }
52276+
52277+ if ((error = gr_set_acls(0))) {
52278+ free_variables();
52279+ goto out;
52280+ }
52281+
52282+ pax_open_kernel();
52283+ gr_status |= GR_READY;
52284+ pax_close_kernel();
52285+
52286+ out:
52287+ return error;
52288+}
52289+
52290+/* derived from glibc fnmatch() 0: match, 1: no match*/
52291+
52292+static int
52293+glob_match(const char *p, const char *n)
52294+{
52295+ char c;
52296+
52297+ while ((c = *p++) != '\0') {
52298+ switch (c) {
52299+ case '?':
52300+ if (*n == '\0')
52301+ return 1;
52302+ else if (*n == '/')
52303+ return 1;
52304+ break;
52305+ case '\\':
52306+ if (*n != c)
52307+ return 1;
52308+ break;
52309+ case '*':
52310+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
52311+ if (*n == '/')
52312+ return 1;
52313+ else if (c == '?') {
52314+ if (*n == '\0')
52315+ return 1;
52316+ else
52317+ ++n;
52318+ }
52319+ }
52320+ if (c == '\0') {
52321+ return 0;
52322+ } else {
52323+ const char *endp;
52324+
52325+ if ((endp = strchr(n, '/')) == NULL)
52326+ endp = n + strlen(n);
52327+
52328+ if (c == '[') {
52329+ for (--p; n < endp; ++n)
52330+ if (!glob_match(p, n))
52331+ return 0;
52332+ } else if (c == '/') {
52333+ while (*n != '\0' && *n != '/')
52334+ ++n;
52335+ if (*n == '/' && !glob_match(p, n + 1))
52336+ return 0;
52337+ } else {
52338+ for (--p; n < endp; ++n)
52339+ if (*n == c && !glob_match(p, n))
52340+ return 0;
52341+ }
52342+
52343+ return 1;
52344+ }
52345+ case '[':
52346+ {
52347+ int not;
52348+ char cold;
52349+
52350+ if (*n == '\0' || *n == '/')
52351+ return 1;
52352+
52353+ not = (*p == '!' || *p == '^');
52354+ if (not)
52355+ ++p;
52356+
52357+ c = *p++;
52358+ for (;;) {
52359+ unsigned char fn = (unsigned char)*n;
52360+
52361+ if (c == '\0')
52362+ return 1;
52363+ else {
52364+ if (c == fn)
52365+ goto matched;
52366+ cold = c;
52367+ c = *p++;
52368+
52369+ if (c == '-' && *p != ']') {
52370+ unsigned char cend = *p++;
52371+
52372+ if (cend == '\0')
52373+ return 1;
52374+
52375+ if (cold <= fn && fn <= cend)
52376+ goto matched;
52377+
52378+ c = *p++;
52379+ }
52380+ }
52381+
52382+ if (c == ']')
52383+ break;
52384+ }
52385+ if (!not)
52386+ return 1;
52387+ break;
52388+ matched:
52389+ while (c != ']') {
52390+ if (c == '\0')
52391+ return 1;
52392+
52393+ c = *p++;
52394+ }
52395+ if (not)
52396+ return 1;
52397+ }
52398+ break;
52399+ default:
52400+ if (c != *n)
52401+ return 1;
52402+ }
52403+
52404+ ++n;
52405+ }
52406+
52407+ if (*n == '\0')
52408+ return 0;
52409+
52410+ if (*n == '/')
52411+ return 0;
52412+
52413+ return 1;
52414+}
52415+
52416+static struct acl_object_label *
52417+chk_glob_label(struct acl_object_label *globbed,
52418+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
52419+{
52420+ struct acl_object_label *tmp;
52421+
52422+ if (*path == NULL)
52423+ *path = gr_to_filename_nolock(dentry, mnt);
52424+
52425+ tmp = globbed;
52426+
52427+ while (tmp) {
52428+ if (!glob_match(tmp->filename, *path))
52429+ return tmp;
52430+ tmp = tmp->next;
52431+ }
52432+
52433+ return NULL;
52434+}
52435+
52436+static struct acl_object_label *
52437+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52438+ const ino_t curr_ino, const dev_t curr_dev,
52439+ const struct acl_subject_label *subj, char **path, const int checkglob)
52440+{
52441+ struct acl_subject_label *tmpsubj;
52442+ struct acl_object_label *retval;
52443+ struct acl_object_label *retval2;
52444+
52445+ tmpsubj = (struct acl_subject_label *) subj;
52446+ read_lock(&gr_inode_lock);
52447+ do {
52448+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
52449+ if (retval) {
52450+ if (checkglob && retval->globbed) {
52451+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
52452+ if (retval2)
52453+ retval = retval2;
52454+ }
52455+ break;
52456+ }
52457+ } while ((tmpsubj = tmpsubj->parent_subject));
52458+ read_unlock(&gr_inode_lock);
52459+
52460+ return retval;
52461+}
52462+
52463+static __inline__ struct acl_object_label *
52464+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52465+ struct dentry *curr_dentry,
52466+ const struct acl_subject_label *subj, char **path, const int checkglob)
52467+{
52468+ int newglob = checkglob;
52469+ ino_t inode;
52470+ dev_t device;
52471+
52472+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
52473+ as we don't want a / * rule to match instead of the / object
52474+ don't do this for create lookups that call this function though, since they're looking up
52475+ on the parent and thus need globbing checks on all paths
52476+ */
52477+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
52478+ newglob = GR_NO_GLOB;
52479+
52480+ spin_lock(&curr_dentry->d_lock);
52481+ inode = curr_dentry->d_inode->i_ino;
52482+ device = __get_dev(curr_dentry);
52483+ spin_unlock(&curr_dentry->d_lock);
52484+
52485+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
52486+}
52487+
52488+static struct acl_object_label *
52489+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52490+ const struct acl_subject_label *subj, char *path, const int checkglob)
52491+{
52492+ struct dentry *dentry = (struct dentry *) l_dentry;
52493+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52494+ struct mount *real_mnt = real_mount(mnt);
52495+ struct acl_object_label *retval;
52496+ struct dentry *parent;
52497+
52498+ write_seqlock(&rename_lock);
52499+ br_read_lock(vfsmount_lock);
52500+
52501+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
52502+#ifdef CONFIG_NET
52503+ mnt == sock_mnt ||
52504+#endif
52505+#ifdef CONFIG_HUGETLBFS
52506+ (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
52507+#endif
52508+ /* ignore Eric Biederman */
52509+ IS_PRIVATE(l_dentry->d_inode))) {
52510+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
52511+ goto out;
52512+ }
52513+
52514+ for (;;) {
52515+ if (dentry == real_root.dentry && mnt == real_root.mnt)
52516+ break;
52517+
52518+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52519+ if (!mnt_has_parent(real_mnt))
52520+ break;
52521+
52522+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52523+ if (retval != NULL)
52524+ goto out;
52525+
52526+ dentry = real_mnt->mnt_mountpoint;
52527+ real_mnt = real_mnt->mnt_parent;
52528+ mnt = &real_mnt->mnt;
52529+ continue;
52530+ }
52531+
52532+ parent = dentry->d_parent;
52533+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52534+ if (retval != NULL)
52535+ goto out;
52536+
52537+ dentry = parent;
52538+ }
52539+
52540+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52541+
52542+ /* real_root is pinned so we don't have to hold a reference */
52543+ if (retval == NULL)
52544+ retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
52545+out:
52546+ br_read_unlock(vfsmount_lock);
52547+ write_sequnlock(&rename_lock);
52548+
52549+ BUG_ON(retval == NULL);
52550+
52551+ return retval;
52552+}
52553+
52554+static __inline__ struct acl_object_label *
52555+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52556+ const struct acl_subject_label *subj)
52557+{
52558+ char *path = NULL;
52559+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
52560+}
52561+
52562+static __inline__ struct acl_object_label *
52563+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52564+ const struct acl_subject_label *subj)
52565+{
52566+ char *path = NULL;
52567+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
52568+}
52569+
52570+static __inline__ struct acl_object_label *
52571+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52572+ const struct acl_subject_label *subj, char *path)
52573+{
52574+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
52575+}
52576+
52577+static struct acl_subject_label *
52578+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52579+ const struct acl_role_label *role)
52580+{
52581+ struct dentry *dentry = (struct dentry *) l_dentry;
52582+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52583+ struct mount *real_mnt = real_mount(mnt);
52584+ struct acl_subject_label *retval;
52585+ struct dentry *parent;
52586+
52587+ write_seqlock(&rename_lock);
52588+ br_read_lock(vfsmount_lock);
52589+
52590+ for (;;) {
52591+ if (dentry == real_root.dentry && mnt == real_root.mnt)
52592+ break;
52593+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52594+ if (!mnt_has_parent(real_mnt))
52595+ break;
52596+
52597+ spin_lock(&dentry->d_lock);
52598+ read_lock(&gr_inode_lock);
52599+ retval =
52600+ lookup_acl_subj_label(dentry->d_inode->i_ino,
52601+ __get_dev(dentry), role);
52602+ read_unlock(&gr_inode_lock);
52603+ spin_unlock(&dentry->d_lock);
52604+ if (retval != NULL)
52605+ goto out;
52606+
52607+ dentry = real_mnt->mnt_mountpoint;
52608+ real_mnt = real_mnt->mnt_parent;
52609+ mnt = &real_mnt->mnt;
52610+ continue;
52611+ }
52612+
52613+ spin_lock(&dentry->d_lock);
52614+ read_lock(&gr_inode_lock);
52615+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
52616+ __get_dev(dentry), role);
52617+ read_unlock(&gr_inode_lock);
52618+ parent = dentry->d_parent;
52619+ spin_unlock(&dentry->d_lock);
52620+
52621+ if (retval != NULL)
52622+ goto out;
52623+
52624+ dentry = parent;
52625+ }
52626+
52627+ spin_lock(&dentry->d_lock);
52628+ read_lock(&gr_inode_lock);
52629+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
52630+ __get_dev(dentry), role);
52631+ read_unlock(&gr_inode_lock);
52632+ spin_unlock(&dentry->d_lock);
52633+
52634+ if (unlikely(retval == NULL)) {
52635+ /* real_root is pinned, we don't need to hold a reference */
52636+ read_lock(&gr_inode_lock);
52637+ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
52638+ __get_dev(real_root.dentry), role);
52639+ read_unlock(&gr_inode_lock);
52640+ }
52641+out:
52642+ br_read_unlock(vfsmount_lock);
52643+ write_sequnlock(&rename_lock);
52644+
52645+ BUG_ON(retval == NULL);
52646+
52647+ return retval;
52648+}
52649+
52650+static void
52651+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
52652+{
52653+ struct task_struct *task = current;
52654+ const struct cred *cred = current_cred();
52655+
52656+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
52657+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52658+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52659+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
52660+
52661+ return;
52662+}
52663+
52664+static void
52665+gr_log_learn_sysctl(const char *path, const __u32 mode)
52666+{
52667+ struct task_struct *task = current;
52668+ const struct cred *cred = current_cred();
52669+
52670+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
52671+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52672+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52673+ 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
52674+
52675+ return;
52676+}
52677+
52678+static void
52679+gr_log_learn_id_change(const char type, const unsigned int real,
52680+ const unsigned int effective, const unsigned int fs)
52681+{
52682+ struct task_struct *task = current;
52683+ const struct cred *cred = current_cred();
52684+
52685+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
52686+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52687+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52688+ type, real, effective, fs, &task->signal->saved_ip);
52689+
52690+ return;
52691+}
52692+
52693+__u32
52694+gr_search_file(const struct dentry * dentry, const __u32 mode,
52695+ const struct vfsmount * mnt)
52696+{
52697+ __u32 retval = mode;
52698+ struct acl_subject_label *curracl;
52699+ struct acl_object_label *currobj;
52700+
52701+ if (unlikely(!(gr_status & GR_READY)))
52702+ return (mode & ~GR_AUDITS);
52703+
52704+ curracl = current->acl;
52705+
52706+ currobj = chk_obj_label(dentry, mnt, curracl);
52707+ retval = currobj->mode & mode;
52708+
52709+ /* if we're opening a specified transfer file for writing
52710+ (e.g. /dev/initctl), then transfer our role to init
52711+ */
52712+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
52713+ current->role->roletype & GR_ROLE_PERSIST)) {
52714+ struct task_struct *task = init_pid_ns.child_reaper;
52715+
52716+ if (task->role != current->role) {
52717+ task->acl_sp_role = 0;
52718+ task->acl_role_id = current->acl_role_id;
52719+ task->role = current->role;
52720+ rcu_read_lock();
52721+ read_lock(&grsec_exec_file_lock);
52722+ gr_apply_subject_to_task(task);
52723+ read_unlock(&grsec_exec_file_lock);
52724+ rcu_read_unlock();
52725+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
52726+ }
52727+ }
52728+
52729+ if (unlikely
52730+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
52731+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
52732+ __u32 new_mode = mode;
52733+
52734+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
52735+
52736+ retval = new_mode;
52737+
52738+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
52739+ new_mode |= GR_INHERIT;
52740+
52741+ if (!(mode & GR_NOLEARN))
52742+ gr_log_learn(dentry, mnt, new_mode);
52743+ }
52744+
52745+ return retval;
52746+}
52747+
52748+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
52749+ const struct dentry *parent,
52750+ const struct vfsmount *mnt)
52751+{
52752+ struct name_entry *match;
52753+ struct acl_object_label *matchpo;
52754+ struct acl_subject_label *curracl;
52755+ char *path;
52756+
52757+ if (unlikely(!(gr_status & GR_READY)))
52758+ return NULL;
52759+
52760+ preempt_disable();
52761+ path = gr_to_filename_rbac(new_dentry, mnt);
52762+ match = lookup_name_entry_create(path);
52763+
52764+ curracl = current->acl;
52765+
52766+ if (match) {
52767+ read_lock(&gr_inode_lock);
52768+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
52769+ read_unlock(&gr_inode_lock);
52770+
52771+ if (matchpo) {
52772+ preempt_enable();
52773+ return matchpo;
52774+ }
52775+ }
52776+
52777+ // lookup parent
52778+
52779+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
52780+
52781+ preempt_enable();
52782+ return matchpo;
52783+}
52784+
52785+__u32
52786+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
52787+ const struct vfsmount * mnt, const __u32 mode)
52788+{
52789+ struct acl_object_label *matchpo;
52790+ __u32 retval;
52791+
52792+ if (unlikely(!(gr_status & GR_READY)))
52793+ return (mode & ~GR_AUDITS);
52794+
52795+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
52796+
52797+ retval = matchpo->mode & mode;
52798+
52799+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
52800+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
52801+ __u32 new_mode = mode;
52802+
52803+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
52804+
52805+ gr_log_learn(new_dentry, mnt, new_mode);
52806+ return new_mode;
52807+ }
52808+
52809+ return retval;
52810+}
52811+
52812+__u32
52813+gr_check_link(const struct dentry * new_dentry,
52814+ const struct dentry * parent_dentry,
52815+ const struct vfsmount * parent_mnt,
52816+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
52817+{
52818+ struct acl_object_label *obj;
52819+ __u32 oldmode, newmode;
52820+ __u32 needmode;
52821+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
52822+ GR_DELETE | GR_INHERIT;
52823+
52824+ if (unlikely(!(gr_status & GR_READY)))
52825+ return (GR_CREATE | GR_LINK);
52826+
52827+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
52828+ oldmode = obj->mode;
52829+
52830+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
52831+ newmode = obj->mode;
52832+
52833+ needmode = newmode & checkmodes;
52834+
52835+ // old name for hardlink must have at least the permissions of the new name
52836+ if ((oldmode & needmode) != needmode)
52837+ goto bad;
52838+
52839+ // if old name had restrictions/auditing, make sure the new name does as well
52840+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
52841+
52842+ // don't allow hardlinking of suid/sgid files without permission
52843+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
52844+ needmode |= GR_SETID;
52845+
52846+ if ((newmode & needmode) != needmode)
52847+ goto bad;
52848+
52849+ // enforce minimum permissions
52850+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
52851+ return newmode;
52852+bad:
52853+ needmode = oldmode;
52854+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
52855+ needmode |= GR_SETID;
52856+
52857+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
52858+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
52859+ return (GR_CREATE | GR_LINK);
52860+ } else if (newmode & GR_SUPPRESS)
52861+ return GR_SUPPRESS;
52862+ else
52863+ return 0;
52864+}
52865+
52866+int
52867+gr_check_hidden_task(const struct task_struct *task)
52868+{
52869+ if (unlikely(!(gr_status & GR_READY)))
52870+ return 0;
52871+
52872+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
52873+ return 1;
52874+
52875+ return 0;
52876+}
52877+
52878+int
52879+gr_check_protected_task(const struct task_struct *task)
52880+{
52881+ if (unlikely(!(gr_status & GR_READY) || !task))
52882+ return 0;
52883+
52884+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
52885+ task->acl != current->acl)
52886+ return 1;
52887+
52888+ return 0;
52889+}
52890+
52891+int
52892+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
52893+{
52894+ struct task_struct *p;
52895+ int ret = 0;
52896+
52897+ if (unlikely(!(gr_status & GR_READY) || !pid))
52898+ return ret;
52899+
52900+ read_lock(&tasklist_lock);
52901+ do_each_pid_task(pid, type, p) {
52902+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
52903+ p->acl != current->acl) {
52904+ ret = 1;
52905+ goto out;
52906+ }
52907+ } while_each_pid_task(pid, type, p);
52908+out:
52909+ read_unlock(&tasklist_lock);
52910+
52911+ return ret;
52912+}
52913+
52914+void
52915+gr_copy_label(struct task_struct *tsk)
52916+{
52917+ /* plain copying of fields is already done by dup_task_struct */
52918+ tsk->signal->used_accept = 0;
52919+ tsk->acl_sp_role = 0;
52920+ //tsk->acl_role_id = current->acl_role_id;
52921+ //tsk->acl = current->acl;
52922+ //tsk->role = current->role;
52923+ tsk->signal->curr_ip = current->signal->curr_ip;
52924+ tsk->signal->saved_ip = current->signal->saved_ip;
52925+ if (current->exec_file)
52926+ get_file(current->exec_file);
52927+ //tsk->exec_file = current->exec_file;
52928+ //tsk->is_writable = current->is_writable;
52929+ if (unlikely(current->signal->used_accept)) {
52930+ current->signal->curr_ip = 0;
52931+ current->signal->saved_ip = 0;
52932+ }
52933+
52934+ return;
52935+}
52936+
52937+static void
52938+gr_set_proc_res(struct task_struct *task)
52939+{
52940+ struct acl_subject_label *proc;
52941+ unsigned short i;
52942+
52943+ proc = task->acl;
52944+
52945+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
52946+ return;
52947+
52948+ for (i = 0; i < RLIM_NLIMITS; i++) {
52949+ if (!(proc->resmask & (1 << i)))
52950+ continue;
52951+
52952+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
52953+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
52954+ }
52955+
52956+ return;
52957+}
52958+
52959+extern int __gr_process_user_ban(struct user_struct *user);
52960+
52961+int
52962+gr_check_user_change(int real, int effective, int fs)
52963+{
52964+ unsigned int i;
52965+ __u16 num;
52966+ uid_t *uidlist;
52967+ int curuid;
52968+ int realok = 0;
52969+ int effectiveok = 0;
52970+ int fsok = 0;
52971+
52972+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
52973+ struct user_struct *user;
52974+
52975+ if (real == -1)
52976+ goto skipit;
52977+
52978+ user = find_user(real);
52979+ if (user == NULL)
52980+ goto skipit;
52981+
52982+ if (__gr_process_user_ban(user)) {
52983+ /* for find_user */
52984+ free_uid(user);
52985+ return 1;
52986+ }
52987+
52988+ /* for find_user */
52989+ free_uid(user);
52990+
52991+skipit:
52992+#endif
52993+
52994+ if (unlikely(!(gr_status & GR_READY)))
52995+ return 0;
52996+
52997+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
52998+ gr_log_learn_id_change('u', real, effective, fs);
52999+
53000+ num = current->acl->user_trans_num;
53001+ uidlist = current->acl->user_transitions;
53002+
53003+ if (uidlist == NULL)
53004+ return 0;
53005+
53006+ if (real == -1)
53007+ realok = 1;
53008+ if (effective == -1)
53009+ effectiveok = 1;
53010+ if (fs == -1)
53011+ fsok = 1;
53012+
53013+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
53014+ for (i = 0; i < num; i++) {
53015+ curuid = (int)uidlist[i];
53016+ if (real == curuid)
53017+ realok = 1;
53018+ if (effective == curuid)
53019+ effectiveok = 1;
53020+ if (fs == curuid)
53021+ fsok = 1;
53022+ }
53023+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
53024+ for (i = 0; i < num; i++) {
53025+ curuid = (int)uidlist[i];
53026+ if (real == curuid)
53027+ break;
53028+ if (effective == curuid)
53029+ break;
53030+ if (fs == curuid)
53031+ break;
53032+ }
53033+ /* not in deny list */
53034+ if (i == num) {
53035+ realok = 1;
53036+ effectiveok = 1;
53037+ fsok = 1;
53038+ }
53039+ }
53040+
53041+ if (realok && effectiveok && fsok)
53042+ return 0;
53043+ else {
53044+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53045+ return 1;
53046+ }
53047+}
53048+
53049+int
53050+gr_check_group_change(int real, int effective, int fs)
53051+{
53052+ unsigned int i;
53053+ __u16 num;
53054+ gid_t *gidlist;
53055+ int curgid;
53056+ int realok = 0;
53057+ int effectiveok = 0;
53058+ int fsok = 0;
53059+
53060+ if (unlikely(!(gr_status & GR_READY)))
53061+ return 0;
53062+
53063+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53064+ gr_log_learn_id_change('g', real, effective, fs);
53065+
53066+ num = current->acl->group_trans_num;
53067+ gidlist = current->acl->group_transitions;
53068+
53069+ if (gidlist == NULL)
53070+ return 0;
53071+
53072+ if (real == -1)
53073+ realok = 1;
53074+ if (effective == -1)
53075+ effectiveok = 1;
53076+ if (fs == -1)
53077+ fsok = 1;
53078+
53079+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
53080+ for (i = 0; i < num; i++) {
53081+ curgid = (int)gidlist[i];
53082+ if (real == curgid)
53083+ realok = 1;
53084+ if (effective == curgid)
53085+ effectiveok = 1;
53086+ if (fs == curgid)
53087+ fsok = 1;
53088+ }
53089+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
53090+ for (i = 0; i < num; i++) {
53091+ curgid = (int)gidlist[i];
53092+ if (real == curgid)
53093+ break;
53094+ if (effective == curgid)
53095+ break;
53096+ if (fs == curgid)
53097+ break;
53098+ }
53099+ /* not in deny list */
53100+ if (i == num) {
53101+ realok = 1;
53102+ effectiveok = 1;
53103+ fsok = 1;
53104+ }
53105+ }
53106+
53107+ if (realok && effectiveok && fsok)
53108+ return 0;
53109+ else {
53110+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53111+ return 1;
53112+ }
53113+}
53114+
53115+extern int gr_acl_is_capable(const int cap);
53116+
53117+void
53118+gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
53119+{
53120+ struct acl_role_label *role = task->role;
53121+ struct acl_subject_label *subj = NULL;
53122+ struct acl_object_label *obj;
53123+ struct file *filp;
53124+
53125+ if (unlikely(!(gr_status & GR_READY)))
53126+ return;
53127+
53128+ filp = task->exec_file;
53129+
53130+ /* kernel process, we'll give them the kernel role */
53131+ if (unlikely(!filp)) {
53132+ task->role = kernel_role;
53133+ task->acl = kernel_role->root_label;
53134+ return;
53135+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
53136+ role = lookup_acl_role_label(task, uid, gid);
53137+
53138+ /* don't change the role if we're not a privileged process */
53139+ if (role && task->role != role &&
53140+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
53141+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
53142+ return;
53143+
53144+ /* perform subject lookup in possibly new role
53145+ we can use this result below in the case where role == task->role
53146+ */
53147+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
53148+
53149+ /* if we changed uid/gid, but result in the same role
53150+ and are using inheritance, don't lose the inherited subject
53151+ if current subject is other than what normal lookup
53152+ would result in, we arrived via inheritance, don't
53153+ lose subject
53154+ */
53155+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
53156+ (subj == task->acl)))
53157+ task->acl = subj;
53158+
53159+ task->role = role;
53160+
53161+ task->is_writable = 0;
53162+
53163+ /* ignore additional mmap checks for processes that are writable
53164+ by the default ACL */
53165+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53166+ if (unlikely(obj->mode & GR_WRITE))
53167+ task->is_writable = 1;
53168+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
53169+ if (unlikely(obj->mode & GR_WRITE))
53170+ task->is_writable = 1;
53171+
53172+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53173+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53174+#endif
53175+
53176+ gr_set_proc_res(task);
53177+
53178+ return;
53179+}
53180+
53181+int
53182+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
53183+ const int unsafe_flags)
53184+{
53185+ struct task_struct *task = current;
53186+ struct acl_subject_label *newacl;
53187+ struct acl_object_label *obj;
53188+ __u32 retmode;
53189+
53190+ if (unlikely(!(gr_status & GR_READY)))
53191+ return 0;
53192+
53193+ newacl = chk_subj_label(dentry, mnt, task->role);
53194+
53195+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
53196+ did an exec
53197+ */
53198+ rcu_read_lock();
53199+ read_lock(&tasklist_lock);
53200+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
53201+ (task->parent->acl->mode & GR_POVERRIDE))) {
53202+ read_unlock(&tasklist_lock);
53203+ rcu_read_unlock();
53204+ goto skip_check;
53205+ }
53206+ read_unlock(&tasklist_lock);
53207+ rcu_read_unlock();
53208+
53209+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
53210+ !(task->role->roletype & GR_ROLE_GOD) &&
53211+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
53212+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
53213+ if (unsafe_flags & LSM_UNSAFE_SHARE)
53214+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
53215+ else
53216+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
53217+ return -EACCES;
53218+ }
53219+
53220+skip_check:
53221+
53222+ obj = chk_obj_label(dentry, mnt, task->acl);
53223+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
53224+
53225+ if (!(task->acl->mode & GR_INHERITLEARN) &&
53226+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
53227+ if (obj->nested)
53228+ task->acl = obj->nested;
53229+ else
53230+ task->acl = newacl;
53231+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
53232+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
53233+
53234+ task->is_writable = 0;
53235+
53236+ /* ignore additional mmap checks for processes that are writable
53237+ by the default ACL */
53238+ obj = chk_obj_label(dentry, mnt, default_role->root_label);
53239+ if (unlikely(obj->mode & GR_WRITE))
53240+ task->is_writable = 1;
53241+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
53242+ if (unlikely(obj->mode & GR_WRITE))
53243+ task->is_writable = 1;
53244+
53245+ gr_set_proc_res(task);
53246+
53247+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53248+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53249+#endif
53250+ return 0;
53251+}
53252+
53253+/* always called with valid inodev ptr */
53254+static void
53255+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
53256+{
53257+ struct acl_object_label *matchpo;
53258+ struct acl_subject_label *matchps;
53259+ struct acl_subject_label *subj;
53260+ struct acl_role_label *role;
53261+ unsigned int x;
53262+
53263+ FOR_EACH_ROLE_START(role)
53264+ FOR_EACH_SUBJECT_START(role, subj, x)
53265+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
53266+ matchpo->mode |= GR_DELETED;
53267+ FOR_EACH_SUBJECT_END(subj,x)
53268+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53269+ if (subj->inode == ino && subj->device == dev)
53270+ subj->mode |= GR_DELETED;
53271+ FOR_EACH_NESTED_SUBJECT_END(subj)
53272+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
53273+ matchps->mode |= GR_DELETED;
53274+ FOR_EACH_ROLE_END(role)
53275+
53276+ inodev->nentry->deleted = 1;
53277+
53278+ return;
53279+}
53280+
53281+void
53282+gr_handle_delete(const ino_t ino, const dev_t dev)
53283+{
53284+ struct inodev_entry *inodev;
53285+
53286+ if (unlikely(!(gr_status & GR_READY)))
53287+ return;
53288+
53289+ write_lock(&gr_inode_lock);
53290+ inodev = lookup_inodev_entry(ino, dev);
53291+ if (inodev != NULL)
53292+ do_handle_delete(inodev, ino, dev);
53293+ write_unlock(&gr_inode_lock);
53294+
53295+ return;
53296+}
53297+
53298+static void
53299+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
53300+ const ino_t newinode, const dev_t newdevice,
53301+ struct acl_subject_label *subj)
53302+{
53303+ unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
53304+ struct acl_object_label *match;
53305+
53306+ match = subj->obj_hash[index];
53307+
53308+ while (match && (match->inode != oldinode ||
53309+ match->device != olddevice ||
53310+ !(match->mode & GR_DELETED)))
53311+ match = match->next;
53312+
53313+ if (match && (match->inode == oldinode)
53314+ && (match->device == olddevice)
53315+ && (match->mode & GR_DELETED)) {
53316+ if (match->prev == NULL) {
53317+ subj->obj_hash[index] = match->next;
53318+ if (match->next != NULL)
53319+ match->next->prev = NULL;
53320+ } else {
53321+ match->prev->next = match->next;
53322+ if (match->next != NULL)
53323+ match->next->prev = match->prev;
53324+ }
53325+ match->prev = NULL;
53326+ match->next = NULL;
53327+ match->inode = newinode;
53328+ match->device = newdevice;
53329+ match->mode &= ~GR_DELETED;
53330+
53331+ insert_acl_obj_label(match, subj);
53332+ }
53333+
53334+ return;
53335+}
53336+
53337+static void
53338+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
53339+ const ino_t newinode, const dev_t newdevice,
53340+ struct acl_role_label *role)
53341+{
53342+ unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
53343+ struct acl_subject_label *match;
53344+
53345+ match = role->subj_hash[index];
53346+
53347+ while (match && (match->inode != oldinode ||
53348+ match->device != olddevice ||
53349+ !(match->mode & GR_DELETED)))
53350+ match = match->next;
53351+
53352+ if (match && (match->inode == oldinode)
53353+ && (match->device == olddevice)
53354+ && (match->mode & GR_DELETED)) {
53355+ if (match->prev == NULL) {
53356+ role->subj_hash[index] = match->next;
53357+ if (match->next != NULL)
53358+ match->next->prev = NULL;
53359+ } else {
53360+ match->prev->next = match->next;
53361+ if (match->next != NULL)
53362+ match->next->prev = match->prev;
53363+ }
53364+ match->prev = NULL;
53365+ match->next = NULL;
53366+ match->inode = newinode;
53367+ match->device = newdevice;
53368+ match->mode &= ~GR_DELETED;
53369+
53370+ insert_acl_subj_label(match, role);
53371+ }
53372+
53373+ return;
53374+}
53375+
53376+static void
53377+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
53378+ const ino_t newinode, const dev_t newdevice)
53379+{
53380+ unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
53381+ struct inodev_entry *match;
53382+
53383+ match = inodev_set.i_hash[index];
53384+
53385+ while (match && (match->nentry->inode != oldinode ||
53386+ match->nentry->device != olddevice || !match->nentry->deleted))
53387+ match = match->next;
53388+
53389+ if (match && (match->nentry->inode == oldinode)
53390+ && (match->nentry->device == olddevice) &&
53391+ match->nentry->deleted) {
53392+ if (match->prev == NULL) {
53393+ inodev_set.i_hash[index] = match->next;
53394+ if (match->next != NULL)
53395+ match->next->prev = NULL;
53396+ } else {
53397+ match->prev->next = match->next;
53398+ if (match->next != NULL)
53399+ match->next->prev = match->prev;
53400+ }
53401+ match->prev = NULL;
53402+ match->next = NULL;
53403+ match->nentry->inode = newinode;
53404+ match->nentry->device = newdevice;
53405+ match->nentry->deleted = 0;
53406+
53407+ insert_inodev_entry(match);
53408+ }
53409+
53410+ return;
53411+}
53412+
53413+static void
53414+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
53415+{
53416+ struct acl_subject_label *subj;
53417+ struct acl_role_label *role;
53418+ unsigned int x;
53419+
53420+ FOR_EACH_ROLE_START(role)
53421+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
53422+
53423+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53424+ if ((subj->inode == ino) && (subj->device == dev)) {
53425+ subj->inode = ino;
53426+ subj->device = dev;
53427+ }
53428+ FOR_EACH_NESTED_SUBJECT_END(subj)
53429+ FOR_EACH_SUBJECT_START(role, subj, x)
53430+ update_acl_obj_label(matchn->inode, matchn->device,
53431+ ino, dev, subj);
53432+ FOR_EACH_SUBJECT_END(subj,x)
53433+ FOR_EACH_ROLE_END(role)
53434+
53435+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
53436+
53437+ return;
53438+}
53439+
53440+static void
53441+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
53442+ const struct vfsmount *mnt)
53443+{
53444+ ino_t ino = dentry->d_inode->i_ino;
53445+ dev_t dev = __get_dev(dentry);
53446+
53447+ __do_handle_create(matchn, ino, dev);
53448+
53449+ return;
53450+}
53451+
53452+void
53453+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
53454+{
53455+ struct name_entry *matchn;
53456+
53457+ if (unlikely(!(gr_status & GR_READY)))
53458+ return;
53459+
53460+ preempt_disable();
53461+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
53462+
53463+ if (unlikely((unsigned long)matchn)) {
53464+ write_lock(&gr_inode_lock);
53465+ do_handle_create(matchn, dentry, mnt);
53466+ write_unlock(&gr_inode_lock);
53467+ }
53468+ preempt_enable();
53469+
53470+ return;
53471+}
53472+
53473+void
53474+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
53475+{
53476+ struct name_entry *matchn;
53477+
53478+ if (unlikely(!(gr_status & GR_READY)))
53479+ return;
53480+
53481+ preempt_disable();
53482+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
53483+
53484+ if (unlikely((unsigned long)matchn)) {
53485+ write_lock(&gr_inode_lock);
53486+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
53487+ write_unlock(&gr_inode_lock);
53488+ }
53489+ preempt_enable();
53490+
53491+ return;
53492+}
53493+
53494+void
53495+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
53496+ struct dentry *old_dentry,
53497+ struct dentry *new_dentry,
53498+ struct vfsmount *mnt, const __u8 replace)
53499+{
53500+ struct name_entry *matchn;
53501+ struct inodev_entry *inodev;
53502+ struct inode *inode = new_dentry->d_inode;
53503+ ino_t old_ino = old_dentry->d_inode->i_ino;
53504+ dev_t old_dev = __get_dev(old_dentry);
53505+
53506+ /* vfs_rename swaps the name and parent link for old_dentry and
53507+ new_dentry
53508+ at this point, old_dentry has the new name, parent link, and inode
53509+ for the renamed file
53510+ if a file is being replaced by a rename, new_dentry has the inode
53511+ and name for the replaced file
53512+ */
53513+
53514+ if (unlikely(!(gr_status & GR_READY)))
53515+ return;
53516+
53517+ preempt_disable();
53518+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
53519+
53520+ /* we wouldn't have to check d_inode if it weren't for
53521+ NFS silly-renaming
53522+ */
53523+
53524+ write_lock(&gr_inode_lock);
53525+ if (unlikely(replace && inode)) {
53526+ ino_t new_ino = inode->i_ino;
53527+ dev_t new_dev = __get_dev(new_dentry);
53528+
53529+ inodev = lookup_inodev_entry(new_ino, new_dev);
53530+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
53531+ do_handle_delete(inodev, new_ino, new_dev);
53532+ }
53533+
53534+ inodev = lookup_inodev_entry(old_ino, old_dev);
53535+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
53536+ do_handle_delete(inodev, old_ino, old_dev);
53537+
53538+ if (unlikely((unsigned long)matchn))
53539+ do_handle_create(matchn, old_dentry, mnt);
53540+
53541+ write_unlock(&gr_inode_lock);
53542+ preempt_enable();
53543+
53544+ return;
53545+}
53546+
53547+static int
53548+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
53549+ unsigned char **sum)
53550+{
53551+ struct acl_role_label *r;
53552+ struct role_allowed_ip *ipp;
53553+ struct role_transition *trans;
53554+ unsigned int i;
53555+ int found = 0;
53556+ u32 curr_ip = current->signal->curr_ip;
53557+
53558+ current->signal->saved_ip = curr_ip;
53559+
53560+ /* check transition table */
53561+
53562+ for (trans = current->role->transitions; trans; trans = trans->next) {
53563+ if (!strcmp(rolename, trans->rolename)) {
53564+ found = 1;
53565+ break;
53566+ }
53567+ }
53568+
53569+ if (!found)
53570+ return 0;
53571+
53572+ /* handle special roles that do not require authentication
53573+ and check ip */
53574+
53575+ FOR_EACH_ROLE_START(r)
53576+ if (!strcmp(rolename, r->rolename) &&
53577+ (r->roletype & GR_ROLE_SPECIAL)) {
53578+ found = 0;
53579+ if (r->allowed_ips != NULL) {
53580+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
53581+ if ((ntohl(curr_ip) & ipp->netmask) ==
53582+ (ntohl(ipp->addr) & ipp->netmask))
53583+ found = 1;
53584+ }
53585+ } else
53586+ found = 2;
53587+ if (!found)
53588+ return 0;
53589+
53590+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
53591+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
53592+ *salt = NULL;
53593+ *sum = NULL;
53594+ return 1;
53595+ }
53596+ }
53597+ FOR_EACH_ROLE_END(r)
53598+
53599+ for (i = 0; i < num_sprole_pws; i++) {
53600+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
53601+ *salt = acl_special_roles[i]->salt;
53602+ *sum = acl_special_roles[i]->sum;
53603+ return 1;
53604+ }
53605+ }
53606+
53607+ return 0;
53608+}
53609+
53610+static void
53611+assign_special_role(char *rolename)
53612+{
53613+ struct acl_object_label *obj;
53614+ struct acl_role_label *r;
53615+ struct acl_role_label *assigned = NULL;
53616+ struct task_struct *tsk;
53617+ struct file *filp;
53618+
53619+ FOR_EACH_ROLE_START(r)
53620+ if (!strcmp(rolename, r->rolename) &&
53621+ (r->roletype & GR_ROLE_SPECIAL)) {
53622+ assigned = r;
53623+ break;
53624+ }
53625+ FOR_EACH_ROLE_END(r)
53626+
53627+ if (!assigned)
53628+ return;
53629+
53630+ read_lock(&tasklist_lock);
53631+ read_lock(&grsec_exec_file_lock);
53632+
53633+ tsk = current->real_parent;
53634+ if (tsk == NULL)
53635+ goto out_unlock;
53636+
53637+ filp = tsk->exec_file;
53638+ if (filp == NULL)
53639+ goto out_unlock;
53640+
53641+ tsk->is_writable = 0;
53642+
53643+ tsk->acl_sp_role = 1;
53644+ tsk->acl_role_id = ++acl_sp_role_value;
53645+ tsk->role = assigned;
53646+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
53647+
53648+ /* ignore additional mmap checks for processes that are writable
53649+ by the default ACL */
53650+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53651+ if (unlikely(obj->mode & GR_WRITE))
53652+ tsk->is_writable = 1;
53653+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
53654+ if (unlikely(obj->mode & GR_WRITE))
53655+ tsk->is_writable = 1;
53656+
53657+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53658+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
53659+#endif
53660+
53661+out_unlock:
53662+ read_unlock(&grsec_exec_file_lock);
53663+ read_unlock(&tasklist_lock);
53664+ return;
53665+}
53666+
53667+int gr_check_secure_terminal(struct task_struct *task)
53668+{
53669+ struct task_struct *p, *p2, *p3;
53670+ struct files_struct *files;
53671+ struct fdtable *fdt;
53672+ struct file *our_file = NULL, *file;
53673+ int i;
53674+
53675+ if (task->signal->tty == NULL)
53676+ return 1;
53677+
53678+ files = get_files_struct(task);
53679+ if (files != NULL) {
53680+ rcu_read_lock();
53681+ fdt = files_fdtable(files);
53682+ for (i=0; i < fdt->max_fds; i++) {
53683+ file = fcheck_files(files, i);
53684+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
53685+ get_file(file);
53686+ our_file = file;
53687+ }
53688+ }
53689+ rcu_read_unlock();
53690+ put_files_struct(files);
53691+ }
53692+
53693+ if (our_file == NULL)
53694+ return 1;
53695+
53696+ read_lock(&tasklist_lock);
53697+ do_each_thread(p2, p) {
53698+ files = get_files_struct(p);
53699+ if (files == NULL ||
53700+ (p->signal && p->signal->tty == task->signal->tty)) {
53701+ if (files != NULL)
53702+ put_files_struct(files);
53703+ continue;
53704+ }
53705+ rcu_read_lock();
53706+ fdt = files_fdtable(files);
53707+ for (i=0; i < fdt->max_fds; i++) {
53708+ file = fcheck_files(files, i);
53709+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
53710+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
53711+ p3 = task;
53712+ while (p3->pid > 0) {
53713+ if (p3 == p)
53714+ break;
53715+ p3 = p3->real_parent;
53716+ }
53717+ if (p3 == p)
53718+ break;
53719+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
53720+ gr_handle_alertkill(p);
53721+ rcu_read_unlock();
53722+ put_files_struct(files);
53723+ read_unlock(&tasklist_lock);
53724+ fput(our_file);
53725+ return 0;
53726+ }
53727+ }
53728+ rcu_read_unlock();
53729+ put_files_struct(files);
53730+ } while_each_thread(p2, p);
53731+ read_unlock(&tasklist_lock);
53732+
53733+ fput(our_file);
53734+ return 1;
53735+}
53736+
53737+ssize_t
53738+write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
53739+{
53740+ struct gr_arg_wrapper uwrap;
53741+ unsigned char *sprole_salt = NULL;
53742+ unsigned char *sprole_sum = NULL;
53743+ int error = sizeof (struct gr_arg_wrapper);
53744+ int error2 = 0;
53745+
53746+ mutex_lock(&gr_dev_mutex);
53747+
53748+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
53749+ error = -EPERM;
53750+ goto out;
53751+ }
53752+
53753+ if (count != sizeof (struct gr_arg_wrapper)) {
53754+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
53755+ error = -EINVAL;
53756+ goto out;
53757+ }
53758+
53759+
53760+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
53761+ gr_auth_expires = 0;
53762+ gr_auth_attempts = 0;
53763+ }
53764+
53765+ if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
53766+ error = -EFAULT;
53767+ goto out;
53768+ }
53769+
53770+ if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
53771+ error = -EINVAL;
53772+ goto out;
53773+ }
53774+
53775+ if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
53776+ error = -EFAULT;
53777+ goto out;
53778+ }
53779+
53780+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
53781+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
53782+ time_after(gr_auth_expires, get_seconds())) {
53783+ error = -EBUSY;
53784+ goto out;
53785+ }
53786+
53787+ /* if non-root trying to do anything other than use a special role,
53788+ do not attempt authentication, do not count towards authentication
53789+ locking
53790+ */
53791+
53792+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
53793+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
53794+ current_uid()) {
53795+ error = -EPERM;
53796+ goto out;
53797+ }
53798+
53799+ /* ensure pw and special role name are null terminated */
53800+
53801+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
53802+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
53803+
53804+ /* Okay.
53805+ * We have our enough of the argument structure..(we have yet
53806+ * to copy_from_user the tables themselves) . Copy the tables
53807+ * only if we need them, i.e. for loading operations. */
53808+
53809+ switch (gr_usermode->mode) {
53810+ case GR_STATUS:
53811+ if (gr_status & GR_READY) {
53812+ error = 1;
53813+ if (!gr_check_secure_terminal(current))
53814+ error = 3;
53815+ } else
53816+ error = 2;
53817+ goto out;
53818+ case GR_SHUTDOWN:
53819+ if ((gr_status & GR_READY)
53820+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
53821+ pax_open_kernel();
53822+ gr_status &= ~GR_READY;
53823+ pax_close_kernel();
53824+
53825+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
53826+ free_variables();
53827+ memset(gr_usermode, 0, sizeof (struct gr_arg));
53828+ memset(gr_system_salt, 0, GR_SALT_LEN);
53829+ memset(gr_system_sum, 0, GR_SHA_LEN);
53830+ } else if (gr_status & GR_READY) {
53831+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
53832+ error = -EPERM;
53833+ } else {
53834+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
53835+ error = -EAGAIN;
53836+ }
53837+ break;
53838+ case GR_ENABLE:
53839+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
53840+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
53841+ else {
53842+ if (gr_status & GR_READY)
53843+ error = -EAGAIN;
53844+ else
53845+ error = error2;
53846+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
53847+ }
53848+ break;
53849+ case GR_RELOAD:
53850+ if (!(gr_status & GR_READY)) {
53851+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
53852+ error = -EAGAIN;
53853+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
53854+ preempt_disable();
53855+
53856+ pax_open_kernel();
53857+ gr_status &= ~GR_READY;
53858+ pax_close_kernel();
53859+
53860+ free_variables();
53861+ if (!(error2 = gracl_init(gr_usermode))) {
53862+ preempt_enable();
53863+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
53864+ } else {
53865+ preempt_enable();
53866+ error = error2;
53867+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
53868+ }
53869+ } else {
53870+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
53871+ error = -EPERM;
53872+ }
53873+ break;
53874+ case GR_SEGVMOD:
53875+ if (unlikely(!(gr_status & GR_READY))) {
53876+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
53877+ error = -EAGAIN;
53878+ break;
53879+ }
53880+
53881+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
53882+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
53883+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
53884+ struct acl_subject_label *segvacl;
53885+ segvacl =
53886+ lookup_acl_subj_label(gr_usermode->segv_inode,
53887+ gr_usermode->segv_device,
53888+ current->role);
53889+ if (segvacl) {
53890+ segvacl->crashes = 0;
53891+ segvacl->expires = 0;
53892+ }
53893+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
53894+ gr_remove_uid(gr_usermode->segv_uid);
53895+ }
53896+ } else {
53897+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
53898+ error = -EPERM;
53899+ }
53900+ break;
53901+ case GR_SPROLE:
53902+ case GR_SPROLEPAM:
53903+ if (unlikely(!(gr_status & GR_READY))) {
53904+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
53905+ error = -EAGAIN;
53906+ break;
53907+ }
53908+
53909+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
53910+ current->role->expires = 0;
53911+ current->role->auth_attempts = 0;
53912+ }
53913+
53914+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
53915+ time_after(current->role->expires, get_seconds())) {
53916+ error = -EBUSY;
53917+ goto out;
53918+ }
53919+
53920+ if (lookup_special_role_auth
53921+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
53922+ && ((!sprole_salt && !sprole_sum)
53923+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
53924+ char *p = "";
53925+ assign_special_role(gr_usermode->sp_role);
53926+ read_lock(&tasklist_lock);
53927+ if (current->real_parent)
53928+ p = current->real_parent->role->rolename;
53929+ read_unlock(&tasklist_lock);
53930+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
53931+ p, acl_sp_role_value);
53932+ } else {
53933+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
53934+ error = -EPERM;
53935+ if(!(current->role->auth_attempts++))
53936+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
53937+
53938+ goto out;
53939+ }
53940+ break;
53941+ case GR_UNSPROLE:
53942+ if (unlikely(!(gr_status & GR_READY))) {
53943+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
53944+ error = -EAGAIN;
53945+ break;
53946+ }
53947+
53948+ if (current->role->roletype & GR_ROLE_SPECIAL) {
53949+ char *p = "";
53950+ int i = 0;
53951+
53952+ read_lock(&tasklist_lock);
53953+ if (current->real_parent) {
53954+ p = current->real_parent->role->rolename;
53955+ i = current->real_parent->acl_role_id;
53956+ }
53957+ read_unlock(&tasklist_lock);
53958+
53959+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
53960+ gr_set_acls(1);
53961+ } else {
53962+ error = -EPERM;
53963+ goto out;
53964+ }
53965+ break;
53966+ default:
53967+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
53968+ error = -EINVAL;
53969+ break;
53970+ }
53971+
53972+ if (error != -EPERM)
53973+ goto out;
53974+
53975+ if(!(gr_auth_attempts++))
53976+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
53977+
53978+ out:
53979+ mutex_unlock(&gr_dev_mutex);
53980+ return error;
53981+}
53982+
53983+/* must be called with
53984+ rcu_read_lock();
53985+ read_lock(&tasklist_lock);
53986+ read_lock(&grsec_exec_file_lock);
53987+*/
53988+int gr_apply_subject_to_task(struct task_struct *task)
53989+{
53990+ struct acl_object_label *obj;
53991+ char *tmpname;
53992+ struct acl_subject_label *tmpsubj;
53993+ struct file *filp;
53994+ struct name_entry *nmatch;
53995+
53996+ filp = task->exec_file;
53997+ if (filp == NULL)
53998+ return 0;
53999+
54000+ /* the following is to apply the correct subject
54001+ on binaries running when the RBAC system
54002+ is enabled, when the binaries have been
54003+ replaced or deleted since their execution
54004+ -----
54005+ when the RBAC system starts, the inode/dev
54006+ from exec_file will be one the RBAC system
54007+ is unaware of. It only knows the inode/dev
54008+ of the present file on disk, or the absence
54009+ of it.
54010+ */
54011+ preempt_disable();
54012+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
54013+
54014+ nmatch = lookup_name_entry(tmpname);
54015+ preempt_enable();
54016+ tmpsubj = NULL;
54017+ if (nmatch) {
54018+ if (nmatch->deleted)
54019+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
54020+ else
54021+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
54022+ if (tmpsubj != NULL)
54023+ task->acl = tmpsubj;
54024+ }
54025+ if (tmpsubj == NULL)
54026+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
54027+ task->role);
54028+ if (task->acl) {
54029+ task->is_writable = 0;
54030+ /* ignore additional mmap checks for processes that are writable
54031+ by the default ACL */
54032+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54033+ if (unlikely(obj->mode & GR_WRITE))
54034+ task->is_writable = 1;
54035+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
54036+ if (unlikely(obj->mode & GR_WRITE))
54037+ task->is_writable = 1;
54038+
54039+ gr_set_proc_res(task);
54040+
54041+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
54042+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
54043+#endif
54044+ } else {
54045+ return 1;
54046+ }
54047+
54048+ return 0;
54049+}
54050+
54051+int
54052+gr_set_acls(const int type)
54053+{
54054+ struct task_struct *task, *task2;
54055+ struct acl_role_label *role = current->role;
54056+ __u16 acl_role_id = current->acl_role_id;
54057+ const struct cred *cred;
54058+ int ret;
54059+
54060+ rcu_read_lock();
54061+ read_lock(&tasklist_lock);
54062+ read_lock(&grsec_exec_file_lock);
54063+ do_each_thread(task2, task) {
54064+ /* check to see if we're called from the exit handler,
54065+ if so, only replace ACLs that have inherited the admin
54066+ ACL */
54067+
54068+ if (type && (task->role != role ||
54069+ task->acl_role_id != acl_role_id))
54070+ continue;
54071+
54072+ task->acl_role_id = 0;
54073+ task->acl_sp_role = 0;
54074+
54075+ if (task->exec_file) {
54076+ cred = __task_cred(task);
54077+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
54078+ ret = gr_apply_subject_to_task(task);
54079+ if (ret) {
54080+ read_unlock(&grsec_exec_file_lock);
54081+ read_unlock(&tasklist_lock);
54082+ rcu_read_unlock();
54083+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
54084+ return ret;
54085+ }
54086+ } else {
54087+ // it's a kernel process
54088+ task->role = kernel_role;
54089+ task->acl = kernel_role->root_label;
54090+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
54091+ task->acl->mode &= ~GR_PROCFIND;
54092+#endif
54093+ }
54094+ } while_each_thread(task2, task);
54095+ read_unlock(&grsec_exec_file_lock);
54096+ read_unlock(&tasklist_lock);
54097+ rcu_read_unlock();
54098+
54099+ return 0;
54100+}
54101+
54102+void
54103+gr_learn_resource(const struct task_struct *task,
54104+ const int res, const unsigned long wanted, const int gt)
54105+{
54106+ struct acl_subject_label *acl;
54107+ const struct cred *cred;
54108+
54109+ if (unlikely((gr_status & GR_READY) &&
54110+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
54111+ goto skip_reslog;
54112+
54113+#ifdef CONFIG_GRKERNSEC_RESLOG
54114+ gr_log_resource(task, res, wanted, gt);
54115+#endif
54116+ skip_reslog:
54117+
54118+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
54119+ return;
54120+
54121+ acl = task->acl;
54122+
54123+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
54124+ !(acl->resmask & (1 << (unsigned short) res))))
54125+ return;
54126+
54127+ if (wanted >= acl->res[res].rlim_cur) {
54128+ unsigned long res_add;
54129+
54130+ res_add = wanted;
54131+ switch (res) {
54132+ case RLIMIT_CPU:
54133+ res_add += GR_RLIM_CPU_BUMP;
54134+ break;
54135+ case RLIMIT_FSIZE:
54136+ res_add += GR_RLIM_FSIZE_BUMP;
54137+ break;
54138+ case RLIMIT_DATA:
54139+ res_add += GR_RLIM_DATA_BUMP;
54140+ break;
54141+ case RLIMIT_STACK:
54142+ res_add += GR_RLIM_STACK_BUMP;
54143+ break;
54144+ case RLIMIT_CORE:
54145+ res_add += GR_RLIM_CORE_BUMP;
54146+ break;
54147+ case RLIMIT_RSS:
54148+ res_add += GR_RLIM_RSS_BUMP;
54149+ break;
54150+ case RLIMIT_NPROC:
54151+ res_add += GR_RLIM_NPROC_BUMP;
54152+ break;
54153+ case RLIMIT_NOFILE:
54154+ res_add += GR_RLIM_NOFILE_BUMP;
54155+ break;
54156+ case RLIMIT_MEMLOCK:
54157+ res_add += GR_RLIM_MEMLOCK_BUMP;
54158+ break;
54159+ case RLIMIT_AS:
54160+ res_add += GR_RLIM_AS_BUMP;
54161+ break;
54162+ case RLIMIT_LOCKS:
54163+ res_add += GR_RLIM_LOCKS_BUMP;
54164+ break;
54165+ case RLIMIT_SIGPENDING:
54166+ res_add += GR_RLIM_SIGPENDING_BUMP;
54167+ break;
54168+ case RLIMIT_MSGQUEUE:
54169+ res_add += GR_RLIM_MSGQUEUE_BUMP;
54170+ break;
54171+ case RLIMIT_NICE:
54172+ res_add += GR_RLIM_NICE_BUMP;
54173+ break;
54174+ case RLIMIT_RTPRIO:
54175+ res_add += GR_RLIM_RTPRIO_BUMP;
54176+ break;
54177+ case RLIMIT_RTTIME:
54178+ res_add += GR_RLIM_RTTIME_BUMP;
54179+ break;
54180+ }
54181+
54182+ acl->res[res].rlim_cur = res_add;
54183+
54184+ if (wanted > acl->res[res].rlim_max)
54185+ acl->res[res].rlim_max = res_add;
54186+
54187+ /* only log the subject filename, since resource logging is supported for
54188+ single-subject learning only */
54189+ rcu_read_lock();
54190+ cred = __task_cred(task);
54191+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
54192+ task->role->roletype, cred->uid, cred->gid, acl->filename,
54193+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
54194+ "", (unsigned long) res, &task->signal->saved_ip);
54195+ rcu_read_unlock();
54196+ }
54197+
54198+ return;
54199+}
54200+
54201+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
54202+void
54203+pax_set_initial_flags(struct linux_binprm *bprm)
54204+{
54205+ struct task_struct *task = current;
54206+ struct acl_subject_label *proc;
54207+ unsigned long flags;
54208+
54209+ if (unlikely(!(gr_status & GR_READY)))
54210+ return;
54211+
54212+ flags = pax_get_flags(task);
54213+
54214+ proc = task->acl;
54215+
54216+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
54217+ flags &= ~MF_PAX_PAGEEXEC;
54218+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
54219+ flags &= ~MF_PAX_SEGMEXEC;
54220+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
54221+ flags &= ~MF_PAX_RANDMMAP;
54222+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
54223+ flags &= ~MF_PAX_EMUTRAMP;
54224+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
54225+ flags &= ~MF_PAX_MPROTECT;
54226+
54227+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
54228+ flags |= MF_PAX_PAGEEXEC;
54229+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
54230+ flags |= MF_PAX_SEGMEXEC;
54231+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
54232+ flags |= MF_PAX_RANDMMAP;
54233+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
54234+ flags |= MF_PAX_EMUTRAMP;
54235+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
54236+ flags |= MF_PAX_MPROTECT;
54237+
54238+ pax_set_flags(task, flags);
54239+
54240+ return;
54241+}
54242+#endif
54243+
54244+#ifdef CONFIG_SYSCTL
54245+/* Eric Biederman likes breaking userland ABI and every inode-based security
54246+ system to save 35kb of memory */
54247+
54248+/* we modify the passed in filename, but adjust it back before returning */
54249+static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
54250+{
54251+ struct name_entry *nmatch;
54252+ char *p, *lastp = NULL;
54253+ struct acl_object_label *obj = NULL, *tmp;
54254+ struct acl_subject_label *tmpsubj;
54255+ char c = '\0';
54256+
54257+ read_lock(&gr_inode_lock);
54258+
54259+ p = name + len - 1;
54260+ do {
54261+ nmatch = lookup_name_entry(name);
54262+ if (lastp != NULL)
54263+ *lastp = c;
54264+
54265+ if (nmatch == NULL)
54266+ goto next_component;
54267+ tmpsubj = current->acl;
54268+ do {
54269+ obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
54270+ if (obj != NULL) {
54271+ tmp = obj->globbed;
54272+ while (tmp) {
54273+ if (!glob_match(tmp->filename, name)) {
54274+ obj = tmp;
54275+ goto found_obj;
54276+ }
54277+ tmp = tmp->next;
54278+ }
54279+ goto found_obj;
54280+ }
54281+ } while ((tmpsubj = tmpsubj->parent_subject));
54282+next_component:
54283+ /* end case */
54284+ if (p == name)
54285+ break;
54286+
54287+ while (*p != '/')
54288+ p--;
54289+ if (p == name)
54290+ lastp = p + 1;
54291+ else {
54292+ lastp = p;
54293+ p--;
54294+ }
54295+ c = *lastp;
54296+ *lastp = '\0';
54297+ } while (1);
54298+found_obj:
54299+ read_unlock(&gr_inode_lock);
54300+ /* obj returned will always be non-null */
54301+ return obj;
54302+}
54303+
54304+/* returns 0 when allowing, non-zero on error
54305+ op of 0 is used for readdir, so we don't log the names of hidden files
54306+*/
54307+__u32
54308+gr_handle_sysctl(const struct ctl_table *table, const int op)
54309+{
54310+ struct ctl_table *tmp;
54311+ const char *proc_sys = "/proc/sys";
54312+ char *path;
54313+ struct acl_object_label *obj;
54314+ unsigned short len = 0, pos = 0, depth = 0, i;
54315+ __u32 err = 0;
54316+ __u32 mode = 0;
54317+
54318+ if (unlikely(!(gr_status & GR_READY)))
54319+ return 0;
54320+
54321+ /* for now, ignore operations on non-sysctl entries if it's not a
54322+ readdir*/
54323+ if (table->child != NULL && op != 0)
54324+ return 0;
54325+
54326+ mode |= GR_FIND;
54327+ /* it's only a read if it's an entry, read on dirs is for readdir */
54328+ if (op & MAY_READ)
54329+ mode |= GR_READ;
54330+ if (op & MAY_WRITE)
54331+ mode |= GR_WRITE;
54332+
54333+ preempt_disable();
54334+
54335+ path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
54336+
54337+ /* it's only a read/write if it's an actual entry, not a dir
54338+ (which are opened for readdir)
54339+ */
54340+
54341+ /* convert the requested sysctl entry into a pathname */
54342+
54343+ for (tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54344+ len += strlen(tmp->procname);
54345+ len++;
54346+ depth++;
54347+ }
54348+
54349+ if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
54350+ /* deny */
54351+ goto out;
54352+ }
54353+
54354+ memset(path, 0, PAGE_SIZE);
54355+
54356+ memcpy(path, proc_sys, strlen(proc_sys));
54357+
54358+ pos += strlen(proc_sys);
54359+
54360+ for (; depth > 0; depth--) {
54361+ path[pos] = '/';
54362+ pos++;
54363+ for (i = 1, tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54364+ if (depth == i) {
54365+ memcpy(path + pos, tmp->procname,
54366+ strlen(tmp->procname));
54367+ pos += strlen(tmp->procname);
54368+ }
54369+ i++;
54370+ }
54371+ }
54372+
54373+ obj = gr_lookup_by_name(path, pos);
54374+ err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
54375+
54376+ if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
54377+ ((err & mode) != mode))) {
54378+ __u32 new_mode = mode;
54379+
54380+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
54381+
54382+ err = 0;
54383+ gr_log_learn_sysctl(path, new_mode);
54384+ } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
54385+ gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
54386+ err = -ENOENT;
54387+ } else if (!(err & GR_FIND)) {
54388+ err = -ENOENT;
54389+ } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
54390+ gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
54391+ path, (mode & GR_READ) ? " reading" : "",
54392+ (mode & GR_WRITE) ? " writing" : "");
54393+ err = -EACCES;
54394+ } else if ((err & mode) != mode) {
54395+ err = -EACCES;
54396+ } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
54397+ gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
54398+ path, (mode & GR_READ) ? " reading" : "",
54399+ (mode & GR_WRITE) ? " writing" : "");
54400+ err = 0;
54401+ } else
54402+ err = 0;
54403+
54404+ out:
54405+ preempt_enable();
54406+
54407+ return err;
54408+}
54409+#endif
54410+
54411+int
54412+gr_handle_proc_ptrace(struct task_struct *task)
54413+{
54414+ struct file *filp;
54415+ struct task_struct *tmp = task;
54416+ struct task_struct *curtemp = current;
54417+ __u32 retmode;
54418+
54419+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54420+ if (unlikely(!(gr_status & GR_READY)))
54421+ return 0;
54422+#endif
54423+
54424+ read_lock(&tasklist_lock);
54425+ read_lock(&grsec_exec_file_lock);
54426+ filp = task->exec_file;
54427+
54428+ while (tmp->pid > 0) {
54429+ if (tmp == curtemp)
54430+ break;
54431+ tmp = tmp->real_parent;
54432+ }
54433+
54434+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54435+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
54436+ read_unlock(&grsec_exec_file_lock);
54437+ read_unlock(&tasklist_lock);
54438+ return 1;
54439+ }
54440+
54441+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54442+ if (!(gr_status & GR_READY)) {
54443+ read_unlock(&grsec_exec_file_lock);
54444+ read_unlock(&tasklist_lock);
54445+ return 0;
54446+ }
54447+#endif
54448+
54449+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
54450+ read_unlock(&grsec_exec_file_lock);
54451+ read_unlock(&tasklist_lock);
54452+
54453+ if (retmode & GR_NOPTRACE)
54454+ return 1;
54455+
54456+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
54457+ && (current->acl != task->acl || (current->acl != current->role->root_label
54458+ && current->pid != task->pid)))
54459+ return 1;
54460+
54461+ return 0;
54462+}
54463+
54464+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
54465+{
54466+ if (unlikely(!(gr_status & GR_READY)))
54467+ return;
54468+
54469+ if (!(current->role->roletype & GR_ROLE_GOD))
54470+ return;
54471+
54472+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
54473+ p->role->rolename, gr_task_roletype_to_char(p),
54474+ p->acl->filename);
54475+}
54476+
54477+int
54478+gr_handle_ptrace(struct task_struct *task, const long request)
54479+{
54480+ struct task_struct *tmp = task;
54481+ struct task_struct *curtemp = current;
54482+ __u32 retmode;
54483+
54484+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54485+ if (unlikely(!(gr_status & GR_READY)))
54486+ return 0;
54487+#endif
54488+
54489+ read_lock(&tasklist_lock);
54490+ while (tmp->pid > 0) {
54491+ if (tmp == curtemp)
54492+ break;
54493+ tmp = tmp->real_parent;
54494+ }
54495+
54496+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54497+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
54498+ read_unlock(&tasklist_lock);
54499+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54500+ return 1;
54501+ }
54502+ read_unlock(&tasklist_lock);
54503+
54504+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54505+ if (!(gr_status & GR_READY))
54506+ return 0;
54507+#endif
54508+
54509+ read_lock(&grsec_exec_file_lock);
54510+ if (unlikely(!task->exec_file)) {
54511+ read_unlock(&grsec_exec_file_lock);
54512+ return 0;
54513+ }
54514+
54515+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
54516+ read_unlock(&grsec_exec_file_lock);
54517+
54518+ if (retmode & GR_NOPTRACE) {
54519+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54520+ return 1;
54521+ }
54522+
54523+ if (retmode & GR_PTRACERD) {
54524+ switch (request) {
54525+ case PTRACE_SEIZE:
54526+ case PTRACE_POKETEXT:
54527+ case PTRACE_POKEDATA:
54528+ case PTRACE_POKEUSR:
54529+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
54530+ case PTRACE_SETREGS:
54531+ case PTRACE_SETFPREGS:
54532+#endif
54533+#ifdef CONFIG_X86
54534+ case PTRACE_SETFPXREGS:
54535+#endif
54536+#ifdef CONFIG_ALTIVEC
54537+ case PTRACE_SETVRREGS:
54538+#endif
54539+ return 1;
54540+ default:
54541+ return 0;
54542+ }
54543+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
54544+ !(current->role->roletype & GR_ROLE_GOD) &&
54545+ (current->acl != task->acl)) {
54546+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54547+ return 1;
54548+ }
54549+
54550+ return 0;
54551+}
54552+
54553+static int is_writable_mmap(const struct file *filp)
54554+{
54555+ struct task_struct *task = current;
54556+ struct acl_object_label *obj, *obj2;
54557+
54558+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
54559+ !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))) {
54560+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54561+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
54562+ task->role->root_label);
54563+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
54564+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
54565+ return 1;
54566+ }
54567+ }
54568+ return 0;
54569+}
54570+
54571+int
54572+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
54573+{
54574+ __u32 mode;
54575+
54576+ if (unlikely(!file || !(prot & PROT_EXEC)))
54577+ return 1;
54578+
54579+ if (is_writable_mmap(file))
54580+ return 0;
54581+
54582+ mode =
54583+ gr_search_file(file->f_path.dentry,
54584+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54585+ file->f_path.mnt);
54586+
54587+ if (!gr_tpe_allow(file))
54588+ return 0;
54589+
54590+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54591+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54592+ return 0;
54593+ } else if (unlikely(!(mode & GR_EXEC))) {
54594+ return 0;
54595+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54596+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54597+ return 1;
54598+ }
54599+
54600+ return 1;
54601+}
54602+
54603+int
54604+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
54605+{
54606+ __u32 mode;
54607+
54608+ if (unlikely(!file || !(prot & PROT_EXEC)))
54609+ return 1;
54610+
54611+ if (is_writable_mmap(file))
54612+ return 0;
54613+
54614+ mode =
54615+ gr_search_file(file->f_path.dentry,
54616+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54617+ file->f_path.mnt);
54618+
54619+ if (!gr_tpe_allow(file))
54620+ return 0;
54621+
54622+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54623+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54624+ return 0;
54625+ } else if (unlikely(!(mode & GR_EXEC))) {
54626+ return 0;
54627+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54628+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54629+ return 1;
54630+ }
54631+
54632+ return 1;
54633+}
54634+
54635+void
54636+gr_acl_handle_psacct(struct task_struct *task, const long code)
54637+{
54638+ unsigned long runtime;
54639+ unsigned long cputime;
54640+ unsigned int wday, cday;
54641+ __u8 whr, chr;
54642+ __u8 wmin, cmin;
54643+ __u8 wsec, csec;
54644+ struct timespec timeval;
54645+
54646+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
54647+ !(task->acl->mode & GR_PROCACCT)))
54648+ return;
54649+
54650+ do_posix_clock_monotonic_gettime(&timeval);
54651+ runtime = timeval.tv_sec - task->start_time.tv_sec;
54652+ wday = runtime / (3600 * 24);
54653+ runtime -= wday * (3600 * 24);
54654+ whr = runtime / 3600;
54655+ runtime -= whr * 3600;
54656+ wmin = runtime / 60;
54657+ runtime -= wmin * 60;
54658+ wsec = runtime;
54659+
54660+ cputime = (task->utime + task->stime) / HZ;
54661+ cday = cputime / (3600 * 24);
54662+ cputime -= cday * (3600 * 24);
54663+ chr = cputime / 3600;
54664+ cputime -= chr * 3600;
54665+ cmin = cputime / 60;
54666+ cputime -= cmin * 60;
54667+ csec = cputime;
54668+
54669+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
54670+
54671+ return;
54672+}
54673+
54674+void gr_set_kernel_label(struct task_struct *task)
54675+{
54676+ if (gr_status & GR_READY) {
54677+ task->role = kernel_role;
54678+ task->acl = kernel_role->root_label;
54679+ }
54680+ return;
54681+}
54682+
54683+#ifdef CONFIG_TASKSTATS
54684+int gr_is_taskstats_denied(int pid)
54685+{
54686+ struct task_struct *task;
54687+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54688+ const struct cred *cred;
54689+#endif
54690+ int ret = 0;
54691+
54692+ /* restrict taskstats viewing to un-chrooted root users
54693+ who have the 'view' subject flag if the RBAC system is enabled
54694+ */
54695+
54696+ rcu_read_lock();
54697+ read_lock(&tasklist_lock);
54698+ task = find_task_by_vpid(pid);
54699+ if (task) {
54700+#ifdef CONFIG_GRKERNSEC_CHROOT
54701+ if (proc_is_chrooted(task))
54702+ ret = -EACCES;
54703+#endif
54704+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54705+ cred = __task_cred(task);
54706+#ifdef CONFIG_GRKERNSEC_PROC_USER
54707+ if (cred->uid != 0)
54708+ ret = -EACCES;
54709+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54710+ if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
54711+ ret = -EACCES;
54712+#endif
54713+#endif
54714+ if (gr_status & GR_READY) {
54715+ if (!(task->acl->mode & GR_VIEW))
54716+ ret = -EACCES;
54717+ }
54718+ } else
54719+ ret = -ENOENT;
54720+
54721+ read_unlock(&tasklist_lock);
54722+ rcu_read_unlock();
54723+
54724+ return ret;
54725+}
54726+#endif
54727+
54728+/* AUXV entries are filled via a descendant of search_binary_handler
54729+ after we've already applied the subject for the target
54730+*/
54731+int gr_acl_enable_at_secure(void)
54732+{
54733+ if (unlikely(!(gr_status & GR_READY)))
54734+ return 0;
54735+
54736+ if (current->acl->mode & GR_ATSECURE)
54737+ return 1;
54738+
54739+ return 0;
54740+}
54741+
54742+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
54743+{
54744+ struct task_struct *task = current;
54745+ struct dentry *dentry = file->f_path.dentry;
54746+ struct vfsmount *mnt = file->f_path.mnt;
54747+ struct acl_object_label *obj, *tmp;
54748+ struct acl_subject_label *subj;
54749+ unsigned int bufsize;
54750+ int is_not_root;
54751+ char *path;
54752+ dev_t dev = __get_dev(dentry);
54753+
54754+ if (unlikely(!(gr_status & GR_READY)))
54755+ return 1;
54756+
54757+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
54758+ return 1;
54759+
54760+ /* ignore Eric Biederman */
54761+ if (IS_PRIVATE(dentry->d_inode))
54762+ return 1;
54763+
54764+ subj = task->acl;
54765+ do {
54766+ obj = lookup_acl_obj_label(ino, dev, subj);
54767+ if (obj != NULL)
54768+ return (obj->mode & GR_FIND) ? 1 : 0;
54769+ } while ((subj = subj->parent_subject));
54770+
54771+ /* this is purely an optimization since we're looking for an object
54772+ for the directory we're doing a readdir on
54773+ if it's possible for any globbed object to match the entry we're
54774+ filling into the directory, then the object we find here will be
54775+ an anchor point with attached globbed objects
54776+ */
54777+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
54778+ if (obj->globbed == NULL)
54779+ return (obj->mode & GR_FIND) ? 1 : 0;
54780+
54781+ is_not_root = ((obj->filename[0] == '/') &&
54782+ (obj->filename[1] == '\0')) ? 0 : 1;
54783+ bufsize = PAGE_SIZE - namelen - is_not_root;
54784+
54785+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
54786+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
54787+ return 1;
54788+
54789+ preempt_disable();
54790+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
54791+ bufsize);
54792+
54793+ bufsize = strlen(path);
54794+
54795+ /* if base is "/", don't append an additional slash */
54796+ if (is_not_root)
54797+ *(path + bufsize) = '/';
54798+ memcpy(path + bufsize + is_not_root, name, namelen);
54799+ *(path + bufsize + namelen + is_not_root) = '\0';
54800+
54801+ tmp = obj->globbed;
54802+ while (tmp) {
54803+ if (!glob_match(tmp->filename, path)) {
54804+ preempt_enable();
54805+ return (tmp->mode & GR_FIND) ? 1 : 0;
54806+ }
54807+ tmp = tmp->next;
54808+ }
54809+ preempt_enable();
54810+ return (obj->mode & GR_FIND) ? 1 : 0;
54811+}
54812+
54813+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
54814+EXPORT_SYMBOL(gr_acl_is_enabled);
54815+#endif
54816+EXPORT_SYMBOL(gr_learn_resource);
54817+EXPORT_SYMBOL(gr_set_kernel_label);
54818+#ifdef CONFIG_SECURITY
54819+EXPORT_SYMBOL(gr_check_user_change);
54820+EXPORT_SYMBOL(gr_check_group_change);
54821+#endif
54822+
54823diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
54824new file mode 100644
54825index 0000000..34fefda
54826--- /dev/null
54827+++ b/grsecurity/gracl_alloc.c
54828@@ -0,0 +1,105 @@
54829+#include <linux/kernel.h>
54830+#include <linux/mm.h>
54831+#include <linux/slab.h>
54832+#include <linux/vmalloc.h>
54833+#include <linux/gracl.h>
54834+#include <linux/grsecurity.h>
54835+
54836+static unsigned long alloc_stack_next = 1;
54837+static unsigned long alloc_stack_size = 1;
54838+static void **alloc_stack;
54839+
54840+static __inline__ int
54841+alloc_pop(void)
54842+{
54843+ if (alloc_stack_next == 1)
54844+ return 0;
54845+
54846+ kfree(alloc_stack[alloc_stack_next - 2]);
54847+
54848+ alloc_stack_next--;
54849+
54850+ return 1;
54851+}
54852+
54853+static __inline__ int
54854+alloc_push(void *buf)
54855+{
54856+ if (alloc_stack_next >= alloc_stack_size)
54857+ return 1;
54858+
54859+ alloc_stack[alloc_stack_next - 1] = buf;
54860+
54861+ alloc_stack_next++;
54862+
54863+ return 0;
54864+}
54865+
54866+void *
54867+acl_alloc(unsigned long len)
54868+{
54869+ void *ret = NULL;
54870+
54871+ if (!len || len > PAGE_SIZE)
54872+ goto out;
54873+
54874+ ret = kmalloc(len, GFP_KERNEL);
54875+
54876+ if (ret) {
54877+ if (alloc_push(ret)) {
54878+ kfree(ret);
54879+ ret = NULL;
54880+ }
54881+ }
54882+
54883+out:
54884+ return ret;
54885+}
54886+
54887+void *
54888+acl_alloc_num(unsigned long num, unsigned long len)
54889+{
54890+ if (!len || (num > (PAGE_SIZE / len)))
54891+ return NULL;
54892+
54893+ return acl_alloc(num * len);
54894+}
54895+
54896+void
54897+acl_free_all(void)
54898+{
54899+ if (gr_acl_is_enabled() || !alloc_stack)
54900+ return;
54901+
54902+ while (alloc_pop()) ;
54903+
54904+ if (alloc_stack) {
54905+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
54906+ kfree(alloc_stack);
54907+ else
54908+ vfree(alloc_stack);
54909+ }
54910+
54911+ alloc_stack = NULL;
54912+ alloc_stack_size = 1;
54913+ alloc_stack_next = 1;
54914+
54915+ return;
54916+}
54917+
54918+int
54919+acl_alloc_stack_init(unsigned long size)
54920+{
54921+ if ((size * sizeof (void *)) <= PAGE_SIZE)
54922+ alloc_stack =
54923+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
54924+ else
54925+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
54926+
54927+ alloc_stack_size = size;
54928+
54929+ if (!alloc_stack)
54930+ return 0;
54931+ else
54932+ return 1;
54933+}
54934diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
54935new file mode 100644
54936index 0000000..6d21049
54937--- /dev/null
54938+++ b/grsecurity/gracl_cap.c
54939@@ -0,0 +1,110 @@
54940+#include <linux/kernel.h>
54941+#include <linux/module.h>
54942+#include <linux/sched.h>
54943+#include <linux/gracl.h>
54944+#include <linux/grsecurity.h>
54945+#include <linux/grinternal.h>
54946+
54947+extern const char *captab_log[];
54948+extern int captab_log_entries;
54949+
54950+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
54951+{
54952+ struct acl_subject_label *curracl;
54953+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
54954+ kernel_cap_t cap_audit = __cap_empty_set;
54955+
54956+ if (!gr_acl_is_enabled())
54957+ return 1;
54958+
54959+ curracl = task->acl;
54960+
54961+ cap_drop = curracl->cap_lower;
54962+ cap_mask = curracl->cap_mask;
54963+ cap_audit = curracl->cap_invert_audit;
54964+
54965+ while ((curracl = curracl->parent_subject)) {
54966+ /* if the cap isn't specified in the current computed mask but is specified in the
54967+ current level subject, and is lowered in the current level subject, then add
54968+ it to the set of dropped capabilities
54969+ otherwise, add the current level subject's mask to the current computed mask
54970+ */
54971+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
54972+ cap_raise(cap_mask, cap);
54973+ if (cap_raised(curracl->cap_lower, cap))
54974+ cap_raise(cap_drop, cap);
54975+ if (cap_raised(curracl->cap_invert_audit, cap))
54976+ cap_raise(cap_audit, cap);
54977+ }
54978+ }
54979+
54980+ if (!cap_raised(cap_drop, cap)) {
54981+ if (cap_raised(cap_audit, cap))
54982+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
54983+ return 1;
54984+ }
54985+
54986+ curracl = task->acl;
54987+
54988+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
54989+ && cap_raised(cred->cap_effective, cap)) {
54990+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
54991+ task->role->roletype, cred->uid,
54992+ cred->gid, task->exec_file ?
54993+ gr_to_filename(task->exec_file->f_path.dentry,
54994+ task->exec_file->f_path.mnt) : curracl->filename,
54995+ curracl->filename, 0UL,
54996+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
54997+ return 1;
54998+ }
54999+
55000+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
55001+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
55002+
55003+ return 0;
55004+}
55005+
55006+int
55007+gr_acl_is_capable(const int cap)
55008+{
55009+ return gr_task_acl_is_capable(current, current_cred(), cap);
55010+}
55011+
55012+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
55013+{
55014+ struct acl_subject_label *curracl;
55015+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55016+
55017+ if (!gr_acl_is_enabled())
55018+ return 1;
55019+
55020+ curracl = task->acl;
55021+
55022+ cap_drop = curracl->cap_lower;
55023+ cap_mask = curracl->cap_mask;
55024+
55025+ while ((curracl = curracl->parent_subject)) {
55026+ /* if the cap isn't specified in the current computed mask but is specified in the
55027+ current level subject, and is lowered in the current level subject, then add
55028+ it to the set of dropped capabilities
55029+ otherwise, add the current level subject's mask to the current computed mask
55030+ */
55031+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55032+ cap_raise(cap_mask, cap);
55033+ if (cap_raised(curracl->cap_lower, cap))
55034+ cap_raise(cap_drop, cap);
55035+ }
55036+ }
55037+
55038+ if (!cap_raised(cap_drop, cap))
55039+ return 1;
55040+
55041+ return 0;
55042+}
55043+
55044+int
55045+gr_acl_is_capable_nolog(const int cap)
55046+{
55047+ return gr_task_acl_is_capable_nolog(current, cap);
55048+}
55049+
55050diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
55051new file mode 100644
55052index 0000000..88d0e87
55053--- /dev/null
55054+++ b/grsecurity/gracl_fs.c
55055@@ -0,0 +1,435 @@
55056+#include <linux/kernel.h>
55057+#include <linux/sched.h>
55058+#include <linux/types.h>
55059+#include <linux/fs.h>
55060+#include <linux/file.h>
55061+#include <linux/stat.h>
55062+#include <linux/grsecurity.h>
55063+#include <linux/grinternal.h>
55064+#include <linux/gracl.h>
55065+
55066+umode_t
55067+gr_acl_umask(void)
55068+{
55069+ if (unlikely(!gr_acl_is_enabled()))
55070+ return 0;
55071+
55072+ return current->role->umask;
55073+}
55074+
55075+__u32
55076+gr_acl_handle_hidden_file(const struct dentry * dentry,
55077+ const struct vfsmount * mnt)
55078+{
55079+ __u32 mode;
55080+
55081+ if (unlikely(!dentry->d_inode))
55082+ return GR_FIND;
55083+
55084+ mode =
55085+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
55086+
55087+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
55088+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55089+ return mode;
55090+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
55091+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55092+ return 0;
55093+ } else if (unlikely(!(mode & GR_FIND)))
55094+ return 0;
55095+
55096+ return GR_FIND;
55097+}
55098+
55099+__u32
55100+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
55101+ int acc_mode)
55102+{
55103+ __u32 reqmode = GR_FIND;
55104+ __u32 mode;
55105+
55106+ if (unlikely(!dentry->d_inode))
55107+ return reqmode;
55108+
55109+ if (acc_mode & MAY_APPEND)
55110+ reqmode |= GR_APPEND;
55111+ else if (acc_mode & MAY_WRITE)
55112+ reqmode |= GR_WRITE;
55113+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
55114+ reqmode |= GR_READ;
55115+
55116+ mode =
55117+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55118+ mnt);
55119+
55120+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55121+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55122+ reqmode & GR_READ ? " reading" : "",
55123+ reqmode & GR_WRITE ? " writing" : reqmode &
55124+ GR_APPEND ? " appending" : "");
55125+ return reqmode;
55126+ } else
55127+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55128+ {
55129+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55130+ reqmode & GR_READ ? " reading" : "",
55131+ reqmode & GR_WRITE ? " writing" : reqmode &
55132+ GR_APPEND ? " appending" : "");
55133+ return 0;
55134+ } else if (unlikely((mode & reqmode) != reqmode))
55135+ return 0;
55136+
55137+ return reqmode;
55138+}
55139+
55140+__u32
55141+gr_acl_handle_creat(const struct dentry * dentry,
55142+ const struct dentry * p_dentry,
55143+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
55144+ const int imode)
55145+{
55146+ __u32 reqmode = GR_WRITE | GR_CREATE;
55147+ __u32 mode;
55148+
55149+ if (acc_mode & MAY_APPEND)
55150+ reqmode |= GR_APPEND;
55151+ // if a directory was required or the directory already exists, then
55152+ // don't count this open as a read
55153+ if ((acc_mode & MAY_READ) &&
55154+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
55155+ reqmode |= GR_READ;
55156+ if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
55157+ reqmode |= GR_SETID;
55158+
55159+ mode =
55160+ gr_check_create(dentry, p_dentry, p_mnt,
55161+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55162+
55163+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55164+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55165+ reqmode & GR_READ ? " reading" : "",
55166+ reqmode & GR_WRITE ? " writing" : reqmode &
55167+ GR_APPEND ? " appending" : "");
55168+ return reqmode;
55169+ } else
55170+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55171+ {
55172+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55173+ reqmode & GR_READ ? " reading" : "",
55174+ reqmode & GR_WRITE ? " writing" : reqmode &
55175+ GR_APPEND ? " appending" : "");
55176+ return 0;
55177+ } else if (unlikely((mode & reqmode) != reqmode))
55178+ return 0;
55179+
55180+ return reqmode;
55181+}
55182+
55183+__u32
55184+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
55185+ const int fmode)
55186+{
55187+ __u32 mode, reqmode = GR_FIND;
55188+
55189+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
55190+ reqmode |= GR_EXEC;
55191+ if (fmode & S_IWOTH)
55192+ reqmode |= GR_WRITE;
55193+ if (fmode & S_IROTH)
55194+ reqmode |= GR_READ;
55195+
55196+ mode =
55197+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55198+ mnt);
55199+
55200+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55201+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55202+ reqmode & GR_READ ? " reading" : "",
55203+ reqmode & GR_WRITE ? " writing" : "",
55204+ reqmode & GR_EXEC ? " executing" : "");
55205+ return reqmode;
55206+ } else
55207+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55208+ {
55209+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55210+ reqmode & GR_READ ? " reading" : "",
55211+ reqmode & GR_WRITE ? " writing" : "",
55212+ reqmode & GR_EXEC ? " executing" : "");
55213+ return 0;
55214+ } else if (unlikely((mode & reqmode) != reqmode))
55215+ return 0;
55216+
55217+ return reqmode;
55218+}
55219+
55220+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
55221+{
55222+ __u32 mode;
55223+
55224+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
55225+
55226+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55227+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
55228+ return mode;
55229+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55230+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
55231+ return 0;
55232+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55233+ return 0;
55234+
55235+ return (reqmode);
55236+}
55237+
55238+__u32
55239+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
55240+{
55241+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
55242+}
55243+
55244+__u32
55245+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
55246+{
55247+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
55248+}
55249+
55250+__u32
55251+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
55252+{
55253+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
55254+}
55255+
55256+__u32
55257+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
55258+{
55259+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
55260+}
55261+
55262+__u32
55263+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
55264+ umode_t *modeptr)
55265+{
55266+ umode_t mode;
55267+
55268+ *modeptr &= ~gr_acl_umask();
55269+ mode = *modeptr;
55270+
55271+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
55272+ return 1;
55273+
55274+ if (unlikely(mode & (S_ISUID | S_ISGID))) {
55275+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
55276+ GR_CHMOD_ACL_MSG);
55277+ } else {
55278+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
55279+ }
55280+}
55281+
55282+__u32
55283+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
55284+{
55285+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
55286+}
55287+
55288+__u32
55289+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
55290+{
55291+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
55292+}
55293+
55294+__u32
55295+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
55296+{
55297+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
55298+}
55299+
55300+__u32
55301+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
55302+{
55303+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
55304+ GR_UNIXCONNECT_ACL_MSG);
55305+}
55306+
55307+/* hardlinks require at minimum create and link permission,
55308+ any additional privilege required is based on the
55309+ privilege of the file being linked to
55310+*/
55311+__u32
55312+gr_acl_handle_link(const struct dentry * new_dentry,
55313+ const struct dentry * parent_dentry,
55314+ const struct vfsmount * parent_mnt,
55315+ const struct dentry * old_dentry,
55316+ const struct vfsmount * old_mnt, const char *to)
55317+{
55318+ __u32 mode;
55319+ __u32 needmode = GR_CREATE | GR_LINK;
55320+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
55321+
55322+ mode =
55323+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
55324+ old_mnt);
55325+
55326+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
55327+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55328+ return mode;
55329+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55330+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55331+ return 0;
55332+ } else if (unlikely((mode & needmode) != needmode))
55333+ return 0;
55334+
55335+ return 1;
55336+}
55337+
55338+__u32
55339+gr_acl_handle_symlink(const struct dentry * new_dentry,
55340+ const struct dentry * parent_dentry,
55341+ const struct vfsmount * parent_mnt, const char *from)
55342+{
55343+ __u32 needmode = GR_WRITE | GR_CREATE;
55344+ __u32 mode;
55345+
55346+ mode =
55347+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
55348+ GR_CREATE | GR_AUDIT_CREATE |
55349+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
55350+
55351+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
55352+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55353+ return mode;
55354+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55355+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55356+ return 0;
55357+ } else if (unlikely((mode & needmode) != needmode))
55358+ return 0;
55359+
55360+ return (GR_WRITE | GR_CREATE);
55361+}
55362+
55363+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)
55364+{
55365+ __u32 mode;
55366+
55367+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55368+
55369+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55370+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
55371+ return mode;
55372+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55373+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
55374+ return 0;
55375+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55376+ return 0;
55377+
55378+ return (reqmode);
55379+}
55380+
55381+__u32
55382+gr_acl_handle_mknod(const struct dentry * new_dentry,
55383+ const struct dentry * parent_dentry,
55384+ const struct vfsmount * parent_mnt,
55385+ const int mode)
55386+{
55387+ __u32 reqmode = GR_WRITE | GR_CREATE;
55388+ if (unlikely(mode & (S_ISUID | S_ISGID)))
55389+ reqmode |= GR_SETID;
55390+
55391+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55392+ reqmode, GR_MKNOD_ACL_MSG);
55393+}
55394+
55395+__u32
55396+gr_acl_handle_mkdir(const struct dentry *new_dentry,
55397+ const struct dentry *parent_dentry,
55398+ const struct vfsmount *parent_mnt)
55399+{
55400+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55401+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
55402+}
55403+
55404+#define RENAME_CHECK_SUCCESS(old, new) \
55405+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
55406+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
55407+
55408+int
55409+gr_acl_handle_rename(struct dentry *new_dentry,
55410+ struct dentry *parent_dentry,
55411+ const struct vfsmount *parent_mnt,
55412+ struct dentry *old_dentry,
55413+ struct inode *old_parent_inode,
55414+ struct vfsmount *old_mnt, const char *newname)
55415+{
55416+ __u32 comp1, comp2;
55417+ int error = 0;
55418+
55419+ if (unlikely(!gr_acl_is_enabled()))
55420+ return 0;
55421+
55422+ if (!new_dentry->d_inode) {
55423+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
55424+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
55425+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
55426+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
55427+ GR_DELETE | GR_AUDIT_DELETE |
55428+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55429+ GR_SUPPRESS, old_mnt);
55430+ } else {
55431+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
55432+ GR_CREATE | GR_DELETE |
55433+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
55434+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55435+ GR_SUPPRESS, parent_mnt);
55436+ comp2 =
55437+ gr_search_file(old_dentry,
55438+ GR_READ | GR_WRITE | GR_AUDIT_READ |
55439+ GR_DELETE | GR_AUDIT_DELETE |
55440+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
55441+ }
55442+
55443+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
55444+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
55445+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55446+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
55447+ && !(comp2 & GR_SUPPRESS)) {
55448+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55449+ error = -EACCES;
55450+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
55451+ error = -EACCES;
55452+
55453+ return error;
55454+}
55455+
55456+void
55457+gr_acl_handle_exit(void)
55458+{
55459+ u16 id;
55460+ char *rolename;
55461+ struct file *exec_file;
55462+
55463+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
55464+ !(current->role->roletype & GR_ROLE_PERSIST))) {
55465+ id = current->acl_role_id;
55466+ rolename = current->role->rolename;
55467+ gr_set_acls(1);
55468+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
55469+ }
55470+
55471+ write_lock(&grsec_exec_file_lock);
55472+ exec_file = current->exec_file;
55473+ current->exec_file = NULL;
55474+ write_unlock(&grsec_exec_file_lock);
55475+
55476+ if (exec_file)
55477+ fput(exec_file);
55478+}
55479+
55480+int
55481+gr_acl_handle_procpidmem(const struct task_struct *task)
55482+{
55483+ if (unlikely(!gr_acl_is_enabled()))
55484+ return 0;
55485+
55486+ if (task != current && task->acl->mode & GR_PROTPROCFD)
55487+ return -EACCES;
55488+
55489+ return 0;
55490+}
55491diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
55492new file mode 100644
55493index 0000000..58800a7
55494--- /dev/null
55495+++ b/grsecurity/gracl_ip.c
55496@@ -0,0 +1,384 @@
55497+#include <linux/kernel.h>
55498+#include <asm/uaccess.h>
55499+#include <asm/errno.h>
55500+#include <net/sock.h>
55501+#include <linux/file.h>
55502+#include <linux/fs.h>
55503+#include <linux/net.h>
55504+#include <linux/in.h>
55505+#include <linux/skbuff.h>
55506+#include <linux/ip.h>
55507+#include <linux/udp.h>
55508+#include <linux/types.h>
55509+#include <linux/sched.h>
55510+#include <linux/netdevice.h>
55511+#include <linux/inetdevice.h>
55512+#include <linux/gracl.h>
55513+#include <linux/grsecurity.h>
55514+#include <linux/grinternal.h>
55515+
55516+#define GR_BIND 0x01
55517+#define GR_CONNECT 0x02
55518+#define GR_INVERT 0x04
55519+#define GR_BINDOVERRIDE 0x08
55520+#define GR_CONNECTOVERRIDE 0x10
55521+#define GR_SOCK_FAMILY 0x20
55522+
55523+static const char * gr_protocols[IPPROTO_MAX] = {
55524+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
55525+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
55526+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
55527+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
55528+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
55529+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
55530+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
55531+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
55532+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
55533+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
55534+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
55535+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
55536+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
55537+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
55538+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
55539+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
55540+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
55541+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
55542+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
55543+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
55544+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
55545+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
55546+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
55547+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
55548+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
55549+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
55550+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
55551+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
55552+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
55553+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
55554+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
55555+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
55556+ };
55557+
55558+static const char * gr_socktypes[SOCK_MAX] = {
55559+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
55560+ "unknown:7", "unknown:8", "unknown:9", "packet"
55561+ };
55562+
55563+static const char * gr_sockfamilies[AF_MAX+1] = {
55564+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
55565+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
55566+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
55567+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
55568+ };
55569+
55570+const char *
55571+gr_proto_to_name(unsigned char proto)
55572+{
55573+ return gr_protocols[proto];
55574+}
55575+
55576+const char *
55577+gr_socktype_to_name(unsigned char type)
55578+{
55579+ return gr_socktypes[type];
55580+}
55581+
55582+const char *
55583+gr_sockfamily_to_name(unsigned char family)
55584+{
55585+ return gr_sockfamilies[family];
55586+}
55587+
55588+int
55589+gr_search_socket(const int domain, const int type, const int protocol)
55590+{
55591+ struct acl_subject_label *curr;
55592+ const struct cred *cred = current_cred();
55593+
55594+ if (unlikely(!gr_acl_is_enabled()))
55595+ goto exit;
55596+
55597+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
55598+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
55599+ goto exit; // let the kernel handle it
55600+
55601+ curr = current->acl;
55602+
55603+ if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
55604+ /* the family is allowed, if this is PF_INET allow it only if
55605+ the extra sock type/protocol checks pass */
55606+ if (domain == PF_INET)
55607+ goto inet_check;
55608+ goto exit;
55609+ } else {
55610+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55611+ __u32 fakeip = 0;
55612+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55613+ current->role->roletype, cred->uid,
55614+ cred->gid, current->exec_file ?
55615+ gr_to_filename(current->exec_file->f_path.dentry,
55616+ current->exec_file->f_path.mnt) :
55617+ curr->filename, curr->filename,
55618+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
55619+ &current->signal->saved_ip);
55620+ goto exit;
55621+ }
55622+ goto exit_fail;
55623+ }
55624+
55625+inet_check:
55626+ /* the rest of this checking is for IPv4 only */
55627+ if (!curr->ips)
55628+ goto exit;
55629+
55630+ if ((curr->ip_type & (1 << type)) &&
55631+ (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
55632+ goto exit;
55633+
55634+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55635+ /* we don't place acls on raw sockets , and sometimes
55636+ dgram/ip sockets are opened for ioctl and not
55637+ bind/connect, so we'll fake a bind learn log */
55638+ if (type == SOCK_RAW || type == SOCK_PACKET) {
55639+ __u32 fakeip = 0;
55640+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55641+ current->role->roletype, cred->uid,
55642+ cred->gid, current->exec_file ?
55643+ gr_to_filename(current->exec_file->f_path.dentry,
55644+ current->exec_file->f_path.mnt) :
55645+ curr->filename, curr->filename,
55646+ &fakeip, 0, type,
55647+ protocol, GR_CONNECT, &current->signal->saved_ip);
55648+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
55649+ __u32 fakeip = 0;
55650+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55651+ current->role->roletype, cred->uid,
55652+ cred->gid, current->exec_file ?
55653+ gr_to_filename(current->exec_file->f_path.dentry,
55654+ current->exec_file->f_path.mnt) :
55655+ curr->filename, curr->filename,
55656+ &fakeip, 0, type,
55657+ protocol, GR_BIND, &current->signal->saved_ip);
55658+ }
55659+ /* we'll log when they use connect or bind */
55660+ goto exit;
55661+ }
55662+
55663+exit_fail:
55664+ if (domain == PF_INET)
55665+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
55666+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
55667+ else
55668+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
55669+ gr_socktype_to_name(type), protocol);
55670+
55671+ return 0;
55672+exit:
55673+ return 1;
55674+}
55675+
55676+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)
55677+{
55678+ if ((ip->mode & mode) &&
55679+ (ip_port >= ip->low) &&
55680+ (ip_port <= ip->high) &&
55681+ ((ntohl(ip_addr) & our_netmask) ==
55682+ (ntohl(our_addr) & our_netmask))
55683+ && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
55684+ && (ip->type & (1 << type))) {
55685+ if (ip->mode & GR_INVERT)
55686+ return 2; // specifically denied
55687+ else
55688+ return 1; // allowed
55689+ }
55690+
55691+ return 0; // not specifically allowed, may continue parsing
55692+}
55693+
55694+static int
55695+gr_search_connectbind(const int full_mode, struct sock *sk,
55696+ struct sockaddr_in *addr, const int type)
55697+{
55698+ char iface[IFNAMSIZ] = {0};
55699+ struct acl_subject_label *curr;
55700+ struct acl_ip_label *ip;
55701+ struct inet_sock *isk;
55702+ struct net_device *dev;
55703+ struct in_device *idev;
55704+ unsigned long i;
55705+ int ret;
55706+ int mode = full_mode & (GR_BIND | GR_CONNECT);
55707+ __u32 ip_addr = 0;
55708+ __u32 our_addr;
55709+ __u32 our_netmask;
55710+ char *p;
55711+ __u16 ip_port = 0;
55712+ const struct cred *cred = current_cred();
55713+
55714+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
55715+ return 0;
55716+
55717+ curr = current->acl;
55718+ isk = inet_sk(sk);
55719+
55720+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
55721+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
55722+ addr->sin_addr.s_addr = curr->inaddr_any_override;
55723+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
55724+ struct sockaddr_in saddr;
55725+ int err;
55726+
55727+ saddr.sin_family = AF_INET;
55728+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
55729+ saddr.sin_port = isk->inet_sport;
55730+
55731+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
55732+ if (err)
55733+ return err;
55734+
55735+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
55736+ if (err)
55737+ return err;
55738+ }
55739+
55740+ if (!curr->ips)
55741+ return 0;
55742+
55743+ ip_addr = addr->sin_addr.s_addr;
55744+ ip_port = ntohs(addr->sin_port);
55745+
55746+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55747+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55748+ current->role->roletype, cred->uid,
55749+ cred->gid, current->exec_file ?
55750+ gr_to_filename(current->exec_file->f_path.dentry,
55751+ current->exec_file->f_path.mnt) :
55752+ curr->filename, curr->filename,
55753+ &ip_addr, ip_port, type,
55754+ sk->sk_protocol, mode, &current->signal->saved_ip);
55755+ return 0;
55756+ }
55757+
55758+ for (i = 0; i < curr->ip_num; i++) {
55759+ ip = *(curr->ips + i);
55760+ if (ip->iface != NULL) {
55761+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
55762+ p = strchr(iface, ':');
55763+ if (p != NULL)
55764+ *p = '\0';
55765+ dev = dev_get_by_name(sock_net(sk), iface);
55766+ if (dev == NULL)
55767+ continue;
55768+ idev = in_dev_get(dev);
55769+ if (idev == NULL) {
55770+ dev_put(dev);
55771+ continue;
55772+ }
55773+ rcu_read_lock();
55774+ for_ifa(idev) {
55775+ if (!strcmp(ip->iface, ifa->ifa_label)) {
55776+ our_addr = ifa->ifa_address;
55777+ our_netmask = 0xffffffff;
55778+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
55779+ if (ret == 1) {
55780+ rcu_read_unlock();
55781+ in_dev_put(idev);
55782+ dev_put(dev);
55783+ return 0;
55784+ } else if (ret == 2) {
55785+ rcu_read_unlock();
55786+ in_dev_put(idev);
55787+ dev_put(dev);
55788+ goto denied;
55789+ }
55790+ }
55791+ } endfor_ifa(idev);
55792+ rcu_read_unlock();
55793+ in_dev_put(idev);
55794+ dev_put(dev);
55795+ } else {
55796+ our_addr = ip->addr;
55797+ our_netmask = ip->netmask;
55798+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
55799+ if (ret == 1)
55800+ return 0;
55801+ else if (ret == 2)
55802+ goto denied;
55803+ }
55804+ }
55805+
55806+denied:
55807+ if (mode == GR_BIND)
55808+ 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));
55809+ else if (mode == GR_CONNECT)
55810+ 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));
55811+
55812+ return -EACCES;
55813+}
55814+
55815+int
55816+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
55817+{
55818+ /* always allow disconnection of dgram sockets with connect */
55819+ if (addr->sin_family == AF_UNSPEC)
55820+ return 0;
55821+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
55822+}
55823+
55824+int
55825+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
55826+{
55827+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
55828+}
55829+
55830+int gr_search_listen(struct socket *sock)
55831+{
55832+ struct sock *sk = sock->sk;
55833+ struct sockaddr_in addr;
55834+
55835+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
55836+ addr.sin_port = inet_sk(sk)->inet_sport;
55837+
55838+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
55839+}
55840+
55841+int gr_search_accept(struct socket *sock)
55842+{
55843+ struct sock *sk = sock->sk;
55844+ struct sockaddr_in addr;
55845+
55846+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
55847+ addr.sin_port = inet_sk(sk)->inet_sport;
55848+
55849+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
55850+}
55851+
55852+int
55853+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
55854+{
55855+ if (addr)
55856+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
55857+ else {
55858+ struct sockaddr_in sin;
55859+ const struct inet_sock *inet = inet_sk(sk);
55860+
55861+ sin.sin_addr.s_addr = inet->inet_daddr;
55862+ sin.sin_port = inet->inet_dport;
55863+
55864+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
55865+ }
55866+}
55867+
55868+int
55869+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
55870+{
55871+ struct sockaddr_in sin;
55872+
55873+ if (unlikely(skb->len < sizeof (struct udphdr)))
55874+ return 0; // skip this packet
55875+
55876+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
55877+ sin.sin_port = udp_hdr(skb)->source;
55878+
55879+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
55880+}
55881diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
55882new file mode 100644
55883index 0000000..25f54ef
55884--- /dev/null
55885+++ b/grsecurity/gracl_learn.c
55886@@ -0,0 +1,207 @@
55887+#include <linux/kernel.h>
55888+#include <linux/mm.h>
55889+#include <linux/sched.h>
55890+#include <linux/poll.h>
55891+#include <linux/string.h>
55892+#include <linux/file.h>
55893+#include <linux/types.h>
55894+#include <linux/vmalloc.h>
55895+#include <linux/grinternal.h>
55896+
55897+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
55898+ size_t count, loff_t *ppos);
55899+extern int gr_acl_is_enabled(void);
55900+
55901+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
55902+static int gr_learn_attached;
55903+
55904+/* use a 512k buffer */
55905+#define LEARN_BUFFER_SIZE (512 * 1024)
55906+
55907+static DEFINE_SPINLOCK(gr_learn_lock);
55908+static DEFINE_MUTEX(gr_learn_user_mutex);
55909+
55910+/* we need to maintain two buffers, so that the kernel context of grlearn
55911+ uses a semaphore around the userspace copying, and the other kernel contexts
55912+ use a spinlock when copying into the buffer, since they cannot sleep
55913+*/
55914+static char *learn_buffer;
55915+static char *learn_buffer_user;
55916+static int learn_buffer_len;
55917+static int learn_buffer_user_len;
55918+
55919+static ssize_t
55920+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
55921+{
55922+ DECLARE_WAITQUEUE(wait, current);
55923+ ssize_t retval = 0;
55924+
55925+ add_wait_queue(&learn_wait, &wait);
55926+ set_current_state(TASK_INTERRUPTIBLE);
55927+ do {
55928+ mutex_lock(&gr_learn_user_mutex);
55929+ spin_lock(&gr_learn_lock);
55930+ if (learn_buffer_len)
55931+ break;
55932+ spin_unlock(&gr_learn_lock);
55933+ mutex_unlock(&gr_learn_user_mutex);
55934+ if (file->f_flags & O_NONBLOCK) {
55935+ retval = -EAGAIN;
55936+ goto out;
55937+ }
55938+ if (signal_pending(current)) {
55939+ retval = -ERESTARTSYS;
55940+ goto out;
55941+ }
55942+
55943+ schedule();
55944+ } while (1);
55945+
55946+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
55947+ learn_buffer_user_len = learn_buffer_len;
55948+ retval = learn_buffer_len;
55949+ learn_buffer_len = 0;
55950+
55951+ spin_unlock(&gr_learn_lock);
55952+
55953+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
55954+ retval = -EFAULT;
55955+
55956+ mutex_unlock(&gr_learn_user_mutex);
55957+out:
55958+ set_current_state(TASK_RUNNING);
55959+ remove_wait_queue(&learn_wait, &wait);
55960+ return retval;
55961+}
55962+
55963+static unsigned int
55964+poll_learn(struct file * file, poll_table * wait)
55965+{
55966+ poll_wait(file, &learn_wait, wait);
55967+
55968+ if (learn_buffer_len)
55969+ return (POLLIN | POLLRDNORM);
55970+
55971+ return 0;
55972+}
55973+
55974+void
55975+gr_clear_learn_entries(void)
55976+{
55977+ char *tmp;
55978+
55979+ mutex_lock(&gr_learn_user_mutex);
55980+ spin_lock(&gr_learn_lock);
55981+ tmp = learn_buffer;
55982+ learn_buffer = NULL;
55983+ spin_unlock(&gr_learn_lock);
55984+ if (tmp)
55985+ vfree(tmp);
55986+ if (learn_buffer_user != NULL) {
55987+ vfree(learn_buffer_user);
55988+ learn_buffer_user = NULL;
55989+ }
55990+ learn_buffer_len = 0;
55991+ mutex_unlock(&gr_learn_user_mutex);
55992+
55993+ return;
55994+}
55995+
55996+void
55997+gr_add_learn_entry(const char *fmt, ...)
55998+{
55999+ va_list args;
56000+ unsigned int len;
56001+
56002+ if (!gr_learn_attached)
56003+ return;
56004+
56005+ spin_lock(&gr_learn_lock);
56006+
56007+ /* leave a gap at the end so we know when it's "full" but don't have to
56008+ compute the exact length of the string we're trying to append
56009+ */
56010+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
56011+ spin_unlock(&gr_learn_lock);
56012+ wake_up_interruptible(&learn_wait);
56013+ return;
56014+ }
56015+ if (learn_buffer == NULL) {
56016+ spin_unlock(&gr_learn_lock);
56017+ return;
56018+ }
56019+
56020+ va_start(args, fmt);
56021+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
56022+ va_end(args);
56023+
56024+ learn_buffer_len += len + 1;
56025+
56026+ spin_unlock(&gr_learn_lock);
56027+ wake_up_interruptible(&learn_wait);
56028+
56029+ return;
56030+}
56031+
56032+static int
56033+open_learn(struct inode *inode, struct file *file)
56034+{
56035+ if (file->f_mode & FMODE_READ && gr_learn_attached)
56036+ return -EBUSY;
56037+ if (file->f_mode & FMODE_READ) {
56038+ int retval = 0;
56039+ mutex_lock(&gr_learn_user_mutex);
56040+ if (learn_buffer == NULL)
56041+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
56042+ if (learn_buffer_user == NULL)
56043+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
56044+ if (learn_buffer == NULL) {
56045+ retval = -ENOMEM;
56046+ goto out_error;
56047+ }
56048+ if (learn_buffer_user == NULL) {
56049+ retval = -ENOMEM;
56050+ goto out_error;
56051+ }
56052+ learn_buffer_len = 0;
56053+ learn_buffer_user_len = 0;
56054+ gr_learn_attached = 1;
56055+out_error:
56056+ mutex_unlock(&gr_learn_user_mutex);
56057+ return retval;
56058+ }
56059+ return 0;
56060+}
56061+
56062+static int
56063+close_learn(struct inode *inode, struct file *file)
56064+{
56065+ if (file->f_mode & FMODE_READ) {
56066+ char *tmp = NULL;
56067+ mutex_lock(&gr_learn_user_mutex);
56068+ spin_lock(&gr_learn_lock);
56069+ tmp = learn_buffer;
56070+ learn_buffer = NULL;
56071+ spin_unlock(&gr_learn_lock);
56072+ if (tmp)
56073+ vfree(tmp);
56074+ if (learn_buffer_user != NULL) {
56075+ vfree(learn_buffer_user);
56076+ learn_buffer_user = NULL;
56077+ }
56078+ learn_buffer_len = 0;
56079+ learn_buffer_user_len = 0;
56080+ gr_learn_attached = 0;
56081+ mutex_unlock(&gr_learn_user_mutex);
56082+ }
56083+
56084+ return 0;
56085+}
56086+
56087+const struct file_operations grsec_fops = {
56088+ .read = read_learn,
56089+ .write = write_grsec_handler,
56090+ .open = open_learn,
56091+ .release = close_learn,
56092+ .poll = poll_learn,
56093+};
56094diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
56095new file mode 100644
56096index 0000000..39645c9
56097--- /dev/null
56098+++ b/grsecurity/gracl_res.c
56099@@ -0,0 +1,68 @@
56100+#include <linux/kernel.h>
56101+#include <linux/sched.h>
56102+#include <linux/gracl.h>
56103+#include <linux/grinternal.h>
56104+
56105+static const char *restab_log[] = {
56106+ [RLIMIT_CPU] = "RLIMIT_CPU",
56107+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
56108+ [RLIMIT_DATA] = "RLIMIT_DATA",
56109+ [RLIMIT_STACK] = "RLIMIT_STACK",
56110+ [RLIMIT_CORE] = "RLIMIT_CORE",
56111+ [RLIMIT_RSS] = "RLIMIT_RSS",
56112+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
56113+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
56114+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
56115+ [RLIMIT_AS] = "RLIMIT_AS",
56116+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
56117+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
56118+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
56119+ [RLIMIT_NICE] = "RLIMIT_NICE",
56120+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
56121+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
56122+ [GR_CRASH_RES] = "RLIMIT_CRASH"
56123+};
56124+
56125+void
56126+gr_log_resource(const struct task_struct *task,
56127+ const int res, const unsigned long wanted, const int gt)
56128+{
56129+ const struct cred *cred;
56130+ unsigned long rlim;
56131+
56132+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
56133+ return;
56134+
56135+ // not yet supported resource
56136+ if (unlikely(!restab_log[res]))
56137+ return;
56138+
56139+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
56140+ rlim = task_rlimit_max(task, res);
56141+ else
56142+ rlim = task_rlimit(task, res);
56143+
56144+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
56145+ return;
56146+
56147+ rcu_read_lock();
56148+ cred = __task_cred(task);
56149+
56150+ if (res == RLIMIT_NPROC &&
56151+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
56152+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
56153+ goto out_rcu_unlock;
56154+ else if (res == RLIMIT_MEMLOCK &&
56155+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
56156+ goto out_rcu_unlock;
56157+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
56158+ goto out_rcu_unlock;
56159+ rcu_read_unlock();
56160+
56161+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
56162+
56163+ return;
56164+out_rcu_unlock:
56165+ rcu_read_unlock();
56166+ return;
56167+}
56168diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
56169new file mode 100644
56170index 0000000..5556be3
56171--- /dev/null
56172+++ b/grsecurity/gracl_segv.c
56173@@ -0,0 +1,299 @@
56174+#include <linux/kernel.h>
56175+#include <linux/mm.h>
56176+#include <asm/uaccess.h>
56177+#include <asm/errno.h>
56178+#include <asm/mman.h>
56179+#include <net/sock.h>
56180+#include <linux/file.h>
56181+#include <linux/fs.h>
56182+#include <linux/net.h>
56183+#include <linux/in.h>
56184+#include <linux/slab.h>
56185+#include <linux/types.h>
56186+#include <linux/sched.h>
56187+#include <linux/timer.h>
56188+#include <linux/gracl.h>
56189+#include <linux/grsecurity.h>
56190+#include <linux/grinternal.h>
56191+
56192+static struct crash_uid *uid_set;
56193+static unsigned short uid_used;
56194+static DEFINE_SPINLOCK(gr_uid_lock);
56195+extern rwlock_t gr_inode_lock;
56196+extern struct acl_subject_label *
56197+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
56198+ struct acl_role_label *role);
56199+
56200+#ifdef CONFIG_BTRFS_FS
56201+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
56202+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
56203+#endif
56204+
56205+static inline dev_t __get_dev(const struct dentry *dentry)
56206+{
56207+#ifdef CONFIG_BTRFS_FS
56208+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
56209+ return get_btrfs_dev_from_inode(dentry->d_inode);
56210+ else
56211+#endif
56212+ return dentry->d_inode->i_sb->s_dev;
56213+}
56214+
56215+int
56216+gr_init_uidset(void)
56217+{
56218+ uid_set =
56219+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
56220+ uid_used = 0;
56221+
56222+ return uid_set ? 1 : 0;
56223+}
56224+
56225+void
56226+gr_free_uidset(void)
56227+{
56228+ if (uid_set)
56229+ kfree(uid_set);
56230+
56231+ return;
56232+}
56233+
56234+int
56235+gr_find_uid(const uid_t uid)
56236+{
56237+ struct crash_uid *tmp = uid_set;
56238+ uid_t buid;
56239+ int low = 0, high = uid_used - 1, mid;
56240+
56241+ while (high >= low) {
56242+ mid = (low + high) >> 1;
56243+ buid = tmp[mid].uid;
56244+ if (buid == uid)
56245+ return mid;
56246+ if (buid > uid)
56247+ high = mid - 1;
56248+ if (buid < uid)
56249+ low = mid + 1;
56250+ }
56251+
56252+ return -1;
56253+}
56254+
56255+static __inline__ void
56256+gr_insertsort(void)
56257+{
56258+ unsigned short i, j;
56259+ struct crash_uid index;
56260+
56261+ for (i = 1; i < uid_used; i++) {
56262+ index = uid_set[i];
56263+ j = i;
56264+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
56265+ uid_set[j] = uid_set[j - 1];
56266+ j--;
56267+ }
56268+ uid_set[j] = index;
56269+ }
56270+
56271+ return;
56272+}
56273+
56274+static __inline__ void
56275+gr_insert_uid(const uid_t uid, const unsigned long expires)
56276+{
56277+ int loc;
56278+
56279+ if (uid_used == GR_UIDTABLE_MAX)
56280+ return;
56281+
56282+ loc = gr_find_uid(uid);
56283+
56284+ if (loc >= 0) {
56285+ uid_set[loc].expires = expires;
56286+ return;
56287+ }
56288+
56289+ uid_set[uid_used].uid = uid;
56290+ uid_set[uid_used].expires = expires;
56291+ uid_used++;
56292+
56293+ gr_insertsort();
56294+
56295+ return;
56296+}
56297+
56298+void
56299+gr_remove_uid(const unsigned short loc)
56300+{
56301+ unsigned short i;
56302+
56303+ for (i = loc + 1; i < uid_used; i++)
56304+ uid_set[i - 1] = uid_set[i];
56305+
56306+ uid_used--;
56307+
56308+ return;
56309+}
56310+
56311+int
56312+gr_check_crash_uid(const uid_t uid)
56313+{
56314+ int loc;
56315+ int ret = 0;
56316+
56317+ if (unlikely(!gr_acl_is_enabled()))
56318+ return 0;
56319+
56320+ spin_lock(&gr_uid_lock);
56321+ loc = gr_find_uid(uid);
56322+
56323+ if (loc < 0)
56324+ goto out_unlock;
56325+
56326+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
56327+ gr_remove_uid(loc);
56328+ else
56329+ ret = 1;
56330+
56331+out_unlock:
56332+ spin_unlock(&gr_uid_lock);
56333+ return ret;
56334+}
56335+
56336+static __inline__ int
56337+proc_is_setxid(const struct cred *cred)
56338+{
56339+ if (cred->uid != cred->euid || cred->uid != cred->suid ||
56340+ cred->uid != cred->fsuid)
56341+ return 1;
56342+ if (cred->gid != cred->egid || cred->gid != cred->sgid ||
56343+ cred->gid != cred->fsgid)
56344+ return 1;
56345+
56346+ return 0;
56347+}
56348+
56349+extern int gr_fake_force_sig(int sig, struct task_struct *t);
56350+
56351+void
56352+gr_handle_crash(struct task_struct *task, const int sig)
56353+{
56354+ struct acl_subject_label *curr;
56355+ struct task_struct *tsk, *tsk2;
56356+ const struct cred *cred;
56357+ const struct cred *cred2;
56358+
56359+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
56360+ return;
56361+
56362+ if (unlikely(!gr_acl_is_enabled()))
56363+ return;
56364+
56365+ curr = task->acl;
56366+
56367+ if (!(curr->resmask & (1 << GR_CRASH_RES)))
56368+ return;
56369+
56370+ if (time_before_eq(curr->expires, get_seconds())) {
56371+ curr->expires = 0;
56372+ curr->crashes = 0;
56373+ }
56374+
56375+ curr->crashes++;
56376+
56377+ if (!curr->expires)
56378+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
56379+
56380+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56381+ time_after(curr->expires, get_seconds())) {
56382+ rcu_read_lock();
56383+ cred = __task_cred(task);
56384+ if (cred->uid && proc_is_setxid(cred)) {
56385+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56386+ spin_lock(&gr_uid_lock);
56387+ gr_insert_uid(cred->uid, curr->expires);
56388+ spin_unlock(&gr_uid_lock);
56389+ curr->expires = 0;
56390+ curr->crashes = 0;
56391+ read_lock(&tasklist_lock);
56392+ do_each_thread(tsk2, tsk) {
56393+ cred2 = __task_cred(tsk);
56394+ if (tsk != task && cred2->uid == cred->uid)
56395+ gr_fake_force_sig(SIGKILL, tsk);
56396+ } while_each_thread(tsk2, tsk);
56397+ read_unlock(&tasklist_lock);
56398+ } else {
56399+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56400+ read_lock(&tasklist_lock);
56401+ read_lock(&grsec_exec_file_lock);
56402+ do_each_thread(tsk2, tsk) {
56403+ if (likely(tsk != task)) {
56404+ // if this thread has the same subject as the one that triggered
56405+ // RES_CRASH and it's the same binary, kill it
56406+ if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
56407+ gr_fake_force_sig(SIGKILL, tsk);
56408+ }
56409+ } while_each_thread(tsk2, tsk);
56410+ read_unlock(&grsec_exec_file_lock);
56411+ read_unlock(&tasklist_lock);
56412+ }
56413+ rcu_read_unlock();
56414+ }
56415+
56416+ return;
56417+}
56418+
56419+int
56420+gr_check_crash_exec(const struct file *filp)
56421+{
56422+ struct acl_subject_label *curr;
56423+
56424+ if (unlikely(!gr_acl_is_enabled()))
56425+ return 0;
56426+
56427+ read_lock(&gr_inode_lock);
56428+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
56429+ __get_dev(filp->f_path.dentry),
56430+ current->role);
56431+ read_unlock(&gr_inode_lock);
56432+
56433+ if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
56434+ (!curr->crashes && !curr->expires))
56435+ return 0;
56436+
56437+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56438+ time_after(curr->expires, get_seconds()))
56439+ return 1;
56440+ else if (time_before_eq(curr->expires, get_seconds())) {
56441+ curr->crashes = 0;
56442+ curr->expires = 0;
56443+ }
56444+
56445+ return 0;
56446+}
56447+
56448+void
56449+gr_handle_alertkill(struct task_struct *task)
56450+{
56451+ struct acl_subject_label *curracl;
56452+ __u32 curr_ip;
56453+ struct task_struct *p, *p2;
56454+
56455+ if (unlikely(!gr_acl_is_enabled()))
56456+ return;
56457+
56458+ curracl = task->acl;
56459+ curr_ip = task->signal->curr_ip;
56460+
56461+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
56462+ read_lock(&tasklist_lock);
56463+ do_each_thread(p2, p) {
56464+ if (p->signal->curr_ip == curr_ip)
56465+ gr_fake_force_sig(SIGKILL, p);
56466+ } while_each_thread(p2, p);
56467+ read_unlock(&tasklist_lock);
56468+ } else if (curracl->mode & GR_KILLPROC)
56469+ gr_fake_force_sig(SIGKILL, task);
56470+
56471+ return;
56472+}
56473diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
56474new file mode 100644
56475index 0000000..9d83a69
56476--- /dev/null
56477+++ b/grsecurity/gracl_shm.c
56478@@ -0,0 +1,40 @@
56479+#include <linux/kernel.h>
56480+#include <linux/mm.h>
56481+#include <linux/sched.h>
56482+#include <linux/file.h>
56483+#include <linux/ipc.h>
56484+#include <linux/gracl.h>
56485+#include <linux/grsecurity.h>
56486+#include <linux/grinternal.h>
56487+
56488+int
56489+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56490+ const time_t shm_createtime, const uid_t cuid, const int shmid)
56491+{
56492+ struct task_struct *task;
56493+
56494+ if (!gr_acl_is_enabled())
56495+ return 1;
56496+
56497+ rcu_read_lock();
56498+ read_lock(&tasklist_lock);
56499+
56500+ task = find_task_by_vpid(shm_cprid);
56501+
56502+ if (unlikely(!task))
56503+ task = find_task_by_vpid(shm_lapid);
56504+
56505+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
56506+ (task->pid == shm_lapid)) &&
56507+ (task->acl->mode & GR_PROTSHM) &&
56508+ (task->acl != current->acl))) {
56509+ read_unlock(&tasklist_lock);
56510+ rcu_read_unlock();
56511+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
56512+ return 0;
56513+ }
56514+ read_unlock(&tasklist_lock);
56515+ rcu_read_unlock();
56516+
56517+ return 1;
56518+}
56519diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
56520new file mode 100644
56521index 0000000..bc0be01
56522--- /dev/null
56523+++ b/grsecurity/grsec_chdir.c
56524@@ -0,0 +1,19 @@
56525+#include <linux/kernel.h>
56526+#include <linux/sched.h>
56527+#include <linux/fs.h>
56528+#include <linux/file.h>
56529+#include <linux/grsecurity.h>
56530+#include <linux/grinternal.h>
56531+
56532+void
56533+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
56534+{
56535+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
56536+ if ((grsec_enable_chdir && grsec_enable_group &&
56537+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
56538+ !grsec_enable_group)) {
56539+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
56540+ }
56541+#endif
56542+ return;
56543+}
56544diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
56545new file mode 100644
56546index 0000000..9807ee2
56547--- /dev/null
56548+++ b/grsecurity/grsec_chroot.c
56549@@ -0,0 +1,368 @@
56550+#include <linux/kernel.h>
56551+#include <linux/module.h>
56552+#include <linux/sched.h>
56553+#include <linux/file.h>
56554+#include <linux/fs.h>
56555+#include <linux/mount.h>
56556+#include <linux/types.h>
56557+#include "../fs/mount.h"
56558+#include <linux/grsecurity.h>
56559+#include <linux/grinternal.h>
56560+
56561+void gr_set_chroot_entries(struct task_struct *task, struct path *path)
56562+{
56563+#ifdef CONFIG_GRKERNSEC
56564+ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
56565+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root)
56566+ task->gr_is_chrooted = 1;
56567+ else
56568+ task->gr_is_chrooted = 0;
56569+
56570+ task->gr_chroot_dentry = path->dentry;
56571+#endif
56572+ return;
56573+}
56574+
56575+void gr_clear_chroot_entries(struct task_struct *task)
56576+{
56577+#ifdef CONFIG_GRKERNSEC
56578+ task->gr_is_chrooted = 0;
56579+ task->gr_chroot_dentry = NULL;
56580+#endif
56581+ return;
56582+}
56583+
56584+int
56585+gr_handle_chroot_unix(const pid_t pid)
56586+{
56587+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
56588+ struct task_struct *p;
56589+
56590+ if (unlikely(!grsec_enable_chroot_unix))
56591+ return 1;
56592+
56593+ if (likely(!proc_is_chrooted(current)))
56594+ return 1;
56595+
56596+ rcu_read_lock();
56597+ read_lock(&tasklist_lock);
56598+ p = find_task_by_vpid_unrestricted(pid);
56599+ if (unlikely(p && !have_same_root(current, p))) {
56600+ read_unlock(&tasklist_lock);
56601+ rcu_read_unlock();
56602+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
56603+ return 0;
56604+ }
56605+ read_unlock(&tasklist_lock);
56606+ rcu_read_unlock();
56607+#endif
56608+ return 1;
56609+}
56610+
56611+int
56612+gr_handle_chroot_nice(void)
56613+{
56614+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56615+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
56616+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
56617+ return -EPERM;
56618+ }
56619+#endif
56620+ return 0;
56621+}
56622+
56623+int
56624+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
56625+{
56626+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56627+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
56628+ && proc_is_chrooted(current)) {
56629+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
56630+ return -EACCES;
56631+ }
56632+#endif
56633+ return 0;
56634+}
56635+
56636+int
56637+gr_handle_chroot_rawio(const struct inode *inode)
56638+{
56639+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56640+ if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
56641+ inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
56642+ return 1;
56643+#endif
56644+ return 0;
56645+}
56646+
56647+int
56648+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
56649+{
56650+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56651+ struct task_struct *p;
56652+ int ret = 0;
56653+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
56654+ return ret;
56655+
56656+ read_lock(&tasklist_lock);
56657+ do_each_pid_task(pid, type, p) {
56658+ if (!have_same_root(current, p)) {
56659+ ret = 1;
56660+ goto out;
56661+ }
56662+ } while_each_pid_task(pid, type, p);
56663+out:
56664+ read_unlock(&tasklist_lock);
56665+ return ret;
56666+#endif
56667+ return 0;
56668+}
56669+
56670+int
56671+gr_pid_is_chrooted(struct task_struct *p)
56672+{
56673+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56674+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
56675+ return 0;
56676+
56677+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
56678+ !have_same_root(current, p)) {
56679+ return 1;
56680+ }
56681+#endif
56682+ return 0;
56683+}
56684+
56685+EXPORT_SYMBOL(gr_pid_is_chrooted);
56686+
56687+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
56688+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
56689+{
56690+ struct path path, currentroot;
56691+ int ret = 0;
56692+
56693+ path.dentry = (struct dentry *)u_dentry;
56694+ path.mnt = (struct vfsmount *)u_mnt;
56695+ get_fs_root(current->fs, &currentroot);
56696+ if (path_is_under(&path, &currentroot))
56697+ ret = 1;
56698+ path_put(&currentroot);
56699+
56700+ return ret;
56701+}
56702+#endif
56703+
56704+int
56705+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
56706+{
56707+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
56708+ if (!grsec_enable_chroot_fchdir)
56709+ return 1;
56710+
56711+ if (!proc_is_chrooted(current))
56712+ return 1;
56713+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
56714+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
56715+ return 0;
56716+ }
56717+#endif
56718+ return 1;
56719+}
56720+
56721+int
56722+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56723+ const time_t shm_createtime)
56724+{
56725+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
56726+ struct task_struct *p;
56727+ time_t starttime;
56728+
56729+ if (unlikely(!grsec_enable_chroot_shmat))
56730+ return 1;
56731+
56732+ if (likely(!proc_is_chrooted(current)))
56733+ return 1;
56734+
56735+ rcu_read_lock();
56736+ read_lock(&tasklist_lock);
56737+
56738+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
56739+ starttime = p->start_time.tv_sec;
56740+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
56741+ if (have_same_root(current, p)) {
56742+ goto allow;
56743+ } else {
56744+ read_unlock(&tasklist_lock);
56745+ rcu_read_unlock();
56746+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
56747+ return 0;
56748+ }
56749+ }
56750+ /* creator exited, pid reuse, fall through to next check */
56751+ }
56752+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
56753+ if (unlikely(!have_same_root(current, p))) {
56754+ read_unlock(&tasklist_lock);
56755+ rcu_read_unlock();
56756+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
56757+ return 0;
56758+ }
56759+ }
56760+
56761+allow:
56762+ read_unlock(&tasklist_lock);
56763+ rcu_read_unlock();
56764+#endif
56765+ return 1;
56766+}
56767+
56768+void
56769+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
56770+{
56771+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
56772+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
56773+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
56774+#endif
56775+ return;
56776+}
56777+
56778+int
56779+gr_handle_chroot_mknod(const struct dentry *dentry,
56780+ const struct vfsmount *mnt, const int mode)
56781+{
56782+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
56783+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
56784+ proc_is_chrooted(current)) {
56785+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
56786+ return -EPERM;
56787+ }
56788+#endif
56789+ return 0;
56790+}
56791+
56792+int
56793+gr_handle_chroot_mount(const struct dentry *dentry,
56794+ const struct vfsmount *mnt, const char *dev_name)
56795+{
56796+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
56797+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
56798+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
56799+ return -EPERM;
56800+ }
56801+#endif
56802+ return 0;
56803+}
56804+
56805+int
56806+gr_handle_chroot_pivot(void)
56807+{
56808+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
56809+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
56810+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
56811+ return -EPERM;
56812+ }
56813+#endif
56814+ return 0;
56815+}
56816+
56817+int
56818+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
56819+{
56820+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
56821+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
56822+ !gr_is_outside_chroot(dentry, mnt)) {
56823+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
56824+ return -EPERM;
56825+ }
56826+#endif
56827+ return 0;
56828+}
56829+
56830+extern const char *captab_log[];
56831+extern int captab_log_entries;
56832+
56833+int
56834+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
56835+{
56836+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56837+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
56838+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
56839+ if (cap_raised(chroot_caps, cap)) {
56840+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
56841+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
56842+ }
56843+ return 0;
56844+ }
56845+ }
56846+#endif
56847+ return 1;
56848+}
56849+
56850+int
56851+gr_chroot_is_capable(const int cap)
56852+{
56853+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56854+ return gr_task_chroot_is_capable(current, current_cred(), cap);
56855+#endif
56856+ return 1;
56857+}
56858+
56859+int
56860+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
56861+{
56862+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56863+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
56864+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
56865+ if (cap_raised(chroot_caps, cap)) {
56866+ return 0;
56867+ }
56868+ }
56869+#endif
56870+ return 1;
56871+}
56872+
56873+int
56874+gr_chroot_is_capable_nolog(const int cap)
56875+{
56876+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56877+ return gr_task_chroot_is_capable_nolog(current, cap);
56878+#endif
56879+ return 1;
56880+}
56881+
56882+int
56883+gr_handle_chroot_sysctl(const int op)
56884+{
56885+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
56886+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
56887+ proc_is_chrooted(current))
56888+ return -EACCES;
56889+#endif
56890+ return 0;
56891+}
56892+
56893+void
56894+gr_handle_chroot_chdir(struct path *path)
56895+{
56896+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
56897+ if (grsec_enable_chroot_chdir)
56898+ set_fs_pwd(current->fs, path);
56899+#endif
56900+ return;
56901+}
56902+
56903+int
56904+gr_handle_chroot_chmod(const struct dentry *dentry,
56905+ const struct vfsmount *mnt, const int mode)
56906+{
56907+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
56908+ /* allow chmod +s on directories, but not files */
56909+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
56910+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
56911+ proc_is_chrooted(current)) {
56912+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
56913+ return -EPERM;
56914+ }
56915+#endif
56916+ return 0;
56917+}
56918diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
56919new file mode 100644
56920index 0000000..213ad8b
56921--- /dev/null
56922+++ b/grsecurity/grsec_disabled.c
56923@@ -0,0 +1,437 @@
56924+#include <linux/kernel.h>
56925+#include <linux/module.h>
56926+#include <linux/sched.h>
56927+#include <linux/file.h>
56928+#include <linux/fs.h>
56929+#include <linux/kdev_t.h>
56930+#include <linux/net.h>
56931+#include <linux/in.h>
56932+#include <linux/ip.h>
56933+#include <linux/skbuff.h>
56934+#include <linux/sysctl.h>
56935+
56936+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
56937+void
56938+pax_set_initial_flags(struct linux_binprm *bprm)
56939+{
56940+ return;
56941+}
56942+#endif
56943+
56944+#ifdef CONFIG_SYSCTL
56945+__u32
56946+gr_handle_sysctl(const struct ctl_table * table, const int op)
56947+{
56948+ return 0;
56949+}
56950+#endif
56951+
56952+#ifdef CONFIG_TASKSTATS
56953+int gr_is_taskstats_denied(int pid)
56954+{
56955+ return 0;
56956+}
56957+#endif
56958+
56959+int
56960+gr_acl_is_enabled(void)
56961+{
56962+ return 0;
56963+}
56964+
56965+void
56966+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
56967+{
56968+ return;
56969+}
56970+
56971+int
56972+gr_handle_rawio(const struct inode *inode)
56973+{
56974+ return 0;
56975+}
56976+
56977+void
56978+gr_acl_handle_psacct(struct task_struct *task, const long code)
56979+{
56980+ return;
56981+}
56982+
56983+int
56984+gr_handle_ptrace(struct task_struct *task, const long request)
56985+{
56986+ return 0;
56987+}
56988+
56989+int
56990+gr_handle_proc_ptrace(struct task_struct *task)
56991+{
56992+ return 0;
56993+}
56994+
56995+void
56996+gr_learn_resource(const struct task_struct *task,
56997+ const int res, const unsigned long wanted, const int gt)
56998+{
56999+ return;
57000+}
57001+
57002+int
57003+gr_set_acls(const int type)
57004+{
57005+ return 0;
57006+}
57007+
57008+int
57009+gr_check_hidden_task(const struct task_struct *tsk)
57010+{
57011+ return 0;
57012+}
57013+
57014+int
57015+gr_check_protected_task(const struct task_struct *task)
57016+{
57017+ return 0;
57018+}
57019+
57020+int
57021+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
57022+{
57023+ return 0;
57024+}
57025+
57026+void
57027+gr_copy_label(struct task_struct *tsk)
57028+{
57029+ return;
57030+}
57031+
57032+void
57033+gr_set_pax_flags(struct task_struct *task)
57034+{
57035+ return;
57036+}
57037+
57038+int
57039+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
57040+ const int unsafe_share)
57041+{
57042+ return 0;
57043+}
57044+
57045+void
57046+gr_handle_delete(const ino_t ino, const dev_t dev)
57047+{
57048+ return;
57049+}
57050+
57051+void
57052+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
57053+{
57054+ return;
57055+}
57056+
57057+void
57058+gr_handle_crash(struct task_struct *task, const int sig)
57059+{
57060+ return;
57061+}
57062+
57063+int
57064+gr_check_crash_exec(const struct file *filp)
57065+{
57066+ return 0;
57067+}
57068+
57069+int
57070+gr_check_crash_uid(const uid_t uid)
57071+{
57072+ return 0;
57073+}
57074+
57075+void
57076+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
57077+ struct dentry *old_dentry,
57078+ struct dentry *new_dentry,
57079+ struct vfsmount *mnt, const __u8 replace)
57080+{
57081+ return;
57082+}
57083+
57084+int
57085+gr_search_socket(const int family, const int type, const int protocol)
57086+{
57087+ return 1;
57088+}
57089+
57090+int
57091+gr_search_connectbind(const int mode, const struct socket *sock,
57092+ const struct sockaddr_in *addr)
57093+{
57094+ return 0;
57095+}
57096+
57097+void
57098+gr_handle_alertkill(struct task_struct *task)
57099+{
57100+ return;
57101+}
57102+
57103+__u32
57104+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
57105+{
57106+ return 1;
57107+}
57108+
57109+__u32
57110+gr_acl_handle_hidden_file(const struct dentry * dentry,
57111+ const struct vfsmount * mnt)
57112+{
57113+ return 1;
57114+}
57115+
57116+__u32
57117+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
57118+ int acc_mode)
57119+{
57120+ return 1;
57121+}
57122+
57123+__u32
57124+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
57125+{
57126+ return 1;
57127+}
57128+
57129+__u32
57130+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
57131+{
57132+ return 1;
57133+}
57134+
57135+int
57136+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
57137+ unsigned int *vm_flags)
57138+{
57139+ return 1;
57140+}
57141+
57142+__u32
57143+gr_acl_handle_truncate(const struct dentry * dentry,
57144+ const struct vfsmount * mnt)
57145+{
57146+ return 1;
57147+}
57148+
57149+__u32
57150+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
57151+{
57152+ return 1;
57153+}
57154+
57155+__u32
57156+gr_acl_handle_access(const struct dentry * dentry,
57157+ const struct vfsmount * mnt, const int fmode)
57158+{
57159+ return 1;
57160+}
57161+
57162+__u32
57163+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
57164+ umode_t *mode)
57165+{
57166+ return 1;
57167+}
57168+
57169+__u32
57170+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
57171+{
57172+ return 1;
57173+}
57174+
57175+__u32
57176+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
57177+{
57178+ return 1;
57179+}
57180+
57181+void
57182+grsecurity_init(void)
57183+{
57184+ return;
57185+}
57186+
57187+umode_t gr_acl_umask(void)
57188+{
57189+ return 0;
57190+}
57191+
57192+__u32
57193+gr_acl_handle_mknod(const struct dentry * new_dentry,
57194+ const struct dentry * parent_dentry,
57195+ const struct vfsmount * parent_mnt,
57196+ const int mode)
57197+{
57198+ return 1;
57199+}
57200+
57201+__u32
57202+gr_acl_handle_mkdir(const struct dentry * new_dentry,
57203+ const struct dentry * parent_dentry,
57204+ const struct vfsmount * parent_mnt)
57205+{
57206+ return 1;
57207+}
57208+
57209+__u32
57210+gr_acl_handle_symlink(const struct dentry * new_dentry,
57211+ const struct dentry * parent_dentry,
57212+ const struct vfsmount * parent_mnt, const char *from)
57213+{
57214+ return 1;
57215+}
57216+
57217+__u32
57218+gr_acl_handle_link(const struct dentry * new_dentry,
57219+ const struct dentry * parent_dentry,
57220+ const struct vfsmount * parent_mnt,
57221+ const struct dentry * old_dentry,
57222+ const struct vfsmount * old_mnt, const char *to)
57223+{
57224+ return 1;
57225+}
57226+
57227+int
57228+gr_acl_handle_rename(const struct dentry *new_dentry,
57229+ const struct dentry *parent_dentry,
57230+ const struct vfsmount *parent_mnt,
57231+ const struct dentry *old_dentry,
57232+ const struct inode *old_parent_inode,
57233+ const struct vfsmount *old_mnt, const char *newname)
57234+{
57235+ return 0;
57236+}
57237+
57238+int
57239+gr_acl_handle_filldir(const struct file *file, const char *name,
57240+ const int namelen, const ino_t ino)
57241+{
57242+ return 1;
57243+}
57244+
57245+int
57246+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
57247+ const time_t shm_createtime, const uid_t cuid, const int shmid)
57248+{
57249+ return 1;
57250+}
57251+
57252+int
57253+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
57254+{
57255+ return 0;
57256+}
57257+
57258+int
57259+gr_search_accept(const struct socket *sock)
57260+{
57261+ return 0;
57262+}
57263+
57264+int
57265+gr_search_listen(const struct socket *sock)
57266+{
57267+ return 0;
57268+}
57269+
57270+int
57271+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
57272+{
57273+ return 0;
57274+}
57275+
57276+__u32
57277+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
57278+{
57279+ return 1;
57280+}
57281+
57282+__u32
57283+gr_acl_handle_creat(const struct dentry * dentry,
57284+ const struct dentry * p_dentry,
57285+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
57286+ const int imode)
57287+{
57288+ return 1;
57289+}
57290+
57291+void
57292+gr_acl_handle_exit(void)
57293+{
57294+ return;
57295+}
57296+
57297+int
57298+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
57299+{
57300+ return 1;
57301+}
57302+
57303+void
57304+gr_set_role_label(const uid_t uid, const gid_t gid)
57305+{
57306+ return;
57307+}
57308+
57309+int
57310+gr_acl_handle_procpidmem(const struct task_struct *task)
57311+{
57312+ return 0;
57313+}
57314+
57315+int
57316+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
57317+{
57318+ return 0;
57319+}
57320+
57321+int
57322+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
57323+{
57324+ return 0;
57325+}
57326+
57327+void
57328+gr_set_kernel_label(struct task_struct *task)
57329+{
57330+ return;
57331+}
57332+
57333+int
57334+gr_check_user_change(int real, int effective, int fs)
57335+{
57336+ return 0;
57337+}
57338+
57339+int
57340+gr_check_group_change(int real, int effective, int fs)
57341+{
57342+ return 0;
57343+}
57344+
57345+int gr_acl_enable_at_secure(void)
57346+{
57347+ return 0;
57348+}
57349+
57350+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
57351+{
57352+ return dentry->d_inode->i_sb->s_dev;
57353+}
57354+
57355+EXPORT_SYMBOL(gr_learn_resource);
57356+EXPORT_SYMBOL(gr_set_kernel_label);
57357+#ifdef CONFIG_SECURITY
57358+EXPORT_SYMBOL(gr_check_user_change);
57359+EXPORT_SYMBOL(gr_check_group_change);
57360+#endif
57361diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
57362new file mode 100644
57363index 0000000..abfa971
57364--- /dev/null
57365+++ b/grsecurity/grsec_exec.c
57366@@ -0,0 +1,174 @@
57367+#include <linux/kernel.h>
57368+#include <linux/sched.h>
57369+#include <linux/file.h>
57370+#include <linux/binfmts.h>
57371+#include <linux/fs.h>
57372+#include <linux/types.h>
57373+#include <linux/grdefs.h>
57374+#include <linux/grsecurity.h>
57375+#include <linux/grinternal.h>
57376+#include <linux/capability.h>
57377+#include <linux/module.h>
57378+
57379+#include <asm/uaccess.h>
57380+
57381+#ifdef CONFIG_GRKERNSEC_EXECLOG
57382+static char gr_exec_arg_buf[132];
57383+static DEFINE_MUTEX(gr_exec_arg_mutex);
57384+#endif
57385+
57386+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
57387+
57388+void
57389+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
57390+{
57391+#ifdef CONFIG_GRKERNSEC_EXECLOG
57392+ char *grarg = gr_exec_arg_buf;
57393+ unsigned int i, x, execlen = 0;
57394+ char c;
57395+
57396+ if (!((grsec_enable_execlog && grsec_enable_group &&
57397+ in_group_p(grsec_audit_gid))
57398+ || (grsec_enable_execlog && !grsec_enable_group)))
57399+ return;
57400+
57401+ mutex_lock(&gr_exec_arg_mutex);
57402+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
57403+
57404+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
57405+ const char __user *p;
57406+ unsigned int len;
57407+
57408+ p = get_user_arg_ptr(argv, i);
57409+ if (IS_ERR(p))
57410+ goto log;
57411+
57412+ len = strnlen_user(p, 128 - execlen);
57413+ if (len > 128 - execlen)
57414+ len = 128 - execlen;
57415+ else if (len > 0)
57416+ len--;
57417+ if (copy_from_user(grarg + execlen, p, len))
57418+ goto log;
57419+
57420+ /* rewrite unprintable characters */
57421+ for (x = 0; x < len; x++) {
57422+ c = *(grarg + execlen + x);
57423+ if (c < 32 || c > 126)
57424+ *(grarg + execlen + x) = ' ';
57425+ }
57426+
57427+ execlen += len;
57428+ *(grarg + execlen) = ' ';
57429+ *(grarg + execlen + 1) = '\0';
57430+ execlen++;
57431+ }
57432+
57433+ log:
57434+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
57435+ bprm->file->f_path.mnt, grarg);
57436+ mutex_unlock(&gr_exec_arg_mutex);
57437+#endif
57438+ return;
57439+}
57440+
57441+#ifdef CONFIG_GRKERNSEC
57442+extern int gr_acl_is_capable(const int cap);
57443+extern int gr_acl_is_capable_nolog(const int cap);
57444+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
57445+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
57446+extern int gr_chroot_is_capable(const int cap);
57447+extern int gr_chroot_is_capable_nolog(const int cap);
57448+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
57449+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
57450+#endif
57451+
57452+const char *captab_log[] = {
57453+ "CAP_CHOWN",
57454+ "CAP_DAC_OVERRIDE",
57455+ "CAP_DAC_READ_SEARCH",
57456+ "CAP_FOWNER",
57457+ "CAP_FSETID",
57458+ "CAP_KILL",
57459+ "CAP_SETGID",
57460+ "CAP_SETUID",
57461+ "CAP_SETPCAP",
57462+ "CAP_LINUX_IMMUTABLE",
57463+ "CAP_NET_BIND_SERVICE",
57464+ "CAP_NET_BROADCAST",
57465+ "CAP_NET_ADMIN",
57466+ "CAP_NET_RAW",
57467+ "CAP_IPC_LOCK",
57468+ "CAP_IPC_OWNER",
57469+ "CAP_SYS_MODULE",
57470+ "CAP_SYS_RAWIO",
57471+ "CAP_SYS_CHROOT",
57472+ "CAP_SYS_PTRACE",
57473+ "CAP_SYS_PACCT",
57474+ "CAP_SYS_ADMIN",
57475+ "CAP_SYS_BOOT",
57476+ "CAP_SYS_NICE",
57477+ "CAP_SYS_RESOURCE",
57478+ "CAP_SYS_TIME",
57479+ "CAP_SYS_TTY_CONFIG",
57480+ "CAP_MKNOD",
57481+ "CAP_LEASE",
57482+ "CAP_AUDIT_WRITE",
57483+ "CAP_AUDIT_CONTROL",
57484+ "CAP_SETFCAP",
57485+ "CAP_MAC_OVERRIDE",
57486+ "CAP_MAC_ADMIN",
57487+ "CAP_SYSLOG",
57488+ "CAP_WAKE_ALARM"
57489+};
57490+
57491+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
57492+
57493+int gr_is_capable(const int cap)
57494+{
57495+#ifdef CONFIG_GRKERNSEC
57496+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
57497+ return 1;
57498+ return 0;
57499+#else
57500+ return 1;
57501+#endif
57502+}
57503+
57504+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
57505+{
57506+#ifdef CONFIG_GRKERNSEC
57507+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
57508+ return 1;
57509+ return 0;
57510+#else
57511+ return 1;
57512+#endif
57513+}
57514+
57515+int gr_is_capable_nolog(const int cap)
57516+{
57517+#ifdef CONFIG_GRKERNSEC
57518+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
57519+ return 1;
57520+ return 0;
57521+#else
57522+ return 1;
57523+#endif
57524+}
57525+
57526+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
57527+{
57528+#ifdef CONFIG_GRKERNSEC
57529+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
57530+ return 1;
57531+ return 0;
57532+#else
57533+ return 1;
57534+#endif
57535+}
57536+
57537+EXPORT_SYMBOL(gr_is_capable);
57538+EXPORT_SYMBOL(gr_is_capable_nolog);
57539+EXPORT_SYMBOL(gr_task_is_capable);
57540+EXPORT_SYMBOL(gr_task_is_capable_nolog);
57541diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
57542new file mode 100644
57543index 0000000..d3ee748
57544--- /dev/null
57545+++ b/grsecurity/grsec_fifo.c
57546@@ -0,0 +1,24 @@
57547+#include <linux/kernel.h>
57548+#include <linux/sched.h>
57549+#include <linux/fs.h>
57550+#include <linux/file.h>
57551+#include <linux/grinternal.h>
57552+
57553+int
57554+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
57555+ const struct dentry *dir, const int flag, const int acc_mode)
57556+{
57557+#ifdef CONFIG_GRKERNSEC_FIFO
57558+ const struct cred *cred = current_cred();
57559+
57560+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
57561+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
57562+ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
57563+ (cred->fsuid != dentry->d_inode->i_uid)) {
57564+ if (!inode_permission(dentry->d_inode, acc_mode))
57565+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
57566+ return -EACCES;
57567+ }
57568+#endif
57569+ return 0;
57570+}
57571diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
57572new file mode 100644
57573index 0000000..8ca18bf
57574--- /dev/null
57575+++ b/grsecurity/grsec_fork.c
57576@@ -0,0 +1,23 @@
57577+#include <linux/kernel.h>
57578+#include <linux/sched.h>
57579+#include <linux/grsecurity.h>
57580+#include <linux/grinternal.h>
57581+#include <linux/errno.h>
57582+
57583+void
57584+gr_log_forkfail(const int retval)
57585+{
57586+#ifdef CONFIG_GRKERNSEC_FORKFAIL
57587+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
57588+ switch (retval) {
57589+ case -EAGAIN:
57590+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
57591+ break;
57592+ case -ENOMEM:
57593+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
57594+ break;
57595+ }
57596+ }
57597+#endif
57598+ return;
57599+}
57600diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
57601new file mode 100644
57602index 0000000..01ddde4
57603--- /dev/null
57604+++ b/grsecurity/grsec_init.c
57605@@ -0,0 +1,277 @@
57606+#include <linux/kernel.h>
57607+#include <linux/sched.h>
57608+#include <linux/mm.h>
57609+#include <linux/gracl.h>
57610+#include <linux/slab.h>
57611+#include <linux/vmalloc.h>
57612+#include <linux/percpu.h>
57613+#include <linux/module.h>
57614+
57615+int grsec_enable_ptrace_readexec;
57616+int grsec_enable_setxid;
57617+int grsec_enable_brute;
57618+int grsec_enable_link;
57619+int grsec_enable_dmesg;
57620+int grsec_enable_harden_ptrace;
57621+int grsec_enable_fifo;
57622+int grsec_enable_execlog;
57623+int grsec_enable_signal;
57624+int grsec_enable_forkfail;
57625+int grsec_enable_audit_ptrace;
57626+int grsec_enable_time;
57627+int grsec_enable_audit_textrel;
57628+int grsec_enable_group;
57629+int grsec_audit_gid;
57630+int grsec_enable_chdir;
57631+int grsec_enable_mount;
57632+int grsec_enable_rofs;
57633+int grsec_enable_chroot_findtask;
57634+int grsec_enable_chroot_mount;
57635+int grsec_enable_chroot_shmat;
57636+int grsec_enable_chroot_fchdir;
57637+int grsec_enable_chroot_double;
57638+int grsec_enable_chroot_pivot;
57639+int grsec_enable_chroot_chdir;
57640+int grsec_enable_chroot_chmod;
57641+int grsec_enable_chroot_mknod;
57642+int grsec_enable_chroot_nice;
57643+int grsec_enable_chroot_execlog;
57644+int grsec_enable_chroot_caps;
57645+int grsec_enable_chroot_sysctl;
57646+int grsec_enable_chroot_unix;
57647+int grsec_enable_tpe;
57648+int grsec_tpe_gid;
57649+int grsec_enable_blackhole;
57650+#ifdef CONFIG_IPV6_MODULE
57651+EXPORT_SYMBOL(grsec_enable_blackhole);
57652+#endif
57653+int grsec_lastack_retries;
57654+int grsec_enable_tpe_all;
57655+int grsec_enable_tpe_invert;
57656+int grsec_enable_socket_all;
57657+int grsec_socket_all_gid;
57658+int grsec_enable_socket_client;
57659+int grsec_socket_client_gid;
57660+int grsec_enable_socket_server;
57661+int grsec_socket_server_gid;
57662+int grsec_resource_logging;
57663+int grsec_disable_privio;
57664+int grsec_enable_log_rwxmaps;
57665+int grsec_lock;
57666+
57667+DEFINE_SPINLOCK(grsec_alert_lock);
57668+unsigned long grsec_alert_wtime = 0;
57669+unsigned long grsec_alert_fyet = 0;
57670+
57671+DEFINE_SPINLOCK(grsec_audit_lock);
57672+
57673+DEFINE_RWLOCK(grsec_exec_file_lock);
57674+
57675+char *gr_shared_page[4];
57676+
57677+char *gr_alert_log_fmt;
57678+char *gr_audit_log_fmt;
57679+char *gr_alert_log_buf;
57680+char *gr_audit_log_buf;
57681+
57682+extern struct gr_arg *gr_usermode;
57683+extern unsigned char *gr_system_salt;
57684+extern unsigned char *gr_system_sum;
57685+
57686+void __init
57687+grsecurity_init(void)
57688+{
57689+ int j;
57690+ /* create the per-cpu shared pages */
57691+
57692+#ifdef CONFIG_X86
57693+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
57694+#endif
57695+
57696+ for (j = 0; j < 4; j++) {
57697+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
57698+ if (gr_shared_page[j] == NULL) {
57699+ panic("Unable to allocate grsecurity shared page");
57700+ return;
57701+ }
57702+ }
57703+
57704+ /* allocate log buffers */
57705+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
57706+ if (!gr_alert_log_fmt) {
57707+ panic("Unable to allocate grsecurity alert log format buffer");
57708+ return;
57709+ }
57710+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
57711+ if (!gr_audit_log_fmt) {
57712+ panic("Unable to allocate grsecurity audit log format buffer");
57713+ return;
57714+ }
57715+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
57716+ if (!gr_alert_log_buf) {
57717+ panic("Unable to allocate grsecurity alert log buffer");
57718+ return;
57719+ }
57720+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
57721+ if (!gr_audit_log_buf) {
57722+ panic("Unable to allocate grsecurity audit log buffer");
57723+ return;
57724+ }
57725+
57726+ /* allocate memory for authentication structure */
57727+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
57728+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
57729+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
57730+
57731+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
57732+ panic("Unable to allocate grsecurity authentication structure");
57733+ return;
57734+ }
57735+
57736+
57737+#ifdef CONFIG_GRKERNSEC_IO
57738+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
57739+ grsec_disable_privio = 1;
57740+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
57741+ grsec_disable_privio = 1;
57742+#else
57743+ grsec_disable_privio = 0;
57744+#endif
57745+#endif
57746+
57747+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
57748+ /* for backward compatibility, tpe_invert always defaults to on if
57749+ enabled in the kernel
57750+ */
57751+ grsec_enable_tpe_invert = 1;
57752+#endif
57753+
57754+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
57755+#ifndef CONFIG_GRKERNSEC_SYSCTL
57756+ grsec_lock = 1;
57757+#endif
57758+
57759+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
57760+ grsec_enable_audit_textrel = 1;
57761+#endif
57762+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
57763+ grsec_enable_log_rwxmaps = 1;
57764+#endif
57765+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
57766+ grsec_enable_group = 1;
57767+ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
57768+#endif
57769+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
57770+ grsec_enable_ptrace_readexec = 1;
57771+#endif
57772+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
57773+ grsec_enable_chdir = 1;
57774+#endif
57775+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
57776+ grsec_enable_harden_ptrace = 1;
57777+#endif
57778+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
57779+ grsec_enable_mount = 1;
57780+#endif
57781+#ifdef CONFIG_GRKERNSEC_LINK
57782+ grsec_enable_link = 1;
57783+#endif
57784+#ifdef CONFIG_GRKERNSEC_BRUTE
57785+ grsec_enable_brute = 1;
57786+#endif
57787+#ifdef CONFIG_GRKERNSEC_DMESG
57788+ grsec_enable_dmesg = 1;
57789+#endif
57790+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
57791+ grsec_enable_blackhole = 1;
57792+ grsec_lastack_retries = 4;
57793+#endif
57794+#ifdef CONFIG_GRKERNSEC_FIFO
57795+ grsec_enable_fifo = 1;
57796+#endif
57797+#ifdef CONFIG_GRKERNSEC_EXECLOG
57798+ grsec_enable_execlog = 1;
57799+#endif
57800+#ifdef CONFIG_GRKERNSEC_SETXID
57801+ grsec_enable_setxid = 1;
57802+#endif
57803+#ifdef CONFIG_GRKERNSEC_SIGNAL
57804+ grsec_enable_signal = 1;
57805+#endif
57806+#ifdef CONFIG_GRKERNSEC_FORKFAIL
57807+ grsec_enable_forkfail = 1;
57808+#endif
57809+#ifdef CONFIG_GRKERNSEC_TIME
57810+ grsec_enable_time = 1;
57811+#endif
57812+#ifdef CONFIG_GRKERNSEC_RESLOG
57813+ grsec_resource_logging = 1;
57814+#endif
57815+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
57816+ grsec_enable_chroot_findtask = 1;
57817+#endif
57818+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
57819+ grsec_enable_chroot_unix = 1;
57820+#endif
57821+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
57822+ grsec_enable_chroot_mount = 1;
57823+#endif
57824+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
57825+ grsec_enable_chroot_fchdir = 1;
57826+#endif
57827+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
57828+ grsec_enable_chroot_shmat = 1;
57829+#endif
57830+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
57831+ grsec_enable_audit_ptrace = 1;
57832+#endif
57833+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
57834+ grsec_enable_chroot_double = 1;
57835+#endif
57836+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
57837+ grsec_enable_chroot_pivot = 1;
57838+#endif
57839+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
57840+ grsec_enable_chroot_chdir = 1;
57841+#endif
57842+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
57843+ grsec_enable_chroot_chmod = 1;
57844+#endif
57845+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
57846+ grsec_enable_chroot_mknod = 1;
57847+#endif
57848+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
57849+ grsec_enable_chroot_nice = 1;
57850+#endif
57851+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
57852+ grsec_enable_chroot_execlog = 1;
57853+#endif
57854+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57855+ grsec_enable_chroot_caps = 1;
57856+#endif
57857+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
57858+ grsec_enable_chroot_sysctl = 1;
57859+#endif
57860+#ifdef CONFIG_GRKERNSEC_TPE
57861+ grsec_enable_tpe = 1;
57862+ grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
57863+#ifdef CONFIG_GRKERNSEC_TPE_ALL
57864+ grsec_enable_tpe_all = 1;
57865+#endif
57866+#endif
57867+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
57868+ grsec_enable_socket_all = 1;
57869+ grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
57870+#endif
57871+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
57872+ grsec_enable_socket_client = 1;
57873+ grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
57874+#endif
57875+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
57876+ grsec_enable_socket_server = 1;
57877+ grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
57878+#endif
57879+#endif
57880+
57881+ return;
57882+}
57883diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
57884new file mode 100644
57885index 0000000..3efe141
57886--- /dev/null
57887+++ b/grsecurity/grsec_link.c
57888@@ -0,0 +1,43 @@
57889+#include <linux/kernel.h>
57890+#include <linux/sched.h>
57891+#include <linux/fs.h>
57892+#include <linux/file.h>
57893+#include <linux/grinternal.h>
57894+
57895+int
57896+gr_handle_follow_link(const struct inode *parent,
57897+ const struct inode *inode,
57898+ const struct dentry *dentry, const struct vfsmount *mnt)
57899+{
57900+#ifdef CONFIG_GRKERNSEC_LINK
57901+ const struct cred *cred = current_cred();
57902+
57903+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
57904+ (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
57905+ (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
57906+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
57907+ return -EACCES;
57908+ }
57909+#endif
57910+ return 0;
57911+}
57912+
57913+int
57914+gr_handle_hardlink(const struct dentry *dentry,
57915+ const struct vfsmount *mnt,
57916+ struct inode *inode, const int mode, const char *to)
57917+{
57918+#ifdef CONFIG_GRKERNSEC_LINK
57919+ const struct cred *cred = current_cred();
57920+
57921+ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
57922+ (!S_ISREG(mode) || (mode & S_ISUID) ||
57923+ ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
57924+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
57925+ !capable(CAP_FOWNER) && cred->uid) {
57926+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
57927+ return -EPERM;
57928+ }
57929+#endif
57930+ return 0;
57931+}
57932diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
57933new file mode 100644
57934index 0000000..a45d2e9
57935--- /dev/null
57936+++ b/grsecurity/grsec_log.c
57937@@ -0,0 +1,322 @@
57938+#include <linux/kernel.h>
57939+#include <linux/sched.h>
57940+#include <linux/file.h>
57941+#include <linux/tty.h>
57942+#include <linux/fs.h>
57943+#include <linux/grinternal.h>
57944+
57945+#ifdef CONFIG_TREE_PREEMPT_RCU
57946+#define DISABLE_PREEMPT() preempt_disable()
57947+#define ENABLE_PREEMPT() preempt_enable()
57948+#else
57949+#define DISABLE_PREEMPT()
57950+#define ENABLE_PREEMPT()
57951+#endif
57952+
57953+#define BEGIN_LOCKS(x) \
57954+ DISABLE_PREEMPT(); \
57955+ rcu_read_lock(); \
57956+ read_lock(&tasklist_lock); \
57957+ read_lock(&grsec_exec_file_lock); \
57958+ if (x != GR_DO_AUDIT) \
57959+ spin_lock(&grsec_alert_lock); \
57960+ else \
57961+ spin_lock(&grsec_audit_lock)
57962+
57963+#define END_LOCKS(x) \
57964+ if (x != GR_DO_AUDIT) \
57965+ spin_unlock(&grsec_alert_lock); \
57966+ else \
57967+ spin_unlock(&grsec_audit_lock); \
57968+ read_unlock(&grsec_exec_file_lock); \
57969+ read_unlock(&tasklist_lock); \
57970+ rcu_read_unlock(); \
57971+ ENABLE_PREEMPT(); \
57972+ if (x == GR_DONT_AUDIT) \
57973+ gr_handle_alertkill(current)
57974+
57975+enum {
57976+ FLOODING,
57977+ NO_FLOODING
57978+};
57979+
57980+extern char *gr_alert_log_fmt;
57981+extern char *gr_audit_log_fmt;
57982+extern char *gr_alert_log_buf;
57983+extern char *gr_audit_log_buf;
57984+
57985+static int gr_log_start(int audit)
57986+{
57987+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
57988+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
57989+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
57990+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
57991+ unsigned long curr_secs = get_seconds();
57992+
57993+ if (audit == GR_DO_AUDIT)
57994+ goto set_fmt;
57995+
57996+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
57997+ grsec_alert_wtime = curr_secs;
57998+ grsec_alert_fyet = 0;
57999+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
58000+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
58001+ grsec_alert_fyet++;
58002+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
58003+ grsec_alert_wtime = curr_secs;
58004+ grsec_alert_fyet++;
58005+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
58006+ return FLOODING;
58007+ }
58008+ else return FLOODING;
58009+
58010+set_fmt:
58011+#endif
58012+ memset(buf, 0, PAGE_SIZE);
58013+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
58014+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
58015+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58016+ } else if (current->signal->curr_ip) {
58017+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
58018+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
58019+ } else if (gr_acl_is_enabled()) {
58020+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
58021+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58022+ } else {
58023+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
58024+ strcpy(buf, fmt);
58025+ }
58026+
58027+ return NO_FLOODING;
58028+}
58029+
58030+static void gr_log_middle(int audit, const char *msg, va_list ap)
58031+ __attribute__ ((format (printf, 2, 0)));
58032+
58033+static void gr_log_middle(int audit, const char *msg, va_list ap)
58034+{
58035+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58036+ unsigned int len = strlen(buf);
58037+
58038+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58039+
58040+ return;
58041+}
58042+
58043+static void gr_log_middle_varargs(int audit, const char *msg, ...)
58044+ __attribute__ ((format (printf, 2, 3)));
58045+
58046+static void gr_log_middle_varargs(int audit, const char *msg, ...)
58047+{
58048+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58049+ unsigned int len = strlen(buf);
58050+ va_list ap;
58051+
58052+ va_start(ap, msg);
58053+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58054+ va_end(ap);
58055+
58056+ return;
58057+}
58058+
58059+static void gr_log_end(int audit, int append_default)
58060+{
58061+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58062+
58063+ if (append_default) {
58064+ unsigned int len = strlen(buf);
58065+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
58066+ }
58067+
58068+ printk("%s\n", buf);
58069+
58070+ return;
58071+}
58072+
58073+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
58074+{
58075+ int logtype;
58076+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
58077+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
58078+ void *voidptr = NULL;
58079+ int num1 = 0, num2 = 0;
58080+ unsigned long ulong1 = 0, ulong2 = 0;
58081+ struct dentry *dentry = NULL;
58082+ struct vfsmount *mnt = NULL;
58083+ struct file *file = NULL;
58084+ struct task_struct *task = NULL;
58085+ const struct cred *cred, *pcred;
58086+ va_list ap;
58087+
58088+ BEGIN_LOCKS(audit);
58089+ logtype = gr_log_start(audit);
58090+ if (logtype == FLOODING) {
58091+ END_LOCKS(audit);
58092+ return;
58093+ }
58094+ va_start(ap, argtypes);
58095+ switch (argtypes) {
58096+ case GR_TTYSNIFF:
58097+ task = va_arg(ap, struct task_struct *);
58098+ 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);
58099+ break;
58100+ case GR_SYSCTL_HIDDEN:
58101+ str1 = va_arg(ap, char *);
58102+ gr_log_middle_varargs(audit, msg, result, str1);
58103+ break;
58104+ case GR_RBAC:
58105+ dentry = va_arg(ap, struct dentry *);
58106+ mnt = va_arg(ap, struct vfsmount *);
58107+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
58108+ break;
58109+ case GR_RBAC_STR:
58110+ dentry = va_arg(ap, struct dentry *);
58111+ mnt = va_arg(ap, struct vfsmount *);
58112+ str1 = va_arg(ap, char *);
58113+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
58114+ break;
58115+ case GR_STR_RBAC:
58116+ str1 = va_arg(ap, char *);
58117+ dentry = va_arg(ap, struct dentry *);
58118+ mnt = va_arg(ap, struct vfsmount *);
58119+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
58120+ break;
58121+ case GR_RBAC_MODE2:
58122+ dentry = va_arg(ap, struct dentry *);
58123+ mnt = va_arg(ap, struct vfsmount *);
58124+ str1 = va_arg(ap, char *);
58125+ str2 = va_arg(ap, char *);
58126+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
58127+ break;
58128+ case GR_RBAC_MODE3:
58129+ dentry = va_arg(ap, struct dentry *);
58130+ mnt = va_arg(ap, struct vfsmount *);
58131+ str1 = va_arg(ap, char *);
58132+ str2 = va_arg(ap, char *);
58133+ str3 = va_arg(ap, char *);
58134+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
58135+ break;
58136+ case GR_FILENAME:
58137+ dentry = va_arg(ap, struct dentry *);
58138+ mnt = va_arg(ap, struct vfsmount *);
58139+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
58140+ break;
58141+ case GR_STR_FILENAME:
58142+ str1 = va_arg(ap, char *);
58143+ dentry = va_arg(ap, struct dentry *);
58144+ mnt = va_arg(ap, struct vfsmount *);
58145+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
58146+ break;
58147+ case GR_FILENAME_STR:
58148+ dentry = va_arg(ap, struct dentry *);
58149+ mnt = va_arg(ap, struct vfsmount *);
58150+ str1 = va_arg(ap, char *);
58151+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
58152+ break;
58153+ case GR_FILENAME_TWO_INT:
58154+ dentry = va_arg(ap, struct dentry *);
58155+ mnt = va_arg(ap, struct vfsmount *);
58156+ num1 = va_arg(ap, int);
58157+ num2 = va_arg(ap, int);
58158+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
58159+ break;
58160+ case GR_FILENAME_TWO_INT_STR:
58161+ dentry = va_arg(ap, struct dentry *);
58162+ mnt = va_arg(ap, struct vfsmount *);
58163+ num1 = va_arg(ap, int);
58164+ num2 = va_arg(ap, int);
58165+ str1 = va_arg(ap, char *);
58166+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
58167+ break;
58168+ case GR_TEXTREL:
58169+ file = va_arg(ap, struct file *);
58170+ ulong1 = va_arg(ap, unsigned long);
58171+ ulong2 = va_arg(ap, unsigned long);
58172+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
58173+ break;
58174+ case GR_PTRACE:
58175+ task = va_arg(ap, struct task_struct *);
58176+ 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);
58177+ break;
58178+ case GR_RESOURCE:
58179+ task = va_arg(ap, struct task_struct *);
58180+ cred = __task_cred(task);
58181+ pcred = __task_cred(task->real_parent);
58182+ ulong1 = va_arg(ap, unsigned long);
58183+ str1 = va_arg(ap, char *);
58184+ ulong2 = va_arg(ap, unsigned long);
58185+ 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);
58186+ break;
58187+ case GR_CAP:
58188+ task = va_arg(ap, struct task_struct *);
58189+ cred = __task_cred(task);
58190+ pcred = __task_cred(task->real_parent);
58191+ str1 = va_arg(ap, char *);
58192+ 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);
58193+ break;
58194+ case GR_SIG:
58195+ str1 = va_arg(ap, char *);
58196+ voidptr = va_arg(ap, void *);
58197+ gr_log_middle_varargs(audit, msg, str1, voidptr);
58198+ break;
58199+ case GR_SIG2:
58200+ task = va_arg(ap, struct task_struct *);
58201+ cred = __task_cred(task);
58202+ pcred = __task_cred(task->real_parent);
58203+ num1 = va_arg(ap, int);
58204+ 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);
58205+ break;
58206+ case GR_CRASH1:
58207+ task = va_arg(ap, struct task_struct *);
58208+ cred = __task_cred(task);
58209+ pcred = __task_cred(task->real_parent);
58210+ ulong1 = va_arg(ap, unsigned long);
58211+ 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);
58212+ break;
58213+ case GR_CRASH2:
58214+ task = va_arg(ap, struct task_struct *);
58215+ cred = __task_cred(task);
58216+ pcred = __task_cred(task->real_parent);
58217+ ulong1 = va_arg(ap, unsigned long);
58218+ 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);
58219+ break;
58220+ case GR_RWXMAP:
58221+ file = va_arg(ap, struct file *);
58222+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
58223+ break;
58224+ case GR_PSACCT:
58225+ {
58226+ unsigned int wday, cday;
58227+ __u8 whr, chr;
58228+ __u8 wmin, cmin;
58229+ __u8 wsec, csec;
58230+ char cur_tty[64] = { 0 };
58231+ char parent_tty[64] = { 0 };
58232+
58233+ task = va_arg(ap, struct task_struct *);
58234+ wday = va_arg(ap, unsigned int);
58235+ cday = va_arg(ap, unsigned int);
58236+ whr = va_arg(ap, int);
58237+ chr = va_arg(ap, int);
58238+ wmin = va_arg(ap, int);
58239+ cmin = va_arg(ap, int);
58240+ wsec = va_arg(ap, int);
58241+ csec = va_arg(ap, int);
58242+ ulong1 = va_arg(ap, unsigned long);
58243+ cred = __task_cred(task);
58244+ pcred = __task_cred(task->real_parent);
58245+
58246+ 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);
58247+ }
58248+ break;
58249+ default:
58250+ gr_log_middle(audit, msg, ap);
58251+ }
58252+ va_end(ap);
58253+ // these don't need DEFAULTSECARGS printed on the end
58254+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
58255+ gr_log_end(audit, 0);
58256+ else
58257+ gr_log_end(audit, 1);
58258+ END_LOCKS(audit);
58259+}
58260diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
58261new file mode 100644
58262index 0000000..f536303
58263--- /dev/null
58264+++ b/grsecurity/grsec_mem.c
58265@@ -0,0 +1,40 @@
58266+#include <linux/kernel.h>
58267+#include <linux/sched.h>
58268+#include <linux/mm.h>
58269+#include <linux/mman.h>
58270+#include <linux/grinternal.h>
58271+
58272+void
58273+gr_handle_ioperm(void)
58274+{
58275+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
58276+ return;
58277+}
58278+
58279+void
58280+gr_handle_iopl(void)
58281+{
58282+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
58283+ return;
58284+}
58285+
58286+void
58287+gr_handle_mem_readwrite(u64 from, u64 to)
58288+{
58289+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
58290+ return;
58291+}
58292+
58293+void
58294+gr_handle_vm86(void)
58295+{
58296+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
58297+ return;
58298+}
58299+
58300+void
58301+gr_log_badprocpid(const char *entry)
58302+{
58303+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
58304+ return;
58305+}
58306diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
58307new file mode 100644
58308index 0000000..2131422
58309--- /dev/null
58310+++ b/grsecurity/grsec_mount.c
58311@@ -0,0 +1,62 @@
58312+#include <linux/kernel.h>
58313+#include <linux/sched.h>
58314+#include <linux/mount.h>
58315+#include <linux/grsecurity.h>
58316+#include <linux/grinternal.h>
58317+
58318+void
58319+gr_log_remount(const char *devname, const int retval)
58320+{
58321+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58322+ if (grsec_enable_mount && (retval >= 0))
58323+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
58324+#endif
58325+ return;
58326+}
58327+
58328+void
58329+gr_log_unmount(const char *devname, const int retval)
58330+{
58331+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58332+ if (grsec_enable_mount && (retval >= 0))
58333+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
58334+#endif
58335+ return;
58336+}
58337+
58338+void
58339+gr_log_mount(const char *from, const char *to, const int retval)
58340+{
58341+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58342+ if (grsec_enable_mount && (retval >= 0))
58343+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
58344+#endif
58345+ return;
58346+}
58347+
58348+int
58349+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
58350+{
58351+#ifdef CONFIG_GRKERNSEC_ROFS
58352+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
58353+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
58354+ return -EPERM;
58355+ } else
58356+ return 0;
58357+#endif
58358+ return 0;
58359+}
58360+
58361+int
58362+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
58363+{
58364+#ifdef CONFIG_GRKERNSEC_ROFS
58365+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
58366+ dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
58367+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
58368+ return -EPERM;
58369+ } else
58370+ return 0;
58371+#endif
58372+ return 0;
58373+}
58374diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
58375new file mode 100644
58376index 0000000..a3b12a0
58377--- /dev/null
58378+++ b/grsecurity/grsec_pax.c
58379@@ -0,0 +1,36 @@
58380+#include <linux/kernel.h>
58381+#include <linux/sched.h>
58382+#include <linux/mm.h>
58383+#include <linux/file.h>
58384+#include <linux/grinternal.h>
58385+#include <linux/grsecurity.h>
58386+
58387+void
58388+gr_log_textrel(struct vm_area_struct * vma)
58389+{
58390+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58391+ if (grsec_enable_audit_textrel)
58392+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
58393+#endif
58394+ return;
58395+}
58396+
58397+void
58398+gr_log_rwxmmap(struct file *file)
58399+{
58400+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58401+ if (grsec_enable_log_rwxmaps)
58402+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
58403+#endif
58404+ return;
58405+}
58406+
58407+void
58408+gr_log_rwxmprotect(struct file *file)
58409+{
58410+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58411+ if (grsec_enable_log_rwxmaps)
58412+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
58413+#endif
58414+ return;
58415+}
58416diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
58417new file mode 100644
58418index 0000000..f7f29aa
58419--- /dev/null
58420+++ b/grsecurity/grsec_ptrace.c
58421@@ -0,0 +1,30 @@
58422+#include <linux/kernel.h>
58423+#include <linux/sched.h>
58424+#include <linux/grinternal.h>
58425+#include <linux/security.h>
58426+
58427+void
58428+gr_audit_ptrace(struct task_struct *task)
58429+{
58430+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58431+ if (grsec_enable_audit_ptrace)
58432+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
58433+#endif
58434+ return;
58435+}
58436+
58437+int
58438+gr_ptrace_readexec(struct file *file, int unsafe_flags)
58439+{
58440+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
58441+ const struct dentry *dentry = file->f_path.dentry;
58442+ const struct vfsmount *mnt = file->f_path.mnt;
58443+
58444+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
58445+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
58446+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
58447+ return -EACCES;
58448+ }
58449+#endif
58450+ return 0;
58451+}
58452diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
58453new file mode 100644
58454index 0000000..7a5b2de
58455--- /dev/null
58456+++ b/grsecurity/grsec_sig.c
58457@@ -0,0 +1,207 @@
58458+#include <linux/kernel.h>
58459+#include <linux/sched.h>
58460+#include <linux/delay.h>
58461+#include <linux/grsecurity.h>
58462+#include <linux/grinternal.h>
58463+#include <linux/hardirq.h>
58464+
58465+char *signames[] = {
58466+ [SIGSEGV] = "Segmentation fault",
58467+ [SIGILL] = "Illegal instruction",
58468+ [SIGABRT] = "Abort",
58469+ [SIGBUS] = "Invalid alignment/Bus error"
58470+};
58471+
58472+void
58473+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
58474+{
58475+#ifdef CONFIG_GRKERNSEC_SIGNAL
58476+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
58477+ (sig == SIGABRT) || (sig == SIGBUS))) {
58478+ if (t->pid == current->pid) {
58479+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
58480+ } else {
58481+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
58482+ }
58483+ }
58484+#endif
58485+ return;
58486+}
58487+
58488+int
58489+gr_handle_signal(const struct task_struct *p, const int sig)
58490+{
58491+#ifdef CONFIG_GRKERNSEC
58492+ /* ignore the 0 signal for protected task checks */
58493+ if (current->pid > 1 && sig && gr_check_protected_task(p)) {
58494+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
58495+ return -EPERM;
58496+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
58497+ return -EPERM;
58498+ }
58499+#endif
58500+ return 0;
58501+}
58502+
58503+#ifdef CONFIG_GRKERNSEC
58504+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
58505+
58506+int gr_fake_force_sig(int sig, struct task_struct *t)
58507+{
58508+ unsigned long int flags;
58509+ int ret, blocked, ignored;
58510+ struct k_sigaction *action;
58511+
58512+ spin_lock_irqsave(&t->sighand->siglock, flags);
58513+ action = &t->sighand->action[sig-1];
58514+ ignored = action->sa.sa_handler == SIG_IGN;
58515+ blocked = sigismember(&t->blocked, sig);
58516+ if (blocked || ignored) {
58517+ action->sa.sa_handler = SIG_DFL;
58518+ if (blocked) {
58519+ sigdelset(&t->blocked, sig);
58520+ recalc_sigpending_and_wake(t);
58521+ }
58522+ }
58523+ if (action->sa.sa_handler == SIG_DFL)
58524+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
58525+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
58526+
58527+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
58528+
58529+ return ret;
58530+}
58531+#endif
58532+
58533+#ifdef CONFIG_GRKERNSEC_BRUTE
58534+#define GR_USER_BAN_TIME (15 * 60)
58535+
58536+static int __get_dumpable(unsigned long mm_flags)
58537+{
58538+ int ret;
58539+
58540+ ret = mm_flags & MMF_DUMPABLE_MASK;
58541+ return (ret >= 2) ? 2 : ret;
58542+}
58543+#endif
58544+
58545+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
58546+{
58547+#ifdef CONFIG_GRKERNSEC_BRUTE
58548+ uid_t uid = 0;
58549+
58550+ if (!grsec_enable_brute)
58551+ return;
58552+
58553+ rcu_read_lock();
58554+ read_lock(&tasklist_lock);
58555+ read_lock(&grsec_exec_file_lock);
58556+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
58557+ p->real_parent->brute = 1;
58558+ else {
58559+ const struct cred *cred = __task_cred(p), *cred2;
58560+ struct task_struct *tsk, *tsk2;
58561+
58562+ if (!__get_dumpable(mm_flags) && cred->uid) {
58563+ struct user_struct *user;
58564+
58565+ uid = cred->uid;
58566+
58567+ /* this is put upon execution past expiration */
58568+ user = find_user(uid);
58569+ if (user == NULL)
58570+ goto unlock;
58571+ user->banned = 1;
58572+ user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
58573+ if (user->ban_expires == ~0UL)
58574+ user->ban_expires--;
58575+
58576+ do_each_thread(tsk2, tsk) {
58577+ cred2 = __task_cred(tsk);
58578+ if (tsk != p && cred2->uid == uid)
58579+ gr_fake_force_sig(SIGKILL, tsk);
58580+ } while_each_thread(tsk2, tsk);
58581+ }
58582+ }
58583+unlock:
58584+ read_unlock(&grsec_exec_file_lock);
58585+ read_unlock(&tasklist_lock);
58586+ rcu_read_unlock();
58587+
58588+ if (uid)
58589+ printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n", uid, GR_USER_BAN_TIME / 60);
58590+
58591+#endif
58592+ return;
58593+}
58594+
58595+void gr_handle_brute_check(void)
58596+{
58597+#ifdef CONFIG_GRKERNSEC_BRUTE
58598+ if (current->brute)
58599+ msleep(30 * 1000);
58600+#endif
58601+ return;
58602+}
58603+
58604+void gr_handle_kernel_exploit(void)
58605+{
58606+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
58607+ const struct cred *cred;
58608+ struct task_struct *tsk, *tsk2;
58609+ struct user_struct *user;
58610+ uid_t uid;
58611+
58612+ if (in_irq() || in_serving_softirq() || in_nmi())
58613+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
58614+
58615+ uid = current_uid();
58616+
58617+ if (uid == 0)
58618+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
58619+ else {
58620+ /* kill all the processes of this user, hold a reference
58621+ to their creds struct, and prevent them from creating
58622+ another process until system reset
58623+ */
58624+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
58625+ /* we intentionally leak this ref */
58626+ user = get_uid(current->cred->user);
58627+ if (user) {
58628+ user->banned = 1;
58629+ user->ban_expires = ~0UL;
58630+ }
58631+
58632+ read_lock(&tasklist_lock);
58633+ do_each_thread(tsk2, tsk) {
58634+ cred = __task_cred(tsk);
58635+ if (cred->uid == uid)
58636+ gr_fake_force_sig(SIGKILL, tsk);
58637+ } while_each_thread(tsk2, tsk);
58638+ read_unlock(&tasklist_lock);
58639+ }
58640+#endif
58641+}
58642+
58643+int __gr_process_user_ban(struct user_struct *user)
58644+{
58645+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58646+ if (unlikely(user->banned)) {
58647+ if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
58648+ user->banned = 0;
58649+ user->ban_expires = 0;
58650+ free_uid(user);
58651+ } else
58652+ return -EPERM;
58653+ }
58654+#endif
58655+ return 0;
58656+}
58657+
58658+int gr_process_user_ban(void)
58659+{
58660+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58661+ return __gr_process_user_ban(current->cred->user);
58662+#endif
58663+ return 0;
58664+}
58665diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
58666new file mode 100644
58667index 0000000..4030d57
58668--- /dev/null
58669+++ b/grsecurity/grsec_sock.c
58670@@ -0,0 +1,244 @@
58671+#include <linux/kernel.h>
58672+#include <linux/module.h>
58673+#include <linux/sched.h>
58674+#include <linux/file.h>
58675+#include <linux/net.h>
58676+#include <linux/in.h>
58677+#include <linux/ip.h>
58678+#include <net/sock.h>
58679+#include <net/inet_sock.h>
58680+#include <linux/grsecurity.h>
58681+#include <linux/grinternal.h>
58682+#include <linux/gracl.h>
58683+
58684+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
58685+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
58686+
58687+EXPORT_SYMBOL(gr_search_udp_recvmsg);
58688+EXPORT_SYMBOL(gr_search_udp_sendmsg);
58689+
58690+#ifdef CONFIG_UNIX_MODULE
58691+EXPORT_SYMBOL(gr_acl_handle_unix);
58692+EXPORT_SYMBOL(gr_acl_handle_mknod);
58693+EXPORT_SYMBOL(gr_handle_chroot_unix);
58694+EXPORT_SYMBOL(gr_handle_create);
58695+#endif
58696+
58697+#ifdef CONFIG_GRKERNSEC
58698+#define gr_conn_table_size 32749
58699+struct conn_table_entry {
58700+ struct conn_table_entry *next;
58701+ struct signal_struct *sig;
58702+};
58703+
58704+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
58705+DEFINE_SPINLOCK(gr_conn_table_lock);
58706+
58707+extern const char * gr_socktype_to_name(unsigned char type);
58708+extern const char * gr_proto_to_name(unsigned char proto);
58709+extern const char * gr_sockfamily_to_name(unsigned char family);
58710+
58711+static __inline__ int
58712+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
58713+{
58714+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
58715+}
58716+
58717+static __inline__ int
58718+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
58719+ __u16 sport, __u16 dport)
58720+{
58721+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
58722+ sig->gr_sport == sport && sig->gr_dport == dport))
58723+ return 1;
58724+ else
58725+ return 0;
58726+}
58727+
58728+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
58729+{
58730+ struct conn_table_entry **match;
58731+ unsigned int index;
58732+
58733+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
58734+ sig->gr_sport, sig->gr_dport,
58735+ gr_conn_table_size);
58736+
58737+ newent->sig = sig;
58738+
58739+ match = &gr_conn_table[index];
58740+ newent->next = *match;
58741+ *match = newent;
58742+
58743+ return;
58744+}
58745+
58746+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
58747+{
58748+ struct conn_table_entry *match, *last = NULL;
58749+ unsigned int index;
58750+
58751+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
58752+ sig->gr_sport, sig->gr_dport,
58753+ gr_conn_table_size);
58754+
58755+ match = gr_conn_table[index];
58756+ while (match && !conn_match(match->sig,
58757+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
58758+ sig->gr_dport)) {
58759+ last = match;
58760+ match = match->next;
58761+ }
58762+
58763+ if (match) {
58764+ if (last)
58765+ last->next = match->next;
58766+ else
58767+ gr_conn_table[index] = NULL;
58768+ kfree(match);
58769+ }
58770+
58771+ return;
58772+}
58773+
58774+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
58775+ __u16 sport, __u16 dport)
58776+{
58777+ struct conn_table_entry *match;
58778+ unsigned int index;
58779+
58780+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
58781+
58782+ match = gr_conn_table[index];
58783+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
58784+ match = match->next;
58785+
58786+ if (match)
58787+ return match->sig;
58788+ else
58789+ return NULL;
58790+}
58791+
58792+#endif
58793+
58794+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
58795+{
58796+#ifdef CONFIG_GRKERNSEC
58797+ struct signal_struct *sig = task->signal;
58798+ struct conn_table_entry *newent;
58799+
58800+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
58801+ if (newent == NULL)
58802+ return;
58803+ /* no bh lock needed since we are called with bh disabled */
58804+ spin_lock(&gr_conn_table_lock);
58805+ gr_del_task_from_ip_table_nolock(sig);
58806+ sig->gr_saddr = inet->inet_rcv_saddr;
58807+ sig->gr_daddr = inet->inet_daddr;
58808+ sig->gr_sport = inet->inet_sport;
58809+ sig->gr_dport = inet->inet_dport;
58810+ gr_add_to_task_ip_table_nolock(sig, newent);
58811+ spin_unlock(&gr_conn_table_lock);
58812+#endif
58813+ return;
58814+}
58815+
58816+void gr_del_task_from_ip_table(struct task_struct *task)
58817+{
58818+#ifdef CONFIG_GRKERNSEC
58819+ spin_lock_bh(&gr_conn_table_lock);
58820+ gr_del_task_from_ip_table_nolock(task->signal);
58821+ spin_unlock_bh(&gr_conn_table_lock);
58822+#endif
58823+ return;
58824+}
58825+
58826+void
58827+gr_attach_curr_ip(const struct sock *sk)
58828+{
58829+#ifdef CONFIG_GRKERNSEC
58830+ struct signal_struct *p, *set;
58831+ const struct inet_sock *inet = inet_sk(sk);
58832+
58833+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
58834+ return;
58835+
58836+ set = current->signal;
58837+
58838+ spin_lock_bh(&gr_conn_table_lock);
58839+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
58840+ inet->inet_dport, inet->inet_sport);
58841+ if (unlikely(p != NULL)) {
58842+ set->curr_ip = p->curr_ip;
58843+ set->used_accept = 1;
58844+ gr_del_task_from_ip_table_nolock(p);
58845+ spin_unlock_bh(&gr_conn_table_lock);
58846+ return;
58847+ }
58848+ spin_unlock_bh(&gr_conn_table_lock);
58849+
58850+ set->curr_ip = inet->inet_daddr;
58851+ set->used_accept = 1;
58852+#endif
58853+ return;
58854+}
58855+
58856+int
58857+gr_handle_sock_all(const int family, const int type, const int protocol)
58858+{
58859+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
58860+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
58861+ (family != AF_UNIX)) {
58862+ if (family == AF_INET)
58863+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
58864+ else
58865+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
58866+ return -EACCES;
58867+ }
58868+#endif
58869+ return 0;
58870+}
58871+
58872+int
58873+gr_handle_sock_server(const struct sockaddr *sck)
58874+{
58875+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
58876+ if (grsec_enable_socket_server &&
58877+ in_group_p(grsec_socket_server_gid) &&
58878+ sck && (sck->sa_family != AF_UNIX) &&
58879+ (sck->sa_family != AF_LOCAL)) {
58880+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
58881+ return -EACCES;
58882+ }
58883+#endif
58884+ return 0;
58885+}
58886+
58887+int
58888+gr_handle_sock_server_other(const struct sock *sck)
58889+{
58890+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
58891+ if (grsec_enable_socket_server &&
58892+ in_group_p(grsec_socket_server_gid) &&
58893+ sck && (sck->sk_family != AF_UNIX) &&
58894+ (sck->sk_family != AF_LOCAL)) {
58895+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
58896+ return -EACCES;
58897+ }
58898+#endif
58899+ return 0;
58900+}
58901+
58902+int
58903+gr_handle_sock_client(const struct sockaddr *sck)
58904+{
58905+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
58906+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
58907+ sck && (sck->sa_family != AF_UNIX) &&
58908+ (sck->sa_family != AF_LOCAL)) {
58909+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
58910+ return -EACCES;
58911+ }
58912+#endif
58913+ return 0;
58914+}
58915diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
58916new file mode 100644
58917index 0000000..a1aedd7
58918--- /dev/null
58919+++ b/grsecurity/grsec_sysctl.c
58920@@ -0,0 +1,451 @@
58921+#include <linux/kernel.h>
58922+#include <linux/sched.h>
58923+#include <linux/sysctl.h>
58924+#include <linux/grsecurity.h>
58925+#include <linux/grinternal.h>
58926+
58927+int
58928+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
58929+{
58930+#ifdef CONFIG_GRKERNSEC_SYSCTL
58931+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
58932+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
58933+ return -EACCES;
58934+ }
58935+#endif
58936+ return 0;
58937+}
58938+
58939+#ifdef CONFIG_GRKERNSEC_ROFS
58940+static int __maybe_unused one = 1;
58941+#endif
58942+
58943+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
58944+struct ctl_table grsecurity_table[] = {
58945+#ifdef CONFIG_GRKERNSEC_SYSCTL
58946+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
58947+#ifdef CONFIG_GRKERNSEC_IO
58948+ {
58949+ .procname = "disable_priv_io",
58950+ .data = &grsec_disable_privio,
58951+ .maxlen = sizeof(int),
58952+ .mode = 0600,
58953+ .proc_handler = &proc_dointvec,
58954+ },
58955+#endif
58956+#endif
58957+#ifdef CONFIG_GRKERNSEC_LINK
58958+ {
58959+ .procname = "linking_restrictions",
58960+ .data = &grsec_enable_link,
58961+ .maxlen = sizeof(int),
58962+ .mode = 0600,
58963+ .proc_handler = &proc_dointvec,
58964+ },
58965+#endif
58966+#ifdef CONFIG_GRKERNSEC_BRUTE
58967+ {
58968+ .procname = "deter_bruteforce",
58969+ .data = &grsec_enable_brute,
58970+ .maxlen = sizeof(int),
58971+ .mode = 0600,
58972+ .proc_handler = &proc_dointvec,
58973+ },
58974+#endif
58975+#ifdef CONFIG_GRKERNSEC_FIFO
58976+ {
58977+ .procname = "fifo_restrictions",
58978+ .data = &grsec_enable_fifo,
58979+ .maxlen = sizeof(int),
58980+ .mode = 0600,
58981+ .proc_handler = &proc_dointvec,
58982+ },
58983+#endif
58984+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
58985+ {
58986+ .procname = "ptrace_readexec",
58987+ .data = &grsec_enable_ptrace_readexec,
58988+ .maxlen = sizeof(int),
58989+ .mode = 0600,
58990+ .proc_handler = &proc_dointvec,
58991+ },
58992+#endif
58993+#ifdef CONFIG_GRKERNSEC_SETXID
58994+ {
58995+ .procname = "consistent_setxid",
58996+ .data = &grsec_enable_setxid,
58997+ .maxlen = sizeof(int),
58998+ .mode = 0600,
58999+ .proc_handler = &proc_dointvec,
59000+ },
59001+#endif
59002+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
59003+ {
59004+ .procname = "ip_blackhole",
59005+ .data = &grsec_enable_blackhole,
59006+ .maxlen = sizeof(int),
59007+ .mode = 0600,
59008+ .proc_handler = &proc_dointvec,
59009+ },
59010+ {
59011+ .procname = "lastack_retries",
59012+ .data = &grsec_lastack_retries,
59013+ .maxlen = sizeof(int),
59014+ .mode = 0600,
59015+ .proc_handler = &proc_dointvec,
59016+ },
59017+#endif
59018+#ifdef CONFIG_GRKERNSEC_EXECLOG
59019+ {
59020+ .procname = "exec_logging",
59021+ .data = &grsec_enable_execlog,
59022+ .maxlen = sizeof(int),
59023+ .mode = 0600,
59024+ .proc_handler = &proc_dointvec,
59025+ },
59026+#endif
59027+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59028+ {
59029+ .procname = "rwxmap_logging",
59030+ .data = &grsec_enable_log_rwxmaps,
59031+ .maxlen = sizeof(int),
59032+ .mode = 0600,
59033+ .proc_handler = &proc_dointvec,
59034+ },
59035+#endif
59036+#ifdef CONFIG_GRKERNSEC_SIGNAL
59037+ {
59038+ .procname = "signal_logging",
59039+ .data = &grsec_enable_signal,
59040+ .maxlen = sizeof(int),
59041+ .mode = 0600,
59042+ .proc_handler = &proc_dointvec,
59043+ },
59044+#endif
59045+#ifdef CONFIG_GRKERNSEC_FORKFAIL
59046+ {
59047+ .procname = "forkfail_logging",
59048+ .data = &grsec_enable_forkfail,
59049+ .maxlen = sizeof(int),
59050+ .mode = 0600,
59051+ .proc_handler = &proc_dointvec,
59052+ },
59053+#endif
59054+#ifdef CONFIG_GRKERNSEC_TIME
59055+ {
59056+ .procname = "timechange_logging",
59057+ .data = &grsec_enable_time,
59058+ .maxlen = sizeof(int),
59059+ .mode = 0600,
59060+ .proc_handler = &proc_dointvec,
59061+ },
59062+#endif
59063+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
59064+ {
59065+ .procname = "chroot_deny_shmat",
59066+ .data = &grsec_enable_chroot_shmat,
59067+ .maxlen = sizeof(int),
59068+ .mode = 0600,
59069+ .proc_handler = &proc_dointvec,
59070+ },
59071+#endif
59072+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
59073+ {
59074+ .procname = "chroot_deny_unix",
59075+ .data = &grsec_enable_chroot_unix,
59076+ .maxlen = sizeof(int),
59077+ .mode = 0600,
59078+ .proc_handler = &proc_dointvec,
59079+ },
59080+#endif
59081+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
59082+ {
59083+ .procname = "chroot_deny_mount",
59084+ .data = &grsec_enable_chroot_mount,
59085+ .maxlen = sizeof(int),
59086+ .mode = 0600,
59087+ .proc_handler = &proc_dointvec,
59088+ },
59089+#endif
59090+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
59091+ {
59092+ .procname = "chroot_deny_fchdir",
59093+ .data = &grsec_enable_chroot_fchdir,
59094+ .maxlen = sizeof(int),
59095+ .mode = 0600,
59096+ .proc_handler = &proc_dointvec,
59097+ },
59098+#endif
59099+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
59100+ {
59101+ .procname = "chroot_deny_chroot",
59102+ .data = &grsec_enable_chroot_double,
59103+ .maxlen = sizeof(int),
59104+ .mode = 0600,
59105+ .proc_handler = &proc_dointvec,
59106+ },
59107+#endif
59108+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
59109+ {
59110+ .procname = "chroot_deny_pivot",
59111+ .data = &grsec_enable_chroot_pivot,
59112+ .maxlen = sizeof(int),
59113+ .mode = 0600,
59114+ .proc_handler = &proc_dointvec,
59115+ },
59116+#endif
59117+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
59118+ {
59119+ .procname = "chroot_enforce_chdir",
59120+ .data = &grsec_enable_chroot_chdir,
59121+ .maxlen = sizeof(int),
59122+ .mode = 0600,
59123+ .proc_handler = &proc_dointvec,
59124+ },
59125+#endif
59126+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
59127+ {
59128+ .procname = "chroot_deny_chmod",
59129+ .data = &grsec_enable_chroot_chmod,
59130+ .maxlen = sizeof(int),
59131+ .mode = 0600,
59132+ .proc_handler = &proc_dointvec,
59133+ },
59134+#endif
59135+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
59136+ {
59137+ .procname = "chroot_deny_mknod",
59138+ .data = &grsec_enable_chroot_mknod,
59139+ .maxlen = sizeof(int),
59140+ .mode = 0600,
59141+ .proc_handler = &proc_dointvec,
59142+ },
59143+#endif
59144+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
59145+ {
59146+ .procname = "chroot_restrict_nice",
59147+ .data = &grsec_enable_chroot_nice,
59148+ .maxlen = sizeof(int),
59149+ .mode = 0600,
59150+ .proc_handler = &proc_dointvec,
59151+ },
59152+#endif
59153+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
59154+ {
59155+ .procname = "chroot_execlog",
59156+ .data = &grsec_enable_chroot_execlog,
59157+ .maxlen = sizeof(int),
59158+ .mode = 0600,
59159+ .proc_handler = &proc_dointvec,
59160+ },
59161+#endif
59162+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
59163+ {
59164+ .procname = "chroot_caps",
59165+ .data = &grsec_enable_chroot_caps,
59166+ .maxlen = sizeof(int),
59167+ .mode = 0600,
59168+ .proc_handler = &proc_dointvec,
59169+ },
59170+#endif
59171+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
59172+ {
59173+ .procname = "chroot_deny_sysctl",
59174+ .data = &grsec_enable_chroot_sysctl,
59175+ .maxlen = sizeof(int),
59176+ .mode = 0600,
59177+ .proc_handler = &proc_dointvec,
59178+ },
59179+#endif
59180+#ifdef CONFIG_GRKERNSEC_TPE
59181+ {
59182+ .procname = "tpe",
59183+ .data = &grsec_enable_tpe,
59184+ .maxlen = sizeof(int),
59185+ .mode = 0600,
59186+ .proc_handler = &proc_dointvec,
59187+ },
59188+ {
59189+ .procname = "tpe_gid",
59190+ .data = &grsec_tpe_gid,
59191+ .maxlen = sizeof(int),
59192+ .mode = 0600,
59193+ .proc_handler = &proc_dointvec,
59194+ },
59195+#endif
59196+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59197+ {
59198+ .procname = "tpe_invert",
59199+ .data = &grsec_enable_tpe_invert,
59200+ .maxlen = sizeof(int),
59201+ .mode = 0600,
59202+ .proc_handler = &proc_dointvec,
59203+ },
59204+#endif
59205+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59206+ {
59207+ .procname = "tpe_restrict_all",
59208+ .data = &grsec_enable_tpe_all,
59209+ .maxlen = sizeof(int),
59210+ .mode = 0600,
59211+ .proc_handler = &proc_dointvec,
59212+ },
59213+#endif
59214+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59215+ {
59216+ .procname = "socket_all",
59217+ .data = &grsec_enable_socket_all,
59218+ .maxlen = sizeof(int),
59219+ .mode = 0600,
59220+ .proc_handler = &proc_dointvec,
59221+ },
59222+ {
59223+ .procname = "socket_all_gid",
59224+ .data = &grsec_socket_all_gid,
59225+ .maxlen = sizeof(int),
59226+ .mode = 0600,
59227+ .proc_handler = &proc_dointvec,
59228+ },
59229+#endif
59230+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59231+ {
59232+ .procname = "socket_client",
59233+ .data = &grsec_enable_socket_client,
59234+ .maxlen = sizeof(int),
59235+ .mode = 0600,
59236+ .proc_handler = &proc_dointvec,
59237+ },
59238+ {
59239+ .procname = "socket_client_gid",
59240+ .data = &grsec_socket_client_gid,
59241+ .maxlen = sizeof(int),
59242+ .mode = 0600,
59243+ .proc_handler = &proc_dointvec,
59244+ },
59245+#endif
59246+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59247+ {
59248+ .procname = "socket_server",
59249+ .data = &grsec_enable_socket_server,
59250+ .maxlen = sizeof(int),
59251+ .mode = 0600,
59252+ .proc_handler = &proc_dointvec,
59253+ },
59254+ {
59255+ .procname = "socket_server_gid",
59256+ .data = &grsec_socket_server_gid,
59257+ .maxlen = sizeof(int),
59258+ .mode = 0600,
59259+ .proc_handler = &proc_dointvec,
59260+ },
59261+#endif
59262+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
59263+ {
59264+ .procname = "audit_group",
59265+ .data = &grsec_enable_group,
59266+ .maxlen = sizeof(int),
59267+ .mode = 0600,
59268+ .proc_handler = &proc_dointvec,
59269+ },
59270+ {
59271+ .procname = "audit_gid",
59272+ .data = &grsec_audit_gid,
59273+ .maxlen = sizeof(int),
59274+ .mode = 0600,
59275+ .proc_handler = &proc_dointvec,
59276+ },
59277+#endif
59278+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
59279+ {
59280+ .procname = "audit_chdir",
59281+ .data = &grsec_enable_chdir,
59282+ .maxlen = sizeof(int),
59283+ .mode = 0600,
59284+ .proc_handler = &proc_dointvec,
59285+ },
59286+#endif
59287+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
59288+ {
59289+ .procname = "audit_mount",
59290+ .data = &grsec_enable_mount,
59291+ .maxlen = sizeof(int),
59292+ .mode = 0600,
59293+ .proc_handler = &proc_dointvec,
59294+ },
59295+#endif
59296+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
59297+ {
59298+ .procname = "audit_textrel",
59299+ .data = &grsec_enable_audit_textrel,
59300+ .maxlen = sizeof(int),
59301+ .mode = 0600,
59302+ .proc_handler = &proc_dointvec,
59303+ },
59304+#endif
59305+#ifdef CONFIG_GRKERNSEC_DMESG
59306+ {
59307+ .procname = "dmesg",
59308+ .data = &grsec_enable_dmesg,
59309+ .maxlen = sizeof(int),
59310+ .mode = 0600,
59311+ .proc_handler = &proc_dointvec,
59312+ },
59313+#endif
59314+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
59315+ {
59316+ .procname = "chroot_findtask",
59317+ .data = &grsec_enable_chroot_findtask,
59318+ .maxlen = sizeof(int),
59319+ .mode = 0600,
59320+ .proc_handler = &proc_dointvec,
59321+ },
59322+#endif
59323+#ifdef CONFIG_GRKERNSEC_RESLOG
59324+ {
59325+ .procname = "resource_logging",
59326+ .data = &grsec_resource_logging,
59327+ .maxlen = sizeof(int),
59328+ .mode = 0600,
59329+ .proc_handler = &proc_dointvec,
59330+ },
59331+#endif
59332+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
59333+ {
59334+ .procname = "audit_ptrace",
59335+ .data = &grsec_enable_audit_ptrace,
59336+ .maxlen = sizeof(int),
59337+ .mode = 0600,
59338+ .proc_handler = &proc_dointvec,
59339+ },
59340+#endif
59341+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59342+ {
59343+ .procname = "harden_ptrace",
59344+ .data = &grsec_enable_harden_ptrace,
59345+ .maxlen = sizeof(int),
59346+ .mode = 0600,
59347+ .proc_handler = &proc_dointvec,
59348+ },
59349+#endif
59350+ {
59351+ .procname = "grsec_lock",
59352+ .data = &grsec_lock,
59353+ .maxlen = sizeof(int),
59354+ .mode = 0600,
59355+ .proc_handler = &proc_dointvec,
59356+ },
59357+#endif
59358+#ifdef CONFIG_GRKERNSEC_ROFS
59359+ {
59360+ .procname = "romount_protect",
59361+ .data = &grsec_enable_rofs,
59362+ .maxlen = sizeof(int),
59363+ .mode = 0600,
59364+ .proc_handler = &proc_dointvec_minmax,
59365+ .extra1 = &one,
59366+ .extra2 = &one,
59367+ },
59368+#endif
59369+ { }
59370+};
59371+#endif
59372diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
59373new file mode 100644
59374index 0000000..0dc13c3
59375--- /dev/null
59376+++ b/grsecurity/grsec_time.c
59377@@ -0,0 +1,16 @@
59378+#include <linux/kernel.h>
59379+#include <linux/sched.h>
59380+#include <linux/grinternal.h>
59381+#include <linux/module.h>
59382+
59383+void
59384+gr_log_timechange(void)
59385+{
59386+#ifdef CONFIG_GRKERNSEC_TIME
59387+ if (grsec_enable_time)
59388+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
59389+#endif
59390+ return;
59391+}
59392+
59393+EXPORT_SYMBOL(gr_log_timechange);
59394diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
59395new file mode 100644
59396index 0000000..07e0dc0
59397--- /dev/null
59398+++ b/grsecurity/grsec_tpe.c
59399@@ -0,0 +1,73 @@
59400+#include <linux/kernel.h>
59401+#include <linux/sched.h>
59402+#include <linux/file.h>
59403+#include <linux/fs.h>
59404+#include <linux/grinternal.h>
59405+
59406+extern int gr_acl_tpe_check(void);
59407+
59408+int
59409+gr_tpe_allow(const struct file *file)
59410+{
59411+#ifdef CONFIG_GRKERNSEC
59412+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
59413+ const struct cred *cred = current_cred();
59414+ char *msg = NULL;
59415+ char *msg2 = NULL;
59416+
59417+ // never restrict root
59418+ if (!cred->uid)
59419+ return 1;
59420+
59421+ if (grsec_enable_tpe) {
59422+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59423+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
59424+ msg = "not being in trusted group";
59425+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
59426+ msg = "being in untrusted group";
59427+#else
59428+ if (in_group_p(grsec_tpe_gid))
59429+ msg = "being in untrusted group";
59430+#endif
59431+ }
59432+ if (!msg && gr_acl_tpe_check())
59433+ msg = "being in untrusted role";
59434+
59435+ // not in any affected group/role
59436+ if (!msg)
59437+ goto next_check;
59438+
59439+ if (inode->i_uid)
59440+ msg2 = "file in non-root-owned directory";
59441+ else if (inode->i_mode & S_IWOTH)
59442+ msg2 = "file in world-writable directory";
59443+ else if (inode->i_mode & S_IWGRP)
59444+ msg2 = "file in group-writable directory";
59445+
59446+ if (msg && msg2) {
59447+ char fullmsg[70] = {0};
59448+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
59449+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
59450+ return 0;
59451+ }
59452+ msg = NULL;
59453+next_check:
59454+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59455+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
59456+ return 1;
59457+
59458+ if (inode->i_uid && (inode->i_uid != cred->uid))
59459+ msg = "directory not owned by user";
59460+ else if (inode->i_mode & S_IWOTH)
59461+ msg = "file in world-writable directory";
59462+ else if (inode->i_mode & S_IWGRP)
59463+ msg = "file in group-writable directory";
59464+
59465+ if (msg) {
59466+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
59467+ return 0;
59468+ }
59469+#endif
59470+#endif
59471+ return 1;
59472+}
59473diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
59474new file mode 100644
59475index 0000000..9f7b1ac
59476--- /dev/null
59477+++ b/grsecurity/grsum.c
59478@@ -0,0 +1,61 @@
59479+#include <linux/err.h>
59480+#include <linux/kernel.h>
59481+#include <linux/sched.h>
59482+#include <linux/mm.h>
59483+#include <linux/scatterlist.h>
59484+#include <linux/crypto.h>
59485+#include <linux/gracl.h>
59486+
59487+
59488+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
59489+#error "crypto and sha256 must be built into the kernel"
59490+#endif
59491+
59492+int
59493+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
59494+{
59495+ char *p;
59496+ struct crypto_hash *tfm;
59497+ struct hash_desc desc;
59498+ struct scatterlist sg;
59499+ unsigned char temp_sum[GR_SHA_LEN];
59500+ volatile int retval = 0;
59501+ volatile int dummy = 0;
59502+ unsigned int i;
59503+
59504+ sg_init_table(&sg, 1);
59505+
59506+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
59507+ if (IS_ERR(tfm)) {
59508+ /* should never happen, since sha256 should be built in */
59509+ return 1;
59510+ }
59511+
59512+ desc.tfm = tfm;
59513+ desc.flags = 0;
59514+
59515+ crypto_hash_init(&desc);
59516+
59517+ p = salt;
59518+ sg_set_buf(&sg, p, GR_SALT_LEN);
59519+ crypto_hash_update(&desc, &sg, sg.length);
59520+
59521+ p = entry->pw;
59522+ sg_set_buf(&sg, p, strlen(p));
59523+
59524+ crypto_hash_update(&desc, &sg, sg.length);
59525+
59526+ crypto_hash_final(&desc, temp_sum);
59527+
59528+ memset(entry->pw, 0, GR_PW_LEN);
59529+
59530+ for (i = 0; i < GR_SHA_LEN; i++)
59531+ if (sum[i] != temp_sum[i])
59532+ retval = 1;
59533+ else
59534+ dummy = 1; // waste a cycle
59535+
59536+ crypto_free_hash(tfm);
59537+
59538+ return retval;
59539+}
59540diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
59541index 6cd5b64..f620d2d 100644
59542--- a/include/acpi/acpi_bus.h
59543+++ b/include/acpi/acpi_bus.h
59544@@ -107,7 +107,7 @@ struct acpi_device_ops {
59545 acpi_op_bind bind;
59546 acpi_op_unbind unbind;
59547 acpi_op_notify notify;
59548-};
59549+} __no_const;
59550
59551 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
59552
59553diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
59554index b7babf0..71e4e74 100644
59555--- a/include/asm-generic/atomic-long.h
59556+++ b/include/asm-generic/atomic-long.h
59557@@ -22,6 +22,12 @@
59558
59559 typedef atomic64_t atomic_long_t;
59560
59561+#ifdef CONFIG_PAX_REFCOUNT
59562+typedef atomic64_unchecked_t atomic_long_unchecked_t;
59563+#else
59564+typedef atomic64_t atomic_long_unchecked_t;
59565+#endif
59566+
59567 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
59568
59569 static inline long atomic_long_read(atomic_long_t *l)
59570@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
59571 return (long)atomic64_read(v);
59572 }
59573
59574+#ifdef CONFIG_PAX_REFCOUNT
59575+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
59576+{
59577+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59578+
59579+ return (long)atomic64_read_unchecked(v);
59580+}
59581+#endif
59582+
59583 static inline void atomic_long_set(atomic_long_t *l, long i)
59584 {
59585 atomic64_t *v = (atomic64_t *)l;
59586@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
59587 atomic64_set(v, i);
59588 }
59589
59590+#ifdef CONFIG_PAX_REFCOUNT
59591+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
59592+{
59593+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59594+
59595+ atomic64_set_unchecked(v, i);
59596+}
59597+#endif
59598+
59599 static inline void atomic_long_inc(atomic_long_t *l)
59600 {
59601 atomic64_t *v = (atomic64_t *)l;
59602@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
59603 atomic64_inc(v);
59604 }
59605
59606+#ifdef CONFIG_PAX_REFCOUNT
59607+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
59608+{
59609+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59610+
59611+ atomic64_inc_unchecked(v);
59612+}
59613+#endif
59614+
59615 static inline void atomic_long_dec(atomic_long_t *l)
59616 {
59617 atomic64_t *v = (atomic64_t *)l;
59618@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
59619 atomic64_dec(v);
59620 }
59621
59622+#ifdef CONFIG_PAX_REFCOUNT
59623+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
59624+{
59625+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59626+
59627+ atomic64_dec_unchecked(v);
59628+}
59629+#endif
59630+
59631 static inline void atomic_long_add(long i, atomic_long_t *l)
59632 {
59633 atomic64_t *v = (atomic64_t *)l;
59634@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
59635 atomic64_add(i, v);
59636 }
59637
59638+#ifdef CONFIG_PAX_REFCOUNT
59639+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
59640+{
59641+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59642+
59643+ atomic64_add_unchecked(i, v);
59644+}
59645+#endif
59646+
59647 static inline void atomic_long_sub(long i, atomic_long_t *l)
59648 {
59649 atomic64_t *v = (atomic64_t *)l;
59650@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
59651 atomic64_sub(i, v);
59652 }
59653
59654+#ifdef CONFIG_PAX_REFCOUNT
59655+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
59656+{
59657+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59658+
59659+ atomic64_sub_unchecked(i, v);
59660+}
59661+#endif
59662+
59663 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
59664 {
59665 atomic64_t *v = (atomic64_t *)l;
59666@@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
59667 return (long)atomic64_inc_return(v);
59668 }
59669
59670+#ifdef CONFIG_PAX_REFCOUNT
59671+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
59672+{
59673+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59674+
59675+ return (long)atomic64_inc_return_unchecked(v);
59676+}
59677+#endif
59678+
59679 static inline long atomic_long_dec_return(atomic_long_t *l)
59680 {
59681 atomic64_t *v = (atomic64_t *)l;
59682@@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
59683
59684 typedef atomic_t atomic_long_t;
59685
59686+#ifdef CONFIG_PAX_REFCOUNT
59687+typedef atomic_unchecked_t atomic_long_unchecked_t;
59688+#else
59689+typedef atomic_t atomic_long_unchecked_t;
59690+#endif
59691+
59692 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
59693 static inline long atomic_long_read(atomic_long_t *l)
59694 {
59695@@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
59696 return (long)atomic_read(v);
59697 }
59698
59699+#ifdef CONFIG_PAX_REFCOUNT
59700+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
59701+{
59702+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59703+
59704+ return (long)atomic_read_unchecked(v);
59705+}
59706+#endif
59707+
59708 static inline void atomic_long_set(atomic_long_t *l, long i)
59709 {
59710 atomic_t *v = (atomic_t *)l;
59711@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
59712 atomic_set(v, i);
59713 }
59714
59715+#ifdef CONFIG_PAX_REFCOUNT
59716+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
59717+{
59718+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59719+
59720+ atomic_set_unchecked(v, i);
59721+}
59722+#endif
59723+
59724 static inline void atomic_long_inc(atomic_long_t *l)
59725 {
59726 atomic_t *v = (atomic_t *)l;
59727@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
59728 atomic_inc(v);
59729 }
59730
59731+#ifdef CONFIG_PAX_REFCOUNT
59732+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
59733+{
59734+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59735+
59736+ atomic_inc_unchecked(v);
59737+}
59738+#endif
59739+
59740 static inline void atomic_long_dec(atomic_long_t *l)
59741 {
59742 atomic_t *v = (atomic_t *)l;
59743@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
59744 atomic_dec(v);
59745 }
59746
59747+#ifdef CONFIG_PAX_REFCOUNT
59748+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
59749+{
59750+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59751+
59752+ atomic_dec_unchecked(v);
59753+}
59754+#endif
59755+
59756 static inline void atomic_long_add(long i, atomic_long_t *l)
59757 {
59758 atomic_t *v = (atomic_t *)l;
59759@@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
59760 atomic_add(i, v);
59761 }
59762
59763+#ifdef CONFIG_PAX_REFCOUNT
59764+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
59765+{
59766+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59767+
59768+ atomic_add_unchecked(i, v);
59769+}
59770+#endif
59771+
59772 static inline void atomic_long_sub(long i, atomic_long_t *l)
59773 {
59774 atomic_t *v = (atomic_t *)l;
59775@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
59776 atomic_sub(i, v);
59777 }
59778
59779+#ifdef CONFIG_PAX_REFCOUNT
59780+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
59781+{
59782+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59783+
59784+ atomic_sub_unchecked(i, v);
59785+}
59786+#endif
59787+
59788 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
59789 {
59790 atomic_t *v = (atomic_t *)l;
59791@@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
59792 return (long)atomic_inc_return(v);
59793 }
59794
59795+#ifdef CONFIG_PAX_REFCOUNT
59796+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
59797+{
59798+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59799+
59800+ return (long)atomic_inc_return_unchecked(v);
59801+}
59802+#endif
59803+
59804 static inline long atomic_long_dec_return(atomic_long_t *l)
59805 {
59806 atomic_t *v = (atomic_t *)l;
59807@@ -255,4 +393,49 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
59808
59809 #endif /* BITS_PER_LONG == 64 */
59810
59811+#ifdef CONFIG_PAX_REFCOUNT
59812+static inline void pax_refcount_needs_these_functions(void)
59813+{
59814+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
59815+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
59816+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
59817+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
59818+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
59819+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
59820+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
59821+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
59822+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
59823+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
59824+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
59825+
59826+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
59827+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
59828+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
59829+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
59830+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
59831+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
59832+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
59833+}
59834+#else
59835+#define atomic_read_unchecked(v) atomic_read(v)
59836+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
59837+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
59838+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
59839+#define atomic_inc_unchecked(v) atomic_inc(v)
59840+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
59841+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
59842+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
59843+#define atomic_dec_unchecked(v) atomic_dec(v)
59844+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
59845+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
59846+
59847+#define atomic_long_read_unchecked(v) atomic_long_read(v)
59848+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
59849+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
59850+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
59851+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
59852+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
59853+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
59854+#endif
59855+
59856 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
59857diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
59858index b18ce4f..2ee2843 100644
59859--- a/include/asm-generic/atomic64.h
59860+++ b/include/asm-generic/atomic64.h
59861@@ -16,6 +16,8 @@ typedef struct {
59862 long long counter;
59863 } atomic64_t;
59864
59865+typedef atomic64_t atomic64_unchecked_t;
59866+
59867 #define ATOMIC64_INIT(i) { (i) }
59868
59869 extern long long atomic64_read(const atomic64_t *v);
59870@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
59871 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
59872 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
59873
59874+#define atomic64_read_unchecked(v) atomic64_read(v)
59875+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
59876+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
59877+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
59878+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
59879+#define atomic64_inc_unchecked(v) atomic64_inc(v)
59880+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
59881+#define atomic64_dec_unchecked(v) atomic64_dec(v)
59882+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
59883+
59884 #endif /* _ASM_GENERIC_ATOMIC64_H */
59885diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
59886index 1bfcfe5..e04c5c9 100644
59887--- a/include/asm-generic/cache.h
59888+++ b/include/asm-generic/cache.h
59889@@ -6,7 +6,7 @@
59890 * cache lines need to provide their own cache.h.
59891 */
59892
59893-#define L1_CACHE_SHIFT 5
59894-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
59895+#define L1_CACHE_SHIFT 5UL
59896+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
59897
59898 #endif /* __ASM_GENERIC_CACHE_H */
59899diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
59900index 0d68a1e..b74a761 100644
59901--- a/include/asm-generic/emergency-restart.h
59902+++ b/include/asm-generic/emergency-restart.h
59903@@ -1,7 +1,7 @@
59904 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
59905 #define _ASM_GENERIC_EMERGENCY_RESTART_H
59906
59907-static inline void machine_emergency_restart(void)
59908+static inline __noreturn void machine_emergency_restart(void)
59909 {
59910 machine_restart(NULL);
59911 }
59912diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
59913index 0232ccb..13d9165 100644
59914--- a/include/asm-generic/kmap_types.h
59915+++ b/include/asm-generic/kmap_types.h
59916@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
59917 KMAP_D(17) KM_NMI,
59918 KMAP_D(18) KM_NMI_PTE,
59919 KMAP_D(19) KM_KDB,
59920+KMAP_D(20) KM_CLEARPAGE,
59921 /*
59922 * Remember to update debug_kmap_atomic() when adding new kmap types!
59923 */
59924-KMAP_D(20) KM_TYPE_NR
59925+KMAP_D(21) KM_TYPE_NR
59926 };
59927
59928 #undef KMAP_D
59929diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
59930index 9ceb03b..2efbcbd 100644
59931--- a/include/asm-generic/local.h
59932+++ b/include/asm-generic/local.h
59933@@ -39,6 +39,7 @@ typedef struct
59934 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
59935 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
59936 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
59937+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
59938
59939 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
59940 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
59941diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
59942index 725612b..9cc513a 100644
59943--- a/include/asm-generic/pgtable-nopmd.h
59944+++ b/include/asm-generic/pgtable-nopmd.h
59945@@ -1,14 +1,19 @@
59946 #ifndef _PGTABLE_NOPMD_H
59947 #define _PGTABLE_NOPMD_H
59948
59949-#ifndef __ASSEMBLY__
59950-
59951 #include <asm-generic/pgtable-nopud.h>
59952
59953-struct mm_struct;
59954-
59955 #define __PAGETABLE_PMD_FOLDED
59956
59957+#define PMD_SHIFT PUD_SHIFT
59958+#define PTRS_PER_PMD 1
59959+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
59960+#define PMD_MASK (~(PMD_SIZE-1))
59961+
59962+#ifndef __ASSEMBLY__
59963+
59964+struct mm_struct;
59965+
59966 /*
59967 * Having the pmd type consist of a pud gets the size right, and allows
59968 * us to conceptually access the pud entry that this pmd is folded into
59969@@ -16,11 +21,6 @@ struct mm_struct;
59970 */
59971 typedef struct { pud_t pud; } pmd_t;
59972
59973-#define PMD_SHIFT PUD_SHIFT
59974-#define PTRS_PER_PMD 1
59975-#define PMD_SIZE (1UL << PMD_SHIFT)
59976-#define PMD_MASK (~(PMD_SIZE-1))
59977-
59978 /*
59979 * The "pud_xxx()" functions here are trivial for a folded two-level
59980 * setup: the pmd is never bad, and a pmd always exists (as it's folded
59981diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
59982index 810431d..ccc3638 100644
59983--- a/include/asm-generic/pgtable-nopud.h
59984+++ b/include/asm-generic/pgtable-nopud.h
59985@@ -1,10 +1,15 @@
59986 #ifndef _PGTABLE_NOPUD_H
59987 #define _PGTABLE_NOPUD_H
59988
59989-#ifndef __ASSEMBLY__
59990-
59991 #define __PAGETABLE_PUD_FOLDED
59992
59993+#define PUD_SHIFT PGDIR_SHIFT
59994+#define PTRS_PER_PUD 1
59995+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
59996+#define PUD_MASK (~(PUD_SIZE-1))
59997+
59998+#ifndef __ASSEMBLY__
59999+
60000 /*
60001 * Having the pud type consist of a pgd gets the size right, and allows
60002 * us to conceptually access the pgd entry that this pud is folded into
60003@@ -12,11 +17,6 @@
60004 */
60005 typedef struct { pgd_t pgd; } pud_t;
60006
60007-#define PUD_SHIFT PGDIR_SHIFT
60008-#define PTRS_PER_PUD 1
60009-#define PUD_SIZE (1UL << PUD_SHIFT)
60010-#define PUD_MASK (~(PUD_SIZE-1))
60011-
60012 /*
60013 * The "pgd_xxx()" functions here are trivial for a folded two-level
60014 * setup: the pud is never bad, and a pud always exists (as it's folded
60015diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
60016index a03c098..7e5b223 100644
60017--- a/include/asm-generic/pgtable.h
60018+++ b/include/asm-generic/pgtable.h
60019@@ -502,6 +502,14 @@ static inline int pmd_trans_unstable(pmd_t *pmd)
60020 #endif
60021 }
60022
60023+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
60024+static inline unsigned long pax_open_kernel(void) { return 0; }
60025+#endif
60026+
60027+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
60028+static inline unsigned long pax_close_kernel(void) { return 0; }
60029+#endif
60030+
60031 #endif /* CONFIG_MMU */
60032
60033 #endif /* !__ASSEMBLY__ */
60034diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
60035index 9788568..510dece 100644
60036--- a/include/asm-generic/uaccess.h
60037+++ b/include/asm-generic/uaccess.h
60038@@ -76,6 +76,8 @@ extern unsigned long search_exception_table(unsigned long);
60039 */
60040 #ifndef __copy_from_user
60041 static inline __must_check long __copy_from_user(void *to,
60042+ const void __user * from, unsigned long n) __size_overflow(3);
60043+static inline __must_check long __copy_from_user(void *to,
60044 const void __user * from, unsigned long n)
60045 {
60046 if (__builtin_constant_p(n)) {
60047@@ -106,6 +108,8 @@ static inline __must_check long __copy_from_user(void *to,
60048
60049 #ifndef __copy_to_user
60050 static inline __must_check long __copy_to_user(void __user *to,
60051+ const void *from, unsigned long n) __size_overflow(3);
60052+static inline __must_check long __copy_to_user(void __user *to,
60053 const void *from, unsigned long n)
60054 {
60055 if (__builtin_constant_p(n)) {
60056@@ -224,6 +228,7 @@ extern int __put_user_bad(void) __attribute__((noreturn));
60057 -EFAULT; \
60058 })
60059
60060+static inline int __get_user_fn(size_t size, const void __user *ptr, void *x) __size_overflow(1);
60061 static inline int __get_user_fn(size_t size, const void __user *ptr, void *x)
60062 {
60063 size = __copy_from_user(x, ptr, size);
60064@@ -240,6 +245,7 @@ extern int __get_user_bad(void) __attribute__((noreturn));
60065 #define __copy_to_user_inatomic __copy_to_user
60066 #endif
60067
60068+static inline long copy_from_user(void *to, const void __user * from, unsigned long n) __size_overflow(3);
60069 static inline long copy_from_user(void *to,
60070 const void __user * from, unsigned long n)
60071 {
60072@@ -250,6 +256,7 @@ static inline long copy_from_user(void *to,
60073 return n;
60074 }
60075
60076+static inline long copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
60077 static inline long copy_to_user(void __user *to,
60078 const void *from, unsigned long n)
60079 {
60080@@ -314,6 +321,8 @@ static inline long strlen_user(const char __user *src)
60081 */
60082 #ifndef __clear_user
60083 static inline __must_check unsigned long
60084+__clear_user(void __user *to, unsigned long n) __size_overflow(2);
60085+static inline __must_check unsigned long
60086 __clear_user(void __user *to, unsigned long n)
60087 {
60088 memset((void __force *)to, 0, n);
60089@@ -322,6 +331,8 @@ __clear_user(void __user *to, unsigned long n)
60090 #endif
60091
60092 static inline __must_check unsigned long
60093+clear_user(void __user *to, unsigned long n) __size_overflow(2);
60094+static inline __must_check unsigned long
60095 clear_user(void __user *to, unsigned long n)
60096 {
60097 might_sleep();
60098diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
60099index b5e2e4c..6a5373e 100644
60100--- a/include/asm-generic/vmlinux.lds.h
60101+++ b/include/asm-generic/vmlinux.lds.h
60102@@ -217,6 +217,7 @@
60103 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
60104 VMLINUX_SYMBOL(__start_rodata) = .; \
60105 *(.rodata) *(.rodata.*) \
60106+ *(.data..read_only) \
60107 *(__vermagic) /* Kernel version magic */ \
60108 . = ALIGN(8); \
60109 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
60110@@ -722,17 +723,18 @@
60111 * section in the linker script will go there too. @phdr should have
60112 * a leading colon.
60113 *
60114- * Note that this macros defines __per_cpu_load as an absolute symbol.
60115+ * Note that this macros defines per_cpu_load as an absolute symbol.
60116 * If there is no need to put the percpu section at a predetermined
60117 * address, use PERCPU_SECTION.
60118 */
60119 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
60120- VMLINUX_SYMBOL(__per_cpu_load) = .; \
60121- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
60122+ per_cpu_load = .; \
60123+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
60124 - LOAD_OFFSET) { \
60125+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
60126 PERCPU_INPUT(cacheline) \
60127 } phdr \
60128- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
60129+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
60130
60131 /**
60132 * PERCPU_SECTION - define output section for percpu area, simple version
60133diff --git a/include/drm/drmP.h b/include/drm/drmP.h
60134index 92f0981..d44a37c 100644
60135--- a/include/drm/drmP.h
60136+++ b/include/drm/drmP.h
60137@@ -72,6 +72,7 @@
60138 #include <linux/workqueue.h>
60139 #include <linux/poll.h>
60140 #include <asm/pgalloc.h>
60141+#include <asm/local.h>
60142 #include "drm.h"
60143
60144 #include <linux/idr.h>
60145@@ -1038,7 +1039,7 @@ struct drm_device {
60146
60147 /** \name Usage Counters */
60148 /*@{ */
60149- int open_count; /**< Outstanding files open */
60150+ local_t open_count; /**< Outstanding files open */
60151 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
60152 atomic_t vma_count; /**< Outstanding vma areas open */
60153 int buf_use; /**< Buffers in use -- cannot alloc */
60154@@ -1049,7 +1050,7 @@ struct drm_device {
60155 /*@{ */
60156 unsigned long counters;
60157 enum drm_stat_type types[15];
60158- atomic_t counts[15];
60159+ atomic_unchecked_t counts[15];
60160 /*@} */
60161
60162 struct list_head filelist;
60163diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
60164index 37515d1..34fa8b0 100644
60165--- a/include/drm/drm_crtc_helper.h
60166+++ b/include/drm/drm_crtc_helper.h
60167@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
60168
60169 /* disable crtc when not in use - more explicit than dpms off */
60170 void (*disable)(struct drm_crtc *crtc);
60171-};
60172+} __no_const;
60173
60174 struct drm_encoder_helper_funcs {
60175 void (*dpms)(struct drm_encoder *encoder, int mode);
60176@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs {
60177 struct drm_connector *connector);
60178 /* disable encoder when not in use - more explicit than dpms off */
60179 void (*disable)(struct drm_encoder *encoder);
60180-};
60181+} __no_const;
60182
60183 struct drm_connector_helper_funcs {
60184 int (*get_modes)(struct drm_connector *connector);
60185diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
60186index 26c1f78..6722682 100644
60187--- a/include/drm/ttm/ttm_memory.h
60188+++ b/include/drm/ttm/ttm_memory.h
60189@@ -47,7 +47,7 @@
60190
60191 struct ttm_mem_shrink {
60192 int (*do_shrink) (struct ttm_mem_shrink *);
60193-};
60194+} __no_const;
60195
60196 /**
60197 * struct ttm_mem_global - Global memory accounting structure.
60198diff --git a/include/linux/a.out.h b/include/linux/a.out.h
60199index e86dfca..40cc55f 100644
60200--- a/include/linux/a.out.h
60201+++ b/include/linux/a.out.h
60202@@ -39,6 +39,14 @@ enum machine_type {
60203 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
60204 };
60205
60206+/* Constants for the N_FLAGS field */
60207+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
60208+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
60209+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
60210+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
60211+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
60212+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
60213+
60214 #if !defined (N_MAGIC)
60215 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
60216 #endif
60217diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
60218index f4ff882..84b53a6 100644
60219--- a/include/linux/atmdev.h
60220+++ b/include/linux/atmdev.h
60221@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
60222 #endif
60223
60224 struct k_atm_aal_stats {
60225-#define __HANDLE_ITEM(i) atomic_t i
60226+#define __HANDLE_ITEM(i) atomic_unchecked_t i
60227 __AAL_STAT_ITEMS
60228 #undef __HANDLE_ITEM
60229 };
60230diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
60231index 0092102..8a801b4 100644
60232--- a/include/linux/binfmts.h
60233+++ b/include/linux/binfmts.h
60234@@ -89,6 +89,7 @@ struct linux_binfmt {
60235 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
60236 int (*load_shlib)(struct file *);
60237 int (*core_dump)(struct coredump_params *cprm);
60238+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
60239 unsigned long min_coredump; /* minimal dump size */
60240 };
60241
60242diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
60243index 606cf33..b72c577 100644
60244--- a/include/linux/blkdev.h
60245+++ b/include/linux/blkdev.h
60246@@ -1379,7 +1379,7 @@ struct block_device_operations {
60247 /* this callback is with swap_lock and sometimes page table lock held */
60248 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
60249 struct module *owner;
60250-};
60251+} __do_const;
60252
60253 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
60254 unsigned long);
60255diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
60256index 4d1a074..88f929a 100644
60257--- a/include/linux/blktrace_api.h
60258+++ b/include/linux/blktrace_api.h
60259@@ -162,7 +162,7 @@ struct blk_trace {
60260 struct dentry *dir;
60261 struct dentry *dropped_file;
60262 struct dentry *msg_file;
60263- atomic_t dropped;
60264+ atomic_unchecked_t dropped;
60265 };
60266
60267 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
60268diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
60269index 83195fb..0b0f77d 100644
60270--- a/include/linux/byteorder/little_endian.h
60271+++ b/include/linux/byteorder/little_endian.h
60272@@ -42,51 +42,51 @@
60273
60274 static inline __le64 __cpu_to_le64p(const __u64 *p)
60275 {
60276- return (__force __le64)*p;
60277+ return (__force const __le64)*p;
60278 }
60279 static inline __u64 __le64_to_cpup(const __le64 *p)
60280 {
60281- return (__force __u64)*p;
60282+ return (__force const __u64)*p;
60283 }
60284 static inline __le32 __cpu_to_le32p(const __u32 *p)
60285 {
60286- return (__force __le32)*p;
60287+ return (__force const __le32)*p;
60288 }
60289 static inline __u32 __le32_to_cpup(const __le32 *p)
60290 {
60291- return (__force __u32)*p;
60292+ return (__force const __u32)*p;
60293 }
60294 static inline __le16 __cpu_to_le16p(const __u16 *p)
60295 {
60296- return (__force __le16)*p;
60297+ return (__force const __le16)*p;
60298 }
60299 static inline __u16 __le16_to_cpup(const __le16 *p)
60300 {
60301- return (__force __u16)*p;
60302+ return (__force const __u16)*p;
60303 }
60304 static inline __be64 __cpu_to_be64p(const __u64 *p)
60305 {
60306- return (__force __be64)__swab64p(p);
60307+ return (__force const __be64)__swab64p(p);
60308 }
60309 static inline __u64 __be64_to_cpup(const __be64 *p)
60310 {
60311- return __swab64p((__u64 *)p);
60312+ return __swab64p((const __u64 *)p);
60313 }
60314 static inline __be32 __cpu_to_be32p(const __u32 *p)
60315 {
60316- return (__force __be32)__swab32p(p);
60317+ return (__force const __be32)__swab32p(p);
60318 }
60319 static inline __u32 __be32_to_cpup(const __be32 *p)
60320 {
60321- return __swab32p((__u32 *)p);
60322+ return __swab32p((const __u32 *)p);
60323 }
60324 static inline __be16 __cpu_to_be16p(const __u16 *p)
60325 {
60326- return (__force __be16)__swab16p(p);
60327+ return (__force const __be16)__swab16p(p);
60328 }
60329 static inline __u16 __be16_to_cpup(const __be16 *p)
60330 {
60331- return __swab16p((__u16 *)p);
60332+ return __swab16p((const __u16 *)p);
60333 }
60334 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
60335 #define __le64_to_cpus(x) do { (void)(x); } while (0)
60336diff --git a/include/linux/cache.h b/include/linux/cache.h
60337index 4c57065..4307975 100644
60338--- a/include/linux/cache.h
60339+++ b/include/linux/cache.h
60340@@ -16,6 +16,10 @@
60341 #define __read_mostly
60342 #endif
60343
60344+#ifndef __read_only
60345+#define __read_only __read_mostly
60346+#endif
60347+
60348 #ifndef ____cacheline_aligned
60349 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
60350 #endif
60351diff --git a/include/linux/capability.h b/include/linux/capability.h
60352index 12d52de..b5f7fa7 100644
60353--- a/include/linux/capability.h
60354+++ b/include/linux/capability.h
60355@@ -548,6 +548,8 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
60356 extern bool capable(int cap);
60357 extern bool ns_capable(struct user_namespace *ns, int cap);
60358 extern bool nsown_capable(int cap);
60359+extern bool capable_nolog(int cap);
60360+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
60361
60362 /* audit system wants to get cap info from files as well */
60363 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
60364diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
60365index 04ffb2e..6799180 100644
60366--- a/include/linux/cleancache.h
60367+++ b/include/linux/cleancache.h
60368@@ -31,7 +31,7 @@ struct cleancache_ops {
60369 void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
60370 void (*flush_inode)(int, struct cleancache_filekey);
60371 void (*flush_fs)(int);
60372-};
60373+} __no_const;
60374
60375 extern struct cleancache_ops
60376 cleancache_register_ops(struct cleancache_ops *ops);
60377diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
60378index 2f40791..567b215 100644
60379--- a/include/linux/compiler-gcc4.h
60380+++ b/include/linux/compiler-gcc4.h
60381@@ -32,6 +32,15 @@
60382 #define __linktime_error(message) __attribute__((__error__(message)))
60383
60384 #if __GNUC_MINOR__ >= 5
60385+
60386+#ifdef CONSTIFY_PLUGIN
60387+#define __no_const __attribute__((no_const))
60388+#define __do_const __attribute__((do_const))
60389+#endif
60390+
60391+#ifdef SIZE_OVERFLOW_PLUGIN
60392+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
60393+#endif
60394 /*
60395 * Mark a position in code as unreachable. This can be used to
60396 * suppress control flow warnings after asm blocks that transfer
60397@@ -47,6 +56,11 @@
60398 #define __noclone __attribute__((__noclone__))
60399
60400 #endif
60401+
60402+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
60403+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
60404+#define __bos0(ptr) __bos((ptr), 0)
60405+#define __bos1(ptr) __bos((ptr), 1)
60406 #endif
60407
60408 #if __GNUC_MINOR__ > 0
60409diff --git a/include/linux/compiler.h b/include/linux/compiler.h
60410index 4a24354..ecaff7a 100644
60411--- a/include/linux/compiler.h
60412+++ b/include/linux/compiler.h
60413@@ -5,31 +5,62 @@
60414
60415 #ifdef __CHECKER__
60416 # define __user __attribute__((noderef, address_space(1)))
60417+# define __force_user __force __user
60418 # define __kernel __attribute__((address_space(0)))
60419+# define __force_kernel __force __kernel
60420 # define __safe __attribute__((safe))
60421 # define __force __attribute__((force))
60422 # define __nocast __attribute__((nocast))
60423 # define __iomem __attribute__((noderef, address_space(2)))
60424+# define __force_iomem __force __iomem
60425 # define __acquires(x) __attribute__((context(x,0,1)))
60426 # define __releases(x) __attribute__((context(x,1,0)))
60427 # define __acquire(x) __context__(x,1)
60428 # define __release(x) __context__(x,-1)
60429 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
60430 # define __percpu __attribute__((noderef, address_space(3)))
60431+# define __force_percpu __force __percpu
60432 #ifdef CONFIG_SPARSE_RCU_POINTER
60433 # define __rcu __attribute__((noderef, address_space(4)))
60434+# define __force_rcu __force __rcu
60435 #else
60436 # define __rcu
60437+# define __force_rcu
60438 #endif
60439 extern void __chk_user_ptr(const volatile void __user *);
60440 extern void __chk_io_ptr(const volatile void __iomem *);
60441+#elif defined(CHECKER_PLUGIN)
60442+//# define __user
60443+//# define __force_user
60444+//# define __kernel
60445+//# define __force_kernel
60446+# define __safe
60447+# define __force
60448+# define __nocast
60449+# define __iomem
60450+# define __force_iomem
60451+# define __chk_user_ptr(x) (void)0
60452+# define __chk_io_ptr(x) (void)0
60453+# define __builtin_warning(x, y...) (1)
60454+# define __acquires(x)
60455+# define __releases(x)
60456+# define __acquire(x) (void)0
60457+# define __release(x) (void)0
60458+# define __cond_lock(x,c) (c)
60459+# define __percpu
60460+# define __force_percpu
60461+# define __rcu
60462+# define __force_rcu
60463 #else
60464 # define __user
60465+# define __force_user
60466 # define __kernel
60467+# define __force_kernel
60468 # define __safe
60469 # define __force
60470 # define __nocast
60471 # define __iomem
60472+# define __force_iomem
60473 # define __chk_user_ptr(x) (void)0
60474 # define __chk_io_ptr(x) (void)0
60475 # define __builtin_warning(x, y...) (1)
60476@@ -39,7 +70,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
60477 # define __release(x) (void)0
60478 # define __cond_lock(x,c) (c)
60479 # define __percpu
60480+# define __force_percpu
60481 # define __rcu
60482+# define __force_rcu
60483 #endif
60484
60485 #ifdef __KERNEL__
60486@@ -264,6 +297,17 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60487 # define __attribute_const__ /* unimplemented */
60488 #endif
60489
60490+#ifndef __no_const
60491+# define __no_const
60492+#endif
60493+
60494+#ifndef __do_const
60495+# define __do_const
60496+#endif
60497+
60498+#ifndef __size_overflow
60499+# define __size_overflow(...)
60500+#endif
60501 /*
60502 * Tell gcc if a function is cold. The compiler will assume any path
60503 * directly leading to the call is unlikely.
60504@@ -273,6 +317,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60505 #define __cold
60506 #endif
60507
60508+#ifndef __alloc_size
60509+#define __alloc_size(...)
60510+#endif
60511+
60512+#ifndef __bos
60513+#define __bos(ptr, arg)
60514+#endif
60515+
60516+#ifndef __bos0
60517+#define __bos0(ptr)
60518+#endif
60519+
60520+#ifndef __bos1
60521+#define __bos1(ptr)
60522+#endif
60523+
60524 /* Simple shorthand for a section definition */
60525 #ifndef __section
60526 # define __section(S) __attribute__ ((__section__(#S)))
60527@@ -308,6 +368,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60528 * use is to mediate communication between process-level code and irq/NMI
60529 * handlers, all running on the same CPU.
60530 */
60531-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
60532+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
60533+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
60534
60535 #endif /* __LINUX_COMPILER_H */
60536diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
60537index e9eaec5..bfeb9bb 100644
60538--- a/include/linux/cpuset.h
60539+++ b/include/linux/cpuset.h
60540@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void)
60541 * nodemask.
60542 */
60543 smp_mb();
60544- --ACCESS_ONCE(current->mems_allowed_change_disable);
60545+ --ACCESS_ONCE_RW(current->mems_allowed_change_disable);
60546 }
60547
60548 static inline void set_mems_allowed(nodemask_t nodemask)
60549diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
60550index b936763..48685ee 100644
60551--- a/include/linux/crash_dump.h
60552+++ b/include/linux/crash_dump.h
60553@@ -14,7 +14,7 @@ extern unsigned long long elfcorehdr_addr;
60554 extern unsigned long long elfcorehdr_size;
60555
60556 extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
60557- unsigned long, int);
60558+ unsigned long, int) __size_overflow(3);
60559
60560 /* Architecture code defines this if there are other possible ELF
60561 * machine types, e.g. on bi-arch capable hardware. */
60562diff --git a/include/linux/cred.h b/include/linux/cred.h
60563index adadf71..6af5560 100644
60564--- a/include/linux/cred.h
60565+++ b/include/linux/cred.h
60566@@ -207,6 +207,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
60567 static inline void validate_process_creds(void)
60568 {
60569 }
60570+static inline void validate_task_creds(struct task_struct *task)
60571+{
60572+}
60573 #endif
60574
60575 /**
60576diff --git a/include/linux/crypto.h b/include/linux/crypto.h
60577index 8a94217..15d49e3 100644
60578--- a/include/linux/crypto.h
60579+++ b/include/linux/crypto.h
60580@@ -365,7 +365,7 @@ struct cipher_tfm {
60581 const u8 *key, unsigned int keylen);
60582 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60583 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60584-};
60585+} __no_const;
60586
60587 struct hash_tfm {
60588 int (*init)(struct hash_desc *desc);
60589@@ -386,13 +386,13 @@ struct compress_tfm {
60590 int (*cot_decompress)(struct crypto_tfm *tfm,
60591 const u8 *src, unsigned int slen,
60592 u8 *dst, unsigned int *dlen);
60593-};
60594+} __no_const;
60595
60596 struct rng_tfm {
60597 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
60598 unsigned int dlen);
60599 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
60600-};
60601+} __no_const;
60602
60603 #define crt_ablkcipher crt_u.ablkcipher
60604 #define crt_aead crt_u.aead
60605diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
60606index 7925bf0..d5143d2 100644
60607--- a/include/linux/decompress/mm.h
60608+++ b/include/linux/decompress/mm.h
60609@@ -77,7 +77,7 @@ static void free(void *where)
60610 * warnings when not needed (indeed large_malloc / large_free are not
60611 * needed by inflate */
60612
60613-#define malloc(a) kmalloc(a, GFP_KERNEL)
60614+#define malloc(a) kmalloc((a), GFP_KERNEL)
60615 #define free(a) kfree(a)
60616
60617 #define large_malloc(a) vmalloc(a)
60618diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
60619index e13117c..e9fc938 100644
60620--- a/include/linux/dma-mapping.h
60621+++ b/include/linux/dma-mapping.h
60622@@ -46,7 +46,7 @@ struct dma_map_ops {
60623 u64 (*get_required_mask)(struct device *dev);
60624 #endif
60625 int is_phys;
60626-};
60627+} __do_const;
60628
60629 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
60630
60631diff --git a/include/linux/efi.h b/include/linux/efi.h
60632index 37c3007..92ab679 100644
60633--- a/include/linux/efi.h
60634+++ b/include/linux/efi.h
60635@@ -580,7 +580,7 @@ struct efivar_operations {
60636 efi_get_variable_t *get_variable;
60637 efi_get_next_variable_t *get_next_variable;
60638 efi_set_variable_t *set_variable;
60639-};
60640+} __no_const;
60641
60642 struct efivars {
60643 /*
60644diff --git a/include/linux/elf.h b/include/linux/elf.h
60645index 999b4f5..57753b4 100644
60646--- a/include/linux/elf.h
60647+++ b/include/linux/elf.h
60648@@ -40,6 +40,17 @@ typedef __s64 Elf64_Sxword;
60649 #define PT_GNU_EH_FRAME 0x6474e550
60650
60651 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
60652+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
60653+
60654+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
60655+
60656+/* Constants for the e_flags field */
60657+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
60658+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
60659+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
60660+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
60661+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
60662+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
60663
60664 /*
60665 * Extended Numbering
60666@@ -97,6 +108,8 @@ typedef __s64 Elf64_Sxword;
60667 #define DT_DEBUG 21
60668 #define DT_TEXTREL 22
60669 #define DT_JMPREL 23
60670+#define DT_FLAGS 30
60671+ #define DF_TEXTREL 0x00000004
60672 #define DT_ENCODING 32
60673 #define OLD_DT_LOOS 0x60000000
60674 #define DT_LOOS 0x6000000d
60675@@ -243,6 +256,19 @@ typedef struct elf64_hdr {
60676 #define PF_W 0x2
60677 #define PF_X 0x1
60678
60679+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
60680+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
60681+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
60682+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
60683+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
60684+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
60685+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
60686+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
60687+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
60688+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
60689+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
60690+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
60691+
60692 typedef struct elf32_phdr{
60693 Elf32_Word p_type;
60694 Elf32_Off p_offset;
60695@@ -335,6 +361,8 @@ typedef struct elf64_shdr {
60696 #define EI_OSABI 7
60697 #define EI_PAD 8
60698
60699+#define EI_PAX 14
60700+
60701 #define ELFMAG0 0x7f /* EI_MAG */
60702 #define ELFMAG1 'E'
60703 #define ELFMAG2 'L'
60704@@ -421,6 +449,7 @@ extern Elf32_Dyn _DYNAMIC [];
60705 #define elf_note elf32_note
60706 #define elf_addr_t Elf32_Off
60707 #define Elf_Half Elf32_Half
60708+#define elf_dyn Elf32_Dyn
60709
60710 #else
60711
60712@@ -431,6 +460,7 @@ extern Elf64_Dyn _DYNAMIC [];
60713 #define elf_note elf64_note
60714 #define elf_addr_t Elf64_Off
60715 #define Elf_Half Elf64_Half
60716+#define elf_dyn Elf64_Dyn
60717
60718 #endif
60719
60720diff --git a/include/linux/filter.h b/include/linux/filter.h
60721index 8eeb205..d59bfa2 100644
60722--- a/include/linux/filter.h
60723+++ b/include/linux/filter.h
60724@@ -134,6 +134,7 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */
60725
60726 struct sk_buff;
60727 struct sock;
60728+struct bpf_jit_work;
60729
60730 struct sk_filter
60731 {
60732@@ -141,6 +142,9 @@ struct sk_filter
60733 unsigned int len; /* Number of filter blocks */
60734 unsigned int (*bpf_func)(const struct sk_buff *skb,
60735 const struct sock_filter *filter);
60736+#ifdef CONFIG_BPF_JIT
60737+ struct bpf_jit_work *work;
60738+#endif
60739 struct rcu_head rcu;
60740 struct sock_filter insns[0];
60741 };
60742diff --git a/include/linux/firewire.h b/include/linux/firewire.h
60743index 84ccf8e..2e9b14c 100644
60744--- a/include/linux/firewire.h
60745+++ b/include/linux/firewire.h
60746@@ -428,7 +428,7 @@ struct fw_iso_context {
60747 union {
60748 fw_iso_callback_t sc;
60749 fw_iso_mc_callback_t mc;
60750- } callback;
60751+ } __no_const callback;
60752 void *callback_data;
60753 };
60754
60755diff --git a/include/linux/fs.h b/include/linux/fs.h
60756index f4b6e06..d6ba573 100644
60757--- a/include/linux/fs.h
60758+++ b/include/linux/fs.h
60759@@ -1628,7 +1628,8 @@ struct file_operations {
60760 int (*setlease)(struct file *, long, struct file_lock **);
60761 long (*fallocate)(struct file *file, int mode, loff_t offset,
60762 loff_t len);
60763-};
60764+} __do_const;
60765+typedef struct file_operations __no_const file_operations_no_const;
60766
60767 struct inode_operations {
60768 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
60769diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
60770index 003dc0f..3c4ea97 100644
60771--- a/include/linux/fs_struct.h
60772+++ b/include/linux/fs_struct.h
60773@@ -6,7 +6,7 @@
60774 #include <linux/seqlock.h>
60775
60776 struct fs_struct {
60777- int users;
60778+ atomic_t users;
60779 spinlock_t lock;
60780 seqcount_t seq;
60781 int umask;
60782diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
60783index ce31408..b1ad003 100644
60784--- a/include/linux/fscache-cache.h
60785+++ b/include/linux/fscache-cache.h
60786@@ -102,7 +102,7 @@ struct fscache_operation {
60787 fscache_operation_release_t release;
60788 };
60789
60790-extern atomic_t fscache_op_debug_id;
60791+extern atomic_unchecked_t fscache_op_debug_id;
60792 extern void fscache_op_work_func(struct work_struct *work);
60793
60794 extern void fscache_enqueue_operation(struct fscache_operation *);
60795@@ -122,7 +122,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
60796 {
60797 INIT_WORK(&op->work, fscache_op_work_func);
60798 atomic_set(&op->usage, 1);
60799- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
60800+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
60801 op->processor = processor;
60802 op->release = release;
60803 INIT_LIST_HEAD(&op->pend_link);
60804diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
60805index 2a53f10..0187fdf 100644
60806--- a/include/linux/fsnotify.h
60807+++ b/include/linux/fsnotify.h
60808@@ -314,7 +314,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
60809 */
60810 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
60811 {
60812- return kstrdup(name, GFP_KERNEL);
60813+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
60814 }
60815
60816 /*
60817diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
60818index 91d0e0a3..035666b 100644
60819--- a/include/linux/fsnotify_backend.h
60820+++ b/include/linux/fsnotify_backend.h
60821@@ -105,6 +105,7 @@ struct fsnotify_ops {
60822 void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
60823 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
60824 };
60825+typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
60826
60827 /*
60828 * A group is a "thing" that wants to receive notification about filesystem
60829diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
60830index c3da42d..c70e0df 100644
60831--- a/include/linux/ftrace_event.h
60832+++ b/include/linux/ftrace_event.h
60833@@ -97,7 +97,7 @@ struct trace_event_functions {
60834 trace_print_func raw;
60835 trace_print_func hex;
60836 trace_print_func binary;
60837-};
60838+} __no_const;
60839
60840 struct trace_event {
60841 struct hlist_node node;
60842@@ -254,7 +254,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
60843 extern int trace_add_event_call(struct ftrace_event_call *call);
60844 extern void trace_remove_event_call(struct ftrace_event_call *call);
60845
60846-#define is_signed_type(type) (((type)(-1)) < 0)
60847+#define is_signed_type(type) (((type)(-1)) < (type)1)
60848
60849 int trace_set_clr_event(const char *system, const char *event, int set);
60850
60851diff --git a/include/linux/genhd.h b/include/linux/genhd.h
60852index e61d319..0da8505 100644
60853--- a/include/linux/genhd.h
60854+++ b/include/linux/genhd.h
60855@@ -185,7 +185,7 @@ struct gendisk {
60856 struct kobject *slave_dir;
60857
60858 struct timer_rand_state *random;
60859- atomic_t sync_io; /* RAID */
60860+ atomic_unchecked_t sync_io; /* RAID */
60861 struct disk_events *ev;
60862 #ifdef CONFIG_BLK_DEV_INTEGRITY
60863 struct blk_integrity *integrity;
60864diff --git a/include/linux/gracl.h b/include/linux/gracl.h
60865new file mode 100644
60866index 0000000..8a130b6
60867--- /dev/null
60868+++ b/include/linux/gracl.h
60869@@ -0,0 +1,319 @@
60870+#ifndef GR_ACL_H
60871+#define GR_ACL_H
60872+
60873+#include <linux/grdefs.h>
60874+#include <linux/resource.h>
60875+#include <linux/capability.h>
60876+#include <linux/dcache.h>
60877+#include <asm/resource.h>
60878+
60879+/* Major status information */
60880+
60881+#define GR_VERSION "grsecurity 2.9"
60882+#define GRSECURITY_VERSION 0x2900
60883+
60884+enum {
60885+ GR_SHUTDOWN = 0,
60886+ GR_ENABLE = 1,
60887+ GR_SPROLE = 2,
60888+ GR_RELOAD = 3,
60889+ GR_SEGVMOD = 4,
60890+ GR_STATUS = 5,
60891+ GR_UNSPROLE = 6,
60892+ GR_PASSSET = 7,
60893+ GR_SPROLEPAM = 8,
60894+};
60895+
60896+/* Password setup definitions
60897+ * kernel/grhash.c */
60898+enum {
60899+ GR_PW_LEN = 128,
60900+ GR_SALT_LEN = 16,
60901+ GR_SHA_LEN = 32,
60902+};
60903+
60904+enum {
60905+ GR_SPROLE_LEN = 64,
60906+};
60907+
60908+enum {
60909+ GR_NO_GLOB = 0,
60910+ GR_REG_GLOB,
60911+ GR_CREATE_GLOB
60912+};
60913+
60914+#define GR_NLIMITS 32
60915+
60916+/* Begin Data Structures */
60917+
60918+struct sprole_pw {
60919+ unsigned char *rolename;
60920+ unsigned char salt[GR_SALT_LEN];
60921+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
60922+};
60923+
60924+struct name_entry {
60925+ __u32 key;
60926+ ino_t inode;
60927+ dev_t device;
60928+ char *name;
60929+ __u16 len;
60930+ __u8 deleted;
60931+ struct name_entry *prev;
60932+ struct name_entry *next;
60933+};
60934+
60935+struct inodev_entry {
60936+ struct name_entry *nentry;
60937+ struct inodev_entry *prev;
60938+ struct inodev_entry *next;
60939+};
60940+
60941+struct acl_role_db {
60942+ struct acl_role_label **r_hash;
60943+ __u32 r_size;
60944+};
60945+
60946+struct inodev_db {
60947+ struct inodev_entry **i_hash;
60948+ __u32 i_size;
60949+};
60950+
60951+struct name_db {
60952+ struct name_entry **n_hash;
60953+ __u32 n_size;
60954+};
60955+
60956+struct crash_uid {
60957+ uid_t uid;
60958+ unsigned long expires;
60959+};
60960+
60961+struct gr_hash_struct {
60962+ void **table;
60963+ void **nametable;
60964+ void *first;
60965+ __u32 table_size;
60966+ __u32 used_size;
60967+ int type;
60968+};
60969+
60970+/* Userspace Grsecurity ACL data structures */
60971+
60972+struct acl_subject_label {
60973+ char *filename;
60974+ ino_t inode;
60975+ dev_t device;
60976+ __u32 mode;
60977+ kernel_cap_t cap_mask;
60978+ kernel_cap_t cap_lower;
60979+ kernel_cap_t cap_invert_audit;
60980+
60981+ struct rlimit res[GR_NLIMITS];
60982+ __u32 resmask;
60983+
60984+ __u8 user_trans_type;
60985+ __u8 group_trans_type;
60986+ uid_t *user_transitions;
60987+ gid_t *group_transitions;
60988+ __u16 user_trans_num;
60989+ __u16 group_trans_num;
60990+
60991+ __u32 sock_families[2];
60992+ __u32 ip_proto[8];
60993+ __u32 ip_type;
60994+ struct acl_ip_label **ips;
60995+ __u32 ip_num;
60996+ __u32 inaddr_any_override;
60997+
60998+ __u32 crashes;
60999+ unsigned long expires;
61000+
61001+ struct acl_subject_label *parent_subject;
61002+ struct gr_hash_struct *hash;
61003+ struct acl_subject_label *prev;
61004+ struct acl_subject_label *next;
61005+
61006+ struct acl_object_label **obj_hash;
61007+ __u32 obj_hash_size;
61008+ __u16 pax_flags;
61009+};
61010+
61011+struct role_allowed_ip {
61012+ __u32 addr;
61013+ __u32 netmask;
61014+
61015+ struct role_allowed_ip *prev;
61016+ struct role_allowed_ip *next;
61017+};
61018+
61019+struct role_transition {
61020+ char *rolename;
61021+
61022+ struct role_transition *prev;
61023+ struct role_transition *next;
61024+};
61025+
61026+struct acl_role_label {
61027+ char *rolename;
61028+ uid_t uidgid;
61029+ __u16 roletype;
61030+
61031+ __u16 auth_attempts;
61032+ unsigned long expires;
61033+
61034+ struct acl_subject_label *root_label;
61035+ struct gr_hash_struct *hash;
61036+
61037+ struct acl_role_label *prev;
61038+ struct acl_role_label *next;
61039+
61040+ struct role_transition *transitions;
61041+ struct role_allowed_ip *allowed_ips;
61042+ uid_t *domain_children;
61043+ __u16 domain_child_num;
61044+
61045+ umode_t umask;
61046+
61047+ struct acl_subject_label **subj_hash;
61048+ __u32 subj_hash_size;
61049+};
61050+
61051+struct user_acl_role_db {
61052+ struct acl_role_label **r_table;
61053+ __u32 num_pointers; /* Number of allocations to track */
61054+ __u32 num_roles; /* Number of roles */
61055+ __u32 num_domain_children; /* Number of domain children */
61056+ __u32 num_subjects; /* Number of subjects */
61057+ __u32 num_objects; /* Number of objects */
61058+};
61059+
61060+struct acl_object_label {
61061+ char *filename;
61062+ ino_t inode;
61063+ dev_t device;
61064+ __u32 mode;
61065+
61066+ struct acl_subject_label *nested;
61067+ struct acl_object_label *globbed;
61068+
61069+ /* next two structures not used */
61070+
61071+ struct acl_object_label *prev;
61072+ struct acl_object_label *next;
61073+};
61074+
61075+struct acl_ip_label {
61076+ char *iface;
61077+ __u32 addr;
61078+ __u32 netmask;
61079+ __u16 low, high;
61080+ __u8 mode;
61081+ __u32 type;
61082+ __u32 proto[8];
61083+
61084+ /* next two structures not used */
61085+
61086+ struct acl_ip_label *prev;
61087+ struct acl_ip_label *next;
61088+};
61089+
61090+struct gr_arg {
61091+ struct user_acl_role_db role_db;
61092+ unsigned char pw[GR_PW_LEN];
61093+ unsigned char salt[GR_SALT_LEN];
61094+ unsigned char sum[GR_SHA_LEN];
61095+ unsigned char sp_role[GR_SPROLE_LEN];
61096+ struct sprole_pw *sprole_pws;
61097+ dev_t segv_device;
61098+ ino_t segv_inode;
61099+ uid_t segv_uid;
61100+ __u16 num_sprole_pws;
61101+ __u16 mode;
61102+};
61103+
61104+struct gr_arg_wrapper {
61105+ struct gr_arg *arg;
61106+ __u32 version;
61107+ __u32 size;
61108+};
61109+
61110+struct subject_map {
61111+ struct acl_subject_label *user;
61112+ struct acl_subject_label *kernel;
61113+ struct subject_map *prev;
61114+ struct subject_map *next;
61115+};
61116+
61117+struct acl_subj_map_db {
61118+ struct subject_map **s_hash;
61119+ __u32 s_size;
61120+};
61121+
61122+/* End Data Structures Section */
61123+
61124+/* Hash functions generated by empirical testing by Brad Spengler
61125+ Makes good use of the low bits of the inode. Generally 0-1 times
61126+ in loop for successful match. 0-3 for unsuccessful match.
61127+ Shift/add algorithm with modulus of table size and an XOR*/
61128+
61129+static __inline__ unsigned int
61130+rhash(const uid_t uid, const __u16 type, const unsigned int sz)
61131+{
61132+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
61133+}
61134+
61135+ static __inline__ unsigned int
61136+shash(const struct acl_subject_label *userp, const unsigned int sz)
61137+{
61138+ return ((const unsigned long)userp % sz);
61139+}
61140+
61141+static __inline__ unsigned int
61142+fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
61143+{
61144+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
61145+}
61146+
61147+static __inline__ unsigned int
61148+nhash(const char *name, const __u16 len, const unsigned int sz)
61149+{
61150+ return full_name_hash((const unsigned char *)name, len) % sz;
61151+}
61152+
61153+#define FOR_EACH_ROLE_START(role) \
61154+ role = role_list; \
61155+ while (role) {
61156+
61157+#define FOR_EACH_ROLE_END(role) \
61158+ role = role->prev; \
61159+ }
61160+
61161+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
61162+ subj = NULL; \
61163+ iter = 0; \
61164+ while (iter < role->subj_hash_size) { \
61165+ if (subj == NULL) \
61166+ subj = role->subj_hash[iter]; \
61167+ if (subj == NULL) { \
61168+ iter++; \
61169+ continue; \
61170+ }
61171+
61172+#define FOR_EACH_SUBJECT_END(subj,iter) \
61173+ subj = subj->next; \
61174+ if (subj == NULL) \
61175+ iter++; \
61176+ }
61177+
61178+
61179+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
61180+ subj = role->hash->first; \
61181+ while (subj != NULL) {
61182+
61183+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
61184+ subj = subj->next; \
61185+ }
61186+
61187+#endif
61188+
61189diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
61190new file mode 100644
61191index 0000000..323ecf2
61192--- /dev/null
61193+++ b/include/linux/gralloc.h
61194@@ -0,0 +1,9 @@
61195+#ifndef __GRALLOC_H
61196+#define __GRALLOC_H
61197+
61198+void acl_free_all(void);
61199+int acl_alloc_stack_init(unsigned long size);
61200+void *acl_alloc(unsigned long len);
61201+void *acl_alloc_num(unsigned long num, unsigned long len);
61202+
61203+#endif
61204diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
61205new file mode 100644
61206index 0000000..b30e9bc
61207--- /dev/null
61208+++ b/include/linux/grdefs.h
61209@@ -0,0 +1,140 @@
61210+#ifndef GRDEFS_H
61211+#define GRDEFS_H
61212+
61213+/* Begin grsecurity status declarations */
61214+
61215+enum {
61216+ GR_READY = 0x01,
61217+ GR_STATUS_INIT = 0x00 // disabled state
61218+};
61219+
61220+/* Begin ACL declarations */
61221+
61222+/* Role flags */
61223+
61224+enum {
61225+ GR_ROLE_USER = 0x0001,
61226+ GR_ROLE_GROUP = 0x0002,
61227+ GR_ROLE_DEFAULT = 0x0004,
61228+ GR_ROLE_SPECIAL = 0x0008,
61229+ GR_ROLE_AUTH = 0x0010,
61230+ GR_ROLE_NOPW = 0x0020,
61231+ GR_ROLE_GOD = 0x0040,
61232+ GR_ROLE_LEARN = 0x0080,
61233+ GR_ROLE_TPE = 0x0100,
61234+ GR_ROLE_DOMAIN = 0x0200,
61235+ GR_ROLE_PAM = 0x0400,
61236+ GR_ROLE_PERSIST = 0x0800
61237+};
61238+
61239+/* ACL Subject and Object mode flags */
61240+enum {
61241+ GR_DELETED = 0x80000000
61242+};
61243+
61244+/* ACL Object-only mode flags */
61245+enum {
61246+ GR_READ = 0x00000001,
61247+ GR_APPEND = 0x00000002,
61248+ GR_WRITE = 0x00000004,
61249+ GR_EXEC = 0x00000008,
61250+ GR_FIND = 0x00000010,
61251+ GR_INHERIT = 0x00000020,
61252+ GR_SETID = 0x00000040,
61253+ GR_CREATE = 0x00000080,
61254+ GR_DELETE = 0x00000100,
61255+ GR_LINK = 0x00000200,
61256+ GR_AUDIT_READ = 0x00000400,
61257+ GR_AUDIT_APPEND = 0x00000800,
61258+ GR_AUDIT_WRITE = 0x00001000,
61259+ GR_AUDIT_EXEC = 0x00002000,
61260+ GR_AUDIT_FIND = 0x00004000,
61261+ GR_AUDIT_INHERIT= 0x00008000,
61262+ GR_AUDIT_SETID = 0x00010000,
61263+ GR_AUDIT_CREATE = 0x00020000,
61264+ GR_AUDIT_DELETE = 0x00040000,
61265+ GR_AUDIT_LINK = 0x00080000,
61266+ GR_PTRACERD = 0x00100000,
61267+ GR_NOPTRACE = 0x00200000,
61268+ GR_SUPPRESS = 0x00400000,
61269+ GR_NOLEARN = 0x00800000,
61270+ GR_INIT_TRANSFER= 0x01000000
61271+};
61272+
61273+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
61274+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
61275+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
61276+
61277+/* ACL subject-only mode flags */
61278+enum {
61279+ GR_KILL = 0x00000001,
61280+ GR_VIEW = 0x00000002,
61281+ GR_PROTECTED = 0x00000004,
61282+ GR_LEARN = 0x00000008,
61283+ GR_OVERRIDE = 0x00000010,
61284+ /* just a placeholder, this mode is only used in userspace */
61285+ GR_DUMMY = 0x00000020,
61286+ GR_PROTSHM = 0x00000040,
61287+ GR_KILLPROC = 0x00000080,
61288+ GR_KILLIPPROC = 0x00000100,
61289+ /* just a placeholder, this mode is only used in userspace */
61290+ GR_NOTROJAN = 0x00000200,
61291+ GR_PROTPROCFD = 0x00000400,
61292+ GR_PROCACCT = 0x00000800,
61293+ GR_RELAXPTRACE = 0x00001000,
61294+ GR_NESTED = 0x00002000,
61295+ GR_INHERITLEARN = 0x00004000,
61296+ GR_PROCFIND = 0x00008000,
61297+ GR_POVERRIDE = 0x00010000,
61298+ GR_KERNELAUTH = 0x00020000,
61299+ GR_ATSECURE = 0x00040000,
61300+ GR_SHMEXEC = 0x00080000
61301+};
61302+
61303+enum {
61304+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
61305+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
61306+ GR_PAX_ENABLE_MPROTECT = 0x0004,
61307+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
61308+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
61309+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
61310+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
61311+ GR_PAX_DISABLE_MPROTECT = 0x0400,
61312+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
61313+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
61314+};
61315+
61316+enum {
61317+ GR_ID_USER = 0x01,
61318+ GR_ID_GROUP = 0x02,
61319+};
61320+
61321+enum {
61322+ GR_ID_ALLOW = 0x01,
61323+ GR_ID_DENY = 0x02,
61324+};
61325+
61326+#define GR_CRASH_RES 31
61327+#define GR_UIDTABLE_MAX 500
61328+
61329+/* begin resource learning section */
61330+enum {
61331+ GR_RLIM_CPU_BUMP = 60,
61332+ GR_RLIM_FSIZE_BUMP = 50000,
61333+ GR_RLIM_DATA_BUMP = 10000,
61334+ GR_RLIM_STACK_BUMP = 1000,
61335+ GR_RLIM_CORE_BUMP = 10000,
61336+ GR_RLIM_RSS_BUMP = 500000,
61337+ GR_RLIM_NPROC_BUMP = 1,
61338+ GR_RLIM_NOFILE_BUMP = 5,
61339+ GR_RLIM_MEMLOCK_BUMP = 50000,
61340+ GR_RLIM_AS_BUMP = 500000,
61341+ GR_RLIM_LOCKS_BUMP = 2,
61342+ GR_RLIM_SIGPENDING_BUMP = 5,
61343+ GR_RLIM_MSGQUEUE_BUMP = 10000,
61344+ GR_RLIM_NICE_BUMP = 1,
61345+ GR_RLIM_RTPRIO_BUMP = 1,
61346+ GR_RLIM_RTTIME_BUMP = 1000000
61347+};
61348+
61349+#endif
61350diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
61351new file mode 100644
61352index 0000000..da390f1
61353--- /dev/null
61354+++ b/include/linux/grinternal.h
61355@@ -0,0 +1,221 @@
61356+#ifndef __GRINTERNAL_H
61357+#define __GRINTERNAL_H
61358+
61359+#ifdef CONFIG_GRKERNSEC
61360+
61361+#include <linux/fs.h>
61362+#include <linux/mnt_namespace.h>
61363+#include <linux/nsproxy.h>
61364+#include <linux/gracl.h>
61365+#include <linux/grdefs.h>
61366+#include <linux/grmsg.h>
61367+
61368+void gr_add_learn_entry(const char *fmt, ...)
61369+ __attribute__ ((format (printf, 1, 2)));
61370+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
61371+ const struct vfsmount *mnt);
61372+__u32 gr_check_create(const struct dentry *new_dentry,
61373+ const struct dentry *parent,
61374+ const struct vfsmount *mnt, const __u32 mode);
61375+int gr_check_protected_task(const struct task_struct *task);
61376+__u32 to_gr_audit(const __u32 reqmode);
61377+int gr_set_acls(const int type);
61378+int gr_apply_subject_to_task(struct task_struct *task);
61379+int gr_acl_is_enabled(void);
61380+char gr_roletype_to_char(void);
61381+
61382+void gr_handle_alertkill(struct task_struct *task);
61383+char *gr_to_filename(const struct dentry *dentry,
61384+ const struct vfsmount *mnt);
61385+char *gr_to_filename1(const struct dentry *dentry,
61386+ const struct vfsmount *mnt);
61387+char *gr_to_filename2(const struct dentry *dentry,
61388+ const struct vfsmount *mnt);
61389+char *gr_to_filename3(const struct dentry *dentry,
61390+ const struct vfsmount *mnt);
61391+
61392+extern int grsec_enable_ptrace_readexec;
61393+extern int grsec_enable_harden_ptrace;
61394+extern int grsec_enable_link;
61395+extern int grsec_enable_fifo;
61396+extern int grsec_enable_execve;
61397+extern int grsec_enable_shm;
61398+extern int grsec_enable_execlog;
61399+extern int grsec_enable_signal;
61400+extern int grsec_enable_audit_ptrace;
61401+extern int grsec_enable_forkfail;
61402+extern int grsec_enable_time;
61403+extern int grsec_enable_rofs;
61404+extern int grsec_enable_chroot_shmat;
61405+extern int grsec_enable_chroot_mount;
61406+extern int grsec_enable_chroot_double;
61407+extern int grsec_enable_chroot_pivot;
61408+extern int grsec_enable_chroot_chdir;
61409+extern int grsec_enable_chroot_chmod;
61410+extern int grsec_enable_chroot_mknod;
61411+extern int grsec_enable_chroot_fchdir;
61412+extern int grsec_enable_chroot_nice;
61413+extern int grsec_enable_chroot_execlog;
61414+extern int grsec_enable_chroot_caps;
61415+extern int grsec_enable_chroot_sysctl;
61416+extern int grsec_enable_chroot_unix;
61417+extern int grsec_enable_tpe;
61418+extern int grsec_tpe_gid;
61419+extern int grsec_enable_tpe_all;
61420+extern int grsec_enable_tpe_invert;
61421+extern int grsec_enable_socket_all;
61422+extern int grsec_socket_all_gid;
61423+extern int grsec_enable_socket_client;
61424+extern int grsec_socket_client_gid;
61425+extern int grsec_enable_socket_server;
61426+extern int grsec_socket_server_gid;
61427+extern int grsec_audit_gid;
61428+extern int grsec_enable_group;
61429+extern int grsec_enable_audit_textrel;
61430+extern int grsec_enable_log_rwxmaps;
61431+extern int grsec_enable_mount;
61432+extern int grsec_enable_chdir;
61433+extern int grsec_resource_logging;
61434+extern int grsec_enable_blackhole;
61435+extern int grsec_lastack_retries;
61436+extern int grsec_enable_brute;
61437+extern int grsec_lock;
61438+
61439+extern spinlock_t grsec_alert_lock;
61440+extern unsigned long grsec_alert_wtime;
61441+extern unsigned long grsec_alert_fyet;
61442+
61443+extern spinlock_t grsec_audit_lock;
61444+
61445+extern rwlock_t grsec_exec_file_lock;
61446+
61447+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
61448+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
61449+ (tsk)->exec_file->f_vfsmnt) : "/")
61450+
61451+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
61452+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
61453+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61454+
61455+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
61456+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
61457+ (tsk)->exec_file->f_vfsmnt) : "/")
61458+
61459+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
61460+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
61461+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61462+
61463+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
61464+
61465+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
61466+
61467+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
61468+ (task)->pid, (cred)->uid, \
61469+ (cred)->euid, (cred)->gid, (cred)->egid, \
61470+ gr_parent_task_fullpath(task), \
61471+ (task)->real_parent->comm, (task)->real_parent->pid, \
61472+ (pcred)->uid, (pcred)->euid, \
61473+ (pcred)->gid, (pcred)->egid
61474+
61475+#define GR_CHROOT_CAPS {{ \
61476+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
61477+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
61478+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
61479+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
61480+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
61481+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
61482+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
61483+
61484+#define security_learn(normal_msg,args...) \
61485+({ \
61486+ read_lock(&grsec_exec_file_lock); \
61487+ gr_add_learn_entry(normal_msg "\n", ## args); \
61488+ read_unlock(&grsec_exec_file_lock); \
61489+})
61490+
61491+enum {
61492+ GR_DO_AUDIT,
61493+ GR_DONT_AUDIT,
61494+ /* used for non-audit messages that we shouldn't kill the task on */
61495+ GR_DONT_AUDIT_GOOD
61496+};
61497+
61498+enum {
61499+ GR_TTYSNIFF,
61500+ GR_RBAC,
61501+ GR_RBAC_STR,
61502+ GR_STR_RBAC,
61503+ GR_RBAC_MODE2,
61504+ GR_RBAC_MODE3,
61505+ GR_FILENAME,
61506+ GR_SYSCTL_HIDDEN,
61507+ GR_NOARGS,
61508+ GR_ONE_INT,
61509+ GR_ONE_INT_TWO_STR,
61510+ GR_ONE_STR,
61511+ GR_STR_INT,
61512+ GR_TWO_STR_INT,
61513+ GR_TWO_INT,
61514+ GR_TWO_U64,
61515+ GR_THREE_INT,
61516+ GR_FIVE_INT_TWO_STR,
61517+ GR_TWO_STR,
61518+ GR_THREE_STR,
61519+ GR_FOUR_STR,
61520+ GR_STR_FILENAME,
61521+ GR_FILENAME_STR,
61522+ GR_FILENAME_TWO_INT,
61523+ GR_FILENAME_TWO_INT_STR,
61524+ GR_TEXTREL,
61525+ GR_PTRACE,
61526+ GR_RESOURCE,
61527+ GR_CAP,
61528+ GR_SIG,
61529+ GR_SIG2,
61530+ GR_CRASH1,
61531+ GR_CRASH2,
61532+ GR_PSACCT,
61533+ GR_RWXMAP
61534+};
61535+
61536+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
61537+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
61538+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
61539+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
61540+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
61541+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
61542+#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)
61543+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
61544+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
61545+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
61546+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
61547+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
61548+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
61549+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
61550+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
61551+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
61552+#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)
61553+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
61554+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
61555+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
61556+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
61557+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
61558+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
61559+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
61560+#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)
61561+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
61562+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
61563+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
61564+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
61565+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
61566+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
61567+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
61568+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
61569+#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)
61570+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
61571+
61572+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
61573+
61574+#endif
61575+
61576+#endif
61577diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
61578new file mode 100644
61579index 0000000..ae576a1
61580--- /dev/null
61581+++ b/include/linux/grmsg.h
61582@@ -0,0 +1,109 @@
61583+#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"
61584+#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"
61585+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
61586+#define GR_STOPMOD_MSG "denied modification of module state by "
61587+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
61588+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
61589+#define GR_IOPERM_MSG "denied use of ioperm() by "
61590+#define GR_IOPL_MSG "denied use of iopl() by "
61591+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
61592+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
61593+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
61594+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
61595+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
61596+#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"
61597+#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"
61598+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
61599+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
61600+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
61601+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
61602+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
61603+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
61604+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
61605+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
61606+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
61607+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
61608+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
61609+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
61610+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
61611+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
61612+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
61613+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
61614+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
61615+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
61616+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
61617+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
61618+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
61619+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
61620+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
61621+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
61622+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
61623+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
61624+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
61625+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
61626+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
61627+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
61628+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
61629+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
61630+#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
61631+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
61632+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
61633+#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"
61634+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
61635+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
61636+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
61637+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
61638+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
61639+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
61640+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
61641+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
61642+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
61643+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
61644+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
61645+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
61646+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
61647+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
61648+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
61649+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
61650+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
61651+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
61652+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
61653+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
61654+#define GR_FAILFORK_MSG "failed fork with errno %s by "
61655+#define GR_NICE_CHROOT_MSG "denied priority change by "
61656+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
61657+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
61658+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
61659+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
61660+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
61661+#define GR_TIME_MSG "time set by "
61662+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
61663+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
61664+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
61665+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
61666+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
61667+#define GR_BIND_MSG "denied bind() by "
61668+#define GR_CONNECT_MSG "denied connect() by "
61669+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
61670+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
61671+#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"
61672+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
61673+#define GR_CAP_ACL_MSG "use of %s denied for "
61674+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
61675+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
61676+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
61677+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
61678+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
61679+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
61680+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
61681+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
61682+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
61683+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
61684+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
61685+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
61686+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
61687+#define GR_VM86_MSG "denied use of vm86 by "
61688+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
61689+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
61690+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
61691+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
61692diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
61693new file mode 100644
61694index 0000000..acd05db
61695--- /dev/null
61696+++ b/include/linux/grsecurity.h
61697@@ -0,0 +1,232 @@
61698+#ifndef GR_SECURITY_H
61699+#define GR_SECURITY_H
61700+#include <linux/fs.h>
61701+#include <linux/fs_struct.h>
61702+#include <linux/binfmts.h>
61703+#include <linux/gracl.h>
61704+
61705+/* notify of brain-dead configs */
61706+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61707+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
61708+#endif
61709+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
61710+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
61711+#endif
61712+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
61713+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
61714+#endif
61715+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
61716+#error "CONFIG_PAX enabled, but no PaX options are enabled."
61717+#endif
61718+
61719+#include <linux/compat.h>
61720+
61721+struct user_arg_ptr {
61722+#ifdef CONFIG_COMPAT
61723+ bool is_compat;
61724+#endif
61725+ union {
61726+ const char __user *const __user *native;
61727+#ifdef CONFIG_COMPAT
61728+ compat_uptr_t __user *compat;
61729+#endif
61730+ } ptr;
61731+};
61732+
61733+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
61734+void gr_handle_brute_check(void);
61735+void gr_handle_kernel_exploit(void);
61736+int gr_process_user_ban(void);
61737+
61738+char gr_roletype_to_char(void);
61739+
61740+int gr_acl_enable_at_secure(void);
61741+
61742+int gr_check_user_change(int real, int effective, int fs);
61743+int gr_check_group_change(int real, int effective, int fs);
61744+
61745+void gr_del_task_from_ip_table(struct task_struct *p);
61746+
61747+int gr_pid_is_chrooted(struct task_struct *p);
61748+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
61749+int gr_handle_chroot_nice(void);
61750+int gr_handle_chroot_sysctl(const int op);
61751+int gr_handle_chroot_setpriority(struct task_struct *p,
61752+ const int niceval);
61753+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
61754+int gr_handle_chroot_chroot(const struct dentry *dentry,
61755+ const struct vfsmount *mnt);
61756+void gr_handle_chroot_chdir(struct path *path);
61757+int gr_handle_chroot_chmod(const struct dentry *dentry,
61758+ const struct vfsmount *mnt, const int mode);
61759+int gr_handle_chroot_mknod(const struct dentry *dentry,
61760+ const struct vfsmount *mnt, const int mode);
61761+int gr_handle_chroot_mount(const struct dentry *dentry,
61762+ const struct vfsmount *mnt,
61763+ const char *dev_name);
61764+int gr_handle_chroot_pivot(void);
61765+int gr_handle_chroot_unix(const pid_t pid);
61766+
61767+int gr_handle_rawio(const struct inode *inode);
61768+
61769+void gr_handle_ioperm(void);
61770+void gr_handle_iopl(void);
61771+
61772+umode_t gr_acl_umask(void);
61773+
61774+int gr_tpe_allow(const struct file *file);
61775+
61776+void gr_set_chroot_entries(struct task_struct *task, struct path *path);
61777+void gr_clear_chroot_entries(struct task_struct *task);
61778+
61779+void gr_log_forkfail(const int retval);
61780+void gr_log_timechange(void);
61781+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
61782+void gr_log_chdir(const struct dentry *dentry,
61783+ const struct vfsmount *mnt);
61784+void gr_log_chroot_exec(const struct dentry *dentry,
61785+ const struct vfsmount *mnt);
61786+void gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv);
61787+void gr_log_remount(const char *devname, const int retval);
61788+void gr_log_unmount(const char *devname, const int retval);
61789+void gr_log_mount(const char *from, const char *to, const int retval);
61790+void gr_log_textrel(struct vm_area_struct *vma);
61791+void gr_log_rwxmmap(struct file *file);
61792+void gr_log_rwxmprotect(struct file *file);
61793+
61794+int gr_handle_follow_link(const struct inode *parent,
61795+ const struct inode *inode,
61796+ const struct dentry *dentry,
61797+ const struct vfsmount *mnt);
61798+int gr_handle_fifo(const struct dentry *dentry,
61799+ const struct vfsmount *mnt,
61800+ const struct dentry *dir, const int flag,
61801+ const int acc_mode);
61802+int gr_handle_hardlink(const struct dentry *dentry,
61803+ const struct vfsmount *mnt,
61804+ struct inode *inode,
61805+ const int mode, const char *to);
61806+
61807+int gr_is_capable(const int cap);
61808+int gr_is_capable_nolog(const int cap);
61809+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
61810+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
61811+
61812+void gr_learn_resource(const struct task_struct *task, const int limit,
61813+ const unsigned long wanted, const int gt);
61814+void gr_copy_label(struct task_struct *tsk);
61815+void gr_handle_crash(struct task_struct *task, const int sig);
61816+int gr_handle_signal(const struct task_struct *p, const int sig);
61817+int gr_check_crash_uid(const uid_t uid);
61818+int gr_check_protected_task(const struct task_struct *task);
61819+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
61820+int gr_acl_handle_mmap(const struct file *file,
61821+ const unsigned long prot);
61822+int gr_acl_handle_mprotect(const struct file *file,
61823+ const unsigned long prot);
61824+int gr_check_hidden_task(const struct task_struct *tsk);
61825+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
61826+ const struct vfsmount *mnt);
61827+__u32 gr_acl_handle_utime(const struct dentry *dentry,
61828+ const struct vfsmount *mnt);
61829+__u32 gr_acl_handle_access(const struct dentry *dentry,
61830+ const struct vfsmount *mnt, const int fmode);
61831+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
61832+ const struct vfsmount *mnt, umode_t *mode);
61833+__u32 gr_acl_handle_chown(const struct dentry *dentry,
61834+ const struct vfsmount *mnt);
61835+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
61836+ const struct vfsmount *mnt);
61837+int gr_handle_ptrace(struct task_struct *task, const long request);
61838+int gr_handle_proc_ptrace(struct task_struct *task);
61839+__u32 gr_acl_handle_execve(const struct dentry *dentry,
61840+ const struct vfsmount *mnt);
61841+int gr_check_crash_exec(const struct file *filp);
61842+int gr_acl_is_enabled(void);
61843+void gr_set_kernel_label(struct task_struct *task);
61844+void gr_set_role_label(struct task_struct *task, const uid_t uid,
61845+ const gid_t gid);
61846+int gr_set_proc_label(const struct dentry *dentry,
61847+ const struct vfsmount *mnt,
61848+ const int unsafe_flags);
61849+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
61850+ const struct vfsmount *mnt);
61851+__u32 gr_acl_handle_open(const struct dentry *dentry,
61852+ const struct vfsmount *mnt, int acc_mode);
61853+__u32 gr_acl_handle_creat(const struct dentry *dentry,
61854+ const struct dentry *p_dentry,
61855+ const struct vfsmount *p_mnt,
61856+ int open_flags, int acc_mode, const int imode);
61857+void gr_handle_create(const struct dentry *dentry,
61858+ const struct vfsmount *mnt);
61859+void gr_handle_proc_create(const struct dentry *dentry,
61860+ const struct inode *inode);
61861+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
61862+ const struct dentry *parent_dentry,
61863+ const struct vfsmount *parent_mnt,
61864+ const int mode);
61865+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
61866+ const struct dentry *parent_dentry,
61867+ const struct vfsmount *parent_mnt);
61868+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
61869+ const struct vfsmount *mnt);
61870+void gr_handle_delete(const ino_t ino, const dev_t dev);
61871+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
61872+ const struct vfsmount *mnt);
61873+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
61874+ const struct dentry *parent_dentry,
61875+ const struct vfsmount *parent_mnt,
61876+ const char *from);
61877+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
61878+ const struct dentry *parent_dentry,
61879+ const struct vfsmount *parent_mnt,
61880+ const struct dentry *old_dentry,
61881+ const struct vfsmount *old_mnt, const char *to);
61882+int gr_acl_handle_rename(struct dentry *new_dentry,
61883+ struct dentry *parent_dentry,
61884+ const struct vfsmount *parent_mnt,
61885+ struct dentry *old_dentry,
61886+ struct inode *old_parent_inode,
61887+ struct vfsmount *old_mnt, const char *newname);
61888+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
61889+ struct dentry *old_dentry,
61890+ struct dentry *new_dentry,
61891+ struct vfsmount *mnt, const __u8 replace);
61892+__u32 gr_check_link(const struct dentry *new_dentry,
61893+ const struct dentry *parent_dentry,
61894+ const struct vfsmount *parent_mnt,
61895+ const struct dentry *old_dentry,
61896+ const struct vfsmount *old_mnt);
61897+int gr_acl_handle_filldir(const struct file *file, const char *name,
61898+ const unsigned int namelen, const ino_t ino);
61899+
61900+__u32 gr_acl_handle_unix(const struct dentry *dentry,
61901+ const struct vfsmount *mnt);
61902+void gr_acl_handle_exit(void);
61903+void gr_acl_handle_psacct(struct task_struct *task, const long code);
61904+int gr_acl_handle_procpidmem(const struct task_struct *task);
61905+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
61906+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
61907+void gr_audit_ptrace(struct task_struct *task);
61908+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
61909+
61910+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
61911+
61912+#ifdef CONFIG_GRKERNSEC
61913+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
61914+void gr_handle_vm86(void);
61915+void gr_handle_mem_readwrite(u64 from, u64 to);
61916+
61917+void gr_log_badprocpid(const char *entry);
61918+
61919+extern int grsec_enable_dmesg;
61920+extern int grsec_disable_privio;
61921+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
61922+extern int grsec_enable_chroot_findtask;
61923+#endif
61924+#ifdef CONFIG_GRKERNSEC_SETXID
61925+extern int grsec_enable_setxid;
61926+#endif
61927+#endif
61928+
61929+#endif
61930diff --git a/include/linux/grsock.h b/include/linux/grsock.h
61931new file mode 100644
61932index 0000000..e7ffaaf
61933--- /dev/null
61934+++ b/include/linux/grsock.h
61935@@ -0,0 +1,19 @@
61936+#ifndef __GRSOCK_H
61937+#define __GRSOCK_H
61938+
61939+extern void gr_attach_curr_ip(const struct sock *sk);
61940+extern int gr_handle_sock_all(const int family, const int type,
61941+ const int protocol);
61942+extern int gr_handle_sock_server(const struct sockaddr *sck);
61943+extern int gr_handle_sock_server_other(const struct sock *sck);
61944+extern int gr_handle_sock_client(const struct sockaddr *sck);
61945+extern int gr_search_connect(struct socket * sock,
61946+ struct sockaddr_in * addr);
61947+extern int gr_search_bind(struct socket * sock,
61948+ struct sockaddr_in * addr);
61949+extern int gr_search_listen(struct socket * sock);
61950+extern int gr_search_accept(struct socket * sock);
61951+extern int gr_search_socket(const int domain, const int type,
61952+ const int protocol);
61953+
61954+#endif
61955diff --git a/include/linux/hid.h b/include/linux/hid.h
61956index 3a95da6..51986f1 100644
61957--- a/include/linux/hid.h
61958+++ b/include/linux/hid.h
61959@@ -696,7 +696,7 @@ struct hid_ll_driver {
61960 unsigned int code, int value);
61961
61962 int (*parse)(struct hid_device *hdev);
61963-};
61964+} __no_const;
61965
61966 #define PM_HINT_FULLON 1<<5
61967 #define PM_HINT_NORMAL 1<<1
61968diff --git a/include/linux/highmem.h b/include/linux/highmem.h
61969index 3a93f73..b19d0b3 100644
61970--- a/include/linux/highmem.h
61971+++ b/include/linux/highmem.h
61972@@ -185,6 +185,18 @@ static inline void clear_highpage(struct page *page)
61973 kunmap_atomic(kaddr, KM_USER0);
61974 }
61975
61976+static inline void sanitize_highpage(struct page *page)
61977+{
61978+ void *kaddr;
61979+ unsigned long flags;
61980+
61981+ local_irq_save(flags);
61982+ kaddr = kmap_atomic(page, KM_CLEARPAGE);
61983+ clear_page(kaddr);
61984+ kunmap_atomic(kaddr, KM_CLEARPAGE);
61985+ local_irq_restore(flags);
61986+}
61987+
61988 static inline void zero_user_segments(struct page *page,
61989 unsigned start1, unsigned end1,
61990 unsigned start2, unsigned end2)
61991diff --git a/include/linux/i2c.h b/include/linux/i2c.h
61992index 8e25a91..551b161 100644
61993--- a/include/linux/i2c.h
61994+++ b/include/linux/i2c.h
61995@@ -364,6 +364,7 @@ struct i2c_algorithm {
61996 /* To determine what the adapter supports */
61997 u32 (*functionality) (struct i2c_adapter *);
61998 };
61999+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
62000
62001 /*
62002 * i2c_adapter is the structure used to identify a physical i2c bus along
62003diff --git a/include/linux/i2o.h b/include/linux/i2o.h
62004index a6deef4..c56a7f2 100644
62005--- a/include/linux/i2o.h
62006+++ b/include/linux/i2o.h
62007@@ -564,7 +564,7 @@ struct i2o_controller {
62008 struct i2o_device *exec; /* Executive */
62009 #if BITS_PER_LONG == 64
62010 spinlock_t context_list_lock; /* lock for context_list */
62011- atomic_t context_list_counter; /* needed for unique contexts */
62012+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
62013 struct list_head context_list; /* list of context id's
62014 and pointers */
62015 #endif
62016diff --git a/include/linux/if_team.h b/include/linux/if_team.h
62017index 58404b0..439ed95 100644
62018--- a/include/linux/if_team.h
62019+++ b/include/linux/if_team.h
62020@@ -64,6 +64,7 @@ struct team_mode_ops {
62021 void (*port_leave)(struct team *team, struct team_port *port);
62022 void (*port_change_mac)(struct team *team, struct team_port *port);
62023 };
62024+typedef struct team_mode_ops __no_const team_mode_ops_no_const;
62025
62026 enum team_option_type {
62027 TEAM_OPTION_TYPE_U32,
62028@@ -112,7 +113,7 @@ struct team {
62029 struct list_head option_list;
62030
62031 const struct team_mode *mode;
62032- struct team_mode_ops ops;
62033+ team_mode_ops_no_const ops;
62034 long mode_priv[TEAM_MODE_PRIV_LONGS];
62035 };
62036
62037diff --git a/include/linux/init.h b/include/linux/init.h
62038index 6b95109..4aca62c 100644
62039--- a/include/linux/init.h
62040+++ b/include/linux/init.h
62041@@ -294,13 +294,13 @@ void __init parse_early_options(char *cmdline);
62042
62043 /* Each module must use one module_init(). */
62044 #define module_init(initfn) \
62045- static inline initcall_t __inittest(void) \
62046+ static inline __used initcall_t __inittest(void) \
62047 { return initfn; } \
62048 int init_module(void) __attribute__((alias(#initfn)));
62049
62050 /* This is only required if you want to be unloadable. */
62051 #define module_exit(exitfn) \
62052- static inline exitcall_t __exittest(void) \
62053+ static inline __used exitcall_t __exittest(void) \
62054 { return exitfn; } \
62055 void cleanup_module(void) __attribute__((alias(#exitfn)));
62056
62057diff --git a/include/linux/init_task.h b/include/linux/init_task.h
62058index 9c66b1a..a3fdded 100644
62059--- a/include/linux/init_task.h
62060+++ b/include/linux/init_task.h
62061@@ -127,6 +127,12 @@ extern struct cred init_cred;
62062
62063 #define INIT_TASK_COMM "swapper"
62064
62065+#ifdef CONFIG_X86
62066+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
62067+#else
62068+#define INIT_TASK_THREAD_INFO
62069+#endif
62070+
62071 /*
62072 * INIT_TASK is used to set up the first task table, touch at
62073 * your own risk!. Base=0, limit=0x1fffff (=2MB)
62074@@ -165,6 +171,7 @@ extern struct cred init_cred;
62075 RCU_INIT_POINTER(.cred, &init_cred), \
62076 .comm = INIT_TASK_COMM, \
62077 .thread = INIT_THREAD, \
62078+ INIT_TASK_THREAD_INFO \
62079 .fs = &init_fs, \
62080 .files = &init_files, \
62081 .signal = &init_signals, \
62082diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
62083index e6ca56d..8583707 100644
62084--- a/include/linux/intel-iommu.h
62085+++ b/include/linux/intel-iommu.h
62086@@ -296,7 +296,7 @@ struct iommu_flush {
62087 u8 fm, u64 type);
62088 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
62089 unsigned int size_order, u64 type);
62090-};
62091+} __no_const;
62092
62093 enum {
62094 SR_DMAR_FECTL_REG,
62095diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
62096index a64b00e..464d8bc 100644
62097--- a/include/linux/interrupt.h
62098+++ b/include/linux/interrupt.h
62099@@ -441,7 +441,7 @@ enum
62100 /* map softirq index to softirq name. update 'softirq_to_name' in
62101 * kernel/softirq.c when adding a new softirq.
62102 */
62103-extern char *softirq_to_name[NR_SOFTIRQS];
62104+extern const char * const softirq_to_name[NR_SOFTIRQS];
62105
62106 /* softirq mask and active fields moved to irq_cpustat_t in
62107 * asm/hardirq.h to get better cache usage. KAO
62108@@ -449,12 +449,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
62109
62110 struct softirq_action
62111 {
62112- void (*action)(struct softirq_action *);
62113+ void (*action)(void);
62114 };
62115
62116 asmlinkage void do_softirq(void);
62117 asmlinkage void __do_softirq(void);
62118-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
62119+extern void open_softirq(int nr, void (*action)(void));
62120 extern void softirq_init(void);
62121 static inline void __raise_softirq_irqoff(unsigned int nr)
62122 {
62123diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
62124index 3875719..4cd454c 100644
62125--- a/include/linux/kallsyms.h
62126+++ b/include/linux/kallsyms.h
62127@@ -15,7 +15,8 @@
62128
62129 struct module;
62130
62131-#ifdef CONFIG_KALLSYMS
62132+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
62133+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
62134 /* Lookup the address for a symbol. Returns 0 if not found. */
62135 unsigned long kallsyms_lookup_name(const char *name);
62136
62137@@ -99,6 +100,16 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
62138 /* Stupid that this does nothing, but I didn't create this mess. */
62139 #define __print_symbol(fmt, addr)
62140 #endif /*CONFIG_KALLSYMS*/
62141+#else /* when included by kallsyms.c, vsnprintf.c, or
62142+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
62143+extern void __print_symbol(const char *fmt, unsigned long address);
62144+extern int sprint_backtrace(char *buffer, unsigned long address);
62145+extern int sprint_symbol(char *buffer, unsigned long address);
62146+const char *kallsyms_lookup(unsigned long addr,
62147+ unsigned long *symbolsize,
62148+ unsigned long *offset,
62149+ char **modname, char *namebuf);
62150+#endif
62151
62152 /* This macro allows us to keep printk typechecking */
62153 static __printf(1, 2)
62154diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
62155index c4d2fc1..5df9c19 100644
62156--- a/include/linux/kgdb.h
62157+++ b/include/linux/kgdb.h
62158@@ -53,7 +53,7 @@ extern int kgdb_connected;
62159 extern int kgdb_io_module_registered;
62160
62161 extern atomic_t kgdb_setting_breakpoint;
62162-extern atomic_t kgdb_cpu_doing_single_step;
62163+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
62164
62165 extern struct task_struct *kgdb_usethread;
62166 extern struct task_struct *kgdb_contthread;
62167@@ -252,7 +252,7 @@ struct kgdb_arch {
62168 void (*disable_hw_break)(struct pt_regs *regs);
62169 void (*remove_all_hw_break)(void);
62170 void (*correct_hw_break)(void);
62171-};
62172+} __do_const;
62173
62174 /**
62175 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
62176@@ -277,7 +277,7 @@ struct kgdb_io {
62177 void (*pre_exception) (void);
62178 void (*post_exception) (void);
62179 int is_console;
62180-};
62181+} __do_const;
62182
62183 extern struct kgdb_arch arch_kgdb_ops;
62184
62185diff --git a/include/linux/kmod.h b/include/linux/kmod.h
62186index 0fb48ef..1b680b2 100644
62187--- a/include/linux/kmod.h
62188+++ b/include/linux/kmod.h
62189@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
62190 * usually useless though. */
62191 extern __printf(2, 3)
62192 int __request_module(bool wait, const char *name, ...);
62193+extern __printf(3, 4)
62194+int ___request_module(bool wait, char *param_name, const char *name, ...);
62195 #define request_module(mod...) __request_module(true, mod)
62196 #define request_module_nowait(mod...) __request_module(false, mod)
62197 #define try_then_request_module(x, mod...) \
62198diff --git a/include/linux/kref.h b/include/linux/kref.h
62199index 9c07dce..a92fa71 100644
62200--- a/include/linux/kref.h
62201+++ b/include/linux/kref.h
62202@@ -63,7 +63,7 @@ static inline void kref_get(struct kref *kref)
62203 static inline int kref_sub(struct kref *kref, unsigned int count,
62204 void (*release)(struct kref *kref))
62205 {
62206- WARN_ON(release == NULL);
62207+ BUG_ON(release == NULL);
62208
62209 if (atomic_sub_and_test((int) count, &kref->refcount)) {
62210 release(kref);
62211diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
62212index bc21720..098aefa 100644
62213--- a/include/linux/kvm_host.h
62214+++ b/include/linux/kvm_host.h
62215@@ -326,7 +326,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
62216 void vcpu_load(struct kvm_vcpu *vcpu);
62217 void vcpu_put(struct kvm_vcpu *vcpu);
62218
62219-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62220+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62221 struct module *module);
62222 void kvm_exit(void);
62223
62224@@ -416,20 +416,20 @@ void kvm_get_pfn(pfn_t pfn);
62225 int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,
62226 int len);
62227 int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data,
62228- unsigned long len);
62229-int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len);
62230+ unsigned long len) __size_overflow(4);
62231+int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len) __size_overflow(2,4);
62232 int kvm_read_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62233- void *data, unsigned long len);
62234+ void *data, unsigned long len) __size_overflow(4);
62235 int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn, const void *data,
62236 int offset, int len);
62237 int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,
62238- unsigned long len);
62239+ unsigned long len) __size_overflow(2,4);
62240 int kvm_write_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62241- void *data, unsigned long len);
62242+ void *data, unsigned long len) __size_overflow(4);
62243 int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62244 gpa_t gpa);
62245 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len);
62246-int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);
62247+int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len) __size_overflow(2,3);
62248 struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);
62249 int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);
62250 unsigned long kvm_host_page_size(struct kvm *kvm, gfn_t gfn);
62251@@ -485,7 +485,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
62252 struct kvm_guest_debug *dbg);
62253 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
62254
62255-int kvm_arch_init(void *opaque);
62256+int kvm_arch_init(const void *opaque);
62257 void kvm_arch_exit(void);
62258
62259 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
62260@@ -727,7 +727,7 @@ int kvm_setup_default_irq_routing(struct kvm *kvm);
62261 int kvm_set_irq_routing(struct kvm *kvm,
62262 const struct kvm_irq_routing_entry *entries,
62263 unsigned nr,
62264- unsigned flags);
62265+ unsigned flags) __size_overflow(3);
62266 void kvm_free_irq_routing(struct kvm *kvm);
62267
62268 #else
62269diff --git a/include/linux/libata.h b/include/linux/libata.h
62270index cafc09a..d7e7829 100644
62271--- a/include/linux/libata.h
62272+++ b/include/linux/libata.h
62273@@ -909,7 +909,7 @@ struct ata_port_operations {
62274 * fields must be pointers.
62275 */
62276 const struct ata_port_operations *inherits;
62277-};
62278+} __do_const;
62279
62280 struct ata_port_info {
62281 unsigned long flags;
62282diff --git a/include/linux/mca.h b/include/linux/mca.h
62283index 3797270..7765ede 100644
62284--- a/include/linux/mca.h
62285+++ b/include/linux/mca.h
62286@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
62287 int region);
62288 void * (*mca_transform_memory)(struct mca_device *,
62289 void *memory);
62290-};
62291+} __no_const;
62292
62293 struct mca_bus {
62294 u64 default_dma_mask;
62295diff --git a/include/linux/memory.h b/include/linux/memory.h
62296index 1ac7f6e..a5794d0 100644
62297--- a/include/linux/memory.h
62298+++ b/include/linux/memory.h
62299@@ -143,7 +143,7 @@ struct memory_accessor {
62300 size_t count);
62301 ssize_t (*write)(struct memory_accessor *, const char *buf,
62302 off_t offset, size_t count);
62303-};
62304+} __no_const;
62305
62306 /*
62307 * Kernel text modification mutex, used for code patching. Users of this lock
62308diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
62309index 9970337..9444122 100644
62310--- a/include/linux/mfd/abx500.h
62311+++ b/include/linux/mfd/abx500.h
62312@@ -188,6 +188,7 @@ struct abx500_ops {
62313 int (*event_registers_startup_state_get) (struct device *, u8 *);
62314 int (*startup_irq_enabled) (struct device *, unsigned int);
62315 };
62316+typedef struct abx500_ops __no_const abx500_ops_no_const;
62317
62318 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
62319 void abx500_remove_ops(struct device *dev);
62320diff --git a/include/linux/mm.h b/include/linux/mm.h
62321index 17b27cd..467ba2f 100644
62322--- a/include/linux/mm.h
62323+++ b/include/linux/mm.h
62324@@ -115,7 +115,14 @@ extern unsigned int kobjsize(const void *objp);
62325
62326 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
62327 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
62328+
62329+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
62330+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
62331+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
62332+#else
62333 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
62334+#endif
62335+
62336 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
62337 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
62338
62339@@ -1012,34 +1019,6 @@ int set_page_dirty(struct page *page);
62340 int set_page_dirty_lock(struct page *page);
62341 int clear_page_dirty_for_io(struct page *page);
62342
62343-/* Is the vma a continuation of the stack vma above it? */
62344-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
62345-{
62346- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
62347-}
62348-
62349-static inline int stack_guard_page_start(struct vm_area_struct *vma,
62350- unsigned long addr)
62351-{
62352- return (vma->vm_flags & VM_GROWSDOWN) &&
62353- (vma->vm_start == addr) &&
62354- !vma_growsdown(vma->vm_prev, addr);
62355-}
62356-
62357-/* Is the vma a continuation of the stack vma below it? */
62358-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
62359-{
62360- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
62361-}
62362-
62363-static inline int stack_guard_page_end(struct vm_area_struct *vma,
62364- unsigned long addr)
62365-{
62366- return (vma->vm_flags & VM_GROWSUP) &&
62367- (vma->vm_end == addr) &&
62368- !vma_growsup(vma->vm_next, addr);
62369-}
62370-
62371 extern unsigned long move_page_tables(struct vm_area_struct *vma,
62372 unsigned long old_addr, struct vm_area_struct *new_vma,
62373 unsigned long new_addr, unsigned long len);
62374@@ -1134,6 +1113,15 @@ static inline void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
62375 }
62376 #endif
62377
62378+#ifdef CONFIG_MMU
62379+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
62380+#else
62381+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
62382+{
62383+ return __pgprot(0);
62384+}
62385+#endif
62386+
62387 int vma_wants_writenotify(struct vm_area_struct *vma);
62388
62389 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
62390@@ -1409,6 +1397,7 @@ out:
62391 }
62392
62393 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
62394+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
62395
62396 extern unsigned long do_brk(unsigned long, unsigned long);
62397
62398@@ -1466,6 +1455,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
62399 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
62400 struct vm_area_struct **pprev);
62401
62402+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
62403+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
62404+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
62405+
62406 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
62407 NULL if none. Assume start_addr < end_addr. */
62408 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
62409@@ -1494,15 +1487,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
62410 return vma;
62411 }
62412
62413-#ifdef CONFIG_MMU
62414-pgprot_t vm_get_page_prot(unsigned long vm_flags);
62415-#else
62416-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
62417-{
62418- return __pgprot(0);
62419-}
62420-#endif
62421-
62422 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
62423 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
62424 unsigned long pfn, unsigned long size, pgprot_t);
62425@@ -1606,7 +1590,7 @@ extern int unpoison_memory(unsigned long pfn);
62426 extern int sysctl_memory_failure_early_kill;
62427 extern int sysctl_memory_failure_recovery;
62428 extern void shake_page(struct page *p, int access);
62429-extern atomic_long_t mce_bad_pages;
62430+extern atomic_long_unchecked_t mce_bad_pages;
62431 extern int soft_offline_page(struct page *page, int flags);
62432
62433 extern void dump_page(struct page *page);
62434@@ -1637,5 +1621,11 @@ static inline unsigned int debug_guardpage_minorder(void) { return 0; }
62435 static inline bool page_is_guard(struct page *page) { return false; }
62436 #endif /* CONFIG_DEBUG_PAGEALLOC */
62437
62438+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
62439+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
62440+#else
62441+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
62442+#endif
62443+
62444 #endif /* __KERNEL__ */
62445 #endif /* _LINUX_MM_H */
62446diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
62447index 3cc3062..efeaeb7 100644
62448--- a/include/linux/mm_types.h
62449+++ b/include/linux/mm_types.h
62450@@ -252,6 +252,8 @@ struct vm_area_struct {
62451 #ifdef CONFIG_NUMA
62452 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
62453 #endif
62454+
62455+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
62456 };
62457
62458 struct core_thread {
62459@@ -326,7 +328,7 @@ struct mm_struct {
62460 unsigned long def_flags;
62461 unsigned long nr_ptes; /* Page table pages */
62462 unsigned long start_code, end_code, start_data, end_data;
62463- unsigned long start_brk, brk, start_stack;
62464+ unsigned long brk_gap, start_brk, brk, start_stack;
62465 unsigned long arg_start, arg_end, env_start, env_end;
62466
62467 unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
62468@@ -388,6 +390,24 @@ struct mm_struct {
62469 #ifdef CONFIG_CPUMASK_OFFSTACK
62470 struct cpumask cpumask_allocation;
62471 #endif
62472+
62473+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS) || defined(CONFIG_PAX_HAVE_ACL_FLAGS) || defined(CONFIG_PAX_HOOK_ACL_FLAGS)
62474+ unsigned long pax_flags;
62475+#endif
62476+
62477+#ifdef CONFIG_PAX_DLRESOLVE
62478+ unsigned long call_dl_resolve;
62479+#endif
62480+
62481+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
62482+ unsigned long call_syscall;
62483+#endif
62484+
62485+#ifdef CONFIG_PAX_ASLR
62486+ unsigned long delta_mmap; /* randomized offset */
62487+ unsigned long delta_stack; /* randomized offset */
62488+#endif
62489+
62490 };
62491
62492 static inline void mm_init_cpumask(struct mm_struct *mm)
62493diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
62494index 1d1b1e1..2a13c78 100644
62495--- a/include/linux/mmu_notifier.h
62496+++ b/include/linux/mmu_notifier.h
62497@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
62498 */
62499 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
62500 ({ \
62501- pte_t __pte; \
62502+ pte_t ___pte; \
62503 struct vm_area_struct *___vma = __vma; \
62504 unsigned long ___address = __address; \
62505- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
62506+ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
62507 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
62508- __pte; \
62509+ ___pte; \
62510 })
62511
62512 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
62513diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
62514index 650ba2f..af0a58c 100644
62515--- a/include/linux/mmzone.h
62516+++ b/include/linux/mmzone.h
62517@@ -379,7 +379,7 @@ struct zone {
62518 unsigned long flags; /* zone flags, see below */
62519
62520 /* Zone statistics */
62521- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
62522+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
62523
62524 /*
62525 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
62526diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
62527index 83ac071..2656e0e 100644
62528--- a/include/linux/mod_devicetable.h
62529+++ b/include/linux/mod_devicetable.h
62530@@ -12,7 +12,7 @@
62531 typedef unsigned long kernel_ulong_t;
62532 #endif
62533
62534-#define PCI_ANY_ID (~0)
62535+#define PCI_ANY_ID ((__u16)~0)
62536
62537 struct pci_device_id {
62538 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
62539@@ -131,7 +131,7 @@ struct usb_device_id {
62540 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
62541 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
62542
62543-#define HID_ANY_ID (~0)
62544+#define HID_ANY_ID (~0U)
62545
62546 struct hid_device_id {
62547 __u16 bus;
62548diff --git a/include/linux/module.h b/include/linux/module.h
62549index 4598bf0..e069d7f 100644
62550--- a/include/linux/module.h
62551+++ b/include/linux/module.h
62552@@ -17,6 +17,7 @@
62553 #include <linux/moduleparam.h>
62554 #include <linux/tracepoint.h>
62555 #include <linux/export.h>
62556+#include <linux/fs.h>
62557
62558 #include <linux/percpu.h>
62559 #include <asm/module.h>
62560@@ -275,19 +276,16 @@ struct module
62561 int (*init)(void);
62562
62563 /* If this is non-NULL, vfree after init() returns */
62564- void *module_init;
62565+ void *module_init_rx, *module_init_rw;
62566
62567 /* Here is the actual code + data, vfree'd on unload. */
62568- void *module_core;
62569+ void *module_core_rx, *module_core_rw;
62570
62571 /* Here are the sizes of the init and core sections */
62572- unsigned int init_size, core_size;
62573+ unsigned int init_size_rw, core_size_rw;
62574
62575 /* The size of the executable code in each section. */
62576- unsigned int init_text_size, core_text_size;
62577-
62578- /* Size of RO sections of the module (text+rodata) */
62579- unsigned int init_ro_size, core_ro_size;
62580+ unsigned int init_size_rx, core_size_rx;
62581
62582 /* Arch-specific module values */
62583 struct mod_arch_specific arch;
62584@@ -343,6 +341,10 @@ struct module
62585 #ifdef CONFIG_EVENT_TRACING
62586 struct ftrace_event_call **trace_events;
62587 unsigned int num_trace_events;
62588+ struct file_operations trace_id;
62589+ struct file_operations trace_enable;
62590+ struct file_operations trace_format;
62591+ struct file_operations trace_filter;
62592 #endif
62593 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
62594 unsigned int num_ftrace_callsites;
62595@@ -390,16 +392,46 @@ bool is_module_address(unsigned long addr);
62596 bool is_module_percpu_address(unsigned long addr);
62597 bool is_module_text_address(unsigned long addr);
62598
62599+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
62600+{
62601+
62602+#ifdef CONFIG_PAX_KERNEXEC
62603+ if (ktla_ktva(addr) >= (unsigned long)start &&
62604+ ktla_ktva(addr) < (unsigned long)start + size)
62605+ return 1;
62606+#endif
62607+
62608+ return ((void *)addr >= start && (void *)addr < start + size);
62609+}
62610+
62611+static inline int within_module_core_rx(unsigned long addr, struct module *mod)
62612+{
62613+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
62614+}
62615+
62616+static inline int within_module_core_rw(unsigned long addr, struct module *mod)
62617+{
62618+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
62619+}
62620+
62621+static inline int within_module_init_rx(unsigned long addr, struct module *mod)
62622+{
62623+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
62624+}
62625+
62626+static inline int within_module_init_rw(unsigned long addr, struct module *mod)
62627+{
62628+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
62629+}
62630+
62631 static inline int within_module_core(unsigned long addr, struct module *mod)
62632 {
62633- return (unsigned long)mod->module_core <= addr &&
62634- addr < (unsigned long)mod->module_core + mod->core_size;
62635+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
62636 }
62637
62638 static inline int within_module_init(unsigned long addr, struct module *mod)
62639 {
62640- return (unsigned long)mod->module_init <= addr &&
62641- addr < (unsigned long)mod->module_init + mod->init_size;
62642+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
62643 }
62644
62645 /* Search for module by name: must hold module_mutex. */
62646diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
62647index b2be02e..72d2f78 100644
62648--- a/include/linux/moduleloader.h
62649+++ b/include/linux/moduleloader.h
62650@@ -23,11 +23,23 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
62651
62652 /* Allocator used for allocating struct module, core sections and init
62653 sections. Returns NULL on failure. */
62654-void *module_alloc(unsigned long size);
62655+void *module_alloc(unsigned long size) __size_overflow(1);
62656+
62657+#ifdef CONFIG_PAX_KERNEXEC
62658+void *module_alloc_exec(unsigned long size) __size_overflow(1);
62659+#else
62660+#define module_alloc_exec(x) module_alloc(x)
62661+#endif
62662
62663 /* Free memory returned from module_alloc. */
62664 void module_free(struct module *mod, void *module_region);
62665
62666+#ifdef CONFIG_PAX_KERNEXEC
62667+void module_free_exec(struct module *mod, void *module_region);
62668+#else
62669+#define module_free_exec(x, y) module_free((x), (y))
62670+#endif
62671+
62672 /* Apply the given relocation to the (simplified) ELF. Return -error
62673 or 0. */
62674 int apply_relocate(Elf_Shdr *sechdrs,
62675diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
62676index c47f4d6..23f9bdb 100644
62677--- a/include/linux/moduleparam.h
62678+++ b/include/linux/moduleparam.h
62679@@ -260,7 +260,7 @@ static inline void __kernel_param_unlock(void)
62680 * @len is usually just sizeof(string).
62681 */
62682 #define module_param_string(name, string, len, perm) \
62683- static const struct kparam_string __param_string_##name \
62684+ static const struct kparam_string __param_string_##name __used \
62685 = { len, string }; \
62686 __module_param_call(MODULE_PARAM_PREFIX, name, \
62687 &param_ops_string, \
62688@@ -396,7 +396,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
62689 */
62690 #define module_param_array_named(name, array, type, nump, perm) \
62691 param_check_##type(name, &(array)[0]); \
62692- static const struct kparam_array __param_arr_##name \
62693+ static const struct kparam_array __param_arr_##name __used \
62694 = { .max = ARRAY_SIZE(array), .num = nump, \
62695 .ops = &param_ops_##type, \
62696 .elemsize = sizeof(array[0]), .elem = array }; \
62697diff --git a/include/linux/namei.h b/include/linux/namei.h
62698index ffc0213..2c1f2cb 100644
62699--- a/include/linux/namei.h
62700+++ b/include/linux/namei.h
62701@@ -24,7 +24,7 @@ struct nameidata {
62702 unsigned seq;
62703 int last_type;
62704 unsigned depth;
62705- char *saved_names[MAX_NESTED_LINKS + 1];
62706+ const char *saved_names[MAX_NESTED_LINKS + 1];
62707
62708 /* Intent data */
62709 union {
62710@@ -94,12 +94,12 @@ extern int follow_up(struct path *);
62711 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
62712 extern void unlock_rename(struct dentry *, struct dentry *);
62713
62714-static inline void nd_set_link(struct nameidata *nd, char *path)
62715+static inline void nd_set_link(struct nameidata *nd, const char *path)
62716 {
62717 nd->saved_names[nd->depth] = path;
62718 }
62719
62720-static inline char *nd_get_link(struct nameidata *nd)
62721+static inline const char *nd_get_link(const struct nameidata *nd)
62722 {
62723 return nd->saved_names[nd->depth];
62724 }
62725diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
62726index 4f3b01a..8256d1a 100644
62727--- a/include/linux/netdevice.h
62728+++ b/include/linux/netdevice.h
62729@@ -1002,6 +1002,7 @@ struct net_device_ops {
62730 int (*ndo_neigh_construct)(struct neighbour *n);
62731 void (*ndo_neigh_destroy)(struct neighbour *n);
62732 };
62733+typedef struct net_device_ops __no_const net_device_ops_no_const;
62734
62735 /*
62736 * The DEVICE structure.
62737@@ -1063,7 +1064,7 @@ struct net_device {
62738 int iflink;
62739
62740 struct net_device_stats stats;
62741- atomic_long_t rx_dropped; /* dropped packets by core network
62742+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
62743 * Do not use this in drivers.
62744 */
62745
62746diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
62747new file mode 100644
62748index 0000000..33f4af8
62749--- /dev/null
62750+++ b/include/linux/netfilter/xt_gradm.h
62751@@ -0,0 +1,9 @@
62752+#ifndef _LINUX_NETFILTER_XT_GRADM_H
62753+#define _LINUX_NETFILTER_XT_GRADM_H 1
62754+
62755+struct xt_gradm_mtinfo {
62756+ __u16 flags;
62757+ __u16 invflags;
62758+};
62759+
62760+#endif
62761diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h
62762index c65a18a..0c05f3a 100644
62763--- a/include/linux/of_pdt.h
62764+++ b/include/linux/of_pdt.h
62765@@ -32,7 +32,7 @@ struct of_pdt_ops {
62766
62767 /* return 0 on success; fill in 'len' with number of bytes in path */
62768 int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
62769-};
62770+} __no_const;
62771
62772 extern void *prom_early_alloc(unsigned long size);
62773
62774diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
62775index a4c5624..2dabfb7 100644
62776--- a/include/linux/oprofile.h
62777+++ b/include/linux/oprofile.h
62778@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
62779 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
62780 char const * name, ulong * val);
62781
62782-/** Create a file for read-only access to an atomic_t. */
62783+/** Create a file for read-only access to an atomic_unchecked_t. */
62784 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
62785- char const * name, atomic_t * val);
62786+ char const * name, atomic_unchecked_t * val);
62787
62788 /** create a directory */
62789 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
62790@@ -163,7 +163,7 @@ ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user * buf, size_t co
62791 * Read an ASCII string for a number from a userspace buffer and fill *val on success.
62792 * Returns 0 on success, < 0 on error.
62793 */
62794-int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count);
62795+int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count) __size_overflow(3);
62796
62797 /** lock for read/write safety */
62798 extern raw_spinlock_t oprofilefs_lock;
62799diff --git a/include/linux/padata.h b/include/linux/padata.h
62800index 4633b2f..988bc08 100644
62801--- a/include/linux/padata.h
62802+++ b/include/linux/padata.h
62803@@ -129,7 +129,7 @@ struct parallel_data {
62804 struct padata_instance *pinst;
62805 struct padata_parallel_queue __percpu *pqueue;
62806 struct padata_serial_queue __percpu *squeue;
62807- atomic_t seq_nr;
62808+ atomic_unchecked_t seq_nr;
62809 atomic_t reorder_objects;
62810 atomic_t refcnt;
62811 unsigned int max_seq_nr;
62812diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
62813index abb2776..d8b8e15 100644
62814--- a/include/linux/perf_event.h
62815+++ b/include/linux/perf_event.h
62816@@ -750,8 +750,8 @@ struct perf_event {
62817
62818 enum perf_event_active_state state;
62819 unsigned int attach_state;
62820- local64_t count;
62821- atomic64_t child_count;
62822+ local64_t count; /* PaX: fix it one day */
62823+ atomic64_unchecked_t child_count;
62824
62825 /*
62826 * These are the total time in nanoseconds that the event
62827@@ -802,8 +802,8 @@ struct perf_event {
62828 * These accumulate total time (in nanoseconds) that children
62829 * events have been enabled and running, respectively.
62830 */
62831- atomic64_t child_total_time_enabled;
62832- atomic64_t child_total_time_running;
62833+ atomic64_unchecked_t child_total_time_enabled;
62834+ atomic64_unchecked_t child_total_time_running;
62835
62836 /*
62837 * Protect attach/detach and child_list:
62838diff --git a/include/linux/personality.h b/include/linux/personality.h
62839index 8fc7dd1a..c19d89e 100644
62840--- a/include/linux/personality.h
62841+++ b/include/linux/personality.h
62842@@ -44,6 +44,7 @@ enum {
62843 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
62844 ADDR_NO_RANDOMIZE | \
62845 ADDR_COMPAT_LAYOUT | \
62846+ ADDR_LIMIT_3GB | \
62847 MMAP_PAGE_ZERO)
62848
62849 /*
62850diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
62851index 77257c9..51d473a 100644
62852--- a/include/linux/pipe_fs_i.h
62853+++ b/include/linux/pipe_fs_i.h
62854@@ -46,9 +46,9 @@ struct pipe_buffer {
62855 struct pipe_inode_info {
62856 wait_queue_head_t wait;
62857 unsigned int nrbufs, curbuf, buffers;
62858- unsigned int readers;
62859- unsigned int writers;
62860- unsigned int waiting_writers;
62861+ atomic_t readers;
62862+ atomic_t writers;
62863+ atomic_t waiting_writers;
62864 unsigned int r_counter;
62865 unsigned int w_counter;
62866 struct page *tmp_page;
62867diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
62868index 609daae..5392427 100644
62869--- a/include/linux/pm_runtime.h
62870+++ b/include/linux/pm_runtime.h
62871@@ -97,7 +97,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
62872
62873 static inline void pm_runtime_mark_last_busy(struct device *dev)
62874 {
62875- ACCESS_ONCE(dev->power.last_busy) = jiffies;
62876+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
62877 }
62878
62879 #else /* !CONFIG_PM_RUNTIME */
62880diff --git a/include/linux/poison.h b/include/linux/poison.h
62881index 2110a81..13a11bb 100644
62882--- a/include/linux/poison.h
62883+++ b/include/linux/poison.h
62884@@ -19,8 +19,8 @@
62885 * under normal circumstances, used to verify that nobody uses
62886 * non-initialized list entries.
62887 */
62888-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
62889-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
62890+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
62891+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
62892
62893 /********** include/linux/timer.h **********/
62894 /*
62895diff --git a/include/linux/preempt.h b/include/linux/preempt.h
62896index 58969b2..ead129b 100644
62897--- a/include/linux/preempt.h
62898+++ b/include/linux/preempt.h
62899@@ -123,7 +123,7 @@ struct preempt_ops {
62900 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
62901 void (*sched_out)(struct preempt_notifier *notifier,
62902 struct task_struct *next);
62903-};
62904+} __no_const;
62905
62906 /**
62907 * preempt_notifier - key for installing preemption notifiers
62908diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
62909index 85c5073..51fac8b 100644
62910--- a/include/linux/proc_fs.h
62911+++ b/include/linux/proc_fs.h
62912@@ -155,6 +155,18 @@ static inline struct proc_dir_entry *proc_create(const char *name, umode_t mode,
62913 return proc_create_data(name, mode, parent, proc_fops, NULL);
62914 }
62915
62916+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
62917+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
62918+{
62919+#ifdef CONFIG_GRKERNSEC_PROC_USER
62920+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
62921+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
62922+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
62923+#else
62924+ return proc_create_data(name, mode, parent, proc_fops, NULL);
62925+#endif
62926+}
62927+
62928 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
62929 umode_t mode, struct proc_dir_entry *base,
62930 read_proc_t *read_proc, void * data)
62931@@ -258,7 +270,7 @@ union proc_op {
62932 int (*proc_show)(struct seq_file *m,
62933 struct pid_namespace *ns, struct pid *pid,
62934 struct task_struct *task);
62935-};
62936+} __no_const;
62937
62938 struct ctl_table_header;
62939 struct ctl_table;
62940diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
62941index c2f1f6a..6fdb196 100644
62942--- a/include/linux/ptrace.h
62943+++ b/include/linux/ptrace.h
62944@@ -199,9 +199,10 @@ static inline void ptrace_event(int event, unsigned long message)
62945 if (unlikely(ptrace_event_enabled(current, event))) {
62946 current->ptrace_message = message;
62947 ptrace_notify((event << 8) | SIGTRAP);
62948- } else if (event == PTRACE_EVENT_EXEC && unlikely(current->ptrace)) {
62949+ } else if (event == PTRACE_EVENT_EXEC) {
62950 /* legacy EXEC report via SIGTRAP */
62951- send_sig(SIGTRAP, current, 0);
62952+ if ((current->ptrace & (PT_PTRACED|PT_SEIZED)) == PT_PTRACED)
62953+ send_sig(SIGTRAP, current, 0);
62954 }
62955 }
62956
62957diff --git a/include/linux/random.h b/include/linux/random.h
62958index 8f74538..02a1012 100644
62959--- a/include/linux/random.h
62960+++ b/include/linux/random.h
62961@@ -69,12 +69,17 @@ void srandom32(u32 seed);
62962
62963 u32 prandom32(struct rnd_state *);
62964
62965+static inline unsigned long pax_get_random_long(void)
62966+{
62967+ return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
62968+}
62969+
62970 /*
62971 * Handle minimum values for seeds
62972 */
62973 static inline u32 __seed(u32 x, u32 m)
62974 {
62975- return (x < m) ? x + m : x;
62976+ return (x <= m) ? x + m + 1 : x;
62977 }
62978
62979 /**
62980diff --git a/include/linux/reboot.h b/include/linux/reboot.h
62981index e0879a7..a12f962 100644
62982--- a/include/linux/reboot.h
62983+++ b/include/linux/reboot.h
62984@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
62985 * Architecture-specific implementations of sys_reboot commands.
62986 */
62987
62988-extern void machine_restart(char *cmd);
62989-extern void machine_halt(void);
62990-extern void machine_power_off(void);
62991+extern void machine_restart(char *cmd) __noreturn;
62992+extern void machine_halt(void) __noreturn;
62993+extern void machine_power_off(void) __noreturn;
62994
62995 extern void machine_shutdown(void);
62996 struct pt_regs;
62997@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
62998 */
62999
63000 extern void kernel_restart_prepare(char *cmd);
63001-extern void kernel_restart(char *cmd);
63002-extern void kernel_halt(void);
63003-extern void kernel_power_off(void);
63004+extern void kernel_restart(char *cmd) __noreturn;
63005+extern void kernel_halt(void) __noreturn;
63006+extern void kernel_power_off(void) __noreturn;
63007
63008 extern int C_A_D; /* for sysctl */
63009 void ctrl_alt_del(void);
63010@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
63011 * Emergency restart, callable from an interrupt handler.
63012 */
63013
63014-extern void emergency_restart(void);
63015+extern void emergency_restart(void) __noreturn;
63016 #include <asm/emergency-restart.h>
63017
63018 #endif
63019diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
63020index 2213ddc..650212a 100644
63021--- a/include/linux/reiserfs_fs.h
63022+++ b/include/linux/reiserfs_fs.h
63023@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
63024 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
63025
63026 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
63027-#define get_generation(s) atomic_read (&fs_generation(s))
63028+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
63029 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
63030 #define __fs_changed(gen,s) (gen != get_generation (s))
63031 #define fs_changed(gen,s) \
63032diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
63033index 8c9e85c..1698e9a 100644
63034--- a/include/linux/reiserfs_fs_sb.h
63035+++ b/include/linux/reiserfs_fs_sb.h
63036@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
63037 /* Comment? -Hans */
63038 wait_queue_head_t s_wait;
63039 /* To be obsoleted soon by per buffer seals.. -Hans */
63040- atomic_t s_generation_counter; // increased by one every time the
63041+ atomic_unchecked_t s_generation_counter; // increased by one every time the
63042 // tree gets re-balanced
63043 unsigned long s_properties; /* File system properties. Currently holds
63044 on-disk FS format */
63045diff --git a/include/linux/relay.h b/include/linux/relay.h
63046index a822fd7..62b70f6 100644
63047--- a/include/linux/relay.h
63048+++ b/include/linux/relay.h
63049@@ -159,7 +159,7 @@ struct rchan_callbacks
63050 * The callback should return 0 if successful, negative if not.
63051 */
63052 int (*remove_buf_file)(struct dentry *dentry);
63053-};
63054+} __no_const;
63055
63056 /*
63057 * CONFIG_RELAY kernel API, kernel/relay.c
63058diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
63059index c6c6084..5bf1212 100644
63060--- a/include/linux/rfkill.h
63061+++ b/include/linux/rfkill.h
63062@@ -147,6 +147,7 @@ struct rfkill_ops {
63063 void (*query)(struct rfkill *rfkill, void *data);
63064 int (*set_block)(void *data, bool blocked);
63065 };
63066+typedef struct rfkill_ops __no_const rfkill_ops_no_const;
63067
63068 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
63069 /**
63070diff --git a/include/linux/rio.h b/include/linux/rio.h
63071index 4d50611..c6858a2 100644
63072--- a/include/linux/rio.h
63073+++ b/include/linux/rio.h
63074@@ -315,7 +315,7 @@ struct rio_ops {
63075 int mbox, void *buffer, size_t len);
63076 int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
63077 void *(*get_inb_message)(struct rio_mport *mport, int mbox);
63078-};
63079+} __no_const;
63080
63081 #define RIO_RESOURCE_MEM 0x00000100
63082 #define RIO_RESOURCE_DOORBELL 0x00000200
63083diff --git a/include/linux/rmap.h b/include/linux/rmap.h
63084index 1cdd62a..e399f0d 100644
63085--- a/include/linux/rmap.h
63086+++ b/include/linux/rmap.h
63087@@ -119,9 +119,9 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
63088 void anon_vma_init(void); /* create anon_vma_cachep */
63089 int anon_vma_prepare(struct vm_area_struct *);
63090 void unlink_anon_vmas(struct vm_area_struct *);
63091-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
63092+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
63093 void anon_vma_moveto_tail(struct vm_area_struct *);
63094-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
63095+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
63096 void __anon_vma_link(struct vm_area_struct *);
63097
63098 static inline void anon_vma_merge(struct vm_area_struct *vma,
63099diff --git a/include/linux/sched.h b/include/linux/sched.h
63100index 0657368..765f70f 100644
63101--- a/include/linux/sched.h
63102+++ b/include/linux/sched.h
63103@@ -101,6 +101,7 @@ struct bio_list;
63104 struct fs_struct;
63105 struct perf_event_context;
63106 struct blk_plug;
63107+struct linux_binprm;
63108
63109 /*
63110 * List of flags we want to share for kernel threads,
63111@@ -382,10 +383,13 @@ struct user_namespace;
63112 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
63113
63114 extern int sysctl_max_map_count;
63115+extern unsigned long sysctl_heap_stack_gap;
63116
63117 #include <linux/aio.h>
63118
63119 #ifdef CONFIG_MMU
63120+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
63121+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
63122 extern void arch_pick_mmap_layout(struct mm_struct *mm);
63123 extern unsigned long
63124 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
63125@@ -631,6 +635,17 @@ struct signal_struct {
63126 #ifdef CONFIG_TASKSTATS
63127 struct taskstats *stats;
63128 #endif
63129+
63130+#ifdef CONFIG_GRKERNSEC
63131+ u32 curr_ip;
63132+ u32 saved_ip;
63133+ u32 gr_saddr;
63134+ u32 gr_daddr;
63135+ u16 gr_sport;
63136+ u16 gr_dport;
63137+ u8 used_accept:1;
63138+#endif
63139+
63140 #ifdef CONFIG_AUDIT
63141 unsigned audit_tty;
63142 struct tty_audit_buf *tty_audit_buf;
63143@@ -714,6 +729,11 @@ struct user_struct {
63144 struct key *session_keyring; /* UID's default session keyring */
63145 #endif
63146
63147+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
63148+ unsigned int banned;
63149+ unsigned long ban_expires;
63150+#endif
63151+
63152 /* Hash table maintenance information */
63153 struct hlist_node uidhash_node;
63154 uid_t uid;
63155@@ -1354,8 +1374,8 @@ struct task_struct {
63156 struct list_head thread_group;
63157
63158 struct completion *vfork_done; /* for vfork() */
63159- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
63160- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63161+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
63162+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63163
63164 cputime_t utime, stime, utimescaled, stimescaled;
63165 cputime_t gtime;
63166@@ -1371,13 +1391,6 @@ struct task_struct {
63167 struct task_cputime cputime_expires;
63168 struct list_head cpu_timers[3];
63169
63170-/* process credentials */
63171- const struct cred __rcu *real_cred; /* objective and real subjective task
63172- * credentials (COW) */
63173- const struct cred __rcu *cred; /* effective (overridable) subjective task
63174- * credentials (COW) */
63175- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63176-
63177 char comm[TASK_COMM_LEN]; /* executable name excluding path
63178 - access with [gs]et_task_comm (which lock
63179 it with task_lock())
63180@@ -1394,8 +1407,16 @@ struct task_struct {
63181 #endif
63182 /* CPU-specific state of this task */
63183 struct thread_struct thread;
63184+/* thread_info moved to task_struct */
63185+#ifdef CONFIG_X86
63186+ struct thread_info tinfo;
63187+#endif
63188 /* filesystem information */
63189 struct fs_struct *fs;
63190+
63191+ const struct cred __rcu *cred; /* effective (overridable) subjective task
63192+ * credentials (COW) */
63193+
63194 /* open file information */
63195 struct files_struct *files;
63196 /* namespaces */
63197@@ -1442,6 +1463,11 @@ struct task_struct {
63198 struct rt_mutex_waiter *pi_blocked_on;
63199 #endif
63200
63201+/* process credentials */
63202+ const struct cred __rcu *real_cred; /* objective and real subjective task
63203+ * credentials (COW) */
63204+ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63205+
63206 #ifdef CONFIG_DEBUG_MUTEXES
63207 /* mutex deadlock detection */
63208 struct mutex_waiter *blocked_on;
63209@@ -1558,6 +1584,27 @@ struct task_struct {
63210 unsigned long default_timer_slack_ns;
63211
63212 struct list_head *scm_work_list;
63213+
63214+#ifdef CONFIG_GRKERNSEC
63215+ /* grsecurity */
63216+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63217+ u64 exec_id;
63218+#endif
63219+#ifdef CONFIG_GRKERNSEC_SETXID
63220+ const struct cred *delayed_cred;
63221+#endif
63222+ struct dentry *gr_chroot_dentry;
63223+ struct acl_subject_label *acl;
63224+ struct acl_role_label *role;
63225+ struct file *exec_file;
63226+ u16 acl_role_id;
63227+ /* is this the task that authenticated to the special role */
63228+ u8 acl_sp_role;
63229+ u8 is_writable;
63230+ u8 brute;
63231+ u8 gr_is_chrooted;
63232+#endif
63233+
63234 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
63235 /* Index of current stored address in ret_stack */
63236 int curr_ret_stack;
63237@@ -1592,6 +1639,51 @@ struct task_struct {
63238 #endif
63239 };
63240
63241+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
63242+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
63243+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
63244+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
63245+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
63246+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
63247+
63248+#ifdef CONFIG_PAX_SOFTMODE
63249+extern int pax_softmode;
63250+#endif
63251+
63252+extern int pax_check_flags(unsigned long *);
63253+
63254+/* if tsk != current then task_lock must be held on it */
63255+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63256+static inline unsigned long pax_get_flags(struct task_struct *tsk)
63257+{
63258+ if (likely(tsk->mm))
63259+ return tsk->mm->pax_flags;
63260+ else
63261+ return 0UL;
63262+}
63263+
63264+/* if tsk != current then task_lock must be held on it */
63265+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
63266+{
63267+ if (likely(tsk->mm)) {
63268+ tsk->mm->pax_flags = flags;
63269+ return 0;
63270+ }
63271+ return -EINVAL;
63272+}
63273+#endif
63274+
63275+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
63276+extern void pax_set_initial_flags(struct linux_binprm *bprm);
63277+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
63278+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
63279+#endif
63280+
63281+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
63282+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
63283+extern void pax_report_refcount_overflow(struct pt_regs *regs);
63284+extern __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type);
63285+
63286 /* Future-safe accessor for struct task_struct's cpus_allowed. */
63287 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
63288
63289@@ -2104,7 +2196,9 @@ void yield(void);
63290 extern struct exec_domain default_exec_domain;
63291
63292 union thread_union {
63293+#ifndef CONFIG_X86
63294 struct thread_info thread_info;
63295+#endif
63296 unsigned long stack[THREAD_SIZE/sizeof(long)];
63297 };
63298
63299@@ -2137,6 +2231,7 @@ extern struct pid_namespace init_pid_ns;
63300 */
63301
63302 extern struct task_struct *find_task_by_vpid(pid_t nr);
63303+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
63304 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
63305 struct pid_namespace *ns);
63306
63307@@ -2280,7 +2375,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
63308 extern void exit_itimers(struct signal_struct *);
63309 extern void flush_itimer_signals(void);
63310
63311-extern void do_group_exit(int);
63312+extern __noreturn void do_group_exit(int);
63313
63314 extern void daemonize(const char *, ...);
63315 extern int allow_signal(int);
63316@@ -2478,13 +2573,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
63317
63318 #endif
63319
63320-static inline int object_is_on_stack(void *obj)
63321+static inline int object_starts_on_stack(void *obj)
63322 {
63323- void *stack = task_stack_page(current);
63324+ const void *stack = task_stack_page(current);
63325
63326 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
63327 }
63328
63329+#ifdef CONFIG_PAX_USERCOPY
63330+extern int object_is_on_stack(const void *obj, unsigned long len);
63331+#endif
63332+
63333 extern void thread_info_cache_init(void);
63334
63335 #ifdef CONFIG_DEBUG_STACK_USAGE
63336diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
63337index 899fbb4..1cb4138 100644
63338--- a/include/linux/screen_info.h
63339+++ b/include/linux/screen_info.h
63340@@ -43,7 +43,8 @@ struct screen_info {
63341 __u16 pages; /* 0x32 */
63342 __u16 vesa_attributes; /* 0x34 */
63343 __u32 capabilities; /* 0x36 */
63344- __u8 _reserved[6]; /* 0x3a */
63345+ __u16 vesapm_size; /* 0x3a */
63346+ __u8 _reserved[4]; /* 0x3c */
63347 } __attribute__((packed));
63348
63349 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
63350diff --git a/include/linux/security.h b/include/linux/security.h
63351index 83c18e8..2d98860 100644
63352--- a/include/linux/security.h
63353+++ b/include/linux/security.h
63354@@ -37,6 +37,7 @@
63355 #include <linux/xfrm.h>
63356 #include <linux/slab.h>
63357 #include <linux/xattr.h>
63358+#include <linux/grsecurity.h>
63359 #include <net/flow.h>
63360
63361 /* Maximum number of letters for an LSM name string */
63362diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
63363index 44f1514..2bbf6c1 100644
63364--- a/include/linux/seq_file.h
63365+++ b/include/linux/seq_file.h
63366@@ -24,6 +24,9 @@ struct seq_file {
63367 struct mutex lock;
63368 const struct seq_operations *op;
63369 int poll_event;
63370+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63371+ u64 exec_id;
63372+#endif
63373 void *private;
63374 };
63375
63376@@ -33,6 +36,7 @@ struct seq_operations {
63377 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
63378 int (*show) (struct seq_file *m, void *v);
63379 };
63380+typedef struct seq_operations __no_const seq_operations_no_const;
63381
63382 #define SEQ_SKIP 1
63383
63384diff --git a/include/linux/shm.h b/include/linux/shm.h
63385index 92808b8..c28cac4 100644
63386--- a/include/linux/shm.h
63387+++ b/include/linux/shm.h
63388@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the kernel */
63389
63390 /* The task created the shm object. NULL if the task is dead. */
63391 struct task_struct *shm_creator;
63392+#ifdef CONFIG_GRKERNSEC
63393+ time_t shm_createtime;
63394+ pid_t shm_lapid;
63395+#endif
63396 };
63397
63398 /* shm_mode upper byte flags */
63399diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
63400index 42854ce..3b7d3c8 100644
63401--- a/include/linux/skbuff.h
63402+++ b/include/linux/skbuff.h
63403@@ -655,7 +655,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
63404 */
63405 static inline int skb_queue_empty(const struct sk_buff_head *list)
63406 {
63407- return list->next == (struct sk_buff *)list;
63408+ return list->next == (const struct sk_buff *)list;
63409 }
63410
63411 /**
63412@@ -668,7 +668,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
63413 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63414 const struct sk_buff *skb)
63415 {
63416- return skb->next == (struct sk_buff *)list;
63417+ return skb->next == (const struct sk_buff *)list;
63418 }
63419
63420 /**
63421@@ -681,7 +681,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63422 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
63423 const struct sk_buff *skb)
63424 {
63425- return skb->prev == (struct sk_buff *)list;
63426+ return skb->prev == (const struct sk_buff *)list;
63427 }
63428
63429 /**
63430@@ -1558,7 +1558,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
63431 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
63432 */
63433 #ifndef NET_SKB_PAD
63434-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
63435+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
63436 #endif
63437
63438 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
63439diff --git a/include/linux/slab.h b/include/linux/slab.h
63440index 573c809..07e1f43 100644
63441--- a/include/linux/slab.h
63442+++ b/include/linux/slab.h
63443@@ -11,12 +11,20 @@
63444
63445 #include <linux/gfp.h>
63446 #include <linux/types.h>
63447+#include <linux/err.h>
63448
63449 /*
63450 * Flags to pass to kmem_cache_create().
63451 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
63452 */
63453 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
63454+
63455+#ifdef CONFIG_PAX_USERCOPY
63456+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
63457+#else
63458+#define SLAB_USERCOPY 0x00000000UL
63459+#endif
63460+
63461 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
63462 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
63463 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
63464@@ -87,10 +95,13 @@
63465 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
63466 * Both make kfree a no-op.
63467 */
63468-#define ZERO_SIZE_PTR ((void *)16)
63469+#define ZERO_SIZE_PTR \
63470+({ \
63471+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
63472+ (void *)(-MAX_ERRNO-1L); \
63473+})
63474
63475-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
63476- (unsigned long)ZERO_SIZE_PTR)
63477+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
63478
63479 /*
63480 * struct kmem_cache related prototypes
63481@@ -156,11 +167,12 @@ unsigned int kmem_cache_size(struct kmem_cache *);
63482 /*
63483 * Common kmalloc functions provided by all allocators
63484 */
63485-void * __must_check __krealloc(const void *, size_t, gfp_t);
63486-void * __must_check krealloc(const void *, size_t, gfp_t);
63487+void * __must_check __krealloc(const void *, size_t, gfp_t) __size_overflow(2);
63488+void * __must_check krealloc(const void *, size_t, gfp_t) __size_overflow(2);
63489 void kfree(const void *);
63490 void kzfree(const void *);
63491 size_t ksize(const void *);
63492+void check_object_size(const void *ptr, unsigned long n, bool to);
63493
63494 /*
63495 * Allocator specific definitions. These are mainly used to establish optimized
63496@@ -287,7 +299,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
63497 */
63498 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63499 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63500-extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63501+extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1);
63502 #define kmalloc_track_caller(size, flags) \
63503 __kmalloc_track_caller(size, flags, _RET_IP_)
63504 #else
63505@@ -306,7 +318,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63506 */
63507 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63508 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63509-extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
63510+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1);
63511 #define kmalloc_node_track_caller(size, flags, node) \
63512 __kmalloc_node_track_caller(size, flags, node, \
63513 _RET_IP_)
63514diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
63515index fbd1117..c0bd874 100644
63516--- a/include/linux/slab_def.h
63517+++ b/include/linux/slab_def.h
63518@@ -66,10 +66,10 @@ struct kmem_cache {
63519 unsigned long node_allocs;
63520 unsigned long node_frees;
63521 unsigned long node_overflow;
63522- atomic_t allochit;
63523- atomic_t allocmiss;
63524- atomic_t freehit;
63525- atomic_t freemiss;
63526+ atomic_unchecked_t allochit;
63527+ atomic_unchecked_t allocmiss;
63528+ atomic_unchecked_t freehit;
63529+ atomic_unchecked_t freemiss;
63530
63531 /*
63532 * If debugging is enabled, then the allocator can add additional
63533@@ -107,7 +107,7 @@ struct cache_sizes {
63534 extern struct cache_sizes malloc_sizes[];
63535
63536 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
63537-void *__kmalloc(size_t size, gfp_t flags);
63538+void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63539
63540 #ifdef CONFIG_TRACING
63541 extern void *kmem_cache_alloc_trace(size_t size,
63542@@ -125,6 +125,7 @@ static inline size_t slab_buffer_size(struct kmem_cache *cachep)
63543 }
63544 #endif
63545
63546+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63547 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63548 {
63549 struct kmem_cache *cachep;
63550@@ -160,7 +161,7 @@ found:
63551 }
63552
63553 #ifdef CONFIG_NUMA
63554-extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
63555+extern void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63556 extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
63557
63558 #ifdef CONFIG_TRACING
63559@@ -179,6 +180,7 @@ kmem_cache_alloc_node_trace(size_t size,
63560 }
63561 #endif
63562
63563+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63564 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63565 {
63566 struct kmem_cache *cachep;
63567diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
63568index 0ec00b3..65e7e0e 100644
63569--- a/include/linux/slob_def.h
63570+++ b/include/linux/slob_def.h
63571@@ -9,8 +9,9 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
63572 return kmem_cache_alloc_node(cachep, flags, -1);
63573 }
63574
63575-void *__kmalloc_node(size_t size, gfp_t flags, int node);
63576+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63577
63578+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63579 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63580 {
63581 return __kmalloc_node(size, flags, node);
63582@@ -24,11 +25,13 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63583 * kmalloc is the normal method of allocating memory
63584 * in the kernel.
63585 */
63586+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63587 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63588 {
63589 return __kmalloc_node(size, flags, -1);
63590 }
63591
63592+static __always_inline void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63593 static __always_inline void *__kmalloc(size_t size, gfp_t flags)
63594 {
63595 return kmalloc(size, flags);
63596diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
63597index a32bcfd..d26bd6e 100644
63598--- a/include/linux/slub_def.h
63599+++ b/include/linux/slub_def.h
63600@@ -89,7 +89,7 @@ struct kmem_cache {
63601 struct kmem_cache_order_objects max;
63602 struct kmem_cache_order_objects min;
63603 gfp_t allocflags; /* gfp flags to use on each alloc */
63604- int refcount; /* Refcount for slab cache destroy */
63605+ atomic_t refcount; /* Refcount for slab cache destroy */
63606 void (*ctor)(void *);
63607 int inuse; /* Offset to metadata */
63608 int align; /* Alignment */
63609@@ -204,6 +204,7 @@ static __always_inline int kmalloc_index(size_t size)
63610 * This ought to end up with a global pointer to the right cache
63611 * in kmalloc_caches.
63612 */
63613+static __always_inline struct kmem_cache *kmalloc_slab(size_t size) __size_overflow(1);
63614 static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
63615 {
63616 int index = kmalloc_index(size);
63617@@ -215,9 +216,11 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
63618 }
63619
63620 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
63621-void *__kmalloc(size_t size, gfp_t flags);
63622+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
63623
63624 static __always_inline void *
63625+kmalloc_order(size_t size, gfp_t flags, unsigned int order) __size_overflow(1);
63626+static __always_inline void *
63627 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
63628 {
63629 void *ret = (void *) __get_free_pages(flags | __GFP_COMP, order);
63630@@ -256,12 +259,14 @@ kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
63631 }
63632 #endif
63633
63634+static __always_inline void *kmalloc_large(size_t size, gfp_t flags) __size_overflow(1);
63635 static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
63636 {
63637 unsigned int order = get_order(size);
63638 return kmalloc_order_trace(size, flags, order);
63639 }
63640
63641+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63642 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63643 {
63644 if (__builtin_constant_p(size)) {
63645@@ -281,7 +286,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
63646 }
63647
63648 #ifdef CONFIG_NUMA
63649-void *__kmalloc_node(size_t size, gfp_t flags, int node);
63650+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63651 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
63652
63653 #ifdef CONFIG_TRACING
63654@@ -298,6 +303,7 @@ kmem_cache_alloc_node_trace(struct kmem_cache *s,
63655 }
63656 #endif
63657
63658+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63659 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63660 {
63661 if (__builtin_constant_p(size) &&
63662diff --git a/include/linux/sonet.h b/include/linux/sonet.h
63663index de8832d..0147b46 100644
63664--- a/include/linux/sonet.h
63665+++ b/include/linux/sonet.h
63666@@ -61,7 +61,7 @@ struct sonet_stats {
63667 #include <linux/atomic.h>
63668
63669 struct k_sonet_stats {
63670-#define __HANDLE_ITEM(i) atomic_t i
63671+#define __HANDLE_ITEM(i) atomic_unchecked_t i
63672 __SONET_ITEMS
63673 #undef __HANDLE_ITEM
63674 };
63675diff --git a/include/linux/stddef.h b/include/linux/stddef.h
63676index 6a40c76..1747b67 100644
63677--- a/include/linux/stddef.h
63678+++ b/include/linux/stddef.h
63679@@ -3,14 +3,10 @@
63680
63681 #include <linux/compiler.h>
63682
63683+#ifdef __KERNEL__
63684+
63685 #undef NULL
63686-#if defined(__cplusplus)
63687-#define NULL 0
63688-#else
63689 #define NULL ((void *)0)
63690-#endif
63691-
63692-#ifdef __KERNEL__
63693
63694 enum {
63695 false = 0,
63696diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
63697index 2c5993a..b0e79f0 100644
63698--- a/include/linux/sunrpc/clnt.h
63699+++ b/include/linux/sunrpc/clnt.h
63700@@ -172,9 +172,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
63701 {
63702 switch (sap->sa_family) {
63703 case AF_INET:
63704- return ntohs(((struct sockaddr_in *)sap)->sin_port);
63705+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
63706 case AF_INET6:
63707- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
63708+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
63709 }
63710 return 0;
63711 }
63712@@ -207,7 +207,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
63713 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
63714 const struct sockaddr *src)
63715 {
63716- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
63717+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
63718 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
63719
63720 dsin->sin_family = ssin->sin_family;
63721@@ -310,7 +310,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
63722 if (sa->sa_family != AF_INET6)
63723 return 0;
63724
63725- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
63726+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
63727 }
63728
63729 #endif /* __KERNEL__ */
63730diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
63731index e775689..9e206d9 100644
63732--- a/include/linux/sunrpc/sched.h
63733+++ b/include/linux/sunrpc/sched.h
63734@@ -105,6 +105,7 @@ struct rpc_call_ops {
63735 void (*rpc_call_done)(struct rpc_task *, void *);
63736 void (*rpc_release)(void *);
63737 };
63738+typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
63739
63740 struct rpc_task_setup {
63741 struct rpc_task *task;
63742diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
63743index c14fe86..393245e 100644
63744--- a/include/linux/sunrpc/svc_rdma.h
63745+++ b/include/linux/sunrpc/svc_rdma.h
63746@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
63747 extern unsigned int svcrdma_max_requests;
63748 extern unsigned int svcrdma_max_req_size;
63749
63750-extern atomic_t rdma_stat_recv;
63751-extern atomic_t rdma_stat_read;
63752-extern atomic_t rdma_stat_write;
63753-extern atomic_t rdma_stat_sq_starve;
63754-extern atomic_t rdma_stat_rq_starve;
63755-extern atomic_t rdma_stat_rq_poll;
63756-extern atomic_t rdma_stat_rq_prod;
63757-extern atomic_t rdma_stat_sq_poll;
63758-extern atomic_t rdma_stat_sq_prod;
63759+extern atomic_unchecked_t rdma_stat_recv;
63760+extern atomic_unchecked_t rdma_stat_read;
63761+extern atomic_unchecked_t rdma_stat_write;
63762+extern atomic_unchecked_t rdma_stat_sq_starve;
63763+extern atomic_unchecked_t rdma_stat_rq_starve;
63764+extern atomic_unchecked_t rdma_stat_rq_poll;
63765+extern atomic_unchecked_t rdma_stat_rq_prod;
63766+extern atomic_unchecked_t rdma_stat_sq_poll;
63767+extern atomic_unchecked_t rdma_stat_sq_prod;
63768
63769 #define RPCRDMA_VERSION 1
63770
63771diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
63772index bb9127d..34ab358 100644
63773--- a/include/linux/sysctl.h
63774+++ b/include/linux/sysctl.h
63775@@ -155,7 +155,11 @@ enum
63776 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
63777 };
63778
63779-
63780+#ifdef CONFIG_PAX_SOFTMODE
63781+enum {
63782+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
63783+};
63784+#endif
63785
63786 /* CTL_VM names: */
63787 enum
63788@@ -968,6 +972,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
63789
63790 extern int proc_dostring(struct ctl_table *, int,
63791 void __user *, size_t *, loff_t *);
63792+extern int proc_dostring_modpriv(struct ctl_table *, int,
63793+ void __user *, size_t *, loff_t *);
63794 extern int proc_dointvec(struct ctl_table *, int,
63795 void __user *, size_t *, loff_t *);
63796 extern int proc_dointvec_minmax(struct ctl_table *, int,
63797diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
63798index a71a292..51bd91d 100644
63799--- a/include/linux/tracehook.h
63800+++ b/include/linux/tracehook.h
63801@@ -54,12 +54,12 @@ struct linux_binprm;
63802 /*
63803 * ptrace report for syscall entry and exit looks identical.
63804 */
63805-static inline void ptrace_report_syscall(struct pt_regs *regs)
63806+static inline int ptrace_report_syscall(struct pt_regs *regs)
63807 {
63808 int ptrace = current->ptrace;
63809
63810 if (!(ptrace & PT_PTRACED))
63811- return;
63812+ return 0;
63813
63814 ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
63815
63816@@ -72,6 +72,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
63817 send_sig(current->exit_code, current, 1);
63818 current->exit_code = 0;
63819 }
63820+
63821+ return fatal_signal_pending(current);
63822 }
63823
63824 /**
63825@@ -96,8 +98,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
63826 static inline __must_check int tracehook_report_syscall_entry(
63827 struct pt_regs *regs)
63828 {
63829- ptrace_report_syscall(regs);
63830- return 0;
63831+ return ptrace_report_syscall(regs);
63832 }
63833
63834 /**
63835diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
63836index ff7dc08..893e1bd 100644
63837--- a/include/linux/tty_ldisc.h
63838+++ b/include/linux/tty_ldisc.h
63839@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
63840
63841 struct module *owner;
63842
63843- int refcount;
63844+ atomic_t refcount;
63845 };
63846
63847 struct tty_ldisc {
63848diff --git a/include/linux/types.h b/include/linux/types.h
63849index e5fa503..df6e8a4 100644
63850--- a/include/linux/types.h
63851+++ b/include/linux/types.h
63852@@ -214,10 +214,26 @@ typedef struct {
63853 int counter;
63854 } atomic_t;
63855
63856+#ifdef CONFIG_PAX_REFCOUNT
63857+typedef struct {
63858+ int counter;
63859+} atomic_unchecked_t;
63860+#else
63861+typedef atomic_t atomic_unchecked_t;
63862+#endif
63863+
63864 #ifdef CONFIG_64BIT
63865 typedef struct {
63866 long counter;
63867 } atomic64_t;
63868+
63869+#ifdef CONFIG_PAX_REFCOUNT
63870+typedef struct {
63871+ long counter;
63872+} atomic64_unchecked_t;
63873+#else
63874+typedef atomic64_t atomic64_unchecked_t;
63875+#endif
63876 #endif
63877
63878 struct list_head {
63879diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
63880index 5ca0951..53a2fff 100644
63881--- a/include/linux/uaccess.h
63882+++ b/include/linux/uaccess.h
63883@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
63884 long ret; \
63885 mm_segment_t old_fs = get_fs(); \
63886 \
63887- set_fs(KERNEL_DS); \
63888 pagefault_disable(); \
63889- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
63890- pagefault_enable(); \
63891+ set_fs(KERNEL_DS); \
63892+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
63893 set_fs(old_fs); \
63894+ pagefault_enable(); \
63895 ret; \
63896 })
63897
63898@@ -105,7 +105,7 @@ extern long __probe_kernel_read(void *dst, const void *src, size_t size);
63899 * Safely write to address @dst from the buffer at @src. If a kernel fault
63900 * happens, handle that and return -EFAULT.
63901 */
63902-extern long notrace probe_kernel_write(void *dst, const void *src, size_t size);
63903+extern long notrace probe_kernel_write(void *dst, const void *src, size_t size) __size_overflow(3);
63904 extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
63905
63906 #endif /* __LINUX_UACCESS_H__ */
63907diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
63908index 99c1b4d..bb94261 100644
63909--- a/include/linux/unaligned/access_ok.h
63910+++ b/include/linux/unaligned/access_ok.h
63911@@ -6,32 +6,32 @@
63912
63913 static inline u16 get_unaligned_le16(const void *p)
63914 {
63915- return le16_to_cpup((__le16 *)p);
63916+ return le16_to_cpup((const __le16 *)p);
63917 }
63918
63919 static inline u32 get_unaligned_le32(const void *p)
63920 {
63921- return le32_to_cpup((__le32 *)p);
63922+ return le32_to_cpup((const __le32 *)p);
63923 }
63924
63925 static inline u64 get_unaligned_le64(const void *p)
63926 {
63927- return le64_to_cpup((__le64 *)p);
63928+ return le64_to_cpup((const __le64 *)p);
63929 }
63930
63931 static inline u16 get_unaligned_be16(const void *p)
63932 {
63933- return be16_to_cpup((__be16 *)p);
63934+ return be16_to_cpup((const __be16 *)p);
63935 }
63936
63937 static inline u32 get_unaligned_be32(const void *p)
63938 {
63939- return be32_to_cpup((__be32 *)p);
63940+ return be32_to_cpup((const __be32 *)p);
63941 }
63942
63943 static inline u64 get_unaligned_be64(const void *p)
63944 {
63945- return be64_to_cpup((__be64 *)p);
63946+ return be64_to_cpup((const __be64 *)p);
63947 }
63948
63949 static inline void put_unaligned_le16(u16 val, void *p)
63950diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
63951index 0d3f988..000f101 100644
63952--- a/include/linux/usb/renesas_usbhs.h
63953+++ b/include/linux/usb/renesas_usbhs.h
63954@@ -39,7 +39,7 @@ enum {
63955 */
63956 struct renesas_usbhs_driver_callback {
63957 int (*notify_hotplug)(struct platform_device *pdev);
63958-};
63959+} __no_const;
63960
63961 /*
63962 * callback functions for platform
63963@@ -97,7 +97,7 @@ struct renesas_usbhs_platform_callback {
63964 * VBUS control is needed for Host
63965 */
63966 int (*set_vbus)(struct platform_device *pdev, int enable);
63967-};
63968+} __no_const;
63969
63970 /*
63971 * parameters for renesas usbhs
63972diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
63973index 6f8fbcf..8259001 100644
63974--- a/include/linux/vermagic.h
63975+++ b/include/linux/vermagic.h
63976@@ -25,9 +25,35 @@
63977 #define MODULE_ARCH_VERMAGIC ""
63978 #endif
63979
63980+#ifdef CONFIG_PAX_REFCOUNT
63981+#define MODULE_PAX_REFCOUNT "REFCOUNT "
63982+#else
63983+#define MODULE_PAX_REFCOUNT ""
63984+#endif
63985+
63986+#ifdef CONSTIFY_PLUGIN
63987+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
63988+#else
63989+#define MODULE_CONSTIFY_PLUGIN ""
63990+#endif
63991+
63992+#ifdef STACKLEAK_PLUGIN
63993+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
63994+#else
63995+#define MODULE_STACKLEAK_PLUGIN ""
63996+#endif
63997+
63998+#ifdef CONFIG_GRKERNSEC
63999+#define MODULE_GRSEC "GRSEC "
64000+#else
64001+#define MODULE_GRSEC ""
64002+#endif
64003+
64004 #define VERMAGIC_STRING \
64005 UTS_RELEASE " " \
64006 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
64007 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
64008- MODULE_ARCH_VERMAGIC
64009+ MODULE_ARCH_VERMAGIC \
64010+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
64011+ MODULE_GRSEC
64012
64013diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
64014index dcdfc2b..cce598d 100644
64015--- a/include/linux/vmalloc.h
64016+++ b/include/linux/vmalloc.h
64017@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
64018 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
64019 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
64020 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
64021+
64022+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
64023+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
64024+#endif
64025+
64026 /* bits [20..32] reserved for arch specific ioremap internals */
64027
64028 /*
64029@@ -51,18 +56,18 @@ static inline void vmalloc_init(void)
64030 }
64031 #endif
64032
64033-extern void *vmalloc(unsigned long size);
64034-extern void *vzalloc(unsigned long size);
64035-extern void *vmalloc_user(unsigned long size);
64036-extern void *vmalloc_node(unsigned long size, int node);
64037-extern void *vzalloc_node(unsigned long size, int node);
64038-extern void *vmalloc_exec(unsigned long size);
64039-extern void *vmalloc_32(unsigned long size);
64040-extern void *vmalloc_32_user(unsigned long size);
64041-extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
64042+extern void *vmalloc(unsigned long size) __size_overflow(1);
64043+extern void *vzalloc(unsigned long size) __size_overflow(1);
64044+extern void *vmalloc_user(unsigned long size) __size_overflow(1);
64045+extern void *vmalloc_node(unsigned long size, int node) __size_overflow(1);
64046+extern void *vzalloc_node(unsigned long size, int node) __size_overflow(1);
64047+extern void *vmalloc_exec(unsigned long size) __size_overflow(1);
64048+extern void *vmalloc_32(unsigned long size) __size_overflow(1);
64049+extern void *vmalloc_32_user(unsigned long size) __size_overflow(1);
64050+extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) __size_overflow(1);
64051 extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
64052 unsigned long start, unsigned long end, gfp_t gfp_mask,
64053- pgprot_t prot, int node, void *caller);
64054+ pgprot_t prot, int node, void *caller) __size_overflow(1);
64055 extern void vfree(const void *addr);
64056
64057 extern void *vmap(struct page **pages, unsigned int count,
64058@@ -123,8 +128,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes);
64059 extern void free_vm_area(struct vm_struct *area);
64060
64061 /* for /dev/kmem */
64062-extern long vread(char *buf, char *addr, unsigned long count);
64063-extern long vwrite(char *buf, char *addr, unsigned long count);
64064+extern long vread(char *buf, char *addr, unsigned long count) __size_overflow(3);
64065+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
64066
64067 /*
64068 * Internals. Dont't use..
64069diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
64070index 65efb92..137adbb 100644
64071--- a/include/linux/vmstat.h
64072+++ b/include/linux/vmstat.h
64073@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
64074 /*
64075 * Zone based page accounting with per cpu differentials.
64076 */
64077-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64078+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64079
64080 static inline void zone_page_state_add(long x, struct zone *zone,
64081 enum zone_stat_item item)
64082 {
64083- atomic_long_add(x, &zone->vm_stat[item]);
64084- atomic_long_add(x, &vm_stat[item]);
64085+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
64086+ atomic_long_add_unchecked(x, &vm_stat[item]);
64087 }
64088
64089 static inline unsigned long global_page_state(enum zone_stat_item item)
64090 {
64091- long x = atomic_long_read(&vm_stat[item]);
64092+ long x = atomic_long_read_unchecked(&vm_stat[item]);
64093 #ifdef CONFIG_SMP
64094 if (x < 0)
64095 x = 0;
64096@@ -109,7 +109,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
64097 static inline unsigned long zone_page_state(struct zone *zone,
64098 enum zone_stat_item item)
64099 {
64100- long x = atomic_long_read(&zone->vm_stat[item]);
64101+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64102 #ifdef CONFIG_SMP
64103 if (x < 0)
64104 x = 0;
64105@@ -126,7 +126,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
64106 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
64107 enum zone_stat_item item)
64108 {
64109- long x = atomic_long_read(&zone->vm_stat[item]);
64110+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64111
64112 #ifdef CONFIG_SMP
64113 int cpu;
64114@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
64115
64116 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
64117 {
64118- atomic_long_inc(&zone->vm_stat[item]);
64119- atomic_long_inc(&vm_stat[item]);
64120+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
64121+ atomic_long_inc_unchecked(&vm_stat[item]);
64122 }
64123
64124 static inline void __inc_zone_page_state(struct page *page,
64125@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page,
64126
64127 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
64128 {
64129- atomic_long_dec(&zone->vm_stat[item]);
64130- atomic_long_dec(&vm_stat[item]);
64131+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
64132+ atomic_long_dec_unchecked(&vm_stat[item]);
64133 }
64134
64135 static inline void __dec_zone_page_state(struct page *page,
64136diff --git a/include/linux/xattr.h b/include/linux/xattr.h
64137index e5d1220..ef6e406 100644
64138--- a/include/linux/xattr.h
64139+++ b/include/linux/xattr.h
64140@@ -57,6 +57,11 @@
64141 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
64142 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
64143
64144+/* User namespace */
64145+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
64146+#define XATTR_PAX_FLAGS_SUFFIX "flags"
64147+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
64148+
64149 #ifdef __KERNEL__
64150
64151 #include <linux/types.h>
64152diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
64153index 4aeff96..b378cdc 100644
64154--- a/include/media/saa7146_vv.h
64155+++ b/include/media/saa7146_vv.h
64156@@ -163,7 +163,7 @@ struct saa7146_ext_vv
64157 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
64158
64159 /* the extension can override this */
64160- struct v4l2_ioctl_ops ops;
64161+ v4l2_ioctl_ops_no_const ops;
64162 /* pointer to the saa7146 core ops */
64163 const struct v4l2_ioctl_ops *core_ops;
64164
64165diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
64166index c7c40f1..4f01585 100644
64167--- a/include/media/v4l2-dev.h
64168+++ b/include/media/v4l2-dev.h
64169@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
64170
64171
64172 struct v4l2_file_operations {
64173- struct module *owner;
64174+ struct module * const owner;
64175 ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
64176 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
64177 unsigned int (*poll) (struct file *, struct poll_table_struct *);
64178@@ -68,6 +68,7 @@ struct v4l2_file_operations {
64179 int (*open) (struct file *);
64180 int (*release) (struct file *);
64181 };
64182+typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
64183
64184 /*
64185 * Newer version of video_device, handled by videodev2.c
64186diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
64187index 3f5d60f..44210ed 100644
64188--- a/include/media/v4l2-ioctl.h
64189+++ b/include/media/v4l2-ioctl.h
64190@@ -278,7 +278,7 @@ struct v4l2_ioctl_ops {
64191 long (*vidioc_default) (struct file *file, void *fh,
64192 bool valid_prio, int cmd, void *arg);
64193 };
64194-
64195+typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
64196
64197 /* v4l debugging and diagnostics */
64198
64199diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
64200index 8d55251..dfe5b0a 100644
64201--- a/include/net/caif/caif_hsi.h
64202+++ b/include/net/caif/caif_hsi.h
64203@@ -98,7 +98,7 @@ struct cfhsi_drv {
64204 void (*rx_done_cb) (struct cfhsi_drv *drv);
64205 void (*wake_up_cb) (struct cfhsi_drv *drv);
64206 void (*wake_down_cb) (struct cfhsi_drv *drv);
64207-};
64208+} __no_const;
64209
64210 /* Structure implemented by HSI device. */
64211 struct cfhsi_dev {
64212diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
64213index 9e5425b..8136ffc 100644
64214--- a/include/net/caif/cfctrl.h
64215+++ b/include/net/caif/cfctrl.h
64216@@ -52,7 +52,7 @@ struct cfctrl_rsp {
64217 void (*radioset_rsp)(void);
64218 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
64219 struct cflayer *client_layer);
64220-};
64221+} __no_const;
64222
64223 /* Link Setup Parameters for CAIF-Links. */
64224 struct cfctrl_link_param {
64225@@ -101,8 +101,8 @@ struct cfctrl_request_info {
64226 struct cfctrl {
64227 struct cfsrvl serv;
64228 struct cfctrl_rsp res;
64229- atomic_t req_seq_no;
64230- atomic_t rsp_seq_no;
64231+ atomic_unchecked_t req_seq_no;
64232+ atomic_unchecked_t rsp_seq_no;
64233 struct list_head list;
64234 /* Protects from simultaneous access to first_req list */
64235 spinlock_t info_list_lock;
64236diff --git a/include/net/flow.h b/include/net/flow.h
64237index 6c469db..7743b8e 100644
64238--- a/include/net/flow.h
64239+++ b/include/net/flow.h
64240@@ -221,6 +221,6 @@ extern struct flow_cache_object *flow_cache_lookup(
64241
64242 extern void flow_cache_flush(void);
64243 extern void flow_cache_flush_deferred(void);
64244-extern atomic_t flow_cache_genid;
64245+extern atomic_unchecked_t flow_cache_genid;
64246
64247 #endif
64248diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
64249index b94765e..053f68b 100644
64250--- a/include/net/inetpeer.h
64251+++ b/include/net/inetpeer.h
64252@@ -48,8 +48,8 @@ struct inet_peer {
64253 */
64254 union {
64255 struct {
64256- atomic_t rid; /* Frag reception counter */
64257- atomic_t ip_id_count; /* IP ID for the next packet */
64258+ atomic_unchecked_t rid; /* Frag reception counter */
64259+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
64260 __u32 tcp_ts;
64261 __u32 tcp_ts_stamp;
64262 };
64263@@ -115,11 +115,11 @@ static inline int inet_getid(struct inet_peer *p, int more)
64264 more++;
64265 inet_peer_refcheck(p);
64266 do {
64267- old = atomic_read(&p->ip_id_count);
64268+ old = atomic_read_unchecked(&p->ip_id_count);
64269 new = old + more;
64270 if (!new)
64271 new = 1;
64272- } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
64273+ } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
64274 return new;
64275 }
64276
64277diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
64278index 10422ef..662570f 100644
64279--- a/include/net/ip_fib.h
64280+++ b/include/net/ip_fib.h
64281@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
64282
64283 #define FIB_RES_SADDR(net, res) \
64284 ((FIB_RES_NH(res).nh_saddr_genid == \
64285- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
64286+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
64287 FIB_RES_NH(res).nh_saddr : \
64288 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
64289 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
64290diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
64291index ebe517f..1bd286b 100644
64292--- a/include/net/ip_vs.h
64293+++ b/include/net/ip_vs.h
64294@@ -509,7 +509,7 @@ struct ip_vs_conn {
64295 struct ip_vs_conn *control; /* Master control connection */
64296 atomic_t n_control; /* Number of controlled ones */
64297 struct ip_vs_dest *dest; /* real server */
64298- atomic_t in_pkts; /* incoming packet counter */
64299+ atomic_unchecked_t in_pkts; /* incoming packet counter */
64300
64301 /* packet transmitter for different forwarding methods. If it
64302 mangles the packet, it must return NF_DROP or better NF_STOLEN,
64303@@ -647,7 +647,7 @@ struct ip_vs_dest {
64304 __be16 port; /* port number of the server */
64305 union nf_inet_addr addr; /* IP address of the server */
64306 volatile unsigned flags; /* dest status flags */
64307- atomic_t conn_flags; /* flags to copy to conn */
64308+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
64309 atomic_t weight; /* server weight */
64310
64311 atomic_t refcnt; /* reference counter */
64312diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
64313index 69b610a..fe3962c 100644
64314--- a/include/net/irda/ircomm_core.h
64315+++ b/include/net/irda/ircomm_core.h
64316@@ -51,7 +51,7 @@ typedef struct {
64317 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
64318 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
64319 struct ircomm_info *);
64320-} call_t;
64321+} __no_const call_t;
64322
64323 struct ircomm_cb {
64324 irda_queue_t queue;
64325diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
64326index 59ba38bc..d515662 100644
64327--- a/include/net/irda/ircomm_tty.h
64328+++ b/include/net/irda/ircomm_tty.h
64329@@ -35,6 +35,7 @@
64330 #include <linux/termios.h>
64331 #include <linux/timer.h>
64332 #include <linux/tty.h> /* struct tty_struct */
64333+#include <asm/local.h>
64334
64335 #include <net/irda/irias_object.h>
64336 #include <net/irda/ircomm_core.h>
64337@@ -105,8 +106,8 @@ struct ircomm_tty_cb {
64338 unsigned short close_delay;
64339 unsigned short closing_wait; /* time to wait before closing */
64340
64341- int open_count;
64342- int blocked_open; /* # of blocked opens */
64343+ local_t open_count;
64344+ local_t blocked_open; /* # of blocked opens */
64345
64346 /* Protect concurent access to :
64347 * o self->open_count
64348diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
64349index 0954ec9..7413562 100644
64350--- a/include/net/iucv/af_iucv.h
64351+++ b/include/net/iucv/af_iucv.h
64352@@ -138,7 +138,7 @@ struct iucv_sock {
64353 struct iucv_sock_list {
64354 struct hlist_head head;
64355 rwlock_t lock;
64356- atomic_t autobind_name;
64357+ atomic_unchecked_t autobind_name;
64358 };
64359
64360 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
64361diff --git a/include/net/neighbour.h b/include/net/neighbour.h
64362index 34c996f..bb3b4d4 100644
64363--- a/include/net/neighbour.h
64364+++ b/include/net/neighbour.h
64365@@ -123,7 +123,7 @@ struct neigh_ops {
64366 void (*error_report)(struct neighbour *, struct sk_buff *);
64367 int (*output)(struct neighbour *, struct sk_buff *);
64368 int (*connected_output)(struct neighbour *, struct sk_buff *);
64369-};
64370+} __do_const;
64371
64372 struct pneigh_entry {
64373 struct pneigh_entry *next;
64374diff --git a/include/net/netlink.h b/include/net/netlink.h
64375index cb1f350..3279d2c 100644
64376--- a/include/net/netlink.h
64377+++ b/include/net/netlink.h
64378@@ -569,7 +569,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
64379 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
64380 {
64381 if (mark)
64382- skb_trim(skb, (unsigned char *) mark - skb->data);
64383+ skb_trim(skb, (const unsigned char *) mark - skb->data);
64384 }
64385
64386 /**
64387diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
64388index bbd023a..97c6d0d 100644
64389--- a/include/net/netns/ipv4.h
64390+++ b/include/net/netns/ipv4.h
64391@@ -57,8 +57,8 @@ struct netns_ipv4 {
64392 unsigned int sysctl_ping_group_range[2];
64393 long sysctl_tcp_mem[3];
64394
64395- atomic_t rt_genid;
64396- atomic_t dev_addr_genid;
64397+ atomic_unchecked_t rt_genid;
64398+ atomic_unchecked_t dev_addr_genid;
64399
64400 #ifdef CONFIG_IP_MROUTE
64401 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
64402diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
64403index d368561..96aaa17 100644
64404--- a/include/net/sctp/sctp.h
64405+++ b/include/net/sctp/sctp.h
64406@@ -318,9 +318,9 @@ do { \
64407
64408 #else /* SCTP_DEBUG */
64409
64410-#define SCTP_DEBUG_PRINTK(whatever...)
64411-#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
64412-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
64413+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
64414+#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
64415+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
64416 #define SCTP_ENABLE_DEBUG
64417 #define SCTP_DISABLE_DEBUG
64418 #define SCTP_ASSERT(expr, str, func)
64419diff --git a/include/net/sock.h b/include/net/sock.h
64420index 91c1c8b..15ae923 100644
64421--- a/include/net/sock.h
64422+++ b/include/net/sock.h
64423@@ -299,7 +299,7 @@ struct sock {
64424 #ifdef CONFIG_RPS
64425 __u32 sk_rxhash;
64426 #endif
64427- atomic_t sk_drops;
64428+ atomic_unchecked_t sk_drops;
64429 int sk_rcvbuf;
64430
64431 struct sk_filter __rcu *sk_filter;
64432@@ -1660,7 +1660,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
64433 }
64434
64435 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
64436- char __user *from, char *to,
64437+ char __user *from, unsigned char *to,
64438 int copy, int offset)
64439 {
64440 if (skb->ip_summed == CHECKSUM_NONE) {
64441diff --git a/include/net/tcp.h b/include/net/tcp.h
64442index 2d80c29..aa07caf 100644
64443--- a/include/net/tcp.h
64444+++ b/include/net/tcp.h
64445@@ -1426,7 +1426,7 @@ struct tcp_seq_afinfo {
64446 char *name;
64447 sa_family_t family;
64448 const struct file_operations *seq_fops;
64449- struct seq_operations seq_ops;
64450+ seq_operations_no_const seq_ops;
64451 };
64452
64453 struct tcp_iter_state {
64454diff --git a/include/net/udp.h b/include/net/udp.h
64455index e39592f..fef9680 100644
64456--- a/include/net/udp.h
64457+++ b/include/net/udp.h
64458@@ -243,7 +243,7 @@ struct udp_seq_afinfo {
64459 sa_family_t family;
64460 struct udp_table *udp_table;
64461 const struct file_operations *seq_fops;
64462- struct seq_operations seq_ops;
64463+ seq_operations_no_const seq_ops;
64464 };
64465
64466 struct udp_iter_state {
64467diff --git a/include/net/xfrm.h b/include/net/xfrm.h
64468index 89174e2..1f82598 100644
64469--- a/include/net/xfrm.h
64470+++ b/include/net/xfrm.h
64471@@ -505,7 +505,7 @@ struct xfrm_policy {
64472 struct timer_list timer;
64473
64474 struct flow_cache_object flo;
64475- atomic_t genid;
64476+ atomic_unchecked_t genid;
64477 u32 priority;
64478 u32 index;
64479 struct xfrm_mark mark;
64480diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
64481index 1a046b1..ee0bef0 100644
64482--- a/include/rdma/iw_cm.h
64483+++ b/include/rdma/iw_cm.h
64484@@ -122,7 +122,7 @@ struct iw_cm_verbs {
64485 int backlog);
64486
64487 int (*destroy_listen)(struct iw_cm_id *cm_id);
64488-};
64489+} __no_const;
64490
64491 /**
64492 * iw_create_cm_id - Create an IW CM identifier.
64493diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
64494index 6a3922f..0b73022 100644
64495--- a/include/scsi/libfc.h
64496+++ b/include/scsi/libfc.h
64497@@ -748,6 +748,7 @@ struct libfc_function_template {
64498 */
64499 void (*disc_stop_final) (struct fc_lport *);
64500 };
64501+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
64502
64503 /**
64504 * struct fc_disc - Discovery context
64505@@ -851,7 +852,7 @@ struct fc_lport {
64506 struct fc_vport *vport;
64507
64508 /* Operational Information */
64509- struct libfc_function_template tt;
64510+ libfc_function_template_no_const tt;
64511 u8 link_up;
64512 u8 qfull;
64513 enum fc_lport_state state;
64514diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
64515index 77273f2..dd4031f 100644
64516--- a/include/scsi/scsi_device.h
64517+++ b/include/scsi/scsi_device.h
64518@@ -161,9 +161,9 @@ struct scsi_device {
64519 unsigned int max_device_blocked; /* what device_blocked counts down from */
64520 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
64521
64522- atomic_t iorequest_cnt;
64523- atomic_t iodone_cnt;
64524- atomic_t ioerr_cnt;
64525+ atomic_unchecked_t iorequest_cnt;
64526+ atomic_unchecked_t iodone_cnt;
64527+ atomic_unchecked_t ioerr_cnt;
64528
64529 struct device sdev_gendev,
64530 sdev_dev;
64531diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
64532index 2a65167..91e01f8 100644
64533--- a/include/scsi/scsi_transport_fc.h
64534+++ b/include/scsi/scsi_transport_fc.h
64535@@ -711,7 +711,7 @@ struct fc_function_template {
64536 unsigned long show_host_system_hostname:1;
64537
64538 unsigned long disable_target_scan:1;
64539-};
64540+} __do_const;
64541
64542
64543 /**
64544diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
64545index 030b87c..98a6954 100644
64546--- a/include/sound/ak4xxx-adda.h
64547+++ b/include/sound/ak4xxx-adda.h
64548@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
64549 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
64550 unsigned char val);
64551 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
64552-};
64553+} __no_const;
64554
64555 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
64556
64557diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
64558index 8c05e47..2b5df97 100644
64559--- a/include/sound/hwdep.h
64560+++ b/include/sound/hwdep.h
64561@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
64562 struct snd_hwdep_dsp_status *status);
64563 int (*dsp_load)(struct snd_hwdep *hw,
64564 struct snd_hwdep_dsp_image *image);
64565-};
64566+} __no_const;
64567
64568 struct snd_hwdep {
64569 struct snd_card *card;
64570diff --git a/include/sound/info.h b/include/sound/info.h
64571index 9ca1a49..aba1728 100644
64572--- a/include/sound/info.h
64573+++ b/include/sound/info.h
64574@@ -44,7 +44,7 @@ struct snd_info_entry_text {
64575 struct snd_info_buffer *buffer);
64576 void (*write)(struct snd_info_entry *entry,
64577 struct snd_info_buffer *buffer);
64578-};
64579+} __no_const;
64580
64581 struct snd_info_entry_ops {
64582 int (*open)(struct snd_info_entry *entry,
64583diff --git a/include/sound/pcm.h b/include/sound/pcm.h
64584index 0cf91b2..b70cae4 100644
64585--- a/include/sound/pcm.h
64586+++ b/include/sound/pcm.h
64587@@ -81,6 +81,7 @@ struct snd_pcm_ops {
64588 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
64589 int (*ack)(struct snd_pcm_substream *substream);
64590 };
64591+typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
64592
64593 /*
64594 *
64595diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
64596index af1b49e..a5d55a5 100644
64597--- a/include/sound/sb16_csp.h
64598+++ b/include/sound/sb16_csp.h
64599@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
64600 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
64601 int (*csp_stop) (struct snd_sb_csp * p);
64602 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
64603-};
64604+} __no_const;
64605
64606 /*
64607 * CSP private data
64608diff --git a/include/sound/soc.h b/include/sound/soc.h
64609index 0992dff..bb366fe 100644
64610--- a/include/sound/soc.h
64611+++ b/include/sound/soc.h
64612@@ -682,7 +682,7 @@ struct snd_soc_platform_driver {
64613 /* platform IO - used for platform DAPM */
64614 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
64615 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
64616-};
64617+} __do_const;
64618
64619 struct snd_soc_platform {
64620 const char *name;
64621@@ -852,7 +852,7 @@ struct snd_soc_pcm_runtime {
64622 struct snd_soc_dai_link *dai_link;
64623 struct mutex pcm_mutex;
64624 enum snd_soc_pcm_subclass pcm_subclass;
64625- struct snd_pcm_ops ops;
64626+ snd_pcm_ops_no_const ops;
64627
64628 unsigned int complete:1;
64629 unsigned int dev_registered:1;
64630diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
64631index 444cd6b..3327cc5 100644
64632--- a/include/sound/ymfpci.h
64633+++ b/include/sound/ymfpci.h
64634@@ -358,7 +358,7 @@ struct snd_ymfpci {
64635 spinlock_t reg_lock;
64636 spinlock_t voice_lock;
64637 wait_queue_head_t interrupt_sleep;
64638- atomic_t interrupt_sleep_count;
64639+ atomic_unchecked_t interrupt_sleep_count;
64640 struct snd_info_entry *proc_entry;
64641 const struct firmware *dsp_microcode;
64642 const struct firmware *controller_microcode;
64643diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
64644index fe73eb8..56388b1 100644
64645--- a/include/target/target_core_base.h
64646+++ b/include/target/target_core_base.h
64647@@ -443,7 +443,7 @@ struct t10_reservation_ops {
64648 int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
64649 int (*t10_pr_register)(struct se_cmd *);
64650 int (*t10_pr_clear)(struct se_cmd *);
64651-};
64652+} __no_const;
64653
64654 struct t10_reservation {
64655 /* Reservation effects all target ports */
64656@@ -561,8 +561,8 @@ struct se_cmd {
64657 atomic_t t_se_count;
64658 atomic_t t_task_cdbs_left;
64659 atomic_t t_task_cdbs_ex_left;
64660- atomic_t t_task_cdbs_sent;
64661- atomic_t t_transport_aborted;
64662+ atomic_unchecked_t t_task_cdbs_sent;
64663+ atomic_unchecked_t t_transport_aborted;
64664 atomic_t t_transport_active;
64665 atomic_t t_transport_complete;
64666 atomic_t t_transport_queue_active;
64667@@ -799,7 +799,7 @@ struct se_device {
64668 spinlock_t stats_lock;
64669 /* Active commands on this virtual SE device */
64670 atomic_t simple_cmds;
64671- atomic_t dev_ordered_id;
64672+ atomic_unchecked_t dev_ordered_id;
64673 atomic_t execute_tasks;
64674 atomic_t dev_ordered_sync;
64675 atomic_t dev_qf_count;
64676diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
64677index 1c09820..7f5ec79 100644
64678--- a/include/trace/events/irq.h
64679+++ b/include/trace/events/irq.h
64680@@ -36,7 +36,7 @@ struct softirq_action;
64681 */
64682 TRACE_EVENT(irq_handler_entry,
64683
64684- TP_PROTO(int irq, struct irqaction *action),
64685+ TP_PROTO(int irq, const struct irqaction *action),
64686
64687 TP_ARGS(irq, action),
64688
64689@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
64690 */
64691 TRACE_EVENT(irq_handler_exit,
64692
64693- TP_PROTO(int irq, struct irqaction *action, int ret),
64694+ TP_PROTO(int irq, const struct irqaction *action, int ret),
64695
64696 TP_ARGS(irq, action, ret),
64697
64698diff --git a/include/video/udlfb.h b/include/video/udlfb.h
64699index c41f308..6918de3 100644
64700--- a/include/video/udlfb.h
64701+++ b/include/video/udlfb.h
64702@@ -52,10 +52,10 @@ struct dlfb_data {
64703 u32 pseudo_palette[256];
64704 int blank_mode; /*one of FB_BLANK_ */
64705 /* blit-only rendering path metrics, exposed through sysfs */
64706- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
64707- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
64708- atomic_t bytes_sent; /* to usb, after compression including overhead */
64709- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
64710+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
64711+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
64712+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
64713+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
64714 };
64715
64716 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
64717diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
64718index 0993a22..32ba2fe 100644
64719--- a/include/video/uvesafb.h
64720+++ b/include/video/uvesafb.h
64721@@ -177,6 +177,7 @@ struct uvesafb_par {
64722 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
64723 u8 pmi_setpal; /* PMI for palette changes */
64724 u16 *pmi_base; /* protected mode interface location */
64725+ u8 *pmi_code; /* protected mode code location */
64726 void *pmi_start;
64727 void *pmi_pal;
64728 u8 *vbe_state_orig; /*
64729diff --git a/init/Kconfig b/init/Kconfig
64730index 3f42cd6..613f41d 100644
64731--- a/init/Kconfig
64732+++ b/init/Kconfig
64733@@ -799,6 +799,7 @@ endif # CGROUPS
64734
64735 config CHECKPOINT_RESTORE
64736 bool "Checkpoint/restore support" if EXPERT
64737+ depends on !GRKERNSEC
64738 default n
64739 help
64740 Enables additional kernel features in a sake of checkpoint/restore.
64741@@ -1249,7 +1250,7 @@ config SLUB_DEBUG
64742
64743 config COMPAT_BRK
64744 bool "Disable heap randomization"
64745- default y
64746+ default n
64747 help
64748 Randomizing heap placement makes heap exploits harder, but it
64749 also breaks ancient binaries (including anything libc5 based).
64750diff --git a/init/do_mounts.c b/init/do_mounts.c
64751index 2974c8b..0b863ae 100644
64752--- a/init/do_mounts.c
64753+++ b/init/do_mounts.c
64754@@ -326,11 +326,11 @@ static void __init get_fs_names(char *page)
64755 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
64756 {
64757 struct super_block *s;
64758- int err = sys_mount(name, "/root", fs, flags, data);
64759+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
64760 if (err)
64761 return err;
64762
64763- sys_chdir((const char __user __force *)"/root");
64764+ sys_chdir((const char __force_user *)"/root");
64765 s = current->fs->pwd.dentry->d_sb;
64766 ROOT_DEV = s->s_dev;
64767 printk(KERN_INFO
64768@@ -450,18 +450,18 @@ void __init change_floppy(char *fmt, ...)
64769 va_start(args, fmt);
64770 vsprintf(buf, fmt, args);
64771 va_end(args);
64772- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
64773+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
64774 if (fd >= 0) {
64775 sys_ioctl(fd, FDEJECT, 0);
64776 sys_close(fd);
64777 }
64778 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
64779- fd = sys_open("/dev/console", O_RDWR, 0);
64780+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
64781 if (fd >= 0) {
64782 sys_ioctl(fd, TCGETS, (long)&termios);
64783 termios.c_lflag &= ~ICANON;
64784 sys_ioctl(fd, TCSETSF, (long)&termios);
64785- sys_read(fd, &c, 1);
64786+ sys_read(fd, (char __user *)&c, 1);
64787 termios.c_lflag |= ICANON;
64788 sys_ioctl(fd, TCSETSF, (long)&termios);
64789 sys_close(fd);
64790@@ -555,6 +555,6 @@ void __init prepare_namespace(void)
64791 mount_root();
64792 out:
64793 devtmpfs_mount("dev");
64794- sys_mount(".", "/", NULL, MS_MOVE, NULL);
64795- sys_chroot((const char __user __force *)".");
64796+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
64797+ sys_chroot((const char __force_user *)".");
64798 }
64799diff --git a/init/do_mounts.h b/init/do_mounts.h
64800index f5b978a..69dbfe8 100644
64801--- a/init/do_mounts.h
64802+++ b/init/do_mounts.h
64803@@ -15,15 +15,15 @@ extern int root_mountflags;
64804
64805 static inline int create_dev(char *name, dev_t dev)
64806 {
64807- sys_unlink(name);
64808- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
64809+ sys_unlink((char __force_user *)name);
64810+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
64811 }
64812
64813 #if BITS_PER_LONG == 32
64814 static inline u32 bstat(char *name)
64815 {
64816 struct stat64 stat;
64817- if (sys_stat64(name, &stat) != 0)
64818+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
64819 return 0;
64820 if (!S_ISBLK(stat.st_mode))
64821 return 0;
64822@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
64823 static inline u32 bstat(char *name)
64824 {
64825 struct stat stat;
64826- if (sys_newstat(name, &stat) != 0)
64827+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
64828 return 0;
64829 if (!S_ISBLK(stat.st_mode))
64830 return 0;
64831diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
64832index 3098a38..253064e 100644
64833--- a/init/do_mounts_initrd.c
64834+++ b/init/do_mounts_initrd.c
64835@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
64836 create_dev("/dev/root.old", Root_RAM0);
64837 /* mount initrd on rootfs' /root */
64838 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
64839- sys_mkdir("/old", 0700);
64840- root_fd = sys_open("/", 0, 0);
64841- old_fd = sys_open("/old", 0, 0);
64842+ sys_mkdir((const char __force_user *)"/old", 0700);
64843+ root_fd = sys_open((const char __force_user *)"/", 0, 0);
64844+ old_fd = sys_open((const char __force_user *)"/old", 0, 0);
64845 /* move initrd over / and chdir/chroot in initrd root */
64846- sys_chdir("/root");
64847- sys_mount(".", "/", NULL, MS_MOVE, NULL);
64848- sys_chroot(".");
64849+ sys_chdir((const char __force_user *)"/root");
64850+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
64851+ sys_chroot((const char __force_user *)".");
64852
64853 /*
64854 * In case that a resume from disk is carried out by linuxrc or one of
64855@@ -67,15 +67,15 @@ static void __init handle_initrd(void)
64856
64857 /* move initrd to rootfs' /old */
64858 sys_fchdir(old_fd);
64859- sys_mount("/", ".", NULL, MS_MOVE, NULL);
64860+ sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
64861 /* switch root and cwd back to / of rootfs */
64862 sys_fchdir(root_fd);
64863- sys_chroot(".");
64864+ sys_chroot((const char __force_user *)".");
64865 sys_close(old_fd);
64866 sys_close(root_fd);
64867
64868 if (new_decode_dev(real_root_dev) == Root_RAM0) {
64869- sys_chdir("/old");
64870+ sys_chdir((const char __force_user *)"/old");
64871 return;
64872 }
64873
64874@@ -83,17 +83,17 @@ static void __init handle_initrd(void)
64875 mount_root();
64876
64877 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
64878- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
64879+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
64880 if (!error)
64881 printk("okay\n");
64882 else {
64883- int fd = sys_open("/dev/root.old", O_RDWR, 0);
64884+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
64885 if (error == -ENOENT)
64886 printk("/initrd does not exist. Ignored.\n");
64887 else
64888 printk("failed\n");
64889 printk(KERN_NOTICE "Unmounting old root\n");
64890- sys_umount("/old", MNT_DETACH);
64891+ sys_umount((char __force_user *)"/old", MNT_DETACH);
64892 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
64893 if (fd < 0) {
64894 error = fd;
64895@@ -116,11 +116,11 @@ int __init initrd_load(void)
64896 * mounted in the normal path.
64897 */
64898 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
64899- sys_unlink("/initrd.image");
64900+ sys_unlink((const char __force_user *)"/initrd.image");
64901 handle_initrd();
64902 return 1;
64903 }
64904 }
64905- sys_unlink("/initrd.image");
64906+ sys_unlink((const char __force_user *)"/initrd.image");
64907 return 0;
64908 }
64909diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
64910index 32c4799..c27ee74 100644
64911--- a/init/do_mounts_md.c
64912+++ b/init/do_mounts_md.c
64913@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
64914 partitioned ? "_d" : "", minor,
64915 md_setup_args[ent].device_names);
64916
64917- fd = sys_open(name, 0, 0);
64918+ fd = sys_open((char __force_user *)name, 0, 0);
64919 if (fd < 0) {
64920 printk(KERN_ERR "md: open failed - cannot start "
64921 "array %s\n", name);
64922@@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
64923 * array without it
64924 */
64925 sys_close(fd);
64926- fd = sys_open(name, 0, 0);
64927+ fd = sys_open((char __force_user *)name, 0, 0);
64928 sys_ioctl(fd, BLKRRPART, 0);
64929 }
64930 sys_close(fd);
64931@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
64932
64933 wait_for_device_probe();
64934
64935- fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
64936+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
64937 if (fd >= 0) {
64938 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
64939 sys_close(fd);
64940diff --git a/init/initramfs.c b/init/initramfs.c
64941index 8216c30..25e8e32 100644
64942--- a/init/initramfs.c
64943+++ b/init/initramfs.c
64944@@ -74,7 +74,7 @@ static void __init free_hash(void)
64945 }
64946 }
64947
64948-static long __init do_utime(char __user *filename, time_t mtime)
64949+static long __init do_utime(__force char __user *filename, time_t mtime)
64950 {
64951 struct timespec t[2];
64952
64953@@ -109,7 +109,7 @@ static void __init dir_utime(void)
64954 struct dir_entry *de, *tmp;
64955 list_for_each_entry_safe(de, tmp, &dir_list, list) {
64956 list_del(&de->list);
64957- do_utime(de->name, de->mtime);
64958+ do_utime((char __force_user *)de->name, de->mtime);
64959 kfree(de->name);
64960 kfree(de);
64961 }
64962@@ -271,7 +271,7 @@ static int __init maybe_link(void)
64963 if (nlink >= 2) {
64964 char *old = find_link(major, minor, ino, mode, collected);
64965 if (old)
64966- return (sys_link(old, collected) < 0) ? -1 : 1;
64967+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
64968 }
64969 return 0;
64970 }
64971@@ -280,11 +280,11 @@ static void __init clean_path(char *path, umode_t mode)
64972 {
64973 struct stat st;
64974
64975- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
64976+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
64977 if (S_ISDIR(st.st_mode))
64978- sys_rmdir(path);
64979+ sys_rmdir((char __force_user *)path);
64980 else
64981- sys_unlink(path);
64982+ sys_unlink((char __force_user *)path);
64983 }
64984 }
64985
64986@@ -305,7 +305,7 @@ static int __init do_name(void)
64987 int openflags = O_WRONLY|O_CREAT;
64988 if (ml != 1)
64989 openflags |= O_TRUNC;
64990- wfd = sys_open(collected, openflags, mode);
64991+ wfd = sys_open((char __force_user *)collected, openflags, mode);
64992
64993 if (wfd >= 0) {
64994 sys_fchown(wfd, uid, gid);
64995@@ -317,17 +317,17 @@ static int __init do_name(void)
64996 }
64997 }
64998 } else if (S_ISDIR(mode)) {
64999- sys_mkdir(collected, mode);
65000- sys_chown(collected, uid, gid);
65001- sys_chmod(collected, mode);
65002+ sys_mkdir((char __force_user *)collected, mode);
65003+ sys_chown((char __force_user *)collected, uid, gid);
65004+ sys_chmod((char __force_user *)collected, mode);
65005 dir_add(collected, mtime);
65006 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
65007 S_ISFIFO(mode) || S_ISSOCK(mode)) {
65008 if (maybe_link() == 0) {
65009- sys_mknod(collected, mode, rdev);
65010- sys_chown(collected, uid, gid);
65011- sys_chmod(collected, mode);
65012- do_utime(collected, mtime);
65013+ sys_mknod((char __force_user *)collected, mode, rdev);
65014+ sys_chown((char __force_user *)collected, uid, gid);
65015+ sys_chmod((char __force_user *)collected, mode);
65016+ do_utime((char __force_user *)collected, mtime);
65017 }
65018 }
65019 return 0;
65020@@ -336,15 +336,15 @@ static int __init do_name(void)
65021 static int __init do_copy(void)
65022 {
65023 if (count >= body_len) {
65024- sys_write(wfd, victim, body_len);
65025+ sys_write(wfd, (char __force_user *)victim, body_len);
65026 sys_close(wfd);
65027- do_utime(vcollected, mtime);
65028+ do_utime((char __force_user *)vcollected, mtime);
65029 kfree(vcollected);
65030 eat(body_len);
65031 state = SkipIt;
65032 return 0;
65033 } else {
65034- sys_write(wfd, victim, count);
65035+ sys_write(wfd, (char __force_user *)victim, count);
65036 body_len -= count;
65037 eat(count);
65038 return 1;
65039@@ -355,9 +355,9 @@ static int __init do_symlink(void)
65040 {
65041 collected[N_ALIGN(name_len) + body_len] = '\0';
65042 clean_path(collected, 0);
65043- sys_symlink(collected + N_ALIGN(name_len), collected);
65044- sys_lchown(collected, uid, gid);
65045- do_utime(collected, mtime);
65046+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
65047+ sys_lchown((char __force_user *)collected, uid, gid);
65048+ do_utime((char __force_user *)collected, mtime);
65049 state = SkipIt;
65050 next_state = Reset;
65051 return 0;
65052diff --git a/init/main.c b/init/main.c
65053index ff49a6d..5fa0429 100644
65054--- a/init/main.c
65055+++ b/init/main.c
65056@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
65057 extern void tc_init(void);
65058 #endif
65059
65060+extern void grsecurity_init(void);
65061+
65062 /*
65063 * Debug helper: via this flag we know that we are in 'early bootup code'
65064 * where only the boot processor is running with IRQ disabled. This means
65065@@ -149,6 +151,49 @@ static int __init set_reset_devices(char *str)
65066
65067 __setup("reset_devices", set_reset_devices);
65068
65069+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
65070+extern char pax_enter_kernel_user[];
65071+extern char pax_exit_kernel_user[];
65072+extern pgdval_t clone_pgd_mask;
65073+#endif
65074+
65075+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
65076+static int __init setup_pax_nouderef(char *str)
65077+{
65078+#ifdef CONFIG_X86_32
65079+ unsigned int cpu;
65080+ struct desc_struct *gdt;
65081+
65082+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
65083+ gdt = get_cpu_gdt_table(cpu);
65084+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
65085+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
65086+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
65087+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
65088+ }
65089+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
65090+#else
65091+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
65092+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
65093+ clone_pgd_mask = ~(pgdval_t)0UL;
65094+#endif
65095+
65096+ return 0;
65097+}
65098+early_param("pax_nouderef", setup_pax_nouderef);
65099+#endif
65100+
65101+#ifdef CONFIG_PAX_SOFTMODE
65102+int pax_softmode;
65103+
65104+static int __init setup_pax_softmode(char *str)
65105+{
65106+ get_option(&str, &pax_softmode);
65107+ return 1;
65108+}
65109+__setup("pax_softmode=", setup_pax_softmode);
65110+#endif
65111+
65112 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
65113 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
65114 static const char *panic_later, *panic_param;
65115@@ -675,6 +720,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
65116 {
65117 int count = preempt_count();
65118 int ret;
65119+ const char *msg1 = "", *msg2 = "";
65120
65121 if (initcall_debug)
65122 ret = do_one_initcall_debug(fn);
65123@@ -687,15 +733,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
65124 sprintf(msgbuf, "error code %d ", ret);
65125
65126 if (preempt_count() != count) {
65127- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
65128+ msg1 = " preemption imbalance";
65129 preempt_count() = count;
65130 }
65131 if (irqs_disabled()) {
65132- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
65133+ msg2 = " disabled interrupts";
65134 local_irq_enable();
65135 }
65136- if (msgbuf[0]) {
65137- printk("initcall %pF returned with %s\n", fn, msgbuf);
65138+ if (msgbuf[0] || *msg1 || *msg2) {
65139+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
65140 }
65141
65142 return ret;
65143@@ -814,7 +860,7 @@ static int __init kernel_init(void * unused)
65144 do_basic_setup();
65145
65146 /* Open the /dev/console on the rootfs, this should never fail */
65147- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
65148+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
65149 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
65150
65151 (void) sys_dup(0);
65152@@ -827,11 +873,13 @@ static int __init kernel_init(void * unused)
65153 if (!ramdisk_execute_command)
65154 ramdisk_execute_command = "/init";
65155
65156- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
65157+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
65158 ramdisk_execute_command = NULL;
65159 prepare_namespace();
65160 }
65161
65162+ grsecurity_init();
65163+
65164 /*
65165 * Ok, we have completed the initial bootup, and
65166 * we're essentially up and running. Get rid of the
65167diff --git a/ipc/mqueue.c b/ipc/mqueue.c
65168index 86ee272..773d937 100644
65169--- a/ipc/mqueue.c
65170+++ b/ipc/mqueue.c
65171@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
65172 mq_bytes = (mq_msg_tblsz +
65173 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
65174
65175+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
65176 spin_lock(&mq_lock);
65177 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
65178 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
65179diff --git a/ipc/msg.c b/ipc/msg.c
65180index 7385de2..a8180e08 100644
65181--- a/ipc/msg.c
65182+++ b/ipc/msg.c
65183@@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
65184 return security_msg_queue_associate(msq, msgflg);
65185 }
65186
65187+static struct ipc_ops msg_ops = {
65188+ .getnew = newque,
65189+ .associate = msg_security,
65190+ .more_checks = NULL
65191+};
65192+
65193 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
65194 {
65195 struct ipc_namespace *ns;
65196- struct ipc_ops msg_ops;
65197 struct ipc_params msg_params;
65198
65199 ns = current->nsproxy->ipc_ns;
65200
65201- msg_ops.getnew = newque;
65202- msg_ops.associate = msg_security;
65203- msg_ops.more_checks = NULL;
65204-
65205 msg_params.key = key;
65206 msg_params.flg = msgflg;
65207
65208diff --git a/ipc/sem.c b/ipc/sem.c
65209index 5215a81..cfc0cac 100644
65210--- a/ipc/sem.c
65211+++ b/ipc/sem.c
65212@@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
65213 return 0;
65214 }
65215
65216+static struct ipc_ops sem_ops = {
65217+ .getnew = newary,
65218+ .associate = sem_security,
65219+ .more_checks = sem_more_checks
65220+};
65221+
65222 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65223 {
65224 struct ipc_namespace *ns;
65225- struct ipc_ops sem_ops;
65226 struct ipc_params sem_params;
65227
65228 ns = current->nsproxy->ipc_ns;
65229@@ -375,10 +380,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65230 if (nsems < 0 || nsems > ns->sc_semmsl)
65231 return -EINVAL;
65232
65233- sem_ops.getnew = newary;
65234- sem_ops.associate = sem_security;
65235- sem_ops.more_checks = sem_more_checks;
65236-
65237 sem_params.key = key;
65238 sem_params.flg = semflg;
65239 sem_params.u.nsems = nsems;
65240diff --git a/ipc/shm.c b/ipc/shm.c
65241index b76be5b..859e750 100644
65242--- a/ipc/shm.c
65243+++ b/ipc/shm.c
65244@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
65245 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
65246 #endif
65247
65248+#ifdef CONFIG_GRKERNSEC
65249+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65250+ const time_t shm_createtime, const uid_t cuid,
65251+ const int shmid);
65252+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65253+ const time_t shm_createtime);
65254+#endif
65255+
65256 void shm_init_ns(struct ipc_namespace *ns)
65257 {
65258 ns->shm_ctlmax = SHMMAX;
65259@@ -508,6 +516,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
65260 shp->shm_lprid = 0;
65261 shp->shm_atim = shp->shm_dtim = 0;
65262 shp->shm_ctim = get_seconds();
65263+#ifdef CONFIG_GRKERNSEC
65264+ {
65265+ struct timespec timeval;
65266+ do_posix_clock_monotonic_gettime(&timeval);
65267+
65268+ shp->shm_createtime = timeval.tv_sec;
65269+ }
65270+#endif
65271 shp->shm_segsz = size;
65272 shp->shm_nattch = 0;
65273 shp->shm_file = file;
65274@@ -559,18 +575,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
65275 return 0;
65276 }
65277
65278+static struct ipc_ops shm_ops = {
65279+ .getnew = newseg,
65280+ .associate = shm_security,
65281+ .more_checks = shm_more_checks
65282+};
65283+
65284 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
65285 {
65286 struct ipc_namespace *ns;
65287- struct ipc_ops shm_ops;
65288 struct ipc_params shm_params;
65289
65290 ns = current->nsproxy->ipc_ns;
65291
65292- shm_ops.getnew = newseg;
65293- shm_ops.associate = shm_security;
65294- shm_ops.more_checks = shm_more_checks;
65295-
65296 shm_params.key = key;
65297 shm_params.flg = shmflg;
65298 shm_params.u.size = size;
65299@@ -988,6 +1005,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65300 f_mode = FMODE_READ | FMODE_WRITE;
65301 }
65302 if (shmflg & SHM_EXEC) {
65303+
65304+#ifdef CONFIG_PAX_MPROTECT
65305+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
65306+ goto out;
65307+#endif
65308+
65309 prot |= PROT_EXEC;
65310 acc_mode |= S_IXUGO;
65311 }
65312@@ -1011,9 +1034,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65313 if (err)
65314 goto out_unlock;
65315
65316+#ifdef CONFIG_GRKERNSEC
65317+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
65318+ shp->shm_perm.cuid, shmid) ||
65319+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
65320+ err = -EACCES;
65321+ goto out_unlock;
65322+ }
65323+#endif
65324+
65325 path = shp->shm_file->f_path;
65326 path_get(&path);
65327 shp->shm_nattch++;
65328+#ifdef CONFIG_GRKERNSEC
65329+ shp->shm_lapid = current->pid;
65330+#endif
65331 size = i_size_read(path.dentry->d_inode);
65332 shm_unlock(shp);
65333
65334diff --git a/kernel/acct.c b/kernel/acct.c
65335index 02e6167..54824f7 100644
65336--- a/kernel/acct.c
65337+++ b/kernel/acct.c
65338@@ -550,7 +550,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
65339 */
65340 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
65341 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
65342- file->f_op->write(file, (char *)&ac,
65343+ file->f_op->write(file, (char __force_user *)&ac,
65344 sizeof(acct_t), &file->f_pos);
65345 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
65346 set_fs(fs);
65347diff --git a/kernel/audit.c b/kernel/audit.c
65348index bb0eb5b..cf2a03a 100644
65349--- a/kernel/audit.c
65350+++ b/kernel/audit.c
65351@@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
65352 3) suppressed due to audit_rate_limit
65353 4) suppressed due to audit_backlog_limit
65354 */
65355-static atomic_t audit_lost = ATOMIC_INIT(0);
65356+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
65357
65358 /* The netlink socket. */
65359 static struct sock *audit_sock;
65360@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
65361 unsigned long now;
65362 int print;
65363
65364- atomic_inc(&audit_lost);
65365+ atomic_inc_unchecked(&audit_lost);
65366
65367 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
65368
65369@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
65370 printk(KERN_WARNING
65371 "audit: audit_lost=%d audit_rate_limit=%d "
65372 "audit_backlog_limit=%d\n",
65373- atomic_read(&audit_lost),
65374+ atomic_read_unchecked(&audit_lost),
65375 audit_rate_limit,
65376 audit_backlog_limit);
65377 audit_panic(message);
65378@@ -689,7 +689,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
65379 status_set.pid = audit_pid;
65380 status_set.rate_limit = audit_rate_limit;
65381 status_set.backlog_limit = audit_backlog_limit;
65382- status_set.lost = atomic_read(&audit_lost);
65383+ status_set.lost = atomic_read_unchecked(&audit_lost);
65384 status_set.backlog = skb_queue_len(&audit_skb_queue);
65385 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
65386 &status_set, sizeof(status_set));
65387diff --git a/kernel/auditsc.c b/kernel/auditsc.c
65388index af1de0f..06dfe57 100644
65389--- a/kernel/auditsc.c
65390+++ b/kernel/auditsc.c
65391@@ -2288,7 +2288,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
65392 }
65393
65394 /* global counter which is incremented every time something logs in */
65395-static atomic_t session_id = ATOMIC_INIT(0);
65396+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
65397
65398 /**
65399 * audit_set_loginuid - set current task's audit_context loginuid
65400@@ -2312,7 +2312,7 @@ int audit_set_loginuid(uid_t loginuid)
65401 return -EPERM;
65402 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
65403
65404- sessionid = atomic_inc_return(&session_id);
65405+ sessionid = atomic_inc_return_unchecked(&session_id);
65406 if (context && context->in_syscall) {
65407 struct audit_buffer *ab;
65408
65409diff --git a/kernel/capability.c b/kernel/capability.c
65410index 3f1adb6..c564db0 100644
65411--- a/kernel/capability.c
65412+++ b/kernel/capability.c
65413@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
65414 * before modification is attempted and the application
65415 * fails.
65416 */
65417+ if (tocopy > ARRAY_SIZE(kdata))
65418+ return -EFAULT;
65419+
65420 if (copy_to_user(dataptr, kdata, tocopy
65421 * sizeof(struct __user_cap_data_struct))) {
65422 return -EFAULT;
65423@@ -303,10 +306,11 @@ bool has_ns_capability(struct task_struct *t,
65424 int ret;
65425
65426 rcu_read_lock();
65427- ret = security_capable(__task_cred(t), ns, cap);
65428+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
65429+ gr_task_is_capable(t, __task_cred(t), cap);
65430 rcu_read_unlock();
65431
65432- return (ret == 0);
65433+ return ret;
65434 }
65435
65436 /**
65437@@ -343,10 +347,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
65438 int ret;
65439
65440 rcu_read_lock();
65441- ret = security_capable_noaudit(__task_cred(t), ns, cap);
65442+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
65443 rcu_read_unlock();
65444
65445- return (ret == 0);
65446+ return ret;
65447 }
65448
65449 /**
65450@@ -384,7 +388,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
65451 BUG();
65452 }
65453
65454- if (security_capable(current_cred(), ns, cap) == 0) {
65455+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
65456 current->flags |= PF_SUPERPRIV;
65457 return true;
65458 }
65459@@ -392,6 +396,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
65460 }
65461 EXPORT_SYMBOL(ns_capable);
65462
65463+bool ns_capable_nolog(struct user_namespace *ns, int cap)
65464+{
65465+ if (unlikely(!cap_valid(cap))) {
65466+ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
65467+ BUG();
65468+ }
65469+
65470+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
65471+ current->flags |= PF_SUPERPRIV;
65472+ return true;
65473+ }
65474+ return false;
65475+}
65476+EXPORT_SYMBOL(ns_capable_nolog);
65477+
65478 /**
65479 * capable - Determine if the current task has a superior capability in effect
65480 * @cap: The capability to be tested for
65481@@ -408,6 +427,12 @@ bool capable(int cap)
65482 }
65483 EXPORT_SYMBOL(capable);
65484
65485+bool capable_nolog(int cap)
65486+{
65487+ return ns_capable_nolog(&init_user_ns, cap);
65488+}
65489+EXPORT_SYMBOL(capable_nolog);
65490+
65491 /**
65492 * nsown_capable - Check superior capability to one's own user_ns
65493 * @cap: The capability in question
65494diff --git a/kernel/compat.c b/kernel/compat.c
65495index f346ced..aa2b1f4 100644
65496--- a/kernel/compat.c
65497+++ b/kernel/compat.c
65498@@ -13,6 +13,7 @@
65499
65500 #include <linux/linkage.h>
65501 #include <linux/compat.h>
65502+#include <linux/module.h>
65503 #include <linux/errno.h>
65504 #include <linux/time.h>
65505 #include <linux/signal.h>
65506@@ -168,7 +169,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
65507 mm_segment_t oldfs;
65508 long ret;
65509
65510- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
65511+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
65512 oldfs = get_fs();
65513 set_fs(KERNEL_DS);
65514 ret = hrtimer_nanosleep_restart(restart);
65515@@ -200,7 +201,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
65516 oldfs = get_fs();
65517 set_fs(KERNEL_DS);
65518 ret = hrtimer_nanosleep(&tu,
65519- rmtp ? (struct timespec __user *)&rmt : NULL,
65520+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
65521 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
65522 set_fs(oldfs);
65523
65524@@ -309,7 +310,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
65525 mm_segment_t old_fs = get_fs();
65526
65527 set_fs(KERNEL_DS);
65528- ret = sys_sigpending((old_sigset_t __user *) &s);
65529+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
65530 set_fs(old_fs);
65531 if (ret == 0)
65532 ret = put_user(s, set);
65533@@ -332,8 +333,8 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
65534 old_fs = get_fs();
65535 set_fs(KERNEL_DS);
65536 ret = sys_sigprocmask(how,
65537- set ? (old_sigset_t __user *) &s : NULL,
65538- oset ? (old_sigset_t __user *) &s : NULL);
65539+ set ? (old_sigset_t __force_user *) &s : NULL,
65540+ oset ? (old_sigset_t __force_user *) &s : NULL);
65541 set_fs(old_fs);
65542 if (ret == 0)
65543 if (oset)
65544@@ -370,7 +371,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
65545 mm_segment_t old_fs = get_fs();
65546
65547 set_fs(KERNEL_DS);
65548- ret = sys_old_getrlimit(resource, &r);
65549+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
65550 set_fs(old_fs);
65551
65552 if (!ret) {
65553@@ -442,7 +443,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
65554 mm_segment_t old_fs = get_fs();
65555
65556 set_fs(KERNEL_DS);
65557- ret = sys_getrusage(who, (struct rusage __user *) &r);
65558+ ret = sys_getrusage(who, (struct rusage __force_user *) &r);
65559 set_fs(old_fs);
65560
65561 if (ret)
65562@@ -469,8 +470,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
65563 set_fs (KERNEL_DS);
65564 ret = sys_wait4(pid,
65565 (stat_addr ?
65566- (unsigned int __user *) &status : NULL),
65567- options, (struct rusage __user *) &r);
65568+ (unsigned int __force_user *) &status : NULL),
65569+ options, (struct rusage __force_user *) &r);
65570 set_fs (old_fs);
65571
65572 if (ret > 0) {
65573@@ -495,8 +496,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
65574 memset(&info, 0, sizeof(info));
65575
65576 set_fs(KERNEL_DS);
65577- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
65578- uru ? (struct rusage __user *)&ru : NULL);
65579+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
65580+ uru ? (struct rusage __force_user *)&ru : NULL);
65581 set_fs(old_fs);
65582
65583 if ((ret < 0) || (info.si_signo == 0))
65584@@ -626,8 +627,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
65585 oldfs = get_fs();
65586 set_fs(KERNEL_DS);
65587 err = sys_timer_settime(timer_id, flags,
65588- (struct itimerspec __user *) &newts,
65589- (struct itimerspec __user *) &oldts);
65590+ (struct itimerspec __force_user *) &newts,
65591+ (struct itimerspec __force_user *) &oldts);
65592 set_fs(oldfs);
65593 if (!err && old && put_compat_itimerspec(old, &oldts))
65594 return -EFAULT;
65595@@ -644,7 +645,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
65596 oldfs = get_fs();
65597 set_fs(KERNEL_DS);
65598 err = sys_timer_gettime(timer_id,
65599- (struct itimerspec __user *) &ts);
65600+ (struct itimerspec __force_user *) &ts);
65601 set_fs(oldfs);
65602 if (!err && put_compat_itimerspec(setting, &ts))
65603 return -EFAULT;
65604@@ -663,7 +664,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
65605 oldfs = get_fs();
65606 set_fs(KERNEL_DS);
65607 err = sys_clock_settime(which_clock,
65608- (struct timespec __user *) &ts);
65609+ (struct timespec __force_user *) &ts);
65610 set_fs(oldfs);
65611 return err;
65612 }
65613@@ -678,7 +679,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
65614 oldfs = get_fs();
65615 set_fs(KERNEL_DS);
65616 err = sys_clock_gettime(which_clock,
65617- (struct timespec __user *) &ts);
65618+ (struct timespec __force_user *) &ts);
65619 set_fs(oldfs);
65620 if (!err && put_compat_timespec(&ts, tp))
65621 return -EFAULT;
65622@@ -698,7 +699,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
65623
65624 oldfs = get_fs();
65625 set_fs(KERNEL_DS);
65626- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
65627+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
65628 set_fs(oldfs);
65629
65630 err = compat_put_timex(utp, &txc);
65631@@ -718,7 +719,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
65632 oldfs = get_fs();
65633 set_fs(KERNEL_DS);
65634 err = sys_clock_getres(which_clock,
65635- (struct timespec __user *) &ts);
65636+ (struct timespec __force_user *) &ts);
65637 set_fs(oldfs);
65638 if (!err && tp && put_compat_timespec(&ts, tp))
65639 return -EFAULT;
65640@@ -730,9 +731,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
65641 long err;
65642 mm_segment_t oldfs;
65643 struct timespec tu;
65644- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
65645+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
65646
65647- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
65648+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
65649 oldfs = get_fs();
65650 set_fs(KERNEL_DS);
65651 err = clock_nanosleep_restart(restart);
65652@@ -764,8 +765,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
65653 oldfs = get_fs();
65654 set_fs(KERNEL_DS);
65655 err = sys_clock_nanosleep(which_clock, flags,
65656- (struct timespec __user *) &in,
65657- (struct timespec __user *) &out);
65658+ (struct timespec __force_user *) &in,
65659+ (struct timespec __force_user *) &out);
65660 set_fs(oldfs);
65661
65662 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
65663diff --git a/kernel/configs.c b/kernel/configs.c
65664index 42e8fa0..9e7406b 100644
65665--- a/kernel/configs.c
65666+++ b/kernel/configs.c
65667@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
65668 struct proc_dir_entry *entry;
65669
65670 /* create the current config file */
65671+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
65672+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
65673+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
65674+ &ikconfig_file_ops);
65675+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65676+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
65677+ &ikconfig_file_ops);
65678+#endif
65679+#else
65680 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
65681 &ikconfig_file_ops);
65682+#endif
65683+
65684 if (!entry)
65685 return -ENOMEM;
65686
65687diff --git a/kernel/cred.c b/kernel/cred.c
65688index 48c6fd3..3342f00 100644
65689--- a/kernel/cred.c
65690+++ b/kernel/cred.c
65691@@ -204,6 +204,15 @@ void exit_creds(struct task_struct *tsk)
65692 validate_creds(cred);
65693 put_cred(cred);
65694 }
65695+
65696+#ifdef CONFIG_GRKERNSEC_SETXID
65697+ cred = (struct cred *) tsk->delayed_cred;
65698+ if (cred) {
65699+ tsk->delayed_cred = NULL;
65700+ validate_creds(cred);
65701+ put_cred(cred);
65702+ }
65703+#endif
65704 }
65705
65706 /**
65707@@ -472,7 +481,7 @@ error_put:
65708 * Always returns 0 thus allowing this function to be tail-called at the end
65709 * of, say, sys_setgid().
65710 */
65711-int commit_creds(struct cred *new)
65712+static int __commit_creds(struct cred *new)
65713 {
65714 struct task_struct *task = current;
65715 const struct cred *old = task->real_cred;
65716@@ -491,6 +500,8 @@ int commit_creds(struct cred *new)
65717
65718 get_cred(new); /* we will require a ref for the subj creds too */
65719
65720+ gr_set_role_label(task, new->uid, new->gid);
65721+
65722 /* dumpability changes */
65723 if (old->euid != new->euid ||
65724 old->egid != new->egid ||
65725@@ -540,6 +551,92 @@ int commit_creds(struct cred *new)
65726 put_cred(old);
65727 return 0;
65728 }
65729+#ifdef CONFIG_GRKERNSEC_SETXID
65730+extern int set_user(struct cred *new);
65731+
65732+void gr_delayed_cred_worker(void)
65733+{
65734+ const struct cred *new = current->delayed_cred;
65735+ struct cred *ncred;
65736+
65737+ current->delayed_cred = NULL;
65738+
65739+ if (current_uid() && new != NULL) {
65740+ // from doing get_cred on it when queueing this
65741+ put_cred(new);
65742+ return;
65743+ } else if (new == NULL)
65744+ return;
65745+
65746+ ncred = prepare_creds();
65747+ if (!ncred)
65748+ goto die;
65749+ // uids
65750+ ncred->uid = new->uid;
65751+ ncred->euid = new->euid;
65752+ ncred->suid = new->suid;
65753+ ncred->fsuid = new->fsuid;
65754+ // gids
65755+ ncred->gid = new->gid;
65756+ ncred->egid = new->egid;
65757+ ncred->sgid = new->sgid;
65758+ ncred->fsgid = new->fsgid;
65759+ // groups
65760+ if (set_groups(ncred, new->group_info) < 0) {
65761+ abort_creds(ncred);
65762+ goto die;
65763+ }
65764+ // caps
65765+ ncred->securebits = new->securebits;
65766+ ncred->cap_inheritable = new->cap_inheritable;
65767+ ncred->cap_permitted = new->cap_permitted;
65768+ ncred->cap_effective = new->cap_effective;
65769+ ncred->cap_bset = new->cap_bset;
65770+
65771+ if (set_user(ncred)) {
65772+ abort_creds(ncred);
65773+ goto die;
65774+ }
65775+
65776+ // from doing get_cred on it when queueing this
65777+ put_cred(new);
65778+
65779+ __commit_creds(ncred);
65780+ return;
65781+die:
65782+ // from doing get_cred on it when queueing this
65783+ put_cred(new);
65784+ do_group_exit(SIGKILL);
65785+}
65786+#endif
65787+
65788+int commit_creds(struct cred *new)
65789+{
65790+#ifdef CONFIG_GRKERNSEC_SETXID
65791+ struct task_struct *t;
65792+
65793+ /* we won't get called with tasklist_lock held for writing
65794+ and interrupts disabled as the cred struct in that case is
65795+ init_cred
65796+ */
65797+ if (grsec_enable_setxid && !current_is_single_threaded() &&
65798+ !current_uid() && new->uid) {
65799+ rcu_read_lock();
65800+ read_lock(&tasklist_lock);
65801+ for (t = next_thread(current); t != current;
65802+ t = next_thread(t)) {
65803+ if (t->delayed_cred == NULL) {
65804+ t->delayed_cred = get_cred(new);
65805+ set_tsk_need_resched(t);
65806+ }
65807+ }
65808+ read_unlock(&tasklist_lock);
65809+ rcu_read_unlock();
65810+ }
65811+#endif
65812+ return __commit_creds(new);
65813+}
65814+
65815 EXPORT_SYMBOL(commit_creds);
65816
65817 /**
65818diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
65819index 7fda904..59f620c 100644
65820--- a/kernel/debug/debug_core.c
65821+++ b/kernel/debug/debug_core.c
65822@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
65823 */
65824 static atomic_t masters_in_kgdb;
65825 static atomic_t slaves_in_kgdb;
65826-static atomic_t kgdb_break_tasklet_var;
65827+static atomic_unchecked_t kgdb_break_tasklet_var;
65828 atomic_t kgdb_setting_breakpoint;
65829
65830 struct task_struct *kgdb_usethread;
65831@@ -129,7 +129,7 @@ int kgdb_single_step;
65832 static pid_t kgdb_sstep_pid;
65833
65834 /* to keep track of the CPU which is doing the single stepping*/
65835-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
65836+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
65837
65838 /*
65839 * If you are debugging a problem where roundup (the collection of
65840@@ -537,7 +537,7 @@ return_normal:
65841 * kernel will only try for the value of sstep_tries before
65842 * giving up and continuing on.
65843 */
65844- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
65845+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
65846 (kgdb_info[cpu].task &&
65847 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
65848 atomic_set(&kgdb_active, -1);
65849@@ -631,8 +631,8 @@ cpu_master_loop:
65850 }
65851
65852 kgdb_restore:
65853- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
65854- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
65855+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
65856+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
65857 if (kgdb_info[sstep_cpu].task)
65858 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
65859 else
65860@@ -829,18 +829,18 @@ static void kgdb_unregister_callbacks(void)
65861 static void kgdb_tasklet_bpt(unsigned long ing)
65862 {
65863 kgdb_breakpoint();
65864- atomic_set(&kgdb_break_tasklet_var, 0);
65865+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
65866 }
65867
65868 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
65869
65870 void kgdb_schedule_breakpoint(void)
65871 {
65872- if (atomic_read(&kgdb_break_tasklet_var) ||
65873+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
65874 atomic_read(&kgdb_active) != -1 ||
65875 atomic_read(&kgdb_setting_breakpoint))
65876 return;
65877- atomic_inc(&kgdb_break_tasklet_var);
65878+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
65879 tasklet_schedule(&kgdb_tasklet_breakpoint);
65880 }
65881 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
65882diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
65883index e2ae734..08a4c5c 100644
65884--- a/kernel/debug/kdb/kdb_main.c
65885+++ b/kernel/debug/kdb/kdb_main.c
65886@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const char **argv)
65887 list_for_each_entry(mod, kdb_modules, list) {
65888
65889 kdb_printf("%-20s%8u 0x%p ", mod->name,
65890- mod->core_size, (void *)mod);
65891+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
65892 #ifdef CONFIG_MODULE_UNLOAD
65893 kdb_printf("%4ld ", module_refcount(mod));
65894 #endif
65895@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const char **argv)
65896 kdb_printf(" (Loading)");
65897 else
65898 kdb_printf(" (Live)");
65899- kdb_printf(" 0x%p", mod->module_core);
65900+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
65901
65902 #ifdef CONFIG_MODULE_UNLOAD
65903 {
65904diff --git a/kernel/events/core.c b/kernel/events/core.c
65905index 1b5c081..c375f83 100644
65906--- a/kernel/events/core.c
65907+++ b/kernel/events/core.c
65908@@ -173,7 +173,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
65909 return 0;
65910 }
65911
65912-static atomic64_t perf_event_id;
65913+static atomic64_unchecked_t perf_event_id;
65914
65915 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
65916 enum event_type_t event_type);
65917@@ -2581,7 +2581,7 @@ static void __perf_event_read(void *info)
65918
65919 static inline u64 perf_event_count(struct perf_event *event)
65920 {
65921- return local64_read(&event->count) + atomic64_read(&event->child_count);
65922+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
65923 }
65924
65925 static u64 perf_event_read(struct perf_event *event)
65926@@ -2897,9 +2897,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
65927 mutex_lock(&event->child_mutex);
65928 total += perf_event_read(event);
65929 *enabled += event->total_time_enabled +
65930- atomic64_read(&event->child_total_time_enabled);
65931+ atomic64_read_unchecked(&event->child_total_time_enabled);
65932 *running += event->total_time_running +
65933- atomic64_read(&event->child_total_time_running);
65934+ atomic64_read_unchecked(&event->child_total_time_running);
65935
65936 list_for_each_entry(child, &event->child_list, child_list) {
65937 total += perf_event_read(child);
65938@@ -3306,10 +3306,10 @@ void perf_event_update_userpage(struct perf_event *event)
65939 userpg->offset -= local64_read(&event->hw.prev_count);
65940
65941 userpg->time_enabled = enabled +
65942- atomic64_read(&event->child_total_time_enabled);
65943+ atomic64_read_unchecked(&event->child_total_time_enabled);
65944
65945 userpg->time_running = running +
65946- atomic64_read(&event->child_total_time_running);
65947+ atomic64_read_unchecked(&event->child_total_time_running);
65948
65949 barrier();
65950 ++userpg->lock;
65951@@ -3738,11 +3738,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
65952 values[n++] = perf_event_count(event);
65953 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
65954 values[n++] = enabled +
65955- atomic64_read(&event->child_total_time_enabled);
65956+ atomic64_read_unchecked(&event->child_total_time_enabled);
65957 }
65958 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
65959 values[n++] = running +
65960- atomic64_read(&event->child_total_time_running);
65961+ atomic64_read_unchecked(&event->child_total_time_running);
65962 }
65963 if (read_format & PERF_FORMAT_ID)
65964 values[n++] = primary_event_id(event);
65965@@ -4393,12 +4393,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
65966 * need to add enough zero bytes after the string to handle
65967 * the 64bit alignment we do later.
65968 */
65969- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
65970+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
65971 if (!buf) {
65972 name = strncpy(tmp, "//enomem", sizeof(tmp));
65973 goto got_name;
65974 }
65975- name = d_path(&file->f_path, buf, PATH_MAX);
65976+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
65977 if (IS_ERR(name)) {
65978 name = strncpy(tmp, "//toolong", sizeof(tmp));
65979 goto got_name;
65980@@ -5765,7 +5765,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
65981 event->parent = parent_event;
65982
65983 event->ns = get_pid_ns(current->nsproxy->pid_ns);
65984- event->id = atomic64_inc_return(&perf_event_id);
65985+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
65986
65987 event->state = PERF_EVENT_STATE_INACTIVE;
65988
65989@@ -6287,10 +6287,10 @@ static void sync_child_event(struct perf_event *child_event,
65990 /*
65991 * Add back the child's count to the parent's count:
65992 */
65993- atomic64_add(child_val, &parent_event->child_count);
65994- atomic64_add(child_event->total_time_enabled,
65995+ atomic64_add_unchecked(child_val, &parent_event->child_count);
65996+ atomic64_add_unchecked(child_event->total_time_enabled,
65997 &parent_event->child_total_time_enabled);
65998- atomic64_add(child_event->total_time_running,
65999+ atomic64_add_unchecked(child_event->total_time_running,
66000 &parent_event->child_total_time_running);
66001
66002 /*
66003diff --git a/kernel/exit.c b/kernel/exit.c
66004index 4b4042f..5bdd8d5 100644
66005--- a/kernel/exit.c
66006+++ b/kernel/exit.c
66007@@ -58,6 +58,10 @@
66008 #include <asm/pgtable.h>
66009 #include <asm/mmu_context.h>
66010
66011+#ifdef CONFIG_GRKERNSEC
66012+extern rwlock_t grsec_exec_file_lock;
66013+#endif
66014+
66015 static void exit_mm(struct task_struct * tsk);
66016
66017 static void __unhash_process(struct task_struct *p, bool group_dead)
66018@@ -169,6 +173,10 @@ void release_task(struct task_struct * p)
66019 struct task_struct *leader;
66020 int zap_leader;
66021 repeat:
66022+#ifdef CONFIG_NET
66023+ gr_del_task_from_ip_table(p);
66024+#endif
66025+
66026 /* don't need to get the RCU readlock here - the process is dead and
66027 * can't be modifying its own credentials. But shut RCU-lockdep up */
66028 rcu_read_lock();
66029@@ -381,7 +389,7 @@ int allow_signal(int sig)
66030 * know it'll be handled, so that they don't get converted to
66031 * SIGKILL or just silently dropped.
66032 */
66033- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
66034+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
66035 recalc_sigpending();
66036 spin_unlock_irq(&current->sighand->siglock);
66037 return 0;
66038@@ -417,6 +425,17 @@ void daemonize(const char *name, ...)
66039 vsnprintf(current->comm, sizeof(current->comm), name, args);
66040 va_end(args);
66041
66042+#ifdef CONFIG_GRKERNSEC
66043+ write_lock(&grsec_exec_file_lock);
66044+ if (current->exec_file) {
66045+ fput(current->exec_file);
66046+ current->exec_file = NULL;
66047+ }
66048+ write_unlock(&grsec_exec_file_lock);
66049+#endif
66050+
66051+ gr_set_kernel_label(current);
66052+
66053 /*
66054 * If we were started as result of loading a module, close all of the
66055 * user space pages. We don't need them, and if we didn't close them
66056@@ -892,6 +911,8 @@ void do_exit(long code)
66057 struct task_struct *tsk = current;
66058 int group_dead;
66059
66060+ set_fs(USER_DS);
66061+
66062 profile_task_exit(tsk);
66063
66064 WARN_ON(blk_needs_flush_plug(tsk));
66065@@ -908,7 +929,6 @@ void do_exit(long code)
66066 * mm_release()->clear_child_tid() from writing to a user-controlled
66067 * kernel address.
66068 */
66069- set_fs(USER_DS);
66070
66071 ptrace_event(PTRACE_EVENT_EXIT, code);
66072
66073@@ -969,6 +989,9 @@ void do_exit(long code)
66074 tsk->exit_code = code;
66075 taskstats_exit(tsk, group_dead);
66076
66077+ gr_acl_handle_psacct(tsk, code);
66078+ gr_acl_handle_exit();
66079+
66080 exit_mm(tsk);
66081
66082 if (group_dead)
66083@@ -1085,7 +1108,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
66084 * Take down every thread in the group. This is called by fatal signals
66085 * as well as by sys_exit_group (below).
66086 */
66087-void
66088+__noreturn void
66089 do_group_exit(int exit_code)
66090 {
66091 struct signal_struct *sig = current->signal;
66092diff --git a/kernel/fork.c b/kernel/fork.c
66093index 26a7a67..a1053f9 100644
66094--- a/kernel/fork.c
66095+++ b/kernel/fork.c
66096@@ -284,7 +284,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
66097 *stackend = STACK_END_MAGIC; /* for overflow detection */
66098
66099 #ifdef CONFIG_CC_STACKPROTECTOR
66100- tsk->stack_canary = get_random_int();
66101+ tsk->stack_canary = pax_get_random_long();
66102 #endif
66103
66104 /*
66105@@ -308,13 +308,77 @@ out:
66106 }
66107
66108 #ifdef CONFIG_MMU
66109+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct vm_area_struct *mpnt)
66110+{
66111+ struct vm_area_struct *tmp;
66112+ unsigned long charge;
66113+ struct mempolicy *pol;
66114+ struct file *file;
66115+
66116+ charge = 0;
66117+ if (mpnt->vm_flags & VM_ACCOUNT) {
66118+ unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66119+ if (security_vm_enough_memory(len))
66120+ goto fail_nomem;
66121+ charge = len;
66122+ }
66123+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66124+ if (!tmp)
66125+ goto fail_nomem;
66126+ *tmp = *mpnt;
66127+ tmp->vm_mm = mm;
66128+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
66129+ pol = mpol_dup(vma_policy(mpnt));
66130+ if (IS_ERR(pol))
66131+ goto fail_nomem_policy;
66132+ vma_set_policy(tmp, pol);
66133+ if (anon_vma_fork(tmp, mpnt))
66134+ goto fail_nomem_anon_vma_fork;
66135+ tmp->vm_flags &= ~VM_LOCKED;
66136+ tmp->vm_next = tmp->vm_prev = NULL;
66137+ tmp->vm_mirror = NULL;
66138+ file = tmp->vm_file;
66139+ if (file) {
66140+ struct inode *inode = file->f_path.dentry->d_inode;
66141+ struct address_space *mapping = file->f_mapping;
66142+
66143+ get_file(file);
66144+ if (tmp->vm_flags & VM_DENYWRITE)
66145+ atomic_dec(&inode->i_writecount);
66146+ mutex_lock(&mapping->i_mmap_mutex);
66147+ if (tmp->vm_flags & VM_SHARED)
66148+ mapping->i_mmap_writable++;
66149+ flush_dcache_mmap_lock(mapping);
66150+ /* insert tmp into the share list, just after mpnt */
66151+ vma_prio_tree_add(tmp, mpnt);
66152+ flush_dcache_mmap_unlock(mapping);
66153+ mutex_unlock(&mapping->i_mmap_mutex);
66154+ }
66155+
66156+ /*
66157+ * Clear hugetlb-related page reserves for children. This only
66158+ * affects MAP_PRIVATE mappings. Faults generated by the child
66159+ * are not guaranteed to succeed, even if read-only
66160+ */
66161+ if (is_vm_hugetlb_page(tmp))
66162+ reset_vma_resv_huge_pages(tmp);
66163+
66164+ return tmp;
66165+
66166+fail_nomem_anon_vma_fork:
66167+ mpol_put(pol);
66168+fail_nomem_policy:
66169+ kmem_cache_free(vm_area_cachep, tmp);
66170+fail_nomem:
66171+ vm_unacct_memory(charge);
66172+ return NULL;
66173+}
66174+
66175 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66176 {
66177 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
66178 struct rb_node **rb_link, *rb_parent;
66179 int retval;
66180- unsigned long charge;
66181- struct mempolicy *pol;
66182
66183 down_write(&oldmm->mmap_sem);
66184 flush_cache_dup_mm(oldmm);
66185@@ -326,8 +390,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66186 mm->locked_vm = 0;
66187 mm->mmap = NULL;
66188 mm->mmap_cache = NULL;
66189- mm->free_area_cache = oldmm->mmap_base;
66190- mm->cached_hole_size = ~0UL;
66191+ mm->free_area_cache = oldmm->free_area_cache;
66192+ mm->cached_hole_size = oldmm->cached_hole_size;
66193 mm->map_count = 0;
66194 cpumask_clear(mm_cpumask(mm));
66195 mm->mm_rb = RB_ROOT;
66196@@ -343,8 +407,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66197
66198 prev = NULL;
66199 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
66200- struct file *file;
66201-
66202 if (mpnt->vm_flags & VM_DONTCOPY) {
66203 long pages = vma_pages(mpnt);
66204 mm->total_vm -= pages;
66205@@ -352,53 +414,11 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66206 -pages);
66207 continue;
66208 }
66209- charge = 0;
66210- if (mpnt->vm_flags & VM_ACCOUNT) {
66211- unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66212- if (security_vm_enough_memory(len))
66213- goto fail_nomem;
66214- charge = len;
66215+ tmp = dup_vma(mm, mpnt);
66216+ if (!tmp) {
66217+ retval = -ENOMEM;
66218+ goto out;
66219 }
66220- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66221- if (!tmp)
66222- goto fail_nomem;
66223- *tmp = *mpnt;
66224- INIT_LIST_HEAD(&tmp->anon_vma_chain);
66225- pol = mpol_dup(vma_policy(mpnt));
66226- retval = PTR_ERR(pol);
66227- if (IS_ERR(pol))
66228- goto fail_nomem_policy;
66229- vma_set_policy(tmp, pol);
66230- tmp->vm_mm = mm;
66231- if (anon_vma_fork(tmp, mpnt))
66232- goto fail_nomem_anon_vma_fork;
66233- tmp->vm_flags &= ~VM_LOCKED;
66234- tmp->vm_next = tmp->vm_prev = NULL;
66235- file = tmp->vm_file;
66236- if (file) {
66237- struct inode *inode = file->f_path.dentry->d_inode;
66238- struct address_space *mapping = file->f_mapping;
66239-
66240- get_file(file);
66241- if (tmp->vm_flags & VM_DENYWRITE)
66242- atomic_dec(&inode->i_writecount);
66243- mutex_lock(&mapping->i_mmap_mutex);
66244- if (tmp->vm_flags & VM_SHARED)
66245- mapping->i_mmap_writable++;
66246- flush_dcache_mmap_lock(mapping);
66247- /* insert tmp into the share list, just after mpnt */
66248- vma_prio_tree_add(tmp, mpnt);
66249- flush_dcache_mmap_unlock(mapping);
66250- mutex_unlock(&mapping->i_mmap_mutex);
66251- }
66252-
66253- /*
66254- * Clear hugetlb-related page reserves for children. This only
66255- * affects MAP_PRIVATE mappings. Faults generated by the child
66256- * are not guaranteed to succeed, even if read-only
66257- */
66258- if (is_vm_hugetlb_page(tmp))
66259- reset_vma_resv_huge_pages(tmp);
66260
66261 /*
66262 * Link in the new vma and copy the page table entries.
66263@@ -421,6 +441,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66264 if (retval)
66265 goto out;
66266 }
66267+
66268+#ifdef CONFIG_PAX_SEGMEXEC
66269+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
66270+ struct vm_area_struct *mpnt_m;
66271+
66272+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
66273+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
66274+
66275+ if (!mpnt->vm_mirror)
66276+ continue;
66277+
66278+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
66279+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
66280+ mpnt->vm_mirror = mpnt_m;
66281+ } else {
66282+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
66283+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
66284+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
66285+ mpnt->vm_mirror->vm_mirror = mpnt;
66286+ }
66287+ }
66288+ BUG_ON(mpnt_m);
66289+ }
66290+#endif
66291+
66292 /* a new mm has just been created */
66293 arch_dup_mmap(oldmm, mm);
66294 retval = 0;
66295@@ -429,14 +474,6 @@ out:
66296 flush_tlb_mm(oldmm);
66297 up_write(&oldmm->mmap_sem);
66298 return retval;
66299-fail_nomem_anon_vma_fork:
66300- mpol_put(pol);
66301-fail_nomem_policy:
66302- kmem_cache_free(vm_area_cachep, tmp);
66303-fail_nomem:
66304- retval = -ENOMEM;
66305- vm_unacct_memory(charge);
66306- goto out;
66307 }
66308
66309 static inline int mm_alloc_pgd(struct mm_struct *mm)
66310@@ -658,8 +695,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
66311 return ERR_PTR(err);
66312
66313 mm = get_task_mm(task);
66314- if (mm && mm != current->mm &&
66315- !ptrace_may_access(task, mode)) {
66316+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
66317+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
66318 mmput(mm);
66319 mm = ERR_PTR(-EACCES);
66320 }
66321@@ -881,13 +918,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
66322 spin_unlock(&fs->lock);
66323 return -EAGAIN;
66324 }
66325- fs->users++;
66326+ atomic_inc(&fs->users);
66327 spin_unlock(&fs->lock);
66328 return 0;
66329 }
66330 tsk->fs = copy_fs_struct(fs);
66331 if (!tsk->fs)
66332 return -ENOMEM;
66333+ gr_set_chroot_entries(tsk, &tsk->fs->root);
66334 return 0;
66335 }
66336
66337@@ -1151,6 +1189,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66338 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
66339 #endif
66340 retval = -EAGAIN;
66341+
66342+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
66343+
66344 if (atomic_read(&p->real_cred->user->processes) >=
66345 task_rlimit(p, RLIMIT_NPROC)) {
66346 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
66347@@ -1306,6 +1347,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66348 if (clone_flags & CLONE_THREAD)
66349 p->tgid = current->tgid;
66350
66351+ gr_copy_label(p);
66352+
66353 p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
66354 /*
66355 * Clear TID on mm_release()?
66356@@ -1472,6 +1515,8 @@ bad_fork_cleanup_count:
66357 bad_fork_free:
66358 free_task(p);
66359 fork_out:
66360+ gr_log_forkfail(retval);
66361+
66362 return ERR_PTR(retval);
66363 }
66364
66365@@ -1572,6 +1617,8 @@ long do_fork(unsigned long clone_flags,
66366 if (clone_flags & CLONE_PARENT_SETTID)
66367 put_user(nr, parent_tidptr);
66368
66369+ gr_handle_brute_check();
66370+
66371 if (clone_flags & CLONE_VFORK) {
66372 p->vfork_done = &vfork;
66373 init_completion(&vfork);
66374@@ -1670,7 +1717,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
66375 return 0;
66376
66377 /* don't need lock here; in the worst case we'll do useless copy */
66378- if (fs->users == 1)
66379+ if (atomic_read(&fs->users) == 1)
66380 return 0;
66381
66382 *new_fsp = copy_fs_struct(fs);
66383@@ -1759,7 +1806,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
66384 fs = current->fs;
66385 spin_lock(&fs->lock);
66386 current->fs = new_fs;
66387- if (--fs->users)
66388+ gr_set_chroot_entries(current, &current->fs->root);
66389+ if (atomic_dec_return(&fs->users))
66390 new_fs = NULL;
66391 else
66392 new_fs = fs;
66393diff --git a/kernel/futex.c b/kernel/futex.c
66394index 866c9d5..5c5f828 100644
66395--- a/kernel/futex.c
66396+++ b/kernel/futex.c
66397@@ -54,6 +54,7 @@
66398 #include <linux/mount.h>
66399 #include <linux/pagemap.h>
66400 #include <linux/syscalls.h>
66401+#include <linux/ptrace.h>
66402 #include <linux/signal.h>
66403 #include <linux/export.h>
66404 #include <linux/magic.h>
66405@@ -239,6 +240,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
66406 struct page *page, *page_head;
66407 int err, ro = 0;
66408
66409+#ifdef CONFIG_PAX_SEGMEXEC
66410+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
66411+ return -EFAULT;
66412+#endif
66413+
66414 /*
66415 * The futex address must be "naturally" aligned.
66416 */
66417@@ -2721,6 +2727,7 @@ static int __init futex_init(void)
66418 {
66419 u32 curval;
66420 int i;
66421+ mm_segment_t oldfs;
66422
66423 /*
66424 * This will fail and we want it. Some arch implementations do
66425@@ -2732,8 +2739,11 @@ static int __init futex_init(void)
66426 * implementation, the non-functional ones will return
66427 * -ENOSYS.
66428 */
66429+ oldfs = get_fs();
66430+ set_fs(USER_DS);
66431 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
66432 futex_cmpxchg_enabled = 1;
66433+ set_fs(oldfs);
66434
66435 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
66436 plist_head_init(&futex_queues[i].chain);
66437diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
66438index 9b22d03..6295b62 100644
66439--- a/kernel/gcov/base.c
66440+++ b/kernel/gcov/base.c
66441@@ -102,11 +102,6 @@ void gcov_enable_events(void)
66442 }
66443
66444 #ifdef CONFIG_MODULES
66445-static inline int within(void *addr, void *start, unsigned long size)
66446-{
66447- return ((addr >= start) && (addr < start + size));
66448-}
66449-
66450 /* Update list and generate events when modules are unloaded. */
66451 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66452 void *data)
66453@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66454 prev = NULL;
66455 /* Remove entries located in module from linked list. */
66456 for (info = gcov_info_head; info; info = info->next) {
66457- if (within(info, mod->module_core, mod->core_size)) {
66458+ if (within_module_core_rw((unsigned long)info, mod)) {
66459 if (prev)
66460 prev->next = info->next;
66461 else
66462diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
66463index ae34bf5..4e2f3d0 100644
66464--- a/kernel/hrtimer.c
66465+++ b/kernel/hrtimer.c
66466@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
66467 local_irq_restore(flags);
66468 }
66469
66470-static void run_hrtimer_softirq(struct softirq_action *h)
66471+static void run_hrtimer_softirq(void)
66472 {
66473 hrtimer_peek_ahead_timers();
66474 }
66475diff --git a/kernel/jump_label.c b/kernel/jump_label.c
66476index 01d3b70..9e4d098 100644
66477--- a/kernel/jump_label.c
66478+++ b/kernel/jump_label.c
66479@@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
66480
66481 size = (((unsigned long)stop - (unsigned long)start)
66482 / sizeof(struct jump_entry));
66483+ pax_open_kernel();
66484 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
66485+ pax_close_kernel();
66486 }
66487
66488 static void jump_label_update(struct jump_label_key *key, int enable);
66489@@ -340,10 +342,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
66490 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
66491 struct jump_entry *iter;
66492
66493+ pax_open_kernel();
66494 for (iter = iter_start; iter < iter_stop; iter++) {
66495 if (within_module_init(iter->code, mod))
66496 iter->code = 0;
66497 }
66498+ pax_close_kernel();
66499 }
66500
66501 static int
66502diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
66503index 079f1d3..a407562 100644
66504--- a/kernel/kallsyms.c
66505+++ b/kernel/kallsyms.c
66506@@ -11,6 +11,9 @@
66507 * Changed the compression method from stem compression to "table lookup"
66508 * compression (see scripts/kallsyms.c for a more complete description)
66509 */
66510+#ifdef CONFIG_GRKERNSEC_HIDESYM
66511+#define __INCLUDED_BY_HIDESYM 1
66512+#endif
66513 #include <linux/kallsyms.h>
66514 #include <linux/module.h>
66515 #include <linux/init.h>
66516@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
66517
66518 static inline int is_kernel_inittext(unsigned long addr)
66519 {
66520+ if (system_state != SYSTEM_BOOTING)
66521+ return 0;
66522+
66523 if (addr >= (unsigned long)_sinittext
66524 && addr <= (unsigned long)_einittext)
66525 return 1;
66526 return 0;
66527 }
66528
66529+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66530+#ifdef CONFIG_MODULES
66531+static inline int is_module_text(unsigned long addr)
66532+{
66533+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
66534+ return 1;
66535+
66536+ addr = ktla_ktva(addr);
66537+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
66538+}
66539+#else
66540+static inline int is_module_text(unsigned long addr)
66541+{
66542+ return 0;
66543+}
66544+#endif
66545+#endif
66546+
66547 static inline int is_kernel_text(unsigned long addr)
66548 {
66549 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
66550@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
66551
66552 static inline int is_kernel(unsigned long addr)
66553 {
66554+
66555+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66556+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
66557+ return 1;
66558+
66559+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
66560+#else
66561 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
66562+#endif
66563+
66564 return 1;
66565 return in_gate_area_no_mm(addr);
66566 }
66567
66568 static int is_ksym_addr(unsigned long addr)
66569 {
66570+
66571+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66572+ if (is_module_text(addr))
66573+ return 0;
66574+#endif
66575+
66576 if (all_var)
66577 return is_kernel(addr);
66578
66579@@ -454,7 +493,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
66580
66581 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
66582 {
66583- iter->name[0] = '\0';
66584 iter->nameoff = get_symbol_offset(new_pos);
66585 iter->pos = new_pos;
66586 }
66587@@ -502,6 +540,11 @@ static int s_show(struct seq_file *m, void *p)
66588 {
66589 struct kallsym_iter *iter = m->private;
66590
66591+#ifdef CONFIG_GRKERNSEC_HIDESYM
66592+ if (current_uid())
66593+ return 0;
66594+#endif
66595+
66596 /* Some debugging symbols have no name. Ignore them. */
66597 if (!iter->name[0])
66598 return 0;
66599@@ -540,7 +583,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
66600 struct kallsym_iter *iter;
66601 int ret;
66602
66603- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
66604+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
66605 if (!iter)
66606 return -ENOMEM;
66607 reset_iter(iter, 0);
66608diff --git a/kernel/kexec.c b/kernel/kexec.c
66609index 7b08867..3bac516 100644
66610--- a/kernel/kexec.c
66611+++ b/kernel/kexec.c
66612@@ -1047,7 +1047,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
66613 unsigned long flags)
66614 {
66615 struct compat_kexec_segment in;
66616- struct kexec_segment out, __user *ksegments;
66617+ struct kexec_segment out;
66618+ struct kexec_segment __user *ksegments;
66619 unsigned long i, result;
66620
66621 /* Don't allow clients that don't understand the native
66622diff --git a/kernel/kmod.c b/kernel/kmod.c
66623index a3a46cb..f2e42f8 100644
66624--- a/kernel/kmod.c
66625+++ b/kernel/kmod.c
66626@@ -75,13 +75,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
66627 * If module auto-loading support is disabled then this function
66628 * becomes a no-operation.
66629 */
66630-int __request_module(bool wait, const char *fmt, ...)
66631+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
66632 {
66633- va_list args;
66634 char module_name[MODULE_NAME_LEN];
66635 unsigned int max_modprobes;
66636 int ret;
66637- char *argv[] = { modprobe_path, "-q", "--", module_name, NULL };
66638+ char *argv[] = { modprobe_path, "-q", "--", module_name, module_param, NULL };
66639 static char *envp[] = { "HOME=/",
66640 "TERM=linux",
66641 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
66642@@ -90,9 +89,7 @@ int __request_module(bool wait, const char *fmt, ...)
66643 #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
66644 static int kmod_loop_msg;
66645
66646- va_start(args, fmt);
66647- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
66648- va_end(args);
66649+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
66650 if (ret >= MODULE_NAME_LEN)
66651 return -ENAMETOOLONG;
66652
66653@@ -100,6 +97,20 @@ int __request_module(bool wait, const char *fmt, ...)
66654 if (ret)
66655 return ret;
66656
66657+#ifdef CONFIG_GRKERNSEC_MODHARDEN
66658+ if (!current_uid()) {
66659+ /* hack to workaround consolekit/udisks stupidity */
66660+ read_lock(&tasklist_lock);
66661+ if (!strcmp(current->comm, "mount") &&
66662+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
66663+ read_unlock(&tasklist_lock);
66664+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
66665+ return -EPERM;
66666+ }
66667+ read_unlock(&tasklist_lock);
66668+ }
66669+#endif
66670+
66671 /* If modprobe needs a service that is in a module, we get a recursive
66672 * loop. Limit the number of running kmod threads to max_threads/2 or
66673 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
66674@@ -135,6 +146,47 @@ int __request_module(bool wait, const char *fmt, ...)
66675 atomic_dec(&kmod_concurrent);
66676 return ret;
66677 }
66678+
66679+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
66680+{
66681+ va_list args;
66682+ int ret;
66683+
66684+ va_start(args, fmt);
66685+ ret = ____request_module(wait, module_param, fmt, args);
66686+ va_end(args);
66687+
66688+ return ret;
66689+}
66690+
66691+int __request_module(bool wait, const char *fmt, ...)
66692+{
66693+ va_list args;
66694+ int ret;
66695+
66696+#ifdef CONFIG_GRKERNSEC_MODHARDEN
66697+ if (current_uid()) {
66698+ char module_param[MODULE_NAME_LEN];
66699+
66700+ memset(module_param, 0, sizeof(module_param));
66701+
66702+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
66703+
66704+ va_start(args, fmt);
66705+ ret = ____request_module(wait, module_param, fmt, args);
66706+ va_end(args);
66707+
66708+ return ret;
66709+ }
66710+#endif
66711+
66712+ va_start(args, fmt);
66713+ ret = ____request_module(wait, NULL, fmt, args);
66714+ va_end(args);
66715+
66716+ return ret;
66717+}
66718+
66719 EXPORT_SYMBOL(__request_module);
66720 #endif /* CONFIG_MODULES */
66721
66722@@ -224,7 +276,7 @@ static int wait_for_helper(void *data)
66723 *
66724 * Thus the __user pointer cast is valid here.
66725 */
66726- sys_wait4(pid, (int __user *)&ret, 0, NULL);
66727+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
66728
66729 /*
66730 * If ret is 0, either ____call_usermodehelper failed and the
66731diff --git a/kernel/kprobes.c b/kernel/kprobes.c
66732index c62b854..cb67968 100644
66733--- a/kernel/kprobes.c
66734+++ b/kernel/kprobes.c
66735@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
66736 * kernel image and loaded module images reside. This is required
66737 * so x86_64 can correctly handle the %rip-relative fixups.
66738 */
66739- kip->insns = module_alloc(PAGE_SIZE);
66740+ kip->insns = module_alloc_exec(PAGE_SIZE);
66741 if (!kip->insns) {
66742 kfree(kip);
66743 return NULL;
66744@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
66745 */
66746 if (!list_is_singular(&kip->list)) {
66747 list_del(&kip->list);
66748- module_free(NULL, kip->insns);
66749+ module_free_exec(NULL, kip->insns);
66750 kfree(kip);
66751 }
66752 return 1;
66753@@ -1955,7 +1955,7 @@ static int __init init_kprobes(void)
66754 {
66755 int i, err = 0;
66756 unsigned long offset = 0, size = 0;
66757- char *modname, namebuf[128];
66758+ char *modname, namebuf[KSYM_NAME_LEN];
66759 const char *symbol_name;
66760 void *addr;
66761 struct kprobe_blackpoint *kb;
66762@@ -2081,7 +2081,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
66763 const char *sym = NULL;
66764 unsigned int i = *(loff_t *) v;
66765 unsigned long offset = 0;
66766- char *modname, namebuf[128];
66767+ char *modname, namebuf[KSYM_NAME_LEN];
66768
66769 head = &kprobe_table[i];
66770 preempt_disable();
66771diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
66772index 4e316e1..5501eef 100644
66773--- a/kernel/ksysfs.c
66774+++ b/kernel/ksysfs.c
66775@@ -47,6 +47,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
66776 {
66777 if (count+1 > UEVENT_HELPER_PATH_LEN)
66778 return -ENOENT;
66779+ if (!capable(CAP_SYS_ADMIN))
66780+ return -EPERM;
66781 memcpy(uevent_helper, buf, count);
66782 uevent_helper[count] = '\0';
66783 if (count && uevent_helper[count-1] == '\n')
66784diff --git a/kernel/lockdep.c b/kernel/lockdep.c
66785index 8889f7d..95319b7 100644
66786--- a/kernel/lockdep.c
66787+++ b/kernel/lockdep.c
66788@@ -590,6 +590,10 @@ static int static_obj(void *obj)
66789 end = (unsigned long) &_end,
66790 addr = (unsigned long) obj;
66791
66792+#ifdef CONFIG_PAX_KERNEXEC
66793+ start = ktla_ktva(start);
66794+#endif
66795+
66796 /*
66797 * static variable?
66798 */
66799@@ -730,6 +734,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
66800 if (!static_obj(lock->key)) {
66801 debug_locks_off();
66802 printk("INFO: trying to register non-static key.\n");
66803+ printk("lock:%pS key:%pS.\n", lock, lock->key);
66804 printk("the code is fine but needs lockdep annotation.\n");
66805 printk("turning off the locking correctness validator.\n");
66806 dump_stack();
66807@@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
66808 if (!class)
66809 return 0;
66810 }
66811- atomic_inc((atomic_t *)&class->ops);
66812+ atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
66813 if (very_verbose(class)) {
66814 printk("\nacquire class [%p] %s", class->key, class->name);
66815 if (class->name_version > 1)
66816diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
66817index 91c32a0..b2c71c5 100644
66818--- a/kernel/lockdep_proc.c
66819+++ b/kernel/lockdep_proc.c
66820@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
66821
66822 static void print_name(struct seq_file *m, struct lock_class *class)
66823 {
66824- char str[128];
66825+ char str[KSYM_NAME_LEN];
66826 const char *name = class->name;
66827
66828 if (!name) {
66829diff --git a/kernel/module.c b/kernel/module.c
66830index 3d56b6f..2a22bd0 100644
66831--- a/kernel/module.c
66832+++ b/kernel/module.c
66833@@ -58,6 +58,7 @@
66834 #include <linux/jump_label.h>
66835 #include <linux/pfn.h>
66836 #include <linux/bsearch.h>
66837+#include <linux/grsecurity.h>
66838
66839 #define CREATE_TRACE_POINTS
66840 #include <trace/events/module.h>
66841@@ -113,7 +114,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
66842
66843 /* Bounds of module allocation, for speeding __module_address.
66844 * Protected by module_mutex. */
66845-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
66846+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
66847+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
66848
66849 int register_module_notifier(struct notifier_block * nb)
66850 {
66851@@ -277,7 +279,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
66852 return true;
66853
66854 list_for_each_entry_rcu(mod, &modules, list) {
66855- struct symsearch arr[] = {
66856+ struct symsearch modarr[] = {
66857 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
66858 NOT_GPL_ONLY, false },
66859 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
66860@@ -299,7 +301,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
66861 #endif
66862 };
66863
66864- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
66865+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
66866 return true;
66867 }
66868 return false;
66869@@ -431,7 +433,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
66870 static int percpu_modalloc(struct module *mod,
66871 unsigned long size, unsigned long align)
66872 {
66873- if (align > PAGE_SIZE) {
66874+ if (align-1 >= PAGE_SIZE) {
66875 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
66876 mod->name, align, PAGE_SIZE);
66877 align = PAGE_SIZE;
66878@@ -1001,7 +1003,7 @@ struct module_attribute module_uevent =
66879 static ssize_t show_coresize(struct module_attribute *mattr,
66880 struct module_kobject *mk, char *buffer)
66881 {
66882- return sprintf(buffer, "%u\n", mk->mod->core_size);
66883+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
66884 }
66885
66886 static struct module_attribute modinfo_coresize =
66887@@ -1010,7 +1012,7 @@ static struct module_attribute modinfo_coresize =
66888 static ssize_t show_initsize(struct module_attribute *mattr,
66889 struct module_kobject *mk, char *buffer)
66890 {
66891- return sprintf(buffer, "%u\n", mk->mod->init_size);
66892+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
66893 }
66894
66895 static struct module_attribute modinfo_initsize =
66896@@ -1224,7 +1226,7 @@ resolve_symbol_wait(struct module *mod,
66897 */
66898 #ifdef CONFIG_SYSFS
66899
66900-#ifdef CONFIG_KALLSYMS
66901+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66902 static inline bool sect_empty(const Elf_Shdr *sect)
66903 {
66904 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
66905@@ -1690,21 +1692,21 @@ static void set_section_ro_nx(void *base,
66906
66907 static void unset_module_core_ro_nx(struct module *mod)
66908 {
66909- set_page_attributes(mod->module_core + mod->core_text_size,
66910- mod->module_core + mod->core_size,
66911+ set_page_attributes(mod->module_core_rw,
66912+ mod->module_core_rw + mod->core_size_rw,
66913 set_memory_x);
66914- set_page_attributes(mod->module_core,
66915- mod->module_core + mod->core_ro_size,
66916+ set_page_attributes(mod->module_core_rx,
66917+ mod->module_core_rx + mod->core_size_rx,
66918 set_memory_rw);
66919 }
66920
66921 static void unset_module_init_ro_nx(struct module *mod)
66922 {
66923- set_page_attributes(mod->module_init + mod->init_text_size,
66924- mod->module_init + mod->init_size,
66925+ set_page_attributes(mod->module_init_rw,
66926+ mod->module_init_rw + mod->init_size_rw,
66927 set_memory_x);
66928- set_page_attributes(mod->module_init,
66929- mod->module_init + mod->init_ro_size,
66930+ set_page_attributes(mod->module_init_rx,
66931+ mod->module_init_rx + mod->init_size_rx,
66932 set_memory_rw);
66933 }
66934
66935@@ -1715,14 +1717,14 @@ void set_all_modules_text_rw(void)
66936
66937 mutex_lock(&module_mutex);
66938 list_for_each_entry_rcu(mod, &modules, list) {
66939- if ((mod->module_core) && (mod->core_text_size)) {
66940- set_page_attributes(mod->module_core,
66941- mod->module_core + mod->core_text_size,
66942+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
66943+ set_page_attributes(mod->module_core_rx,
66944+ mod->module_core_rx + mod->core_size_rx,
66945 set_memory_rw);
66946 }
66947- if ((mod->module_init) && (mod->init_text_size)) {
66948- set_page_attributes(mod->module_init,
66949- mod->module_init + mod->init_text_size,
66950+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
66951+ set_page_attributes(mod->module_init_rx,
66952+ mod->module_init_rx + mod->init_size_rx,
66953 set_memory_rw);
66954 }
66955 }
66956@@ -1736,14 +1738,14 @@ void set_all_modules_text_ro(void)
66957
66958 mutex_lock(&module_mutex);
66959 list_for_each_entry_rcu(mod, &modules, list) {
66960- if ((mod->module_core) && (mod->core_text_size)) {
66961- set_page_attributes(mod->module_core,
66962- mod->module_core + mod->core_text_size,
66963+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
66964+ set_page_attributes(mod->module_core_rx,
66965+ mod->module_core_rx + mod->core_size_rx,
66966 set_memory_ro);
66967 }
66968- if ((mod->module_init) && (mod->init_text_size)) {
66969- set_page_attributes(mod->module_init,
66970- mod->module_init + mod->init_text_size,
66971+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
66972+ set_page_attributes(mod->module_init_rx,
66973+ mod->module_init_rx + mod->init_size_rx,
66974 set_memory_ro);
66975 }
66976 }
66977@@ -1789,16 +1791,19 @@ static void free_module(struct module *mod)
66978
66979 /* This may be NULL, but that's OK */
66980 unset_module_init_ro_nx(mod);
66981- module_free(mod, mod->module_init);
66982+ module_free(mod, mod->module_init_rw);
66983+ module_free_exec(mod, mod->module_init_rx);
66984 kfree(mod->args);
66985 percpu_modfree(mod);
66986
66987 /* Free lock-classes: */
66988- lockdep_free_key_range(mod->module_core, mod->core_size);
66989+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
66990+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
66991
66992 /* Finally, free the core (containing the module structure) */
66993 unset_module_core_ro_nx(mod);
66994- module_free(mod, mod->module_core);
66995+ module_free_exec(mod, mod->module_core_rx);
66996+ module_free(mod, mod->module_core_rw);
66997
66998 #ifdef CONFIG_MPU
66999 update_protections(current->mm);
67000@@ -1867,10 +1872,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67001 unsigned int i;
67002 int ret = 0;
67003 const struct kernel_symbol *ksym;
67004+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67005+ int is_fs_load = 0;
67006+ int register_filesystem_found = 0;
67007+ char *p;
67008+
67009+ p = strstr(mod->args, "grsec_modharden_fs");
67010+ if (p) {
67011+ char *endptr = p + strlen("grsec_modharden_fs");
67012+ /* copy \0 as well */
67013+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
67014+ is_fs_load = 1;
67015+ }
67016+#endif
67017
67018 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
67019 const char *name = info->strtab + sym[i].st_name;
67020
67021+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67022+ /* it's a real shame this will never get ripped and copied
67023+ upstream! ;(
67024+ */
67025+ if (is_fs_load && !strcmp(name, "register_filesystem"))
67026+ register_filesystem_found = 1;
67027+#endif
67028+
67029 switch (sym[i].st_shndx) {
67030 case SHN_COMMON:
67031 /* We compiled with -fno-common. These are not
67032@@ -1891,7 +1917,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67033 ksym = resolve_symbol_wait(mod, info, name);
67034 /* Ok if resolved. */
67035 if (ksym && !IS_ERR(ksym)) {
67036+ pax_open_kernel();
67037 sym[i].st_value = ksym->value;
67038+ pax_close_kernel();
67039 break;
67040 }
67041
67042@@ -1910,11 +1938,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67043 secbase = (unsigned long)mod_percpu(mod);
67044 else
67045 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
67046+ pax_open_kernel();
67047 sym[i].st_value += secbase;
67048+ pax_close_kernel();
67049 break;
67050 }
67051 }
67052
67053+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67054+ if (is_fs_load && !register_filesystem_found) {
67055+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
67056+ ret = -EPERM;
67057+ }
67058+#endif
67059+
67060 return ret;
67061 }
67062
67063@@ -2018,22 +2055,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
67064 || s->sh_entsize != ~0UL
67065 || strstarts(sname, ".init"))
67066 continue;
67067- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
67068+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67069+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
67070+ else
67071+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
67072 pr_debug("\t%s\n", sname);
67073 }
67074- switch (m) {
67075- case 0: /* executable */
67076- mod->core_size = debug_align(mod->core_size);
67077- mod->core_text_size = mod->core_size;
67078- break;
67079- case 1: /* RO: text and ro-data */
67080- mod->core_size = debug_align(mod->core_size);
67081- mod->core_ro_size = mod->core_size;
67082- break;
67083- case 3: /* whole core */
67084- mod->core_size = debug_align(mod->core_size);
67085- break;
67086- }
67087 }
67088
67089 pr_debug("Init section allocation order:\n");
67090@@ -2047,23 +2074,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
67091 || s->sh_entsize != ~0UL
67092 || !strstarts(sname, ".init"))
67093 continue;
67094- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
67095- | INIT_OFFSET_MASK);
67096+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67097+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
67098+ else
67099+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
67100+ s->sh_entsize |= INIT_OFFSET_MASK;
67101 pr_debug("\t%s\n", sname);
67102 }
67103- switch (m) {
67104- case 0: /* executable */
67105- mod->init_size = debug_align(mod->init_size);
67106- mod->init_text_size = mod->init_size;
67107- break;
67108- case 1: /* RO: text and ro-data */
67109- mod->init_size = debug_align(mod->init_size);
67110- mod->init_ro_size = mod->init_size;
67111- break;
67112- case 3: /* whole init */
67113- mod->init_size = debug_align(mod->init_size);
67114- break;
67115- }
67116 }
67117 }
67118
67119@@ -2235,7 +2252,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67120
67121 /* Put symbol section at end of init part of module. */
67122 symsect->sh_flags |= SHF_ALLOC;
67123- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
67124+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
67125 info->index.sym) | INIT_OFFSET_MASK;
67126 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
67127
67128@@ -2250,13 +2267,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67129 }
67130
67131 /* Append room for core symbols at end of core part. */
67132- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
67133- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
67134- mod->core_size += strtab_size;
67135+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
67136+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
67137+ mod->core_size_rx += strtab_size;
67138
67139 /* Put string table section at end of init part of module. */
67140 strsect->sh_flags |= SHF_ALLOC;
67141- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
67142+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
67143 info->index.str) | INIT_OFFSET_MASK;
67144 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
67145 }
67146@@ -2274,12 +2291,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67147 /* Make sure we get permanent strtab: don't use info->strtab. */
67148 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
67149
67150+ pax_open_kernel();
67151+
67152 /* Set types up while we still have access to sections. */
67153 for (i = 0; i < mod->num_symtab; i++)
67154 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
67155
67156- mod->core_symtab = dst = mod->module_core + info->symoffs;
67157- mod->core_strtab = s = mod->module_core + info->stroffs;
67158+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
67159+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
67160 src = mod->symtab;
67161 *dst = *src;
67162 *s++ = 0;
67163@@ -2292,6 +2311,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67164 s += strlcpy(s, &mod->strtab[src->st_name], KSYM_NAME_LEN) + 1;
67165 }
67166 mod->core_num_syms = ndst;
67167+
67168+ pax_close_kernel();
67169 }
67170 #else
67171 static inline void layout_symtab(struct module *mod, struct load_info *info)
67172@@ -2325,17 +2346,33 @@ void * __weak module_alloc(unsigned long size)
67173 return size == 0 ? NULL : vmalloc_exec(size);
67174 }
67175
67176-static void *module_alloc_update_bounds(unsigned long size)
67177+static void *module_alloc_update_bounds_rw(unsigned long size)
67178 {
67179 void *ret = module_alloc(size);
67180
67181 if (ret) {
67182 mutex_lock(&module_mutex);
67183 /* Update module bounds. */
67184- if ((unsigned long)ret < module_addr_min)
67185- module_addr_min = (unsigned long)ret;
67186- if ((unsigned long)ret + size > module_addr_max)
67187- module_addr_max = (unsigned long)ret + size;
67188+ if ((unsigned long)ret < module_addr_min_rw)
67189+ module_addr_min_rw = (unsigned long)ret;
67190+ if ((unsigned long)ret + size > module_addr_max_rw)
67191+ module_addr_max_rw = (unsigned long)ret + size;
67192+ mutex_unlock(&module_mutex);
67193+ }
67194+ return ret;
67195+}
67196+
67197+static void *module_alloc_update_bounds_rx(unsigned long size)
67198+{
67199+ void *ret = module_alloc_exec(size);
67200+
67201+ if (ret) {
67202+ mutex_lock(&module_mutex);
67203+ /* Update module bounds. */
67204+ if ((unsigned long)ret < module_addr_min_rx)
67205+ module_addr_min_rx = (unsigned long)ret;
67206+ if ((unsigned long)ret + size > module_addr_max_rx)
67207+ module_addr_max_rx = (unsigned long)ret + size;
67208 mutex_unlock(&module_mutex);
67209 }
67210 return ret;
67211@@ -2512,8 +2549,14 @@ static struct module *setup_load_info(struct load_info *info)
67212 static int check_modinfo(struct module *mod, struct load_info *info)
67213 {
67214 const char *modmagic = get_modinfo(info, "vermagic");
67215+ const char *license = get_modinfo(info, "license");
67216 int err;
67217
67218+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
67219+ if (!license || !license_is_gpl_compatible(license))
67220+ return -ENOEXEC;
67221+#endif
67222+
67223 /* This is allowed: modprobe --force will invalidate it. */
67224 if (!modmagic) {
67225 err = try_to_force_load(mod, "bad vermagic");
67226@@ -2536,7 +2579,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
67227 }
67228
67229 /* Set up license info based on the info section */
67230- set_license(mod, get_modinfo(info, "license"));
67231+ set_license(mod, license);
67232
67233 return 0;
67234 }
67235@@ -2630,7 +2673,7 @@ static int move_module(struct module *mod, struct load_info *info)
67236 void *ptr;
67237
67238 /* Do the allocs. */
67239- ptr = module_alloc_update_bounds(mod->core_size);
67240+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
67241 /*
67242 * The pointer to this block is stored in the module structure
67243 * which is inside the block. Just mark it as not being a
67244@@ -2640,23 +2683,50 @@ static int move_module(struct module *mod, struct load_info *info)
67245 if (!ptr)
67246 return -ENOMEM;
67247
67248- memset(ptr, 0, mod->core_size);
67249- mod->module_core = ptr;
67250+ memset(ptr, 0, mod->core_size_rw);
67251+ mod->module_core_rw = ptr;
67252
67253- ptr = module_alloc_update_bounds(mod->init_size);
67254+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
67255 /*
67256 * The pointer to this block is stored in the module structure
67257 * which is inside the block. This block doesn't need to be
67258 * scanned as it contains data and code that will be freed
67259 * after the module is initialized.
67260 */
67261- kmemleak_ignore(ptr);
67262- if (!ptr && mod->init_size) {
67263- module_free(mod, mod->module_core);
67264+ kmemleak_not_leak(ptr);
67265+ if (!ptr && mod->init_size_rw) {
67266+ module_free(mod, mod->module_core_rw);
67267 return -ENOMEM;
67268 }
67269- memset(ptr, 0, mod->init_size);
67270- mod->module_init = ptr;
67271+ memset(ptr, 0, mod->init_size_rw);
67272+ mod->module_init_rw = ptr;
67273+
67274+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
67275+ kmemleak_not_leak(ptr);
67276+ if (!ptr) {
67277+ module_free(mod, mod->module_init_rw);
67278+ module_free(mod, mod->module_core_rw);
67279+ return -ENOMEM;
67280+ }
67281+
67282+ pax_open_kernel();
67283+ memset(ptr, 0, mod->core_size_rx);
67284+ pax_close_kernel();
67285+ mod->module_core_rx = ptr;
67286+
67287+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
67288+ kmemleak_not_leak(ptr);
67289+ if (!ptr && mod->init_size_rx) {
67290+ module_free_exec(mod, mod->module_core_rx);
67291+ module_free(mod, mod->module_init_rw);
67292+ module_free(mod, mod->module_core_rw);
67293+ return -ENOMEM;
67294+ }
67295+
67296+ pax_open_kernel();
67297+ memset(ptr, 0, mod->init_size_rx);
67298+ pax_close_kernel();
67299+ mod->module_init_rx = ptr;
67300
67301 /* Transfer each section which specifies SHF_ALLOC */
67302 pr_debug("final section addresses:\n");
67303@@ -2667,16 +2737,45 @@ static int move_module(struct module *mod, struct load_info *info)
67304 if (!(shdr->sh_flags & SHF_ALLOC))
67305 continue;
67306
67307- if (shdr->sh_entsize & INIT_OFFSET_MASK)
67308- dest = mod->module_init
67309- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67310- else
67311- dest = mod->module_core + shdr->sh_entsize;
67312+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
67313+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67314+ dest = mod->module_init_rw
67315+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67316+ else
67317+ dest = mod->module_init_rx
67318+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67319+ } else {
67320+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67321+ dest = mod->module_core_rw + shdr->sh_entsize;
67322+ else
67323+ dest = mod->module_core_rx + shdr->sh_entsize;
67324+ }
67325+
67326+ if (shdr->sh_type != SHT_NOBITS) {
67327+
67328+#ifdef CONFIG_PAX_KERNEXEC
67329+#ifdef CONFIG_X86_64
67330+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
67331+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
67332+#endif
67333+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
67334+ pax_open_kernel();
67335+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67336+ pax_close_kernel();
67337+ } else
67338+#endif
67339
67340- if (shdr->sh_type != SHT_NOBITS)
67341 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67342+ }
67343 /* Update sh_addr to point to copy in image. */
67344- shdr->sh_addr = (unsigned long)dest;
67345+
67346+#ifdef CONFIG_PAX_KERNEXEC
67347+ if (shdr->sh_flags & SHF_EXECINSTR)
67348+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
67349+ else
67350+#endif
67351+
67352+ shdr->sh_addr = (unsigned long)dest;
67353 pr_debug("\t0x%lx %s\n",
67354 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
67355 }
67356@@ -2727,12 +2826,12 @@ static void flush_module_icache(const struct module *mod)
67357 * Do it before processing of module parameters, so the module
67358 * can provide parameter accessor functions of its own.
67359 */
67360- if (mod->module_init)
67361- flush_icache_range((unsigned long)mod->module_init,
67362- (unsigned long)mod->module_init
67363- + mod->init_size);
67364- flush_icache_range((unsigned long)mod->module_core,
67365- (unsigned long)mod->module_core + mod->core_size);
67366+ if (mod->module_init_rx)
67367+ flush_icache_range((unsigned long)mod->module_init_rx,
67368+ (unsigned long)mod->module_init_rx
67369+ + mod->init_size_rx);
67370+ flush_icache_range((unsigned long)mod->module_core_rx,
67371+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
67372
67373 set_fs(old_fs);
67374 }
67375@@ -2802,8 +2901,10 @@ out:
67376 static void module_deallocate(struct module *mod, struct load_info *info)
67377 {
67378 percpu_modfree(mod);
67379- module_free(mod, mod->module_init);
67380- module_free(mod, mod->module_core);
67381+ module_free_exec(mod, mod->module_init_rx);
67382+ module_free_exec(mod, mod->module_core_rx);
67383+ module_free(mod, mod->module_init_rw);
67384+ module_free(mod, mod->module_core_rw);
67385 }
67386
67387 int __weak module_finalize(const Elf_Ehdr *hdr,
67388@@ -2867,9 +2968,38 @@ static struct module *load_module(void __user *umod,
67389 if (err)
67390 goto free_unload;
67391
67392+ /* Now copy in args */
67393+ mod->args = strndup_user(uargs, ~0UL >> 1);
67394+ if (IS_ERR(mod->args)) {
67395+ err = PTR_ERR(mod->args);
67396+ goto free_unload;
67397+ }
67398+
67399 /* Set up MODINFO_ATTR fields */
67400 setup_modinfo(mod, &info);
67401
67402+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67403+ {
67404+ char *p, *p2;
67405+
67406+ if (strstr(mod->args, "grsec_modharden_netdev")) {
67407+ 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);
67408+ err = -EPERM;
67409+ goto free_modinfo;
67410+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
67411+ p += strlen("grsec_modharden_normal");
67412+ p2 = strstr(p, "_");
67413+ if (p2) {
67414+ *p2 = '\0';
67415+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
67416+ *p2 = '_';
67417+ }
67418+ err = -EPERM;
67419+ goto free_modinfo;
67420+ }
67421+ }
67422+#endif
67423+
67424 /* Fix up syms, so that st_value is a pointer to location. */
67425 err = simplify_symbols(mod, &info);
67426 if (err < 0)
67427@@ -2885,13 +3015,6 @@ static struct module *load_module(void __user *umod,
67428
67429 flush_module_icache(mod);
67430
67431- /* Now copy in args */
67432- mod->args = strndup_user(uargs, ~0UL >> 1);
67433- if (IS_ERR(mod->args)) {
67434- err = PTR_ERR(mod->args);
67435- goto free_arch_cleanup;
67436- }
67437-
67438 /* Mark state as coming so strong_try_module_get() ignores us. */
67439 mod->state = MODULE_STATE_COMING;
67440
67441@@ -2948,11 +3071,10 @@ static struct module *load_module(void __user *umod,
67442 unlock:
67443 mutex_unlock(&module_mutex);
67444 synchronize_sched();
67445- kfree(mod->args);
67446- free_arch_cleanup:
67447 module_arch_cleanup(mod);
67448 free_modinfo:
67449 free_modinfo(mod);
67450+ kfree(mod->args);
67451 free_unload:
67452 module_unload_free(mod);
67453 free_module:
67454@@ -2993,16 +3115,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
67455 MODULE_STATE_COMING, mod);
67456
67457 /* Set RO and NX regions for core */
67458- set_section_ro_nx(mod->module_core,
67459- mod->core_text_size,
67460- mod->core_ro_size,
67461- mod->core_size);
67462+ set_section_ro_nx(mod->module_core_rx,
67463+ mod->core_size_rx,
67464+ mod->core_size_rx,
67465+ mod->core_size_rx);
67466
67467 /* Set RO and NX regions for init */
67468- set_section_ro_nx(mod->module_init,
67469- mod->init_text_size,
67470- mod->init_ro_size,
67471- mod->init_size);
67472+ set_section_ro_nx(mod->module_init_rx,
67473+ mod->init_size_rx,
67474+ mod->init_size_rx,
67475+ mod->init_size_rx);
67476
67477 do_mod_ctors(mod);
67478 /* Start the module */
67479@@ -3048,11 +3170,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
67480 mod->strtab = mod->core_strtab;
67481 #endif
67482 unset_module_init_ro_nx(mod);
67483- module_free(mod, mod->module_init);
67484- mod->module_init = NULL;
67485- mod->init_size = 0;
67486- mod->init_ro_size = 0;
67487- mod->init_text_size = 0;
67488+ module_free(mod, mod->module_init_rw);
67489+ module_free_exec(mod, mod->module_init_rx);
67490+ mod->module_init_rw = NULL;
67491+ mod->module_init_rx = NULL;
67492+ mod->init_size_rw = 0;
67493+ mod->init_size_rx = 0;
67494 mutex_unlock(&module_mutex);
67495
67496 return 0;
67497@@ -3083,10 +3206,16 @@ static const char *get_ksymbol(struct module *mod,
67498 unsigned long nextval;
67499
67500 /* At worse, next value is at end of module */
67501- if (within_module_init(addr, mod))
67502- nextval = (unsigned long)mod->module_init+mod->init_text_size;
67503+ if (within_module_init_rx(addr, mod))
67504+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
67505+ else if (within_module_init_rw(addr, mod))
67506+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
67507+ else if (within_module_core_rx(addr, mod))
67508+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
67509+ else if (within_module_core_rw(addr, mod))
67510+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
67511 else
67512- nextval = (unsigned long)mod->module_core+mod->core_text_size;
67513+ return NULL;
67514
67515 /* Scan for closest preceding symbol, and next symbol. (ELF
67516 starts real symbols at 1). */
67517@@ -3321,7 +3450,7 @@ static int m_show(struct seq_file *m, void *p)
67518 char buf[8];
67519
67520 seq_printf(m, "%s %u",
67521- mod->name, mod->init_size + mod->core_size);
67522+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
67523 print_unload_info(m, mod);
67524
67525 /* Informative for users. */
67526@@ -3330,7 +3459,7 @@ static int m_show(struct seq_file *m, void *p)
67527 mod->state == MODULE_STATE_COMING ? "Loading":
67528 "Live");
67529 /* Used by oprofile and other similar tools. */
67530- seq_printf(m, " 0x%pK", mod->module_core);
67531+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
67532
67533 /* Taints info */
67534 if (mod->taints)
67535@@ -3366,7 +3495,17 @@ static const struct file_operations proc_modules_operations = {
67536
67537 static int __init proc_modules_init(void)
67538 {
67539+#ifndef CONFIG_GRKERNSEC_HIDESYM
67540+#ifdef CONFIG_GRKERNSEC_PROC_USER
67541+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
67542+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67543+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
67544+#else
67545 proc_create("modules", 0, NULL, &proc_modules_operations);
67546+#endif
67547+#else
67548+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
67549+#endif
67550 return 0;
67551 }
67552 module_init(proc_modules_init);
67553@@ -3425,12 +3564,12 @@ struct module *__module_address(unsigned long addr)
67554 {
67555 struct module *mod;
67556
67557- if (addr < module_addr_min || addr > module_addr_max)
67558+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
67559+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
67560 return NULL;
67561
67562 list_for_each_entry_rcu(mod, &modules, list)
67563- if (within_module_core(addr, mod)
67564- || within_module_init(addr, mod))
67565+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
67566 return mod;
67567 return NULL;
67568 }
67569@@ -3464,11 +3603,20 @@ bool is_module_text_address(unsigned long addr)
67570 */
67571 struct module *__module_text_address(unsigned long addr)
67572 {
67573- struct module *mod = __module_address(addr);
67574+ struct module *mod;
67575+
67576+#ifdef CONFIG_X86_32
67577+ addr = ktla_ktva(addr);
67578+#endif
67579+
67580+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
67581+ return NULL;
67582+
67583+ mod = __module_address(addr);
67584+
67585 if (mod) {
67586 /* Make sure it's within the text section. */
67587- if (!within(addr, mod->module_init, mod->init_text_size)
67588- && !within(addr, mod->module_core, mod->core_text_size))
67589+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
67590 mod = NULL;
67591 }
67592 return mod;
67593diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
67594index 7e3443f..b2a1e6b 100644
67595--- a/kernel/mutex-debug.c
67596+++ b/kernel/mutex-debug.c
67597@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
67598 }
67599
67600 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67601- struct thread_info *ti)
67602+ struct task_struct *task)
67603 {
67604 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
67605
67606 /* Mark the current thread as blocked on the lock: */
67607- ti->task->blocked_on = waiter;
67608+ task->blocked_on = waiter;
67609 }
67610
67611 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67612- struct thread_info *ti)
67613+ struct task_struct *task)
67614 {
67615 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
67616- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
67617- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
67618- ti->task->blocked_on = NULL;
67619+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
67620+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
67621+ task->blocked_on = NULL;
67622
67623 list_del_init(&waiter->list);
67624 waiter->task = NULL;
67625diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
67626index 0799fd3..d06ae3b 100644
67627--- a/kernel/mutex-debug.h
67628+++ b/kernel/mutex-debug.h
67629@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
67630 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
67631 extern void debug_mutex_add_waiter(struct mutex *lock,
67632 struct mutex_waiter *waiter,
67633- struct thread_info *ti);
67634+ struct task_struct *task);
67635 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67636- struct thread_info *ti);
67637+ struct task_struct *task);
67638 extern void debug_mutex_unlock(struct mutex *lock);
67639 extern void debug_mutex_init(struct mutex *lock, const char *name,
67640 struct lock_class_key *key);
67641diff --git a/kernel/mutex.c b/kernel/mutex.c
67642index 89096dd..f91ebc5 100644
67643--- a/kernel/mutex.c
67644+++ b/kernel/mutex.c
67645@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
67646 spin_lock_mutex(&lock->wait_lock, flags);
67647
67648 debug_mutex_lock_common(lock, &waiter);
67649- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
67650+ debug_mutex_add_waiter(lock, &waiter, task);
67651
67652 /* add waiting tasks to the end of the waitqueue (FIFO): */
67653 list_add_tail(&waiter.list, &lock->wait_list);
67654@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
67655 * TASK_UNINTERRUPTIBLE case.)
67656 */
67657 if (unlikely(signal_pending_state(state, task))) {
67658- mutex_remove_waiter(lock, &waiter,
67659- task_thread_info(task));
67660+ mutex_remove_waiter(lock, &waiter, task);
67661 mutex_release(&lock->dep_map, 1, ip);
67662 spin_unlock_mutex(&lock->wait_lock, flags);
67663
67664@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
67665 done:
67666 lock_acquired(&lock->dep_map, ip);
67667 /* got the lock - rejoice! */
67668- mutex_remove_waiter(lock, &waiter, current_thread_info());
67669+ mutex_remove_waiter(lock, &waiter, task);
67670 mutex_set_owner(lock);
67671
67672 /* set it to 0 if there are no waiters left: */
67673diff --git a/kernel/padata.c b/kernel/padata.c
67674index b452599..5d68f4e 100644
67675--- a/kernel/padata.c
67676+++ b/kernel/padata.c
67677@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_instance *pinst,
67678 padata->pd = pd;
67679 padata->cb_cpu = cb_cpu;
67680
67681- if (unlikely(atomic_read(&pd->seq_nr) == pd->max_seq_nr))
67682- atomic_set(&pd->seq_nr, -1);
67683+ if (unlikely(atomic_read_unchecked(&pd->seq_nr) == pd->max_seq_nr))
67684+ atomic_set_unchecked(&pd->seq_nr, -1);
67685
67686- padata->seq_nr = atomic_inc_return(&pd->seq_nr);
67687+ padata->seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
67688
67689 target_cpu = padata_cpu_hash(padata);
67690 queue = per_cpu_ptr(pd->pqueue, target_cpu);
67691@@ -444,7 +444,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
67692 padata_init_pqueues(pd);
67693 padata_init_squeues(pd);
67694 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
67695- atomic_set(&pd->seq_nr, -1);
67696+ atomic_set_unchecked(&pd->seq_nr, -1);
67697 atomic_set(&pd->reorder_objects, 0);
67698 atomic_set(&pd->refcnt, 0);
67699 pd->pinst = pinst;
67700diff --git a/kernel/panic.c b/kernel/panic.c
67701index 8ed89a1..e83856a 100644
67702--- a/kernel/panic.c
67703+++ b/kernel/panic.c
67704@@ -402,7 +402,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
67705 const char *board;
67706
67707 printk(KERN_WARNING "------------[ cut here ]------------\n");
67708- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
67709+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
67710 board = dmi_get_system_info(DMI_PRODUCT_NAME);
67711 if (board)
67712 printk(KERN_WARNING "Hardware name: %s\n", board);
67713@@ -457,7 +457,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
67714 */
67715 void __stack_chk_fail(void)
67716 {
67717- panic("stack-protector: Kernel stack is corrupted in: %p\n",
67718+ dump_stack();
67719+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
67720 __builtin_return_address(0));
67721 }
67722 EXPORT_SYMBOL(__stack_chk_fail);
67723diff --git a/kernel/pid.c b/kernel/pid.c
67724index 9f08dfa..6765c40 100644
67725--- a/kernel/pid.c
67726+++ b/kernel/pid.c
67727@@ -33,6 +33,7 @@
67728 #include <linux/rculist.h>
67729 #include <linux/bootmem.h>
67730 #include <linux/hash.h>
67731+#include <linux/security.h>
67732 #include <linux/pid_namespace.h>
67733 #include <linux/init_task.h>
67734 #include <linux/syscalls.h>
67735@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
67736
67737 int pid_max = PID_MAX_DEFAULT;
67738
67739-#define RESERVED_PIDS 300
67740+#define RESERVED_PIDS 500
67741
67742 int pid_max_min = RESERVED_PIDS + 1;
67743 int pid_max_max = PID_MAX_LIMIT;
67744@@ -420,10 +421,18 @@ EXPORT_SYMBOL(pid_task);
67745 */
67746 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
67747 {
67748+ struct task_struct *task;
67749+
67750 rcu_lockdep_assert(rcu_read_lock_held(),
67751 "find_task_by_pid_ns() needs rcu_read_lock()"
67752 " protection");
67753- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
67754+
67755+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
67756+
67757+ if (gr_pid_is_chrooted(task))
67758+ return NULL;
67759+
67760+ return task;
67761 }
67762
67763 struct task_struct *find_task_by_vpid(pid_t vnr)
67764@@ -431,6 +440,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
67765 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
67766 }
67767
67768+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
67769+{
67770+ rcu_lockdep_assert(rcu_read_lock_held(),
67771+ "find_task_by_pid_ns() needs rcu_read_lock()"
67772+ " protection");
67773+ return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
67774+}
67775+
67776 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
67777 {
67778 struct pid *pid;
67779diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
67780index 125cb67..a4d1c30 100644
67781--- a/kernel/posix-cpu-timers.c
67782+++ b/kernel/posix-cpu-timers.c
67783@@ -6,6 +6,7 @@
67784 #include <linux/posix-timers.h>
67785 #include <linux/errno.h>
67786 #include <linux/math64.h>
67787+#include <linux/security.h>
67788 #include <asm/uaccess.h>
67789 #include <linux/kernel_stat.h>
67790 #include <trace/events/timer.h>
67791@@ -1578,14 +1579,14 @@ struct k_clock clock_posix_cpu = {
67792
67793 static __init int init_posix_cpu_timers(void)
67794 {
67795- struct k_clock process = {
67796+ static struct k_clock process = {
67797 .clock_getres = process_cpu_clock_getres,
67798 .clock_get = process_cpu_clock_get,
67799 .timer_create = process_cpu_timer_create,
67800 .nsleep = process_cpu_nsleep,
67801 .nsleep_restart = process_cpu_nsleep_restart,
67802 };
67803- struct k_clock thread = {
67804+ static struct k_clock thread = {
67805 .clock_getres = thread_cpu_clock_getres,
67806 .clock_get = thread_cpu_clock_get,
67807 .timer_create = thread_cpu_timer_create,
67808diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
67809index 69185ae..cc2847a 100644
67810--- a/kernel/posix-timers.c
67811+++ b/kernel/posix-timers.c
67812@@ -43,6 +43,7 @@
67813 #include <linux/idr.h>
67814 #include <linux/posix-clock.h>
67815 #include <linux/posix-timers.h>
67816+#include <linux/grsecurity.h>
67817 #include <linux/syscalls.h>
67818 #include <linux/wait.h>
67819 #include <linux/workqueue.h>
67820@@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
67821 * which we beg off on and pass to do_sys_settimeofday().
67822 */
67823
67824-static struct k_clock posix_clocks[MAX_CLOCKS];
67825+static struct k_clock *posix_clocks[MAX_CLOCKS];
67826
67827 /*
67828 * These ones are defined below.
67829@@ -227,7 +228,7 @@ static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
67830 */
67831 static __init int init_posix_timers(void)
67832 {
67833- struct k_clock clock_realtime = {
67834+ static struct k_clock clock_realtime = {
67835 .clock_getres = hrtimer_get_res,
67836 .clock_get = posix_clock_realtime_get,
67837 .clock_set = posix_clock_realtime_set,
67838@@ -239,7 +240,7 @@ static __init int init_posix_timers(void)
67839 .timer_get = common_timer_get,
67840 .timer_del = common_timer_del,
67841 };
67842- struct k_clock clock_monotonic = {
67843+ static struct k_clock clock_monotonic = {
67844 .clock_getres = hrtimer_get_res,
67845 .clock_get = posix_ktime_get_ts,
67846 .nsleep = common_nsleep,
67847@@ -249,19 +250,19 @@ static __init int init_posix_timers(void)
67848 .timer_get = common_timer_get,
67849 .timer_del = common_timer_del,
67850 };
67851- struct k_clock clock_monotonic_raw = {
67852+ static struct k_clock clock_monotonic_raw = {
67853 .clock_getres = hrtimer_get_res,
67854 .clock_get = posix_get_monotonic_raw,
67855 };
67856- struct k_clock clock_realtime_coarse = {
67857+ static struct k_clock clock_realtime_coarse = {
67858 .clock_getres = posix_get_coarse_res,
67859 .clock_get = posix_get_realtime_coarse,
67860 };
67861- struct k_clock clock_monotonic_coarse = {
67862+ static struct k_clock clock_monotonic_coarse = {
67863 .clock_getres = posix_get_coarse_res,
67864 .clock_get = posix_get_monotonic_coarse,
67865 };
67866- struct k_clock clock_boottime = {
67867+ static struct k_clock clock_boottime = {
67868 .clock_getres = hrtimer_get_res,
67869 .clock_get = posix_get_boottime,
67870 .nsleep = common_nsleep,
67871@@ -473,7 +474,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
67872 return;
67873 }
67874
67875- posix_clocks[clock_id] = *new_clock;
67876+ posix_clocks[clock_id] = new_clock;
67877 }
67878 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
67879
67880@@ -519,9 +520,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
67881 return (id & CLOCKFD_MASK) == CLOCKFD ?
67882 &clock_posix_dynamic : &clock_posix_cpu;
67883
67884- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
67885+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
67886 return NULL;
67887- return &posix_clocks[id];
67888+ return posix_clocks[id];
67889 }
67890
67891 static int common_timer_create(struct k_itimer *new_timer)
67892@@ -959,6 +960,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
67893 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
67894 return -EFAULT;
67895
67896+ /* only the CLOCK_REALTIME clock can be set, all other clocks
67897+ have their clock_set fptr set to a nosettime dummy function
67898+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
67899+ call common_clock_set, which calls do_sys_settimeofday, which
67900+ we hook
67901+ */
67902+
67903 return kc->clock_set(which_clock, &new_tp);
67904 }
67905
67906diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
67907index d523593..68197a4 100644
67908--- a/kernel/power/poweroff.c
67909+++ b/kernel/power/poweroff.c
67910@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
67911 .enable_mask = SYSRQ_ENABLE_BOOT,
67912 };
67913
67914-static int pm_sysrq_init(void)
67915+static int __init pm_sysrq_init(void)
67916 {
67917 register_sysrq_key('o', &sysrq_poweroff_op);
67918 return 0;
67919diff --git a/kernel/power/process.c b/kernel/power/process.c
67920index 7aac07a..2d3c6dc 100644
67921--- a/kernel/power/process.c
67922+++ b/kernel/power/process.c
67923@@ -33,6 +33,7 @@ static int try_to_freeze_tasks(bool user_only)
67924 u64 elapsed_csecs64;
67925 unsigned int elapsed_csecs;
67926 bool wakeup = false;
67927+ bool timedout = false;
67928
67929 do_gettimeofday(&start);
67930
67931@@ -43,6 +44,8 @@ static int try_to_freeze_tasks(bool user_only)
67932
67933 while (true) {
67934 todo = 0;
67935+ if (time_after(jiffies, end_time))
67936+ timedout = true;
67937 read_lock(&tasklist_lock);
67938 do_each_thread(g, p) {
67939 if (p == current || !freeze_task(p))
67940@@ -60,9 +63,13 @@ static int try_to_freeze_tasks(bool user_only)
67941 * try_to_stop() after schedule() in ptrace/signal
67942 * stop sees TIF_FREEZE.
67943 */
67944- if (!task_is_stopped_or_traced(p) &&
67945- !freezer_should_skip(p))
67946+ if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
67947 todo++;
67948+ if (timedout) {
67949+ printk(KERN_ERR "Task refusing to freeze:\n");
67950+ sched_show_task(p);
67951+ }
67952+ }
67953 } while_each_thread(g, p);
67954 read_unlock(&tasklist_lock);
67955
67956@@ -71,7 +78,7 @@ static int try_to_freeze_tasks(bool user_only)
67957 todo += wq_busy;
67958 }
67959
67960- if (!todo || time_after(jiffies, end_time))
67961+ if (!todo || timedout)
67962 break;
67963
67964 if (pm_wakeup_pending()) {
67965diff --git a/kernel/printk.c b/kernel/printk.c
67966index 32690a0..cd7c798 100644
67967--- a/kernel/printk.c
67968+++ b/kernel/printk.c
67969@@ -313,6 +313,11 @@ static int check_syslog_permissions(int type, bool from_file)
67970 if (from_file && type != SYSLOG_ACTION_OPEN)
67971 return 0;
67972
67973+#ifdef CONFIG_GRKERNSEC_DMESG
67974+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
67975+ return -EPERM;
67976+#endif
67977+
67978 if (syslog_action_restricted(type)) {
67979 if (capable(CAP_SYSLOG))
67980 return 0;
67981diff --git a/kernel/profile.c b/kernel/profile.c
67982index 76b8e77..a2930e8 100644
67983--- a/kernel/profile.c
67984+++ b/kernel/profile.c
67985@@ -39,7 +39,7 @@ struct profile_hit {
67986 /* Oprofile timer tick hook */
67987 static int (*timer_hook)(struct pt_regs *) __read_mostly;
67988
67989-static atomic_t *prof_buffer;
67990+static atomic_unchecked_t *prof_buffer;
67991 static unsigned long prof_len, prof_shift;
67992
67993 int prof_on __read_mostly;
67994@@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
67995 hits[i].pc = 0;
67996 continue;
67997 }
67998- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
67999+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68000 hits[i].hits = hits[i].pc = 0;
68001 }
68002 }
68003@@ -342,9 +342,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68004 * Add the current hit(s) and flush the write-queue out
68005 * to the global buffer:
68006 */
68007- atomic_add(nr_hits, &prof_buffer[pc]);
68008+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
68009 for (i = 0; i < NR_PROFILE_HIT; ++i) {
68010- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68011+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68012 hits[i].pc = hits[i].hits = 0;
68013 }
68014 out:
68015@@ -419,7 +419,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68016 {
68017 unsigned long pc;
68018 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
68019- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68020+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68021 }
68022 #endif /* !CONFIG_SMP */
68023
68024@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
68025 return -EFAULT;
68026 buf++; p++; count--; read++;
68027 }
68028- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
68029+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
68030 if (copy_to_user(buf, (void *)pnt, count))
68031 return -EFAULT;
68032 read += count;
68033@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
68034 }
68035 #endif
68036 profile_discard_flip_buffers();
68037- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
68038+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
68039 return count;
68040 }
68041
68042diff --git a/kernel/ptrace.c b/kernel/ptrace.c
68043index 00ab2ca..d237f61 100644
68044--- a/kernel/ptrace.c
68045+++ b/kernel/ptrace.c
68046@@ -285,7 +285,7 @@ static int ptrace_attach(struct task_struct *task, long request,
68047 task->ptrace = PT_PTRACED;
68048 if (seize)
68049 task->ptrace |= PT_SEIZED;
68050- if (ns_capable(task_user_ns(task), CAP_SYS_PTRACE))
68051+ if (ns_capable_nolog(task_user_ns(task), CAP_SYS_PTRACE))
68052 task->ptrace |= PT_PTRACE_CAP;
68053
68054 __ptrace_link(task, current);
68055@@ -491,7 +491,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
68056 break;
68057 return -EIO;
68058 }
68059- if (copy_to_user(dst, buf, retval))
68060+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
68061 return -EFAULT;
68062 copied += retval;
68063 src += retval;
68064@@ -688,7 +688,7 @@ int ptrace_request(struct task_struct *child, long request,
68065 bool seized = child->ptrace & PT_SEIZED;
68066 int ret = -EIO;
68067 siginfo_t siginfo, *si;
68068- void __user *datavp = (void __user *) data;
68069+ void __user *datavp = (__force void __user *) data;
68070 unsigned long __user *datalp = datavp;
68071 unsigned long flags;
68072
68073@@ -890,14 +890,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
68074 goto out;
68075 }
68076
68077+ if (gr_handle_ptrace(child, request)) {
68078+ ret = -EPERM;
68079+ goto out_put_task_struct;
68080+ }
68081+
68082 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68083 ret = ptrace_attach(child, request, data);
68084 /*
68085 * Some architectures need to do book-keeping after
68086 * a ptrace attach.
68087 */
68088- if (!ret)
68089+ if (!ret) {
68090 arch_ptrace_attach(child);
68091+ gr_audit_ptrace(child);
68092+ }
68093 goto out_put_task_struct;
68094 }
68095
68096@@ -923,7 +930,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
68097 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
68098 if (copied != sizeof(tmp))
68099 return -EIO;
68100- return put_user(tmp, (unsigned long __user *)data);
68101+ return put_user(tmp, (__force unsigned long __user *)data);
68102 }
68103
68104 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
68105@@ -1033,14 +1040,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
68106 goto out;
68107 }
68108
68109+ if (gr_handle_ptrace(child, request)) {
68110+ ret = -EPERM;
68111+ goto out_put_task_struct;
68112+ }
68113+
68114 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68115 ret = ptrace_attach(child, request, data);
68116 /*
68117 * Some architectures need to do book-keeping after
68118 * a ptrace attach.
68119 */
68120- if (!ret)
68121+ if (!ret) {
68122 arch_ptrace_attach(child);
68123+ gr_audit_ptrace(child);
68124+ }
68125 goto out_put_task_struct;
68126 }
68127
68128diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
68129index 977296d..c4744dc 100644
68130--- a/kernel/rcutiny.c
68131+++ b/kernel/rcutiny.c
68132@@ -46,7 +46,7 @@
68133 struct rcu_ctrlblk;
68134 static void invoke_rcu_callbacks(void);
68135 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
68136-static void rcu_process_callbacks(struct softirq_action *unused);
68137+static void rcu_process_callbacks(void);
68138 static void __call_rcu(struct rcu_head *head,
68139 void (*func)(struct rcu_head *rcu),
68140 struct rcu_ctrlblk *rcp);
68141@@ -297,7 +297,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
68142 rcu_is_callbacks_kthread()));
68143 }
68144
68145-static void rcu_process_callbacks(struct softirq_action *unused)
68146+static void rcu_process_callbacks(void)
68147 {
68148 __rcu_process_callbacks(&rcu_sched_ctrlblk);
68149 __rcu_process_callbacks(&rcu_bh_ctrlblk);
68150diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
68151index 9cb1ae4..aac7d3e 100644
68152--- a/kernel/rcutiny_plugin.h
68153+++ b/kernel/rcutiny_plugin.h
68154@@ -920,7 +920,7 @@ static int rcu_kthread(void *arg)
68155 have_rcu_kthread_work = morework;
68156 local_irq_restore(flags);
68157 if (work)
68158- rcu_process_callbacks(NULL);
68159+ rcu_process_callbacks();
68160 schedule_timeout_interruptible(1); /* Leave CPU for others. */
68161 }
68162
68163diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
68164index a58ac28..196a3d8 100644
68165--- a/kernel/rcutorture.c
68166+++ b/kernel/rcutorture.c
68167@@ -148,12 +148,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
68168 { 0 };
68169 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
68170 { 0 };
68171-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68172-static atomic_t n_rcu_torture_alloc;
68173-static atomic_t n_rcu_torture_alloc_fail;
68174-static atomic_t n_rcu_torture_free;
68175-static atomic_t n_rcu_torture_mberror;
68176-static atomic_t n_rcu_torture_error;
68177+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68178+static atomic_unchecked_t n_rcu_torture_alloc;
68179+static atomic_unchecked_t n_rcu_torture_alloc_fail;
68180+static atomic_unchecked_t n_rcu_torture_free;
68181+static atomic_unchecked_t n_rcu_torture_mberror;
68182+static atomic_unchecked_t n_rcu_torture_error;
68183 static long n_rcu_torture_boost_ktrerror;
68184 static long n_rcu_torture_boost_rterror;
68185 static long n_rcu_torture_boost_failure;
68186@@ -243,11 +243,11 @@ rcu_torture_alloc(void)
68187
68188 spin_lock_bh(&rcu_torture_lock);
68189 if (list_empty(&rcu_torture_freelist)) {
68190- atomic_inc(&n_rcu_torture_alloc_fail);
68191+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
68192 spin_unlock_bh(&rcu_torture_lock);
68193 return NULL;
68194 }
68195- atomic_inc(&n_rcu_torture_alloc);
68196+ atomic_inc_unchecked(&n_rcu_torture_alloc);
68197 p = rcu_torture_freelist.next;
68198 list_del_init(p);
68199 spin_unlock_bh(&rcu_torture_lock);
68200@@ -260,7 +260,7 @@ rcu_torture_alloc(void)
68201 static void
68202 rcu_torture_free(struct rcu_torture *p)
68203 {
68204- atomic_inc(&n_rcu_torture_free);
68205+ atomic_inc_unchecked(&n_rcu_torture_free);
68206 spin_lock_bh(&rcu_torture_lock);
68207 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
68208 spin_unlock_bh(&rcu_torture_lock);
68209@@ -380,7 +380,7 @@ rcu_torture_cb(struct rcu_head *p)
68210 i = rp->rtort_pipe_count;
68211 if (i > RCU_TORTURE_PIPE_LEN)
68212 i = RCU_TORTURE_PIPE_LEN;
68213- atomic_inc(&rcu_torture_wcount[i]);
68214+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68215 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68216 rp->rtort_mbtest = 0;
68217 rcu_torture_free(rp);
68218@@ -427,7 +427,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
68219 i = rp->rtort_pipe_count;
68220 if (i > RCU_TORTURE_PIPE_LEN)
68221 i = RCU_TORTURE_PIPE_LEN;
68222- atomic_inc(&rcu_torture_wcount[i]);
68223+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68224 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68225 rp->rtort_mbtest = 0;
68226 list_del(&rp->rtort_free);
68227@@ -916,7 +916,7 @@ rcu_torture_writer(void *arg)
68228 i = old_rp->rtort_pipe_count;
68229 if (i > RCU_TORTURE_PIPE_LEN)
68230 i = RCU_TORTURE_PIPE_LEN;
68231- atomic_inc(&rcu_torture_wcount[i]);
68232+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68233 old_rp->rtort_pipe_count++;
68234 cur_ops->deferred_free(old_rp);
68235 }
68236@@ -997,7 +997,7 @@ static void rcu_torture_timer(unsigned long unused)
68237 return;
68238 }
68239 if (p->rtort_mbtest == 0)
68240- atomic_inc(&n_rcu_torture_mberror);
68241+ atomic_inc_unchecked(&n_rcu_torture_mberror);
68242 spin_lock(&rand_lock);
68243 cur_ops->read_delay(&rand);
68244 n_rcu_torture_timers++;
68245@@ -1061,7 +1061,7 @@ rcu_torture_reader(void *arg)
68246 continue;
68247 }
68248 if (p->rtort_mbtest == 0)
68249- atomic_inc(&n_rcu_torture_mberror);
68250+ atomic_inc_unchecked(&n_rcu_torture_mberror);
68251 cur_ops->read_delay(&rand);
68252 preempt_disable();
68253 pipe_count = p->rtort_pipe_count;
68254@@ -1123,10 +1123,10 @@ rcu_torture_printk(char *page)
68255 rcu_torture_current,
68256 rcu_torture_current_version,
68257 list_empty(&rcu_torture_freelist),
68258- atomic_read(&n_rcu_torture_alloc),
68259- atomic_read(&n_rcu_torture_alloc_fail),
68260- atomic_read(&n_rcu_torture_free),
68261- atomic_read(&n_rcu_torture_mberror),
68262+ atomic_read_unchecked(&n_rcu_torture_alloc),
68263+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
68264+ atomic_read_unchecked(&n_rcu_torture_free),
68265+ atomic_read_unchecked(&n_rcu_torture_mberror),
68266 n_rcu_torture_boost_ktrerror,
68267 n_rcu_torture_boost_rterror,
68268 n_rcu_torture_boost_failure,
68269@@ -1136,7 +1136,7 @@ rcu_torture_printk(char *page)
68270 n_online_attempts,
68271 n_offline_successes,
68272 n_offline_attempts);
68273- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
68274+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
68275 n_rcu_torture_boost_ktrerror != 0 ||
68276 n_rcu_torture_boost_rterror != 0 ||
68277 n_rcu_torture_boost_failure != 0)
68278@@ -1144,7 +1144,7 @@ rcu_torture_printk(char *page)
68279 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
68280 if (i > 1) {
68281 cnt += sprintf(&page[cnt], "!!! ");
68282- atomic_inc(&n_rcu_torture_error);
68283+ atomic_inc_unchecked(&n_rcu_torture_error);
68284 WARN_ON_ONCE(1);
68285 }
68286 cnt += sprintf(&page[cnt], "Reader Pipe: ");
68287@@ -1158,7 +1158,7 @@ rcu_torture_printk(char *page)
68288 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
68289 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68290 cnt += sprintf(&page[cnt], " %d",
68291- atomic_read(&rcu_torture_wcount[i]));
68292+ atomic_read_unchecked(&rcu_torture_wcount[i]));
68293 }
68294 cnt += sprintf(&page[cnt], "\n");
68295 if (cur_ops->stats)
68296@@ -1600,7 +1600,7 @@ rcu_torture_cleanup(void)
68297
68298 if (cur_ops->cleanup)
68299 cur_ops->cleanup();
68300- if (atomic_read(&n_rcu_torture_error))
68301+ if (atomic_read_unchecked(&n_rcu_torture_error))
68302 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
68303 else
68304 rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
68305@@ -1664,17 +1664,17 @@ rcu_torture_init(void)
68306
68307 rcu_torture_current = NULL;
68308 rcu_torture_current_version = 0;
68309- atomic_set(&n_rcu_torture_alloc, 0);
68310- atomic_set(&n_rcu_torture_alloc_fail, 0);
68311- atomic_set(&n_rcu_torture_free, 0);
68312- atomic_set(&n_rcu_torture_mberror, 0);
68313- atomic_set(&n_rcu_torture_error, 0);
68314+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
68315+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
68316+ atomic_set_unchecked(&n_rcu_torture_free, 0);
68317+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
68318+ atomic_set_unchecked(&n_rcu_torture_error, 0);
68319 n_rcu_torture_boost_ktrerror = 0;
68320 n_rcu_torture_boost_rterror = 0;
68321 n_rcu_torture_boost_failure = 0;
68322 n_rcu_torture_boosts = 0;
68323 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
68324- atomic_set(&rcu_torture_wcount[i], 0);
68325+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
68326 for_each_possible_cpu(cpu) {
68327 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68328 per_cpu(rcu_torture_count, cpu)[i] = 0;
68329diff --git a/kernel/rcutree.c b/kernel/rcutree.c
68330index 6c4a672..70f3202 100644
68331--- a/kernel/rcutree.c
68332+++ b/kernel/rcutree.c
68333@@ -363,9 +363,9 @@ static void rcu_idle_enter_common(struct rcu_dynticks *rdtp, long long oldval)
68334 rcu_prepare_for_idle(smp_processor_id());
68335 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68336 smp_mb__before_atomic_inc(); /* See above. */
68337- atomic_inc(&rdtp->dynticks);
68338+ atomic_inc_unchecked(&rdtp->dynticks);
68339 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
68340- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68341+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68342 }
68343
68344 /**
68345@@ -438,10 +438,10 @@ void rcu_irq_exit(void)
68346 static void rcu_idle_exit_common(struct rcu_dynticks *rdtp, long long oldval)
68347 {
68348 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
68349- atomic_inc(&rdtp->dynticks);
68350+ atomic_inc_unchecked(&rdtp->dynticks);
68351 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68352 smp_mb__after_atomic_inc(); /* See above. */
68353- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68354+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68355 rcu_cleanup_after_idle(smp_processor_id());
68356 trace_rcu_dyntick("End", oldval, rdtp->dynticks_nesting);
68357 if (!is_idle_task(current)) {
68358@@ -531,14 +531,14 @@ void rcu_nmi_enter(void)
68359 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
68360
68361 if (rdtp->dynticks_nmi_nesting == 0 &&
68362- (atomic_read(&rdtp->dynticks) & 0x1))
68363+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
68364 return;
68365 rdtp->dynticks_nmi_nesting++;
68366 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
68367- atomic_inc(&rdtp->dynticks);
68368+ atomic_inc_unchecked(&rdtp->dynticks);
68369 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68370 smp_mb__after_atomic_inc(); /* See above. */
68371- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68372+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68373 }
68374
68375 /**
68376@@ -557,9 +557,9 @@ void rcu_nmi_exit(void)
68377 return;
68378 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68379 smp_mb__before_atomic_inc(); /* See above. */
68380- atomic_inc(&rdtp->dynticks);
68381+ atomic_inc_unchecked(&rdtp->dynticks);
68382 smp_mb__after_atomic_inc(); /* Force delay to next write. */
68383- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68384+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68385 }
68386
68387 #ifdef CONFIG_PROVE_RCU
68388@@ -575,7 +575,7 @@ int rcu_is_cpu_idle(void)
68389 int ret;
68390
68391 preempt_disable();
68392- ret = (atomic_read(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
68393+ ret = (atomic_read_unchecked(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
68394 preempt_enable();
68395 return ret;
68396 }
68397@@ -604,7 +604,7 @@ int rcu_is_cpu_rrupt_from_idle(void)
68398 */
68399 static int dyntick_save_progress_counter(struct rcu_data *rdp)
68400 {
68401- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
68402+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
68403 return (rdp->dynticks_snap & 0x1) == 0;
68404 }
68405
68406@@ -619,7 +619,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
68407 unsigned int curr;
68408 unsigned int snap;
68409
68410- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
68411+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
68412 snap = (unsigned int)rdp->dynticks_snap;
68413
68414 /*
68415@@ -1667,7 +1667,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
68416 /*
68417 * Do RCU core processing for the current CPU.
68418 */
68419-static void rcu_process_callbacks(struct softirq_action *unused)
68420+static void rcu_process_callbacks(void)
68421 {
68422 trace_rcu_utilization("Start RCU core");
68423 __rcu_process_callbacks(&rcu_sched_state,
68424@@ -2030,7 +2030,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
68425 rdp->qlen = 0;
68426 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
68427 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_NESTING);
68428- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
68429+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
68430 rdp->cpu = cpu;
68431 rdp->rsp = rsp;
68432 raw_spin_unlock_irqrestore(&rnp->lock, flags);
68433@@ -2058,8 +2058,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
68434 rdp->n_force_qs_snap = rsp->n_force_qs;
68435 rdp->blimit = blimit;
68436 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_NESTING;
68437- atomic_set(&rdp->dynticks->dynticks,
68438- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
68439+ atomic_set_unchecked(&rdp->dynticks->dynticks,
68440+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
68441 rcu_prepare_for_idle_init(cpu);
68442 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
68443
68444diff --git a/kernel/rcutree.h b/kernel/rcutree.h
68445index fddff92..2c08359 100644
68446--- a/kernel/rcutree.h
68447+++ b/kernel/rcutree.h
68448@@ -87,7 +87,7 @@ struct rcu_dynticks {
68449 long long dynticks_nesting; /* Track irq/process nesting level. */
68450 /* Process level is worth LLONG_MAX/2. */
68451 int dynticks_nmi_nesting; /* Track NMI nesting level. */
68452- atomic_t dynticks; /* Even value for idle, else odd. */
68453+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
68454 };
68455
68456 /* RCU's kthread states for tracing. */
68457diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
68458index 8bb35d7..6ea0a463 100644
68459--- a/kernel/rcutree_plugin.h
68460+++ b/kernel/rcutree_plugin.h
68461@@ -850,7 +850,7 @@ void synchronize_rcu_expedited(void)
68462
68463 /* Clean up and exit. */
68464 smp_mb(); /* ensure expedited GP seen before counter increment. */
68465- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
68466+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
68467 unlock_mb_ret:
68468 mutex_unlock(&sync_rcu_preempt_exp_mutex);
68469 mb_ret:
68470@@ -1833,8 +1833,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
68471
68472 #else /* #ifndef CONFIG_SMP */
68473
68474-static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
68475-static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
68476+static atomic_unchecked_t sync_sched_expedited_started = ATOMIC_INIT(0);
68477+static atomic_unchecked_t sync_sched_expedited_done = ATOMIC_INIT(0);
68478
68479 static int synchronize_sched_expedited_cpu_stop(void *data)
68480 {
68481@@ -1889,7 +1889,7 @@ void synchronize_sched_expedited(void)
68482 int firstsnap, s, snap, trycount = 0;
68483
68484 /* Note that atomic_inc_return() implies full memory barrier. */
68485- firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started);
68486+ firstsnap = snap = atomic_inc_return_unchecked(&sync_sched_expedited_started);
68487 get_online_cpus();
68488
68489 /*
68490@@ -1910,7 +1910,7 @@ void synchronize_sched_expedited(void)
68491 }
68492
68493 /* Check to see if someone else did our work for us. */
68494- s = atomic_read(&sync_sched_expedited_done);
68495+ s = atomic_read_unchecked(&sync_sched_expedited_done);
68496 if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
68497 smp_mb(); /* ensure test happens before caller kfree */
68498 return;
68499@@ -1925,7 +1925,7 @@ void synchronize_sched_expedited(void)
68500 * grace period works for us.
68501 */
68502 get_online_cpus();
68503- snap = atomic_read(&sync_sched_expedited_started);
68504+ snap = atomic_read_unchecked(&sync_sched_expedited_started);
68505 smp_mb(); /* ensure read is before try_stop_cpus(). */
68506 }
68507
68508@@ -1936,12 +1936,12 @@ void synchronize_sched_expedited(void)
68509 * than we did beat us to the punch.
68510 */
68511 do {
68512- s = atomic_read(&sync_sched_expedited_done);
68513+ s = atomic_read_unchecked(&sync_sched_expedited_done);
68514 if (UINT_CMP_GE((unsigned)s, (unsigned)snap)) {
68515 smp_mb(); /* ensure test happens before caller kfree */
68516 break;
68517 }
68518- } while (atomic_cmpxchg(&sync_sched_expedited_done, s, snap) != s);
68519+ } while (atomic_cmpxchg_unchecked(&sync_sched_expedited_done, s, snap) != s);
68520
68521 put_online_cpus();
68522 }
68523diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
68524index 654cfe6..c0b28e2 100644
68525--- a/kernel/rcutree_trace.c
68526+++ b/kernel/rcutree_trace.c
68527@@ -68,7 +68,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
68528 rdp->passed_quiesce, rdp->passed_quiesce_gpnum,
68529 rdp->qs_pending);
68530 seq_printf(m, " dt=%d/%llx/%d df=%lu",
68531- atomic_read(&rdp->dynticks->dynticks),
68532+ atomic_read_unchecked(&rdp->dynticks->dynticks),
68533 rdp->dynticks->dynticks_nesting,
68534 rdp->dynticks->dynticks_nmi_nesting,
68535 rdp->dynticks_fqs);
68536@@ -140,7 +140,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
68537 rdp->passed_quiesce, rdp->passed_quiesce_gpnum,
68538 rdp->qs_pending);
68539 seq_printf(m, ",%d,%llx,%d,%lu",
68540- atomic_read(&rdp->dynticks->dynticks),
68541+ atomic_read_unchecked(&rdp->dynticks->dynticks),
68542 rdp->dynticks->dynticks_nesting,
68543 rdp->dynticks->dynticks_nmi_nesting,
68544 rdp->dynticks_fqs);
68545diff --git a/kernel/resource.c b/kernel/resource.c
68546index 7640b3a..5879283 100644
68547--- a/kernel/resource.c
68548+++ b/kernel/resource.c
68549@@ -141,8 +141,18 @@ static const struct file_operations proc_iomem_operations = {
68550
68551 static int __init ioresources_init(void)
68552 {
68553+#ifdef CONFIG_GRKERNSEC_PROC_ADD
68554+#ifdef CONFIG_GRKERNSEC_PROC_USER
68555+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
68556+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
68557+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
68558+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
68559+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
68560+#endif
68561+#else
68562 proc_create("ioports", 0, NULL, &proc_ioports_operations);
68563 proc_create("iomem", 0, NULL, &proc_iomem_operations);
68564+#endif
68565 return 0;
68566 }
68567 __initcall(ioresources_init);
68568diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
68569index 98ec494..4241d6d 100644
68570--- a/kernel/rtmutex-tester.c
68571+++ b/kernel/rtmutex-tester.c
68572@@ -20,7 +20,7 @@
68573 #define MAX_RT_TEST_MUTEXES 8
68574
68575 static spinlock_t rttest_lock;
68576-static atomic_t rttest_event;
68577+static atomic_unchecked_t rttest_event;
68578
68579 struct test_thread_data {
68580 int opcode;
68581@@ -61,7 +61,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68582
68583 case RTTEST_LOCKCONT:
68584 td->mutexes[td->opdata] = 1;
68585- td->event = atomic_add_return(1, &rttest_event);
68586+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68587 return 0;
68588
68589 case RTTEST_RESET:
68590@@ -74,7 +74,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68591 return 0;
68592
68593 case RTTEST_RESETEVENT:
68594- atomic_set(&rttest_event, 0);
68595+ atomic_set_unchecked(&rttest_event, 0);
68596 return 0;
68597
68598 default:
68599@@ -91,9 +91,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68600 return ret;
68601
68602 td->mutexes[id] = 1;
68603- td->event = atomic_add_return(1, &rttest_event);
68604+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68605 rt_mutex_lock(&mutexes[id]);
68606- td->event = atomic_add_return(1, &rttest_event);
68607+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68608 td->mutexes[id] = 4;
68609 return 0;
68610
68611@@ -104,9 +104,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68612 return ret;
68613
68614 td->mutexes[id] = 1;
68615- td->event = atomic_add_return(1, &rttest_event);
68616+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68617 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
68618- td->event = atomic_add_return(1, &rttest_event);
68619+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68620 td->mutexes[id] = ret ? 0 : 4;
68621 return ret ? -EINTR : 0;
68622
68623@@ -115,9 +115,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68624 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
68625 return ret;
68626
68627- td->event = atomic_add_return(1, &rttest_event);
68628+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68629 rt_mutex_unlock(&mutexes[id]);
68630- td->event = atomic_add_return(1, &rttest_event);
68631+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68632 td->mutexes[id] = 0;
68633 return 0;
68634
68635@@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
68636 break;
68637
68638 td->mutexes[dat] = 2;
68639- td->event = atomic_add_return(1, &rttest_event);
68640+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68641 break;
68642
68643 default:
68644@@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
68645 return;
68646
68647 td->mutexes[dat] = 3;
68648- td->event = atomic_add_return(1, &rttest_event);
68649+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68650 break;
68651
68652 case RTTEST_LOCKNOWAIT:
68653@@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
68654 return;
68655
68656 td->mutexes[dat] = 1;
68657- td->event = atomic_add_return(1, &rttest_event);
68658+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68659 return;
68660
68661 default:
68662diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
68663index e8a1f83..363d17d 100644
68664--- a/kernel/sched/auto_group.c
68665+++ b/kernel/sched/auto_group.c
68666@@ -11,7 +11,7 @@
68667
68668 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
68669 static struct autogroup autogroup_default;
68670-static atomic_t autogroup_seq_nr;
68671+static atomic_unchecked_t autogroup_seq_nr;
68672
68673 void __init autogroup_init(struct task_struct *init_task)
68674 {
68675@@ -78,7 +78,7 @@ static inline struct autogroup *autogroup_create(void)
68676
68677 kref_init(&ag->kref);
68678 init_rwsem(&ag->lock);
68679- ag->id = atomic_inc_return(&autogroup_seq_nr);
68680+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
68681 ag->tg = tg;
68682 #ifdef CONFIG_RT_GROUP_SCHED
68683 /*
68684diff --git a/kernel/sched/core.c b/kernel/sched/core.c
68685index b342f57..00324a0 100644
68686--- a/kernel/sched/core.c
68687+++ b/kernel/sched/core.c
68688@@ -3143,6 +3143,19 @@ pick_next_task(struct rq *rq)
68689 BUG(); /* the idle class will always have a runnable task */
68690 }
68691
68692+#ifdef CONFIG_GRKERNSEC_SETXID
68693+extern void gr_delayed_cred_worker(void);
68694+static inline void gr_cred_schedule(void)
68695+{
68696+ if (unlikely(current->delayed_cred))
68697+ gr_delayed_cred_worker();
68698+}
68699+#else
68700+static inline void gr_cred_schedule(void)
68701+{
68702+}
68703+#endif
68704+
68705 /*
68706 * __schedule() is the main scheduler function.
68707 */
68708@@ -3162,6 +3175,8 @@ need_resched:
68709
68710 schedule_debug(prev);
68711
68712+ gr_cred_schedule();
68713+
68714 if (sched_feat(HRTICK))
68715 hrtick_clear(rq);
68716
68717@@ -3852,6 +3867,8 @@ int can_nice(const struct task_struct *p, const int nice)
68718 /* convert nice value [19,-20] to rlimit style value [1,40] */
68719 int nice_rlim = 20 - nice;
68720
68721+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
68722+
68723 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
68724 capable(CAP_SYS_NICE));
68725 }
68726@@ -3885,7 +3902,8 @@ SYSCALL_DEFINE1(nice, int, increment)
68727 if (nice > 19)
68728 nice = 19;
68729
68730- if (increment < 0 && !can_nice(current, nice))
68731+ if (increment < 0 && (!can_nice(current, nice) ||
68732+ gr_handle_chroot_nice()))
68733 return -EPERM;
68734
68735 retval = security_task_setnice(current, nice);
68736@@ -4042,6 +4060,7 @@ recheck:
68737 unsigned long rlim_rtprio =
68738 task_rlimit(p, RLIMIT_RTPRIO);
68739
68740+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
68741 /* can't set/change the rt policy */
68742 if (policy != p->policy && !rlim_rtprio)
68743 return -EPERM;
68744diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
68745index aca16b8..8e3acc4 100644
68746--- a/kernel/sched/fair.c
68747+++ b/kernel/sched/fair.c
68748@@ -5147,7 +5147,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
68749 * run_rebalance_domains is triggered when needed from the scheduler tick.
68750 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
68751 */
68752-static void run_rebalance_domains(struct softirq_action *h)
68753+static void run_rebalance_domains(void)
68754 {
68755 int this_cpu = smp_processor_id();
68756 struct rq *this_rq = cpu_rq(this_cpu);
68757diff --git a/kernel/signal.c b/kernel/signal.c
68758index c73c428..7040057 100644
68759--- a/kernel/signal.c
68760+++ b/kernel/signal.c
68761@@ -46,12 +46,12 @@ static struct kmem_cache *sigqueue_cachep;
68762
68763 int print_fatal_signals __read_mostly;
68764
68765-static void __user *sig_handler(struct task_struct *t, int sig)
68766+static __sighandler_t sig_handler(struct task_struct *t, int sig)
68767 {
68768 return t->sighand->action[sig - 1].sa.sa_handler;
68769 }
68770
68771-static int sig_handler_ignored(void __user *handler, int sig)
68772+static int sig_handler_ignored(__sighandler_t handler, int sig)
68773 {
68774 /* Is it explicitly or implicitly ignored? */
68775 return handler == SIG_IGN ||
68776@@ -61,7 +61,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
68777 static int sig_task_ignored(struct task_struct *t, int sig,
68778 int from_ancestor_ns)
68779 {
68780- void __user *handler;
68781+ __sighandler_t handler;
68782
68783 handler = sig_handler(t, sig);
68784
68785@@ -365,6 +365,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
68786 atomic_inc(&user->sigpending);
68787 rcu_read_unlock();
68788
68789+ if (!override_rlimit)
68790+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
68791+
68792 if (override_rlimit ||
68793 atomic_read(&user->sigpending) <=
68794 task_rlimit(t, RLIMIT_SIGPENDING)) {
68795@@ -489,7 +492,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
68796
68797 int unhandled_signal(struct task_struct *tsk, int sig)
68798 {
68799- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
68800+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
68801 if (is_global_init(tsk))
68802 return 1;
68803 if (handler != SIG_IGN && handler != SIG_DFL)
68804@@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
68805 }
68806 }
68807
68808+ /* allow glibc communication via tgkill to other threads in our
68809+ thread group */
68810+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
68811+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
68812+ && gr_handle_signal(t, sig))
68813+ return -EPERM;
68814+
68815 return security_task_kill(t, info, sig, 0);
68816 }
68817
68818@@ -1197,7 +1207,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
68819 return send_signal(sig, info, p, 1);
68820 }
68821
68822-static int
68823+int
68824 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
68825 {
68826 return send_signal(sig, info, t, 0);
68827@@ -1234,6 +1244,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
68828 unsigned long int flags;
68829 int ret, blocked, ignored;
68830 struct k_sigaction *action;
68831+ int is_unhandled = 0;
68832
68833 spin_lock_irqsave(&t->sighand->siglock, flags);
68834 action = &t->sighand->action[sig-1];
68835@@ -1248,9 +1259,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
68836 }
68837 if (action->sa.sa_handler == SIG_DFL)
68838 t->signal->flags &= ~SIGNAL_UNKILLABLE;
68839+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
68840+ is_unhandled = 1;
68841 ret = specific_send_sig_info(sig, info, t);
68842 spin_unlock_irqrestore(&t->sighand->siglock, flags);
68843
68844+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
68845+ normal operation */
68846+ if (is_unhandled) {
68847+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
68848+ gr_handle_crash(t, sig);
68849+ }
68850+
68851 return ret;
68852 }
68853
68854@@ -1317,8 +1337,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
68855 ret = check_kill_permission(sig, info, p);
68856 rcu_read_unlock();
68857
68858- if (!ret && sig)
68859+ if (!ret && sig) {
68860 ret = do_send_sig_info(sig, info, p, true);
68861+ if (!ret)
68862+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
68863+ }
68864
68865 return ret;
68866 }
68867@@ -2820,7 +2843,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
68868 int error = -ESRCH;
68869
68870 rcu_read_lock();
68871- p = find_task_by_vpid(pid);
68872+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
68873+ /* allow glibc communication via tgkill to other threads in our
68874+ thread group */
68875+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
68876+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
68877+ p = find_task_by_vpid_unrestricted(pid);
68878+ else
68879+#endif
68880+ p = find_task_by_vpid(pid);
68881 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
68882 error = check_kill_permission(sig, info, p);
68883 /*
68884diff --git a/kernel/smp.c b/kernel/smp.c
68885index db197d6..17aef0b 100644
68886--- a/kernel/smp.c
68887+++ b/kernel/smp.c
68888@@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
68889 }
68890 EXPORT_SYMBOL(smp_call_function);
68891
68892-void ipi_call_lock(void)
68893+void ipi_call_lock(void) __acquires(call_function.lock)
68894 {
68895 raw_spin_lock(&call_function.lock);
68896 }
68897
68898-void ipi_call_unlock(void)
68899+void ipi_call_unlock(void) __releases(call_function.lock)
68900 {
68901 raw_spin_unlock(&call_function.lock);
68902 }
68903
68904-void ipi_call_lock_irq(void)
68905+void ipi_call_lock_irq(void) __acquires(call_function.lock)
68906 {
68907 raw_spin_lock_irq(&call_function.lock);
68908 }
68909
68910-void ipi_call_unlock_irq(void)
68911+void ipi_call_unlock_irq(void) __releases(call_function.lock)
68912 {
68913 raw_spin_unlock_irq(&call_function.lock);
68914 }
68915diff --git a/kernel/softirq.c b/kernel/softirq.c
68916index 4eb3a0f..6f1fa81 100644
68917--- a/kernel/softirq.c
68918+++ b/kernel/softirq.c
68919@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
68920
68921 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
68922
68923-char *softirq_to_name[NR_SOFTIRQS] = {
68924+const char * const softirq_to_name[NR_SOFTIRQS] = {
68925 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
68926 "TASKLET", "SCHED", "HRTIMER", "RCU"
68927 };
68928@@ -235,7 +235,7 @@ restart:
68929 kstat_incr_softirqs_this_cpu(vec_nr);
68930
68931 trace_softirq_entry(vec_nr);
68932- h->action(h);
68933+ h->action();
68934 trace_softirq_exit(vec_nr);
68935 if (unlikely(prev_count != preempt_count())) {
68936 printk(KERN_ERR "huh, entered softirq %u %s %p"
68937@@ -385,9 +385,11 @@ void raise_softirq(unsigned int nr)
68938 local_irq_restore(flags);
68939 }
68940
68941-void open_softirq(int nr, void (*action)(struct softirq_action *))
68942+void open_softirq(int nr, void (*action)(void))
68943 {
68944- softirq_vec[nr].action = action;
68945+ pax_open_kernel();
68946+ *(void **)&softirq_vec[nr].action = action;
68947+ pax_close_kernel();
68948 }
68949
68950 /*
68951@@ -441,7 +443,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
68952
68953 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
68954
68955-static void tasklet_action(struct softirq_action *a)
68956+static void tasklet_action(void)
68957 {
68958 struct tasklet_struct *list;
68959
68960@@ -476,7 +478,7 @@ static void tasklet_action(struct softirq_action *a)
68961 }
68962 }
68963
68964-static void tasklet_hi_action(struct softirq_action *a)
68965+static void tasklet_hi_action(void)
68966 {
68967 struct tasklet_struct *list;
68968
68969diff --git a/kernel/sys.c b/kernel/sys.c
68970index 888d227..f04b318 100644
68971--- a/kernel/sys.c
68972+++ b/kernel/sys.c
68973@@ -158,6 +158,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
68974 error = -EACCES;
68975 goto out;
68976 }
68977+
68978+ if (gr_handle_chroot_setpriority(p, niceval)) {
68979+ error = -EACCES;
68980+ goto out;
68981+ }
68982+
68983 no_nice = security_task_setnice(p, niceval);
68984 if (no_nice) {
68985 error = no_nice;
68986@@ -572,6 +578,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
68987 goto error;
68988 }
68989
68990+ if (gr_check_group_change(new->gid, new->egid, -1))
68991+ goto error;
68992+
68993 if (rgid != (gid_t) -1 ||
68994 (egid != (gid_t) -1 && egid != old->gid))
68995 new->sgid = new->egid;
68996@@ -601,6 +610,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
68997 old = current_cred();
68998
68999 retval = -EPERM;
69000+
69001+ if (gr_check_group_change(gid, gid, gid))
69002+ goto error;
69003+
69004 if (nsown_capable(CAP_SETGID))
69005 new->gid = new->egid = new->sgid = new->fsgid = gid;
69006 else if (gid == old->gid || gid == old->sgid)
69007@@ -618,7 +631,7 @@ error:
69008 /*
69009 * change the user struct in a credentials set to match the new UID
69010 */
69011-static int set_user(struct cred *new)
69012+int set_user(struct cred *new)
69013 {
69014 struct user_struct *new_user;
69015
69016@@ -688,6 +701,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
69017 goto error;
69018 }
69019
69020+ if (gr_check_user_change(new->uid, new->euid, -1))
69021+ goto error;
69022+
69023 if (new->uid != old->uid) {
69024 retval = set_user(new);
69025 if (retval < 0)
69026@@ -732,6 +748,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
69027 old = current_cred();
69028
69029 retval = -EPERM;
69030+
69031+ if (gr_check_crash_uid(uid))
69032+ goto error;
69033+ if (gr_check_user_change(uid, uid, uid))
69034+ goto error;
69035+
69036 if (nsown_capable(CAP_SETUID)) {
69037 new->suid = new->uid = uid;
69038 if (uid != old->uid) {
69039@@ -786,6 +808,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
69040 goto error;
69041 }
69042
69043+ if (gr_check_user_change(ruid, euid, -1))
69044+ goto error;
69045+
69046 if (ruid != (uid_t) -1) {
69047 new->uid = ruid;
69048 if (ruid != old->uid) {
69049@@ -850,6 +875,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
69050 goto error;
69051 }
69052
69053+ if (gr_check_group_change(rgid, egid, -1))
69054+ goto error;
69055+
69056 if (rgid != (gid_t) -1)
69057 new->gid = rgid;
69058 if (egid != (gid_t) -1)
69059@@ -896,6 +924,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69060 old = current_cred();
69061 old_fsuid = old->fsuid;
69062
69063+ if (gr_check_user_change(-1, -1, uid))
69064+ goto error;
69065+
69066 if (uid == old->uid || uid == old->euid ||
69067 uid == old->suid || uid == old->fsuid ||
69068 nsown_capable(CAP_SETUID)) {
69069@@ -906,6 +937,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69070 }
69071 }
69072
69073+error:
69074 abort_creds(new);
69075 return old_fsuid;
69076
69077@@ -932,12 +964,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
69078 if (gid == old->gid || gid == old->egid ||
69079 gid == old->sgid || gid == old->fsgid ||
69080 nsown_capable(CAP_SETGID)) {
69081+ if (gr_check_group_change(-1, -1, gid))
69082+ goto error;
69083+
69084 if (gid != old_fsgid) {
69085 new->fsgid = gid;
69086 goto change_okay;
69087 }
69088 }
69089
69090+error:
69091 abort_creds(new);
69092 return old_fsgid;
69093
69094@@ -1189,7 +1225,10 @@ static int override_release(char __user *release, int len)
69095 }
69096 v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
69097 snprintf(buf, len, "2.6.%u%s", v, rest);
69098- ret = copy_to_user(release, buf, len);
69099+ if (len > sizeof(buf))
69100+ ret = -EFAULT;
69101+ else
69102+ ret = copy_to_user(release, buf, len);
69103 }
69104 return ret;
69105 }
69106@@ -1243,19 +1282,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
69107 return -EFAULT;
69108
69109 down_read(&uts_sem);
69110- error = __copy_to_user(&name->sysname, &utsname()->sysname,
69111+ error = __copy_to_user(name->sysname, &utsname()->sysname,
69112 __OLD_UTS_LEN);
69113 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
69114- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
69115+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
69116 __OLD_UTS_LEN);
69117 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
69118- error |= __copy_to_user(&name->release, &utsname()->release,
69119+ error |= __copy_to_user(name->release, &utsname()->release,
69120 __OLD_UTS_LEN);
69121 error |= __put_user(0, name->release + __OLD_UTS_LEN);
69122- error |= __copy_to_user(&name->version, &utsname()->version,
69123+ error |= __copy_to_user(name->version, &utsname()->version,
69124 __OLD_UTS_LEN);
69125 error |= __put_user(0, name->version + __OLD_UTS_LEN);
69126- error |= __copy_to_user(&name->machine, &utsname()->machine,
69127+ error |= __copy_to_user(name->machine, &utsname()->machine,
69128 __OLD_UTS_LEN);
69129 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
69130 up_read(&uts_sem);
69131@@ -1838,7 +1877,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
69132 error = get_dumpable(me->mm);
69133 break;
69134 case PR_SET_DUMPABLE:
69135- if (arg2 < 0 || arg2 > 1) {
69136+ if (arg2 > 1) {
69137 error = -EINVAL;
69138 break;
69139 }
69140diff --git a/kernel/sysctl.c b/kernel/sysctl.c
69141index f03a6ef..5fcc8af 100644
69142--- a/kernel/sysctl.c
69143+++ b/kernel/sysctl.c
69144@@ -86,6 +86,13 @@
69145
69146
69147 #if defined(CONFIG_SYSCTL)
69148+#include <linux/grsecurity.h>
69149+#include <linux/grinternal.h>
69150+
69151+extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
69152+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
69153+ const int op);
69154+extern int gr_handle_chroot_sysctl(const int op);
69155
69156 /* External variables not in a header file. */
69157 extern int sysctl_overcommit_memory;
69158@@ -191,6 +198,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
69159 }
69160
69161 #endif
69162+extern struct ctl_table grsecurity_table[];
69163
69164 static struct ctl_table root_table[];
69165 static struct ctl_table_root sysctl_table_root;
69166@@ -220,6 +228,20 @@ extern struct ctl_table epoll_table[];
69167 int sysctl_legacy_va_layout;
69168 #endif
69169
69170+#ifdef CONFIG_PAX_SOFTMODE
69171+static ctl_table pax_table[] = {
69172+ {
69173+ .procname = "softmode",
69174+ .data = &pax_softmode,
69175+ .maxlen = sizeof(unsigned int),
69176+ .mode = 0600,
69177+ .proc_handler = &proc_dointvec,
69178+ },
69179+
69180+ { }
69181+};
69182+#endif
69183+
69184 /* The default sysctl tables: */
69185
69186 static struct ctl_table root_table[] = {
69187@@ -266,6 +288,22 @@ static int max_extfrag_threshold = 1000;
69188 #endif
69189
69190 static struct ctl_table kern_table[] = {
69191+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
69192+ {
69193+ .procname = "grsecurity",
69194+ .mode = 0500,
69195+ .child = grsecurity_table,
69196+ },
69197+#endif
69198+
69199+#ifdef CONFIG_PAX_SOFTMODE
69200+ {
69201+ .procname = "pax",
69202+ .mode = 0500,
69203+ .child = pax_table,
69204+ },
69205+#endif
69206+
69207 {
69208 .procname = "sched_child_runs_first",
69209 .data = &sysctl_sched_child_runs_first,
69210@@ -550,7 +588,7 @@ static struct ctl_table kern_table[] = {
69211 .data = &modprobe_path,
69212 .maxlen = KMOD_PATH_LEN,
69213 .mode = 0644,
69214- .proc_handler = proc_dostring,
69215+ .proc_handler = proc_dostring_modpriv,
69216 },
69217 {
69218 .procname = "modules_disabled",
69219@@ -717,16 +755,20 @@ static struct ctl_table kern_table[] = {
69220 .extra1 = &zero,
69221 .extra2 = &one,
69222 },
69223+#endif
69224 {
69225 .procname = "kptr_restrict",
69226 .data = &kptr_restrict,
69227 .maxlen = sizeof(int),
69228 .mode = 0644,
69229 .proc_handler = proc_dointvec_minmax_sysadmin,
69230+#ifdef CONFIG_GRKERNSEC_HIDESYM
69231+ .extra1 = &two,
69232+#else
69233 .extra1 = &zero,
69234+#endif
69235 .extra2 = &two,
69236 },
69237-#endif
69238 {
69239 .procname = "ngroups_max",
69240 .data = &ngroups_max,
69241@@ -1225,6 +1267,13 @@ static struct ctl_table vm_table[] = {
69242 .proc_handler = proc_dointvec_minmax,
69243 .extra1 = &zero,
69244 },
69245+ {
69246+ .procname = "heap_stack_gap",
69247+ .data = &sysctl_heap_stack_gap,
69248+ .maxlen = sizeof(sysctl_heap_stack_gap),
69249+ .mode = 0644,
69250+ .proc_handler = proc_doulongvec_minmax,
69251+ },
69252 #else
69253 {
69254 .procname = "nr_trim_pages",
69255@@ -1729,6 +1778,17 @@ static int test_perm(int mode, int op)
69256 int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
69257 {
69258 int mode;
69259+ int error;
69260+
69261+ if (table->parent != NULL && table->parent->procname != NULL &&
69262+ table->procname != NULL &&
69263+ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
69264+ return -EACCES;
69265+ if (gr_handle_chroot_sysctl(op))
69266+ return -EACCES;
69267+ error = gr_handle_sysctl(table, op);
69268+ if (error)
69269+ return error;
69270
69271 if (root->permissions)
69272 mode = root->permissions(root, current->nsproxy, table);
69273@@ -2133,6 +2193,16 @@ int proc_dostring(struct ctl_table *table, int write,
69274 buffer, lenp, ppos);
69275 }
69276
69277+int proc_dostring_modpriv(struct ctl_table *table, int write,
69278+ void __user *buffer, size_t *lenp, loff_t *ppos)
69279+{
69280+ if (write && !capable(CAP_SYS_MODULE))
69281+ return -EPERM;
69282+
69283+ return _proc_do_string(table->data, table->maxlen, write,
69284+ buffer, lenp, ppos);
69285+}
69286+
69287 static size_t proc_skip_spaces(char **buf)
69288 {
69289 size_t ret;
69290@@ -2238,6 +2308,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
69291 len = strlen(tmp);
69292 if (len > *size)
69293 len = *size;
69294+ if (len > sizeof(tmp))
69295+ len = sizeof(tmp);
69296 if (copy_to_user(*buf, tmp, len))
69297 return -EFAULT;
69298 *size -= len;
69299@@ -2554,8 +2626,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
69300 *i = val;
69301 } else {
69302 val = convdiv * (*i) / convmul;
69303- if (!first)
69304+ if (!first) {
69305 err = proc_put_char(&buffer, &left, '\t');
69306+ if (err)
69307+ break;
69308+ }
69309 err = proc_put_long(&buffer, &left, val, false);
69310 if (err)
69311 break;
69312@@ -2950,6 +3025,12 @@ int proc_dostring(struct ctl_table *table, int write,
69313 return -ENOSYS;
69314 }
69315
69316+int proc_dostring_modpriv(struct ctl_table *table, int write,
69317+ void __user *buffer, size_t *lenp, loff_t *ppos)
69318+{
69319+ return -ENOSYS;
69320+}
69321+
69322 int proc_dointvec(struct ctl_table *table, int write,
69323 void __user *buffer, size_t *lenp, loff_t *ppos)
69324 {
69325@@ -3006,6 +3087,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
69326 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
69327 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
69328 EXPORT_SYMBOL(proc_dostring);
69329+EXPORT_SYMBOL(proc_dostring_modpriv);
69330 EXPORT_SYMBOL(proc_doulongvec_minmax);
69331 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
69332 EXPORT_SYMBOL(register_sysctl_table);
69333diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
69334index a650694..aaeeb20 100644
69335--- a/kernel/sysctl_binary.c
69336+++ b/kernel/sysctl_binary.c
69337@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *file,
69338 int i;
69339
69340 set_fs(KERNEL_DS);
69341- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
69342+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
69343 set_fs(old_fs);
69344 if (result < 0)
69345 goto out_kfree;
69346@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *file,
69347 }
69348
69349 set_fs(KERNEL_DS);
69350- result = vfs_write(file, buffer, str - buffer, &pos);
69351+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
69352 set_fs(old_fs);
69353 if (result < 0)
69354 goto out_kfree;
69355@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file *file,
69356 int i;
69357
69358 set_fs(KERNEL_DS);
69359- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
69360+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
69361 set_fs(old_fs);
69362 if (result < 0)
69363 goto out_kfree;
69364@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file *file,
69365 }
69366
69367 set_fs(KERNEL_DS);
69368- result = vfs_write(file, buffer, str - buffer, &pos);
69369+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
69370 set_fs(old_fs);
69371 if (result < 0)
69372 goto out_kfree;
69373@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *file,
69374 int i;
69375
69376 set_fs(KERNEL_DS);
69377- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
69378+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
69379 set_fs(old_fs);
69380 if (result < 0)
69381 goto out;
69382@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struct file *file,
69383 __le16 dnaddr;
69384
69385 set_fs(KERNEL_DS);
69386- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
69387+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
69388 set_fs(old_fs);
69389 if (result < 0)
69390 goto out;
69391@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struct file *file,
69392 le16_to_cpu(dnaddr) & 0x3ff);
69393
69394 set_fs(KERNEL_DS);
69395- result = vfs_write(file, buf, len, &pos);
69396+ result = vfs_write(file, (const char __force_user *)buf, len, &pos);
69397 set_fs(old_fs);
69398 if (result < 0)
69399 goto out;
69400diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
69401index 362da65..ab8ef8c 100644
69402--- a/kernel/sysctl_check.c
69403+++ b/kernel/sysctl_check.c
69404@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
69405 set_fail(&fail, table, "Directory with extra2");
69406 } else {
69407 if ((table->proc_handler == proc_dostring) ||
69408+ (table->proc_handler == proc_dostring_modpriv) ||
69409 (table->proc_handler == proc_dointvec) ||
69410 (table->proc_handler == proc_dointvec_minmax) ||
69411 (table->proc_handler == proc_dointvec_jiffies) ||
69412diff --git a/kernel/taskstats.c b/kernel/taskstats.c
69413index e660464..c8b9e67 100644
69414--- a/kernel/taskstats.c
69415+++ b/kernel/taskstats.c
69416@@ -27,9 +27,12 @@
69417 #include <linux/cgroup.h>
69418 #include <linux/fs.h>
69419 #include <linux/file.h>
69420+#include <linux/grsecurity.h>
69421 #include <net/genetlink.h>
69422 #include <linux/atomic.h>
69423
69424+extern int gr_is_taskstats_denied(int pid);
69425+
69426 /*
69427 * Maximum length of a cpumask that can be specified in
69428 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
69429@@ -556,6 +559,9 @@ err:
69430
69431 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
69432 {
69433+ if (gr_is_taskstats_denied(current->pid))
69434+ return -EACCES;
69435+
69436 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
69437 return cmd_attr_register_cpumask(info);
69438 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
69439diff --git a/kernel/time.c b/kernel/time.c
69440index 73e416d..cfc6f69 100644
69441--- a/kernel/time.c
69442+++ b/kernel/time.c
69443@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
69444 return error;
69445
69446 if (tz) {
69447+ /* we log in do_settimeofday called below, so don't log twice
69448+ */
69449+ if (!tv)
69450+ gr_log_timechange();
69451+
69452 /* SMP safe, global irq locking makes it work. */
69453 sys_tz = *tz;
69454 update_vsyscall_tz();
69455diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
69456index 8a46f5d..bbe6f9c 100644
69457--- a/kernel/time/alarmtimer.c
69458+++ b/kernel/time/alarmtimer.c
69459@@ -773,7 +773,7 @@ static int __init alarmtimer_init(void)
69460 struct platform_device *pdev;
69461 int error = 0;
69462 int i;
69463- struct k_clock alarm_clock = {
69464+ static struct k_clock alarm_clock = {
69465 .clock_getres = alarm_clock_getres,
69466 .clock_get = alarm_clock_get,
69467 .timer_create = alarm_timer_create,
69468diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
69469index fd4a7b1..fae5c2a 100644
69470--- a/kernel/time/tick-broadcast.c
69471+++ b/kernel/time/tick-broadcast.c
69472@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
69473 * then clear the broadcast bit.
69474 */
69475 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
69476- int cpu = smp_processor_id();
69477+ cpu = smp_processor_id();
69478
69479 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
69480 tick_broadcast_clear_oneshot(cpu);
69481diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
69482index 0c63581..e25dcb6 100644
69483--- a/kernel/time/timekeeping.c
69484+++ b/kernel/time/timekeeping.c
69485@@ -14,6 +14,7 @@
69486 #include <linux/init.h>
69487 #include <linux/mm.h>
69488 #include <linux/sched.h>
69489+#include <linux/grsecurity.h>
69490 #include <linux/syscore_ops.h>
69491 #include <linux/clocksource.h>
69492 #include <linux/jiffies.h>
69493@@ -365,6 +366,8 @@ int do_settimeofday(const struct timespec *tv)
69494 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
69495 return -EINVAL;
69496
69497+ gr_log_timechange();
69498+
69499 write_seqlock_irqsave(&xtime_lock, flags);
69500
69501 timekeeping_forward_now();
69502diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
69503index 3258455..f35227d 100644
69504--- a/kernel/time/timer_list.c
69505+++ b/kernel/time/timer_list.c
69506@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
69507
69508 static void print_name_offset(struct seq_file *m, void *sym)
69509 {
69510+#ifdef CONFIG_GRKERNSEC_HIDESYM
69511+ SEQ_printf(m, "<%p>", NULL);
69512+#else
69513 char symname[KSYM_NAME_LEN];
69514
69515 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
69516 SEQ_printf(m, "<%pK>", sym);
69517 else
69518 SEQ_printf(m, "%s", symname);
69519+#endif
69520 }
69521
69522 static void
69523@@ -112,7 +116,11 @@ next_one:
69524 static void
69525 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
69526 {
69527+#ifdef CONFIG_GRKERNSEC_HIDESYM
69528+ SEQ_printf(m, " .base: %p\n", NULL);
69529+#else
69530 SEQ_printf(m, " .base: %pK\n", base);
69531+#endif
69532 SEQ_printf(m, " .index: %d\n",
69533 base->index);
69534 SEQ_printf(m, " .resolution: %Lu nsecs\n",
69535@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
69536 {
69537 struct proc_dir_entry *pe;
69538
69539+#ifdef CONFIG_GRKERNSEC_PROC_ADD
69540+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
69541+#else
69542 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
69543+#endif
69544 if (!pe)
69545 return -ENOMEM;
69546 return 0;
69547diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
69548index 0b537f2..9e71eca 100644
69549--- a/kernel/time/timer_stats.c
69550+++ b/kernel/time/timer_stats.c
69551@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
69552 static unsigned long nr_entries;
69553 static struct entry entries[MAX_ENTRIES];
69554
69555-static atomic_t overflow_count;
69556+static atomic_unchecked_t overflow_count;
69557
69558 /*
69559 * The entries are in a hash-table, for fast lookup:
69560@@ -140,7 +140,7 @@ static void reset_entries(void)
69561 nr_entries = 0;
69562 memset(entries, 0, sizeof(entries));
69563 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
69564- atomic_set(&overflow_count, 0);
69565+ atomic_set_unchecked(&overflow_count, 0);
69566 }
69567
69568 static struct entry *alloc_entry(void)
69569@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
69570 if (likely(entry))
69571 entry->count++;
69572 else
69573- atomic_inc(&overflow_count);
69574+ atomic_inc_unchecked(&overflow_count);
69575
69576 out_unlock:
69577 raw_spin_unlock_irqrestore(lock, flags);
69578@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
69579
69580 static void print_name_offset(struct seq_file *m, unsigned long addr)
69581 {
69582+#ifdef CONFIG_GRKERNSEC_HIDESYM
69583+ seq_printf(m, "<%p>", NULL);
69584+#else
69585 char symname[KSYM_NAME_LEN];
69586
69587 if (lookup_symbol_name(addr, symname) < 0)
69588 seq_printf(m, "<%p>", (void *)addr);
69589 else
69590 seq_printf(m, "%s", symname);
69591+#endif
69592 }
69593
69594 static int tstats_show(struct seq_file *m, void *v)
69595@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
69596
69597 seq_puts(m, "Timer Stats Version: v0.2\n");
69598 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
69599- if (atomic_read(&overflow_count))
69600+ if (atomic_read_unchecked(&overflow_count))
69601 seq_printf(m, "Overflow: %d entries\n",
69602- atomic_read(&overflow_count));
69603+ atomic_read_unchecked(&overflow_count));
69604
69605 for (i = 0; i < nr_entries; i++) {
69606 entry = entries + i;
69607@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
69608 {
69609 struct proc_dir_entry *pe;
69610
69611+#ifdef CONFIG_GRKERNSEC_PROC_ADD
69612+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
69613+#else
69614 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
69615+#endif
69616 if (!pe)
69617 return -ENOMEM;
69618 return 0;
69619diff --git a/kernel/timer.c b/kernel/timer.c
69620index a297ffc..5e16b0b 100644
69621--- a/kernel/timer.c
69622+++ b/kernel/timer.c
69623@@ -1354,7 +1354,7 @@ void update_process_times(int user_tick)
69624 /*
69625 * This function runs timers and the timer-tq in bottom half context.
69626 */
69627-static void run_timer_softirq(struct softirq_action *h)
69628+static void run_timer_softirq(void)
69629 {
69630 struct tvec_base *base = __this_cpu_read(tvec_bases);
69631
69632diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
69633index cdea7b5..9b820d4 100644
69634--- a/kernel/trace/blktrace.c
69635+++ b/kernel/trace/blktrace.c
69636@@ -324,7 +324,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
69637 struct blk_trace *bt = filp->private_data;
69638 char buf[16];
69639
69640- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
69641+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
69642
69643 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
69644 }
69645@@ -389,7 +389,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
69646 return 1;
69647
69648 bt = buf->chan->private_data;
69649- atomic_inc(&bt->dropped);
69650+ atomic_inc_unchecked(&bt->dropped);
69651 return 0;
69652 }
69653
69654@@ -490,7 +490,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
69655
69656 bt->dir = dir;
69657 bt->dev = dev;
69658- atomic_set(&bt->dropped, 0);
69659+ atomic_set_unchecked(&bt->dropped, 0);
69660
69661 ret = -EIO;
69662 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
69663diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
69664index 683d559..d70d914 100644
69665--- a/kernel/trace/ftrace.c
69666+++ b/kernel/trace/ftrace.c
69667@@ -1726,12 +1726,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
69668 if (unlikely(ftrace_disabled))
69669 return 0;
69670
69671+ ret = ftrace_arch_code_modify_prepare();
69672+ FTRACE_WARN_ON(ret);
69673+ if (ret)
69674+ return 0;
69675+
69676 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
69677+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
69678 if (ret) {
69679 ftrace_bug(ret, ip);
69680- return 0;
69681 }
69682- return 1;
69683+ return ret ? 0 : 1;
69684 }
69685
69686 /*
69687@@ -2843,7 +2848,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
69688
69689 int
69690 register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
69691- void *data)
69692+ void *data)
69693 {
69694 struct ftrace_func_probe *entry;
69695 struct ftrace_page *pg;
69696diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
69697index c4579f1..6a439da 100644
69698--- a/kernel/trace/trace.c
69699+++ b/kernel/trace/trace.c
69700@@ -4258,10 +4258,9 @@ static const struct file_operations tracing_dyn_info_fops = {
69701 };
69702 #endif
69703
69704-static struct dentry *d_tracer;
69705-
69706 struct dentry *tracing_init_dentry(void)
69707 {
69708+ static struct dentry *d_tracer;
69709 static int once;
69710
69711 if (d_tracer)
69712@@ -4281,10 +4280,9 @@ struct dentry *tracing_init_dentry(void)
69713 return d_tracer;
69714 }
69715
69716-static struct dentry *d_percpu;
69717-
69718 struct dentry *tracing_dentry_percpu(void)
69719 {
69720+ static struct dentry *d_percpu;
69721 static int once;
69722 struct dentry *d_tracer;
69723
69724diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
69725index c212a7f..7b02394 100644
69726--- a/kernel/trace/trace_events.c
69727+++ b/kernel/trace/trace_events.c
69728@@ -1299,10 +1299,6 @@ static LIST_HEAD(ftrace_module_file_list);
69729 struct ftrace_module_file_ops {
69730 struct list_head list;
69731 struct module *mod;
69732- struct file_operations id;
69733- struct file_operations enable;
69734- struct file_operations format;
69735- struct file_operations filter;
69736 };
69737
69738 static struct ftrace_module_file_ops *
69739@@ -1323,17 +1319,12 @@ trace_create_file_ops(struct module *mod)
69740
69741 file_ops->mod = mod;
69742
69743- file_ops->id = ftrace_event_id_fops;
69744- file_ops->id.owner = mod;
69745-
69746- file_ops->enable = ftrace_enable_fops;
69747- file_ops->enable.owner = mod;
69748-
69749- file_ops->filter = ftrace_event_filter_fops;
69750- file_ops->filter.owner = mod;
69751-
69752- file_ops->format = ftrace_event_format_fops;
69753- file_ops->format.owner = mod;
69754+ pax_open_kernel();
69755+ *(void **)&mod->trace_id.owner = mod;
69756+ *(void **)&mod->trace_enable.owner = mod;
69757+ *(void **)&mod->trace_filter.owner = mod;
69758+ *(void **)&mod->trace_format.owner = mod;
69759+ pax_close_kernel();
69760
69761 list_add(&file_ops->list, &ftrace_module_file_list);
69762
69763@@ -1357,8 +1348,8 @@ static void trace_module_add_events(struct module *mod)
69764
69765 for_each_event(call, start, end) {
69766 __trace_add_event_call(*call, mod,
69767- &file_ops->id, &file_ops->enable,
69768- &file_ops->filter, &file_ops->format);
69769+ &mod->trace_id, &mod->trace_enable,
69770+ &mod->trace_filter, &mod->trace_format);
69771 }
69772 }
69773
69774diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
69775index 00d527c..7c5b1a3 100644
69776--- a/kernel/trace/trace_kprobe.c
69777+++ b/kernel/trace/trace_kprobe.c
69778@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
69779 long ret;
69780 int maxlen = get_rloc_len(*(u32 *)dest);
69781 u8 *dst = get_rloc_data(dest);
69782- u8 *src = addr;
69783+ const u8 __user *src = (const u8 __force_user *)addr;
69784 mm_segment_t old_fs = get_fs();
69785 if (!maxlen)
69786 return;
69787@@ -229,7 +229,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
69788 pagefault_disable();
69789 do
69790 ret = __copy_from_user_inatomic(dst++, src++, 1);
69791- while (dst[-1] && ret == 0 && src - (u8 *)addr < maxlen);
69792+ while (dst[-1] && ret == 0 && src - (const u8 __force_user *)addr < maxlen);
69793 dst[-1] = '\0';
69794 pagefault_enable();
69795 set_fs(old_fs);
69796@@ -238,7 +238,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
69797 ((u8 *)get_rloc_data(dest))[0] = '\0';
69798 *(u32 *)dest = make_data_rloc(0, get_rloc_offs(*(u32 *)dest));
69799 } else
69800- *(u32 *)dest = make_data_rloc(src - (u8 *)addr,
69801+ *(u32 *)dest = make_data_rloc(src - (const u8 __force_user *)addr,
69802 get_rloc_offs(*(u32 *)dest));
69803 }
69804 /* Return the length of string -- including null terminal byte */
69805@@ -252,7 +252,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs *regs,
69806 set_fs(KERNEL_DS);
69807 pagefault_disable();
69808 do {
69809- ret = __copy_from_user_inatomic(&c, (u8 *)addr + len, 1);
69810+ ret = __copy_from_user_inatomic(&c, (const u8 __force_user *)addr + len, 1);
69811 len++;
69812 } while (c && ret == 0 && len < MAX_STRING_SIZE);
69813 pagefault_enable();
69814diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
69815index fd3c8aa..5f324a6 100644
69816--- a/kernel/trace/trace_mmiotrace.c
69817+++ b/kernel/trace/trace_mmiotrace.c
69818@@ -24,7 +24,7 @@ struct header_iter {
69819 static struct trace_array *mmio_trace_array;
69820 static bool overrun_detected;
69821 static unsigned long prev_overruns;
69822-static atomic_t dropped_count;
69823+static atomic_unchecked_t dropped_count;
69824
69825 static void mmio_reset_data(struct trace_array *tr)
69826 {
69827@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
69828
69829 static unsigned long count_overruns(struct trace_iterator *iter)
69830 {
69831- unsigned long cnt = atomic_xchg(&dropped_count, 0);
69832+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
69833 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
69834
69835 if (over > prev_overruns)
69836@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
69837 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
69838 sizeof(*entry), 0, pc);
69839 if (!event) {
69840- atomic_inc(&dropped_count);
69841+ atomic_inc_unchecked(&dropped_count);
69842 return;
69843 }
69844 entry = ring_buffer_event_data(event);
69845@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
69846 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
69847 sizeof(*entry), 0, pc);
69848 if (!event) {
69849- atomic_inc(&dropped_count);
69850+ atomic_inc_unchecked(&dropped_count);
69851 return;
69852 }
69853 entry = ring_buffer_event_data(event);
69854diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
69855index 0d6ff35..67e0ed7 100644
69856--- a/kernel/trace/trace_output.c
69857+++ b/kernel/trace/trace_output.c
69858@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
69859
69860 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
69861 if (!IS_ERR(p)) {
69862- p = mangle_path(s->buffer + s->len, p, "\n");
69863+ p = mangle_path(s->buffer + s->len, p, "\n\\");
69864 if (p) {
69865 s->len = p - s->buffer;
69866 return 1;
69867diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
69868index d4545f4..a9010a1 100644
69869--- a/kernel/trace/trace_stack.c
69870+++ b/kernel/trace/trace_stack.c
69871@@ -53,7 +53,7 @@ static inline void check_stack(void)
69872 return;
69873
69874 /* we do not handle interrupt stacks yet */
69875- if (!object_is_on_stack(&this_size))
69876+ if (!object_starts_on_stack(&this_size))
69877 return;
69878
69879 local_irq_save(flags);
69880diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
69881index 209b379..7f76423 100644
69882--- a/kernel/trace/trace_workqueue.c
69883+++ b/kernel/trace/trace_workqueue.c
69884@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
69885 int cpu;
69886 pid_t pid;
69887 /* Can be inserted from interrupt or user context, need to be atomic */
69888- atomic_t inserted;
69889+ atomic_unchecked_t inserted;
69890 /*
69891 * Don't need to be atomic, works are serialized in a single workqueue thread
69892 * on a single CPU.
69893@@ -60,7 +60,7 @@ probe_workqueue_insertion(void *ignore,
69894 spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
69895 list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
69896 if (node->pid == wq_thread->pid) {
69897- atomic_inc(&node->inserted);
69898+ atomic_inc_unchecked(&node->inserted);
69899 goto found;
69900 }
69901 }
69902@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
69903 tsk = get_pid_task(pid, PIDTYPE_PID);
69904 if (tsk) {
69905 seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
69906- atomic_read(&cws->inserted), cws->executed,
69907+ atomic_read_unchecked(&cws->inserted), cws->executed,
69908 tsk->comm);
69909 put_task_struct(tsk);
69910 }
69911diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
69912index 8745ac7..d144e37 100644
69913--- a/lib/Kconfig.debug
69914+++ b/lib/Kconfig.debug
69915@@ -1103,6 +1103,7 @@ config LATENCYTOP
69916 depends on DEBUG_KERNEL
69917 depends on STACKTRACE_SUPPORT
69918 depends on PROC_FS
69919+ depends on !GRKERNSEC_HIDESYM
69920 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
69921 select KALLSYMS
69922 select KALLSYMS_ALL
69923diff --git a/lib/bitmap.c b/lib/bitmap.c
69924index 0d4a127..33a06c7 100644
69925--- a/lib/bitmap.c
69926+++ b/lib/bitmap.c
69927@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
69928 {
69929 int c, old_c, totaldigits, ndigits, nchunks, nbits;
69930 u32 chunk;
69931- const char __user __force *ubuf = (const char __user __force *)buf;
69932+ const char __user *ubuf = (const char __force_user *)buf;
69933
69934 bitmap_zero(maskp, nmaskbits);
69935
69936@@ -504,7 +504,7 @@ int bitmap_parse_user(const char __user *ubuf,
69937 {
69938 if (!access_ok(VERIFY_READ, ubuf, ulen))
69939 return -EFAULT;
69940- return __bitmap_parse((const char __force *)ubuf,
69941+ return __bitmap_parse((const char __force_kernel *)ubuf,
69942 ulen, 1, maskp, nmaskbits);
69943
69944 }
69945@@ -596,7 +596,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
69946 {
69947 unsigned a, b;
69948 int c, old_c, totaldigits;
69949- const char __user __force *ubuf = (const char __user __force *)buf;
69950+ const char __user *ubuf = (const char __force_user *)buf;
69951 int exp_digit, in_range;
69952
69953 totaldigits = c = 0;
69954@@ -696,7 +696,7 @@ int bitmap_parselist_user(const char __user *ubuf,
69955 {
69956 if (!access_ok(VERIFY_READ, ubuf, ulen))
69957 return -EFAULT;
69958- return __bitmap_parselist((const char __force *)ubuf,
69959+ return __bitmap_parselist((const char __force_kernel *)ubuf,
69960 ulen, 1, maskp, nmaskbits);
69961 }
69962 EXPORT_SYMBOL(bitmap_parselist_user);
69963diff --git a/lib/bug.c b/lib/bug.c
69964index a28c141..2bd3d95 100644
69965--- a/lib/bug.c
69966+++ b/lib/bug.c
69967@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
69968 return BUG_TRAP_TYPE_NONE;
69969
69970 bug = find_bug(bugaddr);
69971+ if (!bug)
69972+ return BUG_TRAP_TYPE_NONE;
69973
69974 file = NULL;
69975 line = 0;
69976diff --git a/lib/debugobjects.c b/lib/debugobjects.c
69977index 0ab9ae8..f01ceca 100644
69978--- a/lib/debugobjects.c
69979+++ b/lib/debugobjects.c
69980@@ -288,7 +288,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
69981 if (limit > 4)
69982 return;
69983
69984- is_on_stack = object_is_on_stack(addr);
69985+ is_on_stack = object_starts_on_stack(addr);
69986 if (is_on_stack == onstack)
69987 return;
69988
69989diff --git a/lib/devres.c b/lib/devres.c
69990index 9676617..5149e15 100644
69991--- a/lib/devres.c
69992+++ b/lib/devres.c
69993@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
69994 void devm_iounmap(struct device *dev, void __iomem *addr)
69995 {
69996 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
69997- (void *)addr));
69998+ (void __force *)addr));
69999 iounmap(addr);
70000 }
70001 EXPORT_SYMBOL(devm_iounmap);
70002@@ -192,7 +192,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
70003 {
70004 ioport_unmap(addr);
70005 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
70006- devm_ioport_map_match, (void *)addr));
70007+ devm_ioport_map_match, (void __force *)addr));
70008 }
70009 EXPORT_SYMBOL(devm_ioport_unmap);
70010
70011diff --git a/lib/dma-debug.c b/lib/dma-debug.c
70012index fea790a..ebb0e82 100644
70013--- a/lib/dma-debug.c
70014+++ b/lib/dma-debug.c
70015@@ -925,7 +925,7 @@ out:
70016
70017 static void check_for_stack(struct device *dev, void *addr)
70018 {
70019- if (object_is_on_stack(addr))
70020+ if (object_starts_on_stack(addr))
70021 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
70022 "stack [addr=%p]\n", addr);
70023 }
70024diff --git a/lib/extable.c b/lib/extable.c
70025index 4cac81e..63e9b8f 100644
70026--- a/lib/extable.c
70027+++ b/lib/extable.c
70028@@ -13,6 +13,7 @@
70029 #include <linux/init.h>
70030 #include <linux/sort.h>
70031 #include <asm/uaccess.h>
70032+#include <asm/pgtable.h>
70033
70034 #ifndef ARCH_HAS_SORT_EXTABLE
70035 /*
70036@@ -36,8 +37,10 @@ static int cmp_ex(const void *a, const void *b)
70037 void sort_extable(struct exception_table_entry *start,
70038 struct exception_table_entry *finish)
70039 {
70040+ pax_open_kernel();
70041 sort(start, finish - start, sizeof(struct exception_table_entry),
70042 cmp_ex, NULL);
70043+ pax_close_kernel();
70044 }
70045
70046 #ifdef CONFIG_MODULES
70047diff --git a/lib/inflate.c b/lib/inflate.c
70048index 013a761..c28f3fc 100644
70049--- a/lib/inflate.c
70050+++ b/lib/inflate.c
70051@@ -269,7 +269,7 @@ static void free(void *where)
70052 malloc_ptr = free_mem_ptr;
70053 }
70054 #else
70055-#define malloc(a) kmalloc(a, GFP_KERNEL)
70056+#define malloc(a) kmalloc((a), GFP_KERNEL)
70057 #define free(a) kfree(a)
70058 #endif
70059
70060diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
70061index bd2bea9..6b3c95e 100644
70062--- a/lib/is_single_threaded.c
70063+++ b/lib/is_single_threaded.c
70064@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
70065 struct task_struct *p, *t;
70066 bool ret;
70067
70068+ if (!mm)
70069+ return true;
70070+
70071 if (atomic_read(&task->signal->live) != 1)
70072 return false;
70073
70074diff --git a/lib/radix-tree.c b/lib/radix-tree.c
70075index dc63d08..95ae14a 100644
70076--- a/lib/radix-tree.c
70077+++ b/lib/radix-tree.c
70078@@ -78,7 +78,7 @@ struct radix_tree_preload {
70079 int nr;
70080 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
70081 };
70082-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
70083+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
70084
70085 static inline void *ptr_to_indirect(void *ptr)
70086 {
70087diff --git a/lib/vsprintf.c b/lib/vsprintf.c
70088index 38e612e..4fb99a8 100644
70089--- a/lib/vsprintf.c
70090+++ b/lib/vsprintf.c
70091@@ -16,6 +16,9 @@
70092 * - scnprintf and vscnprintf
70093 */
70094
70095+#ifdef CONFIG_GRKERNSEC_HIDESYM
70096+#define __INCLUDED_BY_HIDESYM 1
70097+#endif
70098 #include <stdarg.h>
70099 #include <linux/module.h>
70100 #include <linux/types.h>
70101@@ -413,7 +416,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
70102 char sym[KSYM_SYMBOL_LEN];
70103 if (ext == 'B')
70104 sprint_backtrace(sym, value);
70105- else if (ext != 'f' && ext != 's')
70106+ else if (ext != 'f' && ext != 's' && ext != 'a')
70107 sprint_symbol(sym, value);
70108 else
70109 kallsyms_lookup(value, NULL, NULL, NULL, sym);
70110@@ -789,7 +792,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
70111 return number(buf, end, *(const netdev_features_t *)addr, spec);
70112 }
70113
70114+#ifdef CONFIG_GRKERNSEC_HIDESYM
70115+int kptr_restrict __read_mostly = 2;
70116+#else
70117 int kptr_restrict __read_mostly;
70118+#endif
70119
70120 /*
70121 * Show a '%p' thing. A kernel extension is that the '%p' is followed
70122@@ -803,6 +810,8 @@ int kptr_restrict __read_mostly;
70123 * - 'S' For symbolic direct pointers with offset
70124 * - 's' For symbolic direct pointers without offset
70125 * - 'B' For backtraced symbolic direct pointers with offset
70126+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
70127+ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
70128 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
70129 * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
70130 * - 'M' For a 6-byte MAC address, it prints the address in the
70131@@ -848,12 +857,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70132 {
70133 if (!ptr && *fmt != 'K') {
70134 /*
70135- * Print (null) with the same width as a pointer so it makes
70136+ * Print (nil) with the same width as a pointer so it makes
70137 * tabular output look nice.
70138 */
70139 if (spec.field_width == -1)
70140 spec.field_width = 2 * sizeof(void *);
70141- return string(buf, end, "(null)", spec);
70142+ return string(buf, end, "(nil)", spec);
70143 }
70144
70145 switch (*fmt) {
70146@@ -863,6 +872,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70147 /* Fallthrough */
70148 case 'S':
70149 case 's':
70150+#ifdef CONFIG_GRKERNSEC_HIDESYM
70151+ break;
70152+#else
70153+ return symbol_string(buf, end, ptr, spec, *fmt);
70154+#endif
70155+ case 'A':
70156+ case 'a':
70157 case 'B':
70158 return symbol_string(buf, end, ptr, spec, *fmt);
70159 case 'R':
70160@@ -1633,11 +1649,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70161 typeof(type) value; \
70162 if (sizeof(type) == 8) { \
70163 args = PTR_ALIGN(args, sizeof(u32)); \
70164- *(u32 *)&value = *(u32 *)args; \
70165- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
70166+ *(u32 *)&value = *(const u32 *)args; \
70167+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
70168 } else { \
70169 args = PTR_ALIGN(args, sizeof(type)); \
70170- value = *(typeof(type) *)args; \
70171+ value = *(const typeof(type) *)args; \
70172 } \
70173 args += sizeof(type); \
70174 value; \
70175@@ -1700,7 +1716,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70176 case FORMAT_TYPE_STR: {
70177 const char *str_arg = args;
70178 args += strlen(str_arg) + 1;
70179- str = string(str, end, (char *)str_arg, spec);
70180+ str = string(str, end, str_arg, spec);
70181 break;
70182 }
70183
70184diff --git a/localversion-grsec b/localversion-grsec
70185new file mode 100644
70186index 0000000..7cd6065
70187--- /dev/null
70188+++ b/localversion-grsec
70189@@ -0,0 +1 @@
70190+-grsec
70191diff --git a/mm/Kconfig b/mm/Kconfig
70192index e338407..49b5b7a 100644
70193--- a/mm/Kconfig
70194+++ b/mm/Kconfig
70195@@ -247,10 +247,10 @@ config KSM
70196 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
70197
70198 config DEFAULT_MMAP_MIN_ADDR
70199- int "Low address space to protect from user allocation"
70200+ int "Low address space to protect from user allocation"
70201 depends on MMU
70202- default 4096
70203- help
70204+ default 65536
70205+ help
70206 This is the portion of low virtual memory which should be protected
70207 from userspace allocation. Keeping a user from writing to low pages
70208 can help reduce the impact of kernel NULL pointer bugs.
70209diff --git a/mm/filemap.c b/mm/filemap.c
70210index b662757..3081ddd 100644
70211--- a/mm/filemap.c
70212+++ b/mm/filemap.c
70213@@ -1770,7 +1770,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
70214 struct address_space *mapping = file->f_mapping;
70215
70216 if (!mapping->a_ops->readpage)
70217- return -ENOEXEC;
70218+ return -ENODEV;
70219 file_accessed(file);
70220 vma->vm_ops = &generic_file_vm_ops;
70221 vma->vm_flags |= VM_CAN_NONLINEAR;
70222@@ -2176,6 +2176,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
70223 *pos = i_size_read(inode);
70224
70225 if (limit != RLIM_INFINITY) {
70226+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
70227 if (*pos >= limit) {
70228 send_sig(SIGXFSZ, current, 0);
70229 return -EFBIG;
70230diff --git a/mm/fremap.c b/mm/fremap.c
70231index 9ed4fd4..c42648d 100644
70232--- a/mm/fremap.c
70233+++ b/mm/fremap.c
70234@@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
70235 retry:
70236 vma = find_vma(mm, start);
70237
70238+#ifdef CONFIG_PAX_SEGMEXEC
70239+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
70240+ goto out;
70241+#endif
70242+
70243 /*
70244 * Make sure the vma is shared, that it supports prefaulting,
70245 * and that the remapped range is valid and fully within
70246diff --git a/mm/highmem.c b/mm/highmem.c
70247index 57d82c6..e9e0552 100644
70248--- a/mm/highmem.c
70249+++ b/mm/highmem.c
70250@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
70251 * So no dangers, even with speculative execution.
70252 */
70253 page = pte_page(pkmap_page_table[i]);
70254+ pax_open_kernel();
70255 pte_clear(&init_mm, (unsigned long)page_address(page),
70256 &pkmap_page_table[i]);
70257-
70258+ pax_close_kernel();
70259 set_page_address(page, NULL);
70260 need_flush = 1;
70261 }
70262@@ -186,9 +187,11 @@ start:
70263 }
70264 }
70265 vaddr = PKMAP_ADDR(last_pkmap_nr);
70266+
70267+ pax_open_kernel();
70268 set_pte_at(&init_mm, vaddr,
70269 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
70270-
70271+ pax_close_kernel();
70272 pkmap_count[last_pkmap_nr] = 1;
70273 set_page_address(page, (void *)vaddr);
70274
70275diff --git a/mm/huge_memory.c b/mm/huge_memory.c
70276index 8f7fc39..69bf1e9 100644
70277--- a/mm/huge_memory.c
70278+++ b/mm/huge_memory.c
70279@@ -733,7 +733,7 @@ out:
70280 * run pte_offset_map on the pmd, if an huge pmd could
70281 * materialize from under us from a different thread.
70282 */
70283- if (unlikely(__pte_alloc(mm, vma, pmd, address)))
70284+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
70285 return VM_FAULT_OOM;
70286 /* if an huge pmd materialized from under us just retry later */
70287 if (unlikely(pmd_trans_huge(*pmd)))
70288diff --git a/mm/hugetlb.c b/mm/hugetlb.c
70289index a7cf829..d60e0e1 100644
70290--- a/mm/hugetlb.c
70291+++ b/mm/hugetlb.c
70292@@ -2346,6 +2346,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
70293 return 1;
70294 }
70295
70296+#ifdef CONFIG_PAX_SEGMEXEC
70297+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
70298+{
70299+ struct mm_struct *mm = vma->vm_mm;
70300+ struct vm_area_struct *vma_m;
70301+ unsigned long address_m;
70302+ pte_t *ptep_m;
70303+
70304+ vma_m = pax_find_mirror_vma(vma);
70305+ if (!vma_m)
70306+ return;
70307+
70308+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
70309+ address_m = address + SEGMEXEC_TASK_SIZE;
70310+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
70311+ get_page(page_m);
70312+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
70313+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
70314+}
70315+#endif
70316+
70317 /*
70318 * Hugetlb_cow() should be called with page lock of the original hugepage held.
70319 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
70320@@ -2459,6 +2480,11 @@ retry_avoidcopy:
70321 make_huge_pte(vma, new_page, 1));
70322 page_remove_rmap(old_page);
70323 hugepage_add_new_anon_rmap(new_page, vma, address);
70324+
70325+#ifdef CONFIG_PAX_SEGMEXEC
70326+ pax_mirror_huge_pte(vma, address, new_page);
70327+#endif
70328+
70329 /* Make the old page be freed below */
70330 new_page = old_page;
70331 mmu_notifier_invalidate_range_end(mm,
70332@@ -2613,6 +2639,10 @@ retry:
70333 && (vma->vm_flags & VM_SHARED)));
70334 set_huge_pte_at(mm, address, ptep, new_pte);
70335
70336+#ifdef CONFIG_PAX_SEGMEXEC
70337+ pax_mirror_huge_pte(vma, address, page);
70338+#endif
70339+
70340 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
70341 /* Optimization, do the COW without a second fault */
70342 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
70343@@ -2642,6 +2672,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70344 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
70345 struct hstate *h = hstate_vma(vma);
70346
70347+#ifdef CONFIG_PAX_SEGMEXEC
70348+ struct vm_area_struct *vma_m;
70349+#endif
70350+
70351 address &= huge_page_mask(h);
70352
70353 ptep = huge_pte_offset(mm, address);
70354@@ -2655,6 +2689,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70355 VM_FAULT_SET_HINDEX(h - hstates);
70356 }
70357
70358+#ifdef CONFIG_PAX_SEGMEXEC
70359+ vma_m = pax_find_mirror_vma(vma);
70360+ if (vma_m) {
70361+ unsigned long address_m;
70362+
70363+ if (vma->vm_start > vma_m->vm_start) {
70364+ address_m = address;
70365+ address -= SEGMEXEC_TASK_SIZE;
70366+ vma = vma_m;
70367+ h = hstate_vma(vma);
70368+ } else
70369+ address_m = address + SEGMEXEC_TASK_SIZE;
70370+
70371+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
70372+ return VM_FAULT_OOM;
70373+ address_m &= HPAGE_MASK;
70374+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
70375+ }
70376+#endif
70377+
70378 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
70379 if (!ptep)
70380 return VM_FAULT_OOM;
70381diff --git a/mm/internal.h b/mm/internal.h
70382index 2189af4..f2ca332 100644
70383--- a/mm/internal.h
70384+++ b/mm/internal.h
70385@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
70386 * in mm/page_alloc.c
70387 */
70388 extern void __free_pages_bootmem(struct page *page, unsigned int order);
70389+extern void free_compound_page(struct page *page);
70390 extern void prep_compound_page(struct page *page, unsigned long order);
70391 #ifdef CONFIG_MEMORY_FAILURE
70392 extern bool is_free_buddy_page(struct page *page);
70393diff --git a/mm/kmemleak.c b/mm/kmemleak.c
70394index 45eb621..6ccd8ea 100644
70395--- a/mm/kmemleak.c
70396+++ b/mm/kmemleak.c
70397@@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
70398
70399 for (i = 0; i < object->trace_len; i++) {
70400 void *ptr = (void *)object->trace[i];
70401- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
70402+ seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
70403 }
70404 }
70405
70406diff --git a/mm/maccess.c b/mm/maccess.c
70407index d53adf9..03a24bf 100644
70408--- a/mm/maccess.c
70409+++ b/mm/maccess.c
70410@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
70411 set_fs(KERNEL_DS);
70412 pagefault_disable();
70413 ret = __copy_from_user_inatomic(dst,
70414- (__force const void __user *)src, size);
70415+ (const void __force_user *)src, size);
70416 pagefault_enable();
70417 set_fs(old_fs);
70418
70419@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
70420
70421 set_fs(KERNEL_DS);
70422 pagefault_disable();
70423- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
70424+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
70425 pagefault_enable();
70426 set_fs(old_fs);
70427
70428diff --git a/mm/madvise.c b/mm/madvise.c
70429index 74bf193..feb6fd3 100644
70430--- a/mm/madvise.c
70431+++ b/mm/madvise.c
70432@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
70433 pgoff_t pgoff;
70434 unsigned long new_flags = vma->vm_flags;
70435
70436+#ifdef CONFIG_PAX_SEGMEXEC
70437+ struct vm_area_struct *vma_m;
70438+#endif
70439+
70440 switch (behavior) {
70441 case MADV_NORMAL:
70442 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
70443@@ -110,6 +114,13 @@ success:
70444 /*
70445 * vm_flags is protected by the mmap_sem held in write mode.
70446 */
70447+
70448+#ifdef CONFIG_PAX_SEGMEXEC
70449+ vma_m = pax_find_mirror_vma(vma);
70450+ if (vma_m)
70451+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
70452+#endif
70453+
70454 vma->vm_flags = new_flags;
70455
70456 out:
70457@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
70458 struct vm_area_struct ** prev,
70459 unsigned long start, unsigned long end)
70460 {
70461+
70462+#ifdef CONFIG_PAX_SEGMEXEC
70463+ struct vm_area_struct *vma_m;
70464+#endif
70465+
70466 *prev = vma;
70467 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
70468 return -EINVAL;
70469@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
70470 zap_page_range(vma, start, end - start, &details);
70471 } else
70472 zap_page_range(vma, start, end - start, NULL);
70473+
70474+#ifdef CONFIG_PAX_SEGMEXEC
70475+ vma_m = pax_find_mirror_vma(vma);
70476+ if (vma_m) {
70477+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
70478+ struct zap_details details = {
70479+ .nonlinear_vma = vma_m,
70480+ .last_index = ULONG_MAX,
70481+ };
70482+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
70483+ } else
70484+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
70485+ }
70486+#endif
70487+
70488 return 0;
70489 }
70490
70491@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
70492 if (end < start)
70493 goto out;
70494
70495+#ifdef CONFIG_PAX_SEGMEXEC
70496+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
70497+ if (end > SEGMEXEC_TASK_SIZE)
70498+ goto out;
70499+ } else
70500+#endif
70501+
70502+ if (end > TASK_SIZE)
70503+ goto out;
70504+
70505 error = 0;
70506 if (end == start)
70507 goto out;
70508diff --git a/mm/memory-failure.c b/mm/memory-failure.c
70509index 56080ea..115071e 100644
70510--- a/mm/memory-failure.c
70511+++ b/mm/memory-failure.c
70512@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
70513
70514 int sysctl_memory_failure_recovery __read_mostly = 1;
70515
70516-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
70517+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
70518
70519 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
70520
70521@@ -202,7 +202,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
70522 si.si_signo = SIGBUS;
70523 si.si_errno = 0;
70524 si.si_code = BUS_MCEERR_AO;
70525- si.si_addr = (void *)addr;
70526+ si.si_addr = (void __user *)addr;
70527 #ifdef __ARCH_SI_TRAPNO
70528 si.si_trapno = trapno;
70529 #endif
70530@@ -1010,7 +1010,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70531 }
70532
70533 nr_pages = 1 << compound_trans_order(hpage);
70534- atomic_long_add(nr_pages, &mce_bad_pages);
70535+ atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
70536
70537 /*
70538 * We need/can do nothing about count=0 pages.
70539@@ -1040,7 +1040,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70540 if (!PageHWPoison(hpage)
70541 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
70542 || (p != hpage && TestSetPageHWPoison(hpage))) {
70543- atomic_long_sub(nr_pages, &mce_bad_pages);
70544+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70545 return 0;
70546 }
70547 set_page_hwpoison_huge_page(hpage);
70548@@ -1098,7 +1098,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70549 }
70550 if (hwpoison_filter(p)) {
70551 if (TestClearPageHWPoison(p))
70552- atomic_long_sub(nr_pages, &mce_bad_pages);
70553+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70554 unlock_page(hpage);
70555 put_page(hpage);
70556 return 0;
70557@@ -1315,7 +1315,7 @@ int unpoison_memory(unsigned long pfn)
70558 return 0;
70559 }
70560 if (TestClearPageHWPoison(p))
70561- atomic_long_sub(nr_pages, &mce_bad_pages);
70562+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70563 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
70564 return 0;
70565 }
70566@@ -1329,7 +1329,7 @@ int unpoison_memory(unsigned long pfn)
70567 */
70568 if (TestClearPageHWPoison(page)) {
70569 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
70570- atomic_long_sub(nr_pages, &mce_bad_pages);
70571+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70572 freeit = 1;
70573 if (PageHuge(page))
70574 clear_page_hwpoison_huge_page(page);
70575@@ -1442,7 +1442,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
70576 }
70577 done:
70578 if (!PageHWPoison(hpage))
70579- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
70580+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
70581 set_page_hwpoison_huge_page(hpage);
70582 dequeue_hwpoisoned_huge_page(hpage);
70583 /* keep elevated page count for bad page */
70584@@ -1573,7 +1573,7 @@ int soft_offline_page(struct page *page, int flags)
70585 return ret;
70586
70587 done:
70588- atomic_long_add(1, &mce_bad_pages);
70589+ atomic_long_add_unchecked(1, &mce_bad_pages);
70590 SetPageHWPoison(page);
70591 /* keep elevated page count for bad page */
70592 return ret;
70593diff --git a/mm/memory.c b/mm/memory.c
70594index 10b4dda..764ee07 100644
70595--- a/mm/memory.c
70596+++ b/mm/memory.c
70597@@ -457,8 +457,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
70598 return;
70599
70600 pmd = pmd_offset(pud, start);
70601+
70602+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
70603 pud_clear(pud);
70604 pmd_free_tlb(tlb, pmd, start);
70605+#endif
70606+
70607 }
70608
70609 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
70610@@ -489,9 +493,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
70611 if (end - 1 > ceiling - 1)
70612 return;
70613
70614+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
70615 pud = pud_offset(pgd, start);
70616 pgd_clear(pgd);
70617 pud_free_tlb(tlb, pud, start);
70618+#endif
70619+
70620 }
70621
70622 /*
70623@@ -1593,12 +1600,6 @@ no_page_table:
70624 return page;
70625 }
70626
70627-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
70628-{
70629- return stack_guard_page_start(vma, addr) ||
70630- stack_guard_page_end(vma, addr+PAGE_SIZE);
70631-}
70632-
70633 /**
70634 * __get_user_pages() - pin user pages in memory
70635 * @tsk: task_struct of target task
70636@@ -1671,10 +1672,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
70637 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
70638 i = 0;
70639
70640- do {
70641+ while (nr_pages) {
70642 struct vm_area_struct *vma;
70643
70644- vma = find_extend_vma(mm, start);
70645+ vma = find_vma(mm, start);
70646 if (!vma && in_gate_area(mm, start)) {
70647 unsigned long pg = start & PAGE_MASK;
70648 pgd_t *pgd;
70649@@ -1722,7 +1723,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
70650 goto next_page;
70651 }
70652
70653- if (!vma ||
70654+ if (!vma || start < vma->vm_start ||
70655 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
70656 !(vm_flags & vma->vm_flags))
70657 return i ? : -EFAULT;
70658@@ -1749,11 +1750,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
70659 int ret;
70660 unsigned int fault_flags = 0;
70661
70662- /* For mlock, just skip the stack guard page. */
70663- if (foll_flags & FOLL_MLOCK) {
70664- if (stack_guard_page(vma, start))
70665- goto next_page;
70666- }
70667 if (foll_flags & FOLL_WRITE)
70668 fault_flags |= FAULT_FLAG_WRITE;
70669 if (nonblocking)
70670@@ -1827,7 +1823,7 @@ next_page:
70671 start += PAGE_SIZE;
70672 nr_pages--;
70673 } while (nr_pages && start < vma->vm_end);
70674- } while (nr_pages);
70675+ }
70676 return i;
70677 }
70678 EXPORT_SYMBOL(__get_user_pages);
70679@@ -2034,6 +2030,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
70680 page_add_file_rmap(page);
70681 set_pte_at(mm, addr, pte, mk_pte(page, prot));
70682
70683+#ifdef CONFIG_PAX_SEGMEXEC
70684+ pax_mirror_file_pte(vma, addr, page, ptl);
70685+#endif
70686+
70687 retval = 0;
70688 pte_unmap_unlock(pte, ptl);
70689 return retval;
70690@@ -2068,10 +2068,22 @@ out:
70691 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
70692 struct page *page)
70693 {
70694+
70695+#ifdef CONFIG_PAX_SEGMEXEC
70696+ struct vm_area_struct *vma_m;
70697+#endif
70698+
70699 if (addr < vma->vm_start || addr >= vma->vm_end)
70700 return -EFAULT;
70701 if (!page_count(page))
70702 return -EINVAL;
70703+
70704+#ifdef CONFIG_PAX_SEGMEXEC
70705+ vma_m = pax_find_mirror_vma(vma);
70706+ if (vma_m)
70707+ vma_m->vm_flags |= VM_INSERTPAGE;
70708+#endif
70709+
70710 vma->vm_flags |= VM_INSERTPAGE;
70711 return insert_page(vma, addr, page, vma->vm_page_prot);
70712 }
70713@@ -2157,6 +2169,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
70714 unsigned long pfn)
70715 {
70716 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
70717+ BUG_ON(vma->vm_mirror);
70718
70719 if (addr < vma->vm_start || addr >= vma->vm_end)
70720 return -EFAULT;
70721@@ -2472,6 +2485,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
70722 copy_user_highpage(dst, src, va, vma);
70723 }
70724
70725+#ifdef CONFIG_PAX_SEGMEXEC
70726+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
70727+{
70728+ struct mm_struct *mm = vma->vm_mm;
70729+ spinlock_t *ptl;
70730+ pte_t *pte, entry;
70731+
70732+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
70733+ entry = *pte;
70734+ if (!pte_present(entry)) {
70735+ if (!pte_none(entry)) {
70736+ BUG_ON(pte_file(entry));
70737+ free_swap_and_cache(pte_to_swp_entry(entry));
70738+ pte_clear_not_present_full(mm, address, pte, 0);
70739+ }
70740+ } else {
70741+ struct page *page;
70742+
70743+ flush_cache_page(vma, address, pte_pfn(entry));
70744+ entry = ptep_clear_flush(vma, address, pte);
70745+ BUG_ON(pte_dirty(entry));
70746+ page = vm_normal_page(vma, address, entry);
70747+ if (page) {
70748+ update_hiwater_rss(mm);
70749+ if (PageAnon(page))
70750+ dec_mm_counter_fast(mm, MM_ANONPAGES);
70751+ else
70752+ dec_mm_counter_fast(mm, MM_FILEPAGES);
70753+ page_remove_rmap(page);
70754+ page_cache_release(page);
70755+ }
70756+ }
70757+ pte_unmap_unlock(pte, ptl);
70758+}
70759+
70760+/* PaX: if vma is mirrored, synchronize the mirror's PTE
70761+ *
70762+ * the ptl of the lower mapped page is held on entry and is not released on exit
70763+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
70764+ */
70765+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
70766+{
70767+ struct mm_struct *mm = vma->vm_mm;
70768+ unsigned long address_m;
70769+ spinlock_t *ptl_m;
70770+ struct vm_area_struct *vma_m;
70771+ pmd_t *pmd_m;
70772+ pte_t *pte_m, entry_m;
70773+
70774+ BUG_ON(!page_m || !PageAnon(page_m));
70775+
70776+ vma_m = pax_find_mirror_vma(vma);
70777+ if (!vma_m)
70778+ return;
70779+
70780+ BUG_ON(!PageLocked(page_m));
70781+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
70782+ address_m = address + SEGMEXEC_TASK_SIZE;
70783+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
70784+ pte_m = pte_offset_map(pmd_m, address_m);
70785+ ptl_m = pte_lockptr(mm, pmd_m);
70786+ if (ptl != ptl_m) {
70787+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
70788+ if (!pte_none(*pte_m))
70789+ goto out;
70790+ }
70791+
70792+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
70793+ page_cache_get(page_m);
70794+ page_add_anon_rmap(page_m, vma_m, address_m);
70795+ inc_mm_counter_fast(mm, MM_ANONPAGES);
70796+ set_pte_at(mm, address_m, pte_m, entry_m);
70797+ update_mmu_cache(vma_m, address_m, entry_m);
70798+out:
70799+ if (ptl != ptl_m)
70800+ spin_unlock(ptl_m);
70801+ pte_unmap(pte_m);
70802+ unlock_page(page_m);
70803+}
70804+
70805+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
70806+{
70807+ struct mm_struct *mm = vma->vm_mm;
70808+ unsigned long address_m;
70809+ spinlock_t *ptl_m;
70810+ struct vm_area_struct *vma_m;
70811+ pmd_t *pmd_m;
70812+ pte_t *pte_m, entry_m;
70813+
70814+ BUG_ON(!page_m || PageAnon(page_m));
70815+
70816+ vma_m = pax_find_mirror_vma(vma);
70817+ if (!vma_m)
70818+ return;
70819+
70820+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
70821+ address_m = address + SEGMEXEC_TASK_SIZE;
70822+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
70823+ pte_m = pte_offset_map(pmd_m, address_m);
70824+ ptl_m = pte_lockptr(mm, pmd_m);
70825+ if (ptl != ptl_m) {
70826+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
70827+ if (!pte_none(*pte_m))
70828+ goto out;
70829+ }
70830+
70831+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
70832+ page_cache_get(page_m);
70833+ page_add_file_rmap(page_m);
70834+ inc_mm_counter_fast(mm, MM_FILEPAGES);
70835+ set_pte_at(mm, address_m, pte_m, entry_m);
70836+ update_mmu_cache(vma_m, address_m, entry_m);
70837+out:
70838+ if (ptl != ptl_m)
70839+ spin_unlock(ptl_m);
70840+ pte_unmap(pte_m);
70841+}
70842+
70843+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
70844+{
70845+ struct mm_struct *mm = vma->vm_mm;
70846+ unsigned long address_m;
70847+ spinlock_t *ptl_m;
70848+ struct vm_area_struct *vma_m;
70849+ pmd_t *pmd_m;
70850+ pte_t *pte_m, entry_m;
70851+
70852+ vma_m = pax_find_mirror_vma(vma);
70853+ if (!vma_m)
70854+ return;
70855+
70856+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
70857+ address_m = address + SEGMEXEC_TASK_SIZE;
70858+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
70859+ pte_m = pte_offset_map(pmd_m, address_m);
70860+ ptl_m = pte_lockptr(mm, pmd_m);
70861+ if (ptl != ptl_m) {
70862+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
70863+ if (!pte_none(*pte_m))
70864+ goto out;
70865+ }
70866+
70867+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
70868+ set_pte_at(mm, address_m, pte_m, entry_m);
70869+out:
70870+ if (ptl != ptl_m)
70871+ spin_unlock(ptl_m);
70872+ pte_unmap(pte_m);
70873+}
70874+
70875+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
70876+{
70877+ struct page *page_m;
70878+ pte_t entry;
70879+
70880+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
70881+ goto out;
70882+
70883+ entry = *pte;
70884+ page_m = vm_normal_page(vma, address, entry);
70885+ if (!page_m)
70886+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
70887+ else if (PageAnon(page_m)) {
70888+ if (pax_find_mirror_vma(vma)) {
70889+ pte_unmap_unlock(pte, ptl);
70890+ lock_page(page_m);
70891+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
70892+ if (pte_same(entry, *pte))
70893+ pax_mirror_anon_pte(vma, address, page_m, ptl);
70894+ else
70895+ unlock_page(page_m);
70896+ }
70897+ } else
70898+ pax_mirror_file_pte(vma, address, page_m, ptl);
70899+
70900+out:
70901+ pte_unmap_unlock(pte, ptl);
70902+}
70903+#endif
70904+
70905 /*
70906 * This routine handles present pages, when users try to write
70907 * to a shared page. It is done by copying the page to a new address
70908@@ -2683,6 +2876,12 @@ gotten:
70909 */
70910 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
70911 if (likely(pte_same(*page_table, orig_pte))) {
70912+
70913+#ifdef CONFIG_PAX_SEGMEXEC
70914+ if (pax_find_mirror_vma(vma))
70915+ BUG_ON(!trylock_page(new_page));
70916+#endif
70917+
70918 if (old_page) {
70919 if (!PageAnon(old_page)) {
70920 dec_mm_counter_fast(mm, MM_FILEPAGES);
70921@@ -2734,6 +2933,10 @@ gotten:
70922 page_remove_rmap(old_page);
70923 }
70924
70925+#ifdef CONFIG_PAX_SEGMEXEC
70926+ pax_mirror_anon_pte(vma, address, new_page, ptl);
70927+#endif
70928+
70929 /* Free the old page.. */
70930 new_page = old_page;
70931 ret |= VM_FAULT_WRITE;
70932@@ -3013,6 +3216,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
70933 swap_free(entry);
70934 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
70935 try_to_free_swap(page);
70936+
70937+#ifdef CONFIG_PAX_SEGMEXEC
70938+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
70939+#endif
70940+
70941 unlock_page(page);
70942 if (swapcache) {
70943 /*
70944@@ -3036,6 +3244,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
70945
70946 /* No need to invalidate - it was non-present before */
70947 update_mmu_cache(vma, address, page_table);
70948+
70949+#ifdef CONFIG_PAX_SEGMEXEC
70950+ pax_mirror_anon_pte(vma, address, page, ptl);
70951+#endif
70952+
70953 unlock:
70954 pte_unmap_unlock(page_table, ptl);
70955 out:
70956@@ -3055,40 +3268,6 @@ out_release:
70957 }
70958
70959 /*
70960- * This is like a special single-page "expand_{down|up}wards()",
70961- * except we must first make sure that 'address{-|+}PAGE_SIZE'
70962- * doesn't hit another vma.
70963- */
70964-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
70965-{
70966- address &= PAGE_MASK;
70967- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
70968- struct vm_area_struct *prev = vma->vm_prev;
70969-
70970- /*
70971- * Is there a mapping abutting this one below?
70972- *
70973- * That's only ok if it's the same stack mapping
70974- * that has gotten split..
70975- */
70976- if (prev && prev->vm_end == address)
70977- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
70978-
70979- expand_downwards(vma, address - PAGE_SIZE);
70980- }
70981- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
70982- struct vm_area_struct *next = vma->vm_next;
70983-
70984- /* As VM_GROWSDOWN but s/below/above/ */
70985- if (next && next->vm_start == address + PAGE_SIZE)
70986- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
70987-
70988- expand_upwards(vma, address + PAGE_SIZE);
70989- }
70990- return 0;
70991-}
70992-
70993-/*
70994 * We enter with non-exclusive mmap_sem (to exclude vma changes,
70995 * but allow concurrent faults), and pte mapped but not yet locked.
70996 * We return with mmap_sem still held, but pte unmapped and unlocked.
70997@@ -3097,27 +3276,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
70998 unsigned long address, pte_t *page_table, pmd_t *pmd,
70999 unsigned int flags)
71000 {
71001- struct page *page;
71002+ struct page *page = NULL;
71003 spinlock_t *ptl;
71004 pte_t entry;
71005
71006- pte_unmap(page_table);
71007-
71008- /* Check if we need to add a guard page to the stack */
71009- if (check_stack_guard_page(vma, address) < 0)
71010- return VM_FAULT_SIGBUS;
71011-
71012- /* Use the zero-page for reads */
71013 if (!(flags & FAULT_FLAG_WRITE)) {
71014 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
71015 vma->vm_page_prot));
71016- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71017+ ptl = pte_lockptr(mm, pmd);
71018+ spin_lock(ptl);
71019 if (!pte_none(*page_table))
71020 goto unlock;
71021 goto setpte;
71022 }
71023
71024 /* Allocate our own private page. */
71025+ pte_unmap(page_table);
71026+
71027 if (unlikely(anon_vma_prepare(vma)))
71028 goto oom;
71029 page = alloc_zeroed_user_highpage_movable(vma, address);
71030@@ -3136,6 +3311,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71031 if (!pte_none(*page_table))
71032 goto release;
71033
71034+#ifdef CONFIG_PAX_SEGMEXEC
71035+ if (pax_find_mirror_vma(vma))
71036+ BUG_ON(!trylock_page(page));
71037+#endif
71038+
71039 inc_mm_counter_fast(mm, MM_ANONPAGES);
71040 page_add_new_anon_rmap(page, vma, address);
71041 setpte:
71042@@ -3143,6 +3323,12 @@ setpte:
71043
71044 /* No need to invalidate - it was non-present before */
71045 update_mmu_cache(vma, address, page_table);
71046+
71047+#ifdef CONFIG_PAX_SEGMEXEC
71048+ if (page)
71049+ pax_mirror_anon_pte(vma, address, page, ptl);
71050+#endif
71051+
71052 unlock:
71053 pte_unmap_unlock(page_table, ptl);
71054 return 0;
71055@@ -3286,6 +3472,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71056 */
71057 /* Only go through if we didn't race with anybody else... */
71058 if (likely(pte_same(*page_table, orig_pte))) {
71059+
71060+#ifdef CONFIG_PAX_SEGMEXEC
71061+ if (anon && pax_find_mirror_vma(vma))
71062+ BUG_ON(!trylock_page(page));
71063+#endif
71064+
71065 flush_icache_page(vma, page);
71066 entry = mk_pte(page, vma->vm_page_prot);
71067 if (flags & FAULT_FLAG_WRITE)
71068@@ -3305,6 +3497,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71069
71070 /* no need to invalidate: a not-present page won't be cached */
71071 update_mmu_cache(vma, address, page_table);
71072+
71073+#ifdef CONFIG_PAX_SEGMEXEC
71074+ if (anon)
71075+ pax_mirror_anon_pte(vma, address, page, ptl);
71076+ else
71077+ pax_mirror_file_pte(vma, address, page, ptl);
71078+#endif
71079+
71080 } else {
71081 if (cow_page)
71082 mem_cgroup_uncharge_page(cow_page);
71083@@ -3458,6 +3658,12 @@ int handle_pte_fault(struct mm_struct *mm,
71084 if (flags & FAULT_FLAG_WRITE)
71085 flush_tlb_fix_spurious_fault(vma, address);
71086 }
71087+
71088+#ifdef CONFIG_PAX_SEGMEXEC
71089+ pax_mirror_pte(vma, address, pte, pmd, ptl);
71090+ return 0;
71091+#endif
71092+
71093 unlock:
71094 pte_unmap_unlock(pte, ptl);
71095 return 0;
71096@@ -3474,6 +3680,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71097 pmd_t *pmd;
71098 pte_t *pte;
71099
71100+#ifdef CONFIG_PAX_SEGMEXEC
71101+ struct vm_area_struct *vma_m;
71102+#endif
71103+
71104 __set_current_state(TASK_RUNNING);
71105
71106 count_vm_event(PGFAULT);
71107@@ -3485,6 +3695,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71108 if (unlikely(is_vm_hugetlb_page(vma)))
71109 return hugetlb_fault(mm, vma, address, flags);
71110
71111+#ifdef CONFIG_PAX_SEGMEXEC
71112+ vma_m = pax_find_mirror_vma(vma);
71113+ if (vma_m) {
71114+ unsigned long address_m;
71115+ pgd_t *pgd_m;
71116+ pud_t *pud_m;
71117+ pmd_t *pmd_m;
71118+
71119+ if (vma->vm_start > vma_m->vm_start) {
71120+ address_m = address;
71121+ address -= SEGMEXEC_TASK_SIZE;
71122+ vma = vma_m;
71123+ } else
71124+ address_m = address + SEGMEXEC_TASK_SIZE;
71125+
71126+ pgd_m = pgd_offset(mm, address_m);
71127+ pud_m = pud_alloc(mm, pgd_m, address_m);
71128+ if (!pud_m)
71129+ return VM_FAULT_OOM;
71130+ pmd_m = pmd_alloc(mm, pud_m, address_m);
71131+ if (!pmd_m)
71132+ return VM_FAULT_OOM;
71133+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
71134+ return VM_FAULT_OOM;
71135+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
71136+ }
71137+#endif
71138+
71139 pgd = pgd_offset(mm, address);
71140 pud = pud_alloc(mm, pgd, address);
71141 if (!pud)
71142@@ -3514,7 +3752,7 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71143 * run pte_offset_map on the pmd, if an huge pmd could
71144 * materialize from under us from a different thread.
71145 */
71146- if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
71147+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
71148 return VM_FAULT_OOM;
71149 /* if an huge pmd materialized from under us just retry later */
71150 if (unlikely(pmd_trans_huge(*pmd)))
71151@@ -3618,7 +3856,7 @@ static int __init gate_vma_init(void)
71152 gate_vma.vm_start = FIXADDR_USER_START;
71153 gate_vma.vm_end = FIXADDR_USER_END;
71154 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
71155- gate_vma.vm_page_prot = __P101;
71156+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
71157 /*
71158 * Make sure the vDSO gets into every core dump.
71159 * Dumping its contents makes post-mortem fully interpretable later
71160diff --git a/mm/mempolicy.c b/mm/mempolicy.c
71161index 0a37570..2048346 100644
71162--- a/mm/mempolicy.c
71163+++ b/mm/mempolicy.c
71164@@ -640,6 +640,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71165 unsigned long vmstart;
71166 unsigned long vmend;
71167
71168+#ifdef CONFIG_PAX_SEGMEXEC
71169+ struct vm_area_struct *vma_m;
71170+#endif
71171+
71172 vma = find_vma(mm, start);
71173 if (!vma || vma->vm_start > start)
71174 return -EFAULT;
71175@@ -679,6 +683,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71176 err = policy_vma(vma, new_pol);
71177 if (err)
71178 goto out;
71179+
71180+#ifdef CONFIG_PAX_SEGMEXEC
71181+ vma_m = pax_find_mirror_vma(vma);
71182+ if (vma_m) {
71183+ err = policy_vma(vma_m, new_pol);
71184+ if (err)
71185+ goto out;
71186+ }
71187+#endif
71188+
71189 }
71190
71191 out:
71192@@ -1112,6 +1126,17 @@ static long do_mbind(unsigned long start, unsigned long len,
71193
71194 if (end < start)
71195 return -EINVAL;
71196+
71197+#ifdef CONFIG_PAX_SEGMEXEC
71198+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
71199+ if (end > SEGMEXEC_TASK_SIZE)
71200+ return -EINVAL;
71201+ } else
71202+#endif
71203+
71204+ if (end > TASK_SIZE)
71205+ return -EINVAL;
71206+
71207 if (end == start)
71208 return 0;
71209
71210@@ -1330,6 +1355,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71211 if (!mm)
71212 goto out;
71213
71214+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71215+ if (mm != current->mm &&
71216+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71217+ err = -EPERM;
71218+ goto out;
71219+ }
71220+#endif
71221+
71222 /*
71223 * Check if this process has the right to modify the specified
71224 * process. The right exists if the process has administrative
71225@@ -1339,8 +1372,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71226 rcu_read_lock();
71227 tcred = __task_cred(task);
71228 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
71229- cred->uid != tcred->suid && cred->uid != tcred->uid &&
71230- !capable(CAP_SYS_NICE)) {
71231+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
71232 rcu_read_unlock();
71233 err = -EPERM;
71234 goto out;
71235diff --git a/mm/migrate.c b/mm/migrate.c
71236index 1503b6b..156c672 100644
71237--- a/mm/migrate.c
71238+++ b/mm/migrate.c
71239@@ -1370,6 +1370,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
71240 if (!mm)
71241 return -EINVAL;
71242
71243+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71244+ if (mm != current->mm &&
71245+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71246+ err = -EPERM;
71247+ goto out;
71248+ }
71249+#endif
71250+
71251 /*
71252 * Check if this process has the right to modify the specified
71253 * process. The right exists if the process has administrative
71254@@ -1379,8 +1387,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
71255 rcu_read_lock();
71256 tcred = __task_cred(task);
71257 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
71258- cred->uid != tcred->suid && cred->uid != tcred->uid &&
71259- !capable(CAP_SYS_NICE)) {
71260+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
71261 rcu_read_unlock();
71262 err = -EPERM;
71263 goto out;
71264diff --git a/mm/mlock.c b/mm/mlock.c
71265index ef726e8..13e0901 100644
71266--- a/mm/mlock.c
71267+++ b/mm/mlock.c
71268@@ -13,6 +13,7 @@
71269 #include <linux/pagemap.h>
71270 #include <linux/mempolicy.h>
71271 #include <linux/syscalls.h>
71272+#include <linux/security.h>
71273 #include <linux/sched.h>
71274 #include <linux/export.h>
71275 #include <linux/rmap.h>
71276@@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
71277 return -EINVAL;
71278 if (end == start)
71279 return 0;
71280+ if (end > TASK_SIZE)
71281+ return -EINVAL;
71282+
71283 vma = find_vma(current->mm, start);
71284 if (!vma || vma->vm_start > start)
71285 return -ENOMEM;
71286@@ -396,6 +400,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
71287 for (nstart = start ; ; ) {
71288 vm_flags_t newflags;
71289
71290+#ifdef CONFIG_PAX_SEGMEXEC
71291+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
71292+ break;
71293+#endif
71294+
71295 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
71296
71297 newflags = vma->vm_flags | VM_LOCKED;
71298@@ -501,6 +510,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
71299 lock_limit >>= PAGE_SHIFT;
71300
71301 /* check against resource limits */
71302+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
71303 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
71304 error = do_mlock(start, len, 1);
71305 up_write(&current->mm->mmap_sem);
71306@@ -524,17 +534,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
71307 static int do_mlockall(int flags)
71308 {
71309 struct vm_area_struct * vma, * prev = NULL;
71310- unsigned int def_flags = 0;
71311
71312 if (flags & MCL_FUTURE)
71313- def_flags = VM_LOCKED;
71314- current->mm->def_flags = def_flags;
71315+ current->mm->def_flags |= VM_LOCKED;
71316+ else
71317+ current->mm->def_flags &= ~VM_LOCKED;
71318 if (flags == MCL_FUTURE)
71319 goto out;
71320
71321 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
71322 vm_flags_t newflags;
71323
71324+#ifdef CONFIG_PAX_SEGMEXEC
71325+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
71326+ break;
71327+#endif
71328+
71329+ BUG_ON(vma->vm_end > TASK_SIZE);
71330 newflags = vma->vm_flags | VM_LOCKED;
71331 if (!(flags & MCL_CURRENT))
71332 newflags &= ~VM_LOCKED;
71333@@ -567,6 +583,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
71334 lock_limit >>= PAGE_SHIFT;
71335
71336 ret = -ENOMEM;
71337+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
71338 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
71339 capable(CAP_IPC_LOCK))
71340 ret = do_mlockall(flags);
71341diff --git a/mm/mmap.c b/mm/mmap.c
71342index da15a79..314aef3 100644
71343--- a/mm/mmap.c
71344+++ b/mm/mmap.c
71345@@ -46,6 +46,16 @@
71346 #define arch_rebalance_pgtables(addr, len) (addr)
71347 #endif
71348
71349+static inline void verify_mm_writelocked(struct mm_struct *mm)
71350+{
71351+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
71352+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
71353+ up_read(&mm->mmap_sem);
71354+ BUG();
71355+ }
71356+#endif
71357+}
71358+
71359 static void unmap_region(struct mm_struct *mm,
71360 struct vm_area_struct *vma, struct vm_area_struct *prev,
71361 unsigned long start, unsigned long end);
71362@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struct *mm,
71363 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
71364 *
71365 */
71366-pgprot_t protection_map[16] = {
71367+pgprot_t protection_map[16] __read_only = {
71368 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
71369 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
71370 };
71371
71372-pgprot_t vm_get_page_prot(unsigned long vm_flags)
71373+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
71374 {
71375- return __pgprot(pgprot_val(protection_map[vm_flags &
71376+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
71377 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
71378 pgprot_val(arch_vm_get_page_prot(vm_flags)));
71379+
71380+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71381+ if (!(__supported_pte_mask & _PAGE_NX) &&
71382+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
71383+ (vm_flags & (VM_READ | VM_WRITE)))
71384+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
71385+#endif
71386+
71387+ return prot;
71388 }
71389 EXPORT_SYMBOL(vm_get_page_prot);
71390
71391 int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS; /* heuristic overcommit */
71392 int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
71393 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
71394+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
71395 /*
71396 * Make sure vm_committed_as in one cacheline and not cacheline shared with
71397 * other variables. It can be updated by several CPUs frequently.
71398@@ -228,6 +248,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
71399 struct vm_area_struct *next = vma->vm_next;
71400
71401 might_sleep();
71402+ BUG_ON(vma->vm_mirror);
71403 if (vma->vm_ops && vma->vm_ops->close)
71404 vma->vm_ops->close(vma);
71405 if (vma->vm_file) {
71406@@ -272,6 +293,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
71407 * not page aligned -Ram Gupta
71408 */
71409 rlim = rlimit(RLIMIT_DATA);
71410+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
71411 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
71412 (mm->end_data - mm->start_data) > rlim)
71413 goto out;
71414@@ -689,6 +711,12 @@ static int
71415 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
71416 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
71417 {
71418+
71419+#ifdef CONFIG_PAX_SEGMEXEC
71420+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
71421+ return 0;
71422+#endif
71423+
71424 if (is_mergeable_vma(vma, file, vm_flags) &&
71425 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
71426 if (vma->vm_pgoff == vm_pgoff)
71427@@ -708,6 +736,12 @@ static int
71428 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
71429 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
71430 {
71431+
71432+#ifdef CONFIG_PAX_SEGMEXEC
71433+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
71434+ return 0;
71435+#endif
71436+
71437 if (is_mergeable_vma(vma, file, vm_flags) &&
71438 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
71439 pgoff_t vm_pglen;
71440@@ -750,13 +784,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
71441 struct vm_area_struct *vma_merge(struct mm_struct *mm,
71442 struct vm_area_struct *prev, unsigned long addr,
71443 unsigned long end, unsigned long vm_flags,
71444- struct anon_vma *anon_vma, struct file *file,
71445+ struct anon_vma *anon_vma, struct file *file,
71446 pgoff_t pgoff, struct mempolicy *policy)
71447 {
71448 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
71449 struct vm_area_struct *area, *next;
71450 int err;
71451
71452+#ifdef CONFIG_PAX_SEGMEXEC
71453+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
71454+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
71455+
71456+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
71457+#endif
71458+
71459 /*
71460 * We later require that vma->vm_flags == vm_flags,
71461 * so this tests vma->vm_flags & VM_SPECIAL, too.
71462@@ -772,6 +813,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71463 if (next && next->vm_end == end) /* cases 6, 7, 8 */
71464 next = next->vm_next;
71465
71466+#ifdef CONFIG_PAX_SEGMEXEC
71467+ if (prev)
71468+ prev_m = pax_find_mirror_vma(prev);
71469+ if (area)
71470+ area_m = pax_find_mirror_vma(area);
71471+ if (next)
71472+ next_m = pax_find_mirror_vma(next);
71473+#endif
71474+
71475 /*
71476 * Can it merge with the predecessor?
71477 */
71478@@ -791,9 +841,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71479 /* cases 1, 6 */
71480 err = vma_adjust(prev, prev->vm_start,
71481 next->vm_end, prev->vm_pgoff, NULL);
71482- } else /* cases 2, 5, 7 */
71483+
71484+#ifdef CONFIG_PAX_SEGMEXEC
71485+ if (!err && prev_m)
71486+ err = vma_adjust(prev_m, prev_m->vm_start,
71487+ next_m->vm_end, prev_m->vm_pgoff, NULL);
71488+#endif
71489+
71490+ } else { /* cases 2, 5, 7 */
71491 err = vma_adjust(prev, prev->vm_start,
71492 end, prev->vm_pgoff, NULL);
71493+
71494+#ifdef CONFIG_PAX_SEGMEXEC
71495+ if (!err && prev_m)
71496+ err = vma_adjust(prev_m, prev_m->vm_start,
71497+ end_m, prev_m->vm_pgoff, NULL);
71498+#endif
71499+
71500+ }
71501 if (err)
71502 return NULL;
71503 khugepaged_enter_vma_merge(prev);
71504@@ -807,12 +872,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71505 mpol_equal(policy, vma_policy(next)) &&
71506 can_vma_merge_before(next, vm_flags,
71507 anon_vma, file, pgoff+pglen)) {
71508- if (prev && addr < prev->vm_end) /* case 4 */
71509+ if (prev && addr < prev->vm_end) { /* case 4 */
71510 err = vma_adjust(prev, prev->vm_start,
71511 addr, prev->vm_pgoff, NULL);
71512- else /* cases 3, 8 */
71513+
71514+#ifdef CONFIG_PAX_SEGMEXEC
71515+ if (!err && prev_m)
71516+ err = vma_adjust(prev_m, prev_m->vm_start,
71517+ addr_m, prev_m->vm_pgoff, NULL);
71518+#endif
71519+
71520+ } else { /* cases 3, 8 */
71521 err = vma_adjust(area, addr, next->vm_end,
71522 next->vm_pgoff - pglen, NULL);
71523+
71524+#ifdef CONFIG_PAX_SEGMEXEC
71525+ if (!err && area_m)
71526+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
71527+ next_m->vm_pgoff - pglen, NULL);
71528+#endif
71529+
71530+ }
71531 if (err)
71532 return NULL;
71533 khugepaged_enter_vma_merge(area);
71534@@ -921,14 +1001,11 @@ none:
71535 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
71536 struct file *file, long pages)
71537 {
71538- const unsigned long stack_flags
71539- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
71540-
71541 if (file) {
71542 mm->shared_vm += pages;
71543 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
71544 mm->exec_vm += pages;
71545- } else if (flags & stack_flags)
71546+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
71547 mm->stack_vm += pages;
71548 if (flags & (VM_RESERVED|VM_IO))
71549 mm->reserved_vm += pages;
71550@@ -955,7 +1032,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71551 * (the exception is when the underlying filesystem is noexec
71552 * mounted, in which case we dont add PROT_EXEC.)
71553 */
71554- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
71555+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
71556 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
71557 prot |= PROT_EXEC;
71558
71559@@ -981,7 +1058,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71560 /* Obtain the address to map to. we verify (or select) it and ensure
71561 * that it represents a valid section of the address space.
71562 */
71563- addr = get_unmapped_area(file, addr, len, pgoff, flags);
71564+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
71565 if (addr & ~PAGE_MASK)
71566 return addr;
71567
71568@@ -992,6 +1069,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71569 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
71570 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
71571
71572+#ifdef CONFIG_PAX_MPROTECT
71573+ if (mm->pax_flags & MF_PAX_MPROTECT) {
71574+#ifndef CONFIG_PAX_MPROTECT_COMPAT
71575+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
71576+ gr_log_rwxmmap(file);
71577+
71578+#ifdef CONFIG_PAX_EMUPLT
71579+ vm_flags &= ~VM_EXEC;
71580+#else
71581+ return -EPERM;
71582+#endif
71583+
71584+ }
71585+
71586+ if (!(vm_flags & VM_EXEC))
71587+ vm_flags &= ~VM_MAYEXEC;
71588+#else
71589+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
71590+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
71591+#endif
71592+ else
71593+ vm_flags &= ~VM_MAYWRITE;
71594+ }
71595+#endif
71596+
71597+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71598+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
71599+ vm_flags &= ~VM_PAGEEXEC;
71600+#endif
71601+
71602 if (flags & MAP_LOCKED)
71603 if (!can_do_mlock())
71604 return -EPERM;
71605@@ -1003,6 +1110,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71606 locked += mm->locked_vm;
71607 lock_limit = rlimit(RLIMIT_MEMLOCK);
71608 lock_limit >>= PAGE_SHIFT;
71609+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
71610 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
71611 return -EAGAIN;
71612 }
71613@@ -1073,6 +1181,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71614 if (error)
71615 return error;
71616
71617+ if (!gr_acl_handle_mmap(file, prot))
71618+ return -EACCES;
71619+
71620 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
71621 }
71622 EXPORT_SYMBOL(do_mmap_pgoff);
71623@@ -1153,7 +1264,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
71624 vm_flags_t vm_flags = vma->vm_flags;
71625
71626 /* If it was private or non-writable, the write bit is already clear */
71627- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
71628+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
71629 return 0;
71630
71631 /* The backer wishes to know when pages are first written to? */
71632@@ -1202,14 +1313,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
71633 unsigned long charged = 0;
71634 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
71635
71636+#ifdef CONFIG_PAX_SEGMEXEC
71637+ struct vm_area_struct *vma_m = NULL;
71638+#endif
71639+
71640+ /*
71641+ * mm->mmap_sem is required to protect against another thread
71642+ * changing the mappings in case we sleep.
71643+ */
71644+ verify_mm_writelocked(mm);
71645+
71646 /* Clear old maps */
71647 error = -ENOMEM;
71648-munmap_back:
71649 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
71650 if (vma && vma->vm_start < addr + len) {
71651 if (do_munmap(mm, addr, len))
71652 return -ENOMEM;
71653- goto munmap_back;
71654+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
71655+ BUG_ON(vma && vma->vm_start < addr + len);
71656 }
71657
71658 /* Check against address space limit. */
71659@@ -1258,6 +1379,16 @@ munmap_back:
71660 goto unacct_error;
71661 }
71662
71663+#ifdef CONFIG_PAX_SEGMEXEC
71664+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
71665+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
71666+ if (!vma_m) {
71667+ error = -ENOMEM;
71668+ goto free_vma;
71669+ }
71670+ }
71671+#endif
71672+
71673 vma->vm_mm = mm;
71674 vma->vm_start = addr;
71675 vma->vm_end = addr + len;
71676@@ -1282,6 +1413,19 @@ munmap_back:
71677 error = file->f_op->mmap(file, vma);
71678 if (error)
71679 goto unmap_and_free_vma;
71680+
71681+#ifdef CONFIG_PAX_SEGMEXEC
71682+ if (vma_m && (vm_flags & VM_EXECUTABLE))
71683+ added_exe_file_vma(mm);
71684+#endif
71685+
71686+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71687+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
71688+ vma->vm_flags |= VM_PAGEEXEC;
71689+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
71690+ }
71691+#endif
71692+
71693 if (vm_flags & VM_EXECUTABLE)
71694 added_exe_file_vma(mm);
71695
71696@@ -1319,6 +1463,11 @@ munmap_back:
71697 vma_link(mm, vma, prev, rb_link, rb_parent);
71698 file = vma->vm_file;
71699
71700+#ifdef CONFIG_PAX_SEGMEXEC
71701+ if (vma_m)
71702+ BUG_ON(pax_mirror_vma(vma_m, vma));
71703+#endif
71704+
71705 /* Once vma denies write, undo our temporary denial count */
71706 if (correct_wcount)
71707 atomic_inc(&inode->i_writecount);
71708@@ -1327,6 +1476,7 @@ out:
71709
71710 mm->total_vm += len >> PAGE_SHIFT;
71711 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
71712+ track_exec_limit(mm, addr, addr + len, vm_flags);
71713 if (vm_flags & VM_LOCKED) {
71714 if (!mlock_vma_pages_range(vma, addr, addr + len))
71715 mm->locked_vm += (len >> PAGE_SHIFT);
71716@@ -1344,6 +1494,12 @@ unmap_and_free_vma:
71717 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
71718 charged = 0;
71719 free_vma:
71720+
71721+#ifdef CONFIG_PAX_SEGMEXEC
71722+ if (vma_m)
71723+ kmem_cache_free(vm_area_cachep, vma_m);
71724+#endif
71725+
71726 kmem_cache_free(vm_area_cachep, vma);
71727 unacct_error:
71728 if (charged)
71729@@ -1351,6 +1507,44 @@ unacct_error:
71730 return error;
71731 }
71732
71733+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
71734+{
71735+ if (!vma) {
71736+#ifdef CONFIG_STACK_GROWSUP
71737+ if (addr > sysctl_heap_stack_gap)
71738+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
71739+ else
71740+ vma = find_vma(current->mm, 0);
71741+ if (vma && (vma->vm_flags & VM_GROWSUP))
71742+ return false;
71743+#endif
71744+ return true;
71745+ }
71746+
71747+ if (addr + len > vma->vm_start)
71748+ return false;
71749+
71750+ if (vma->vm_flags & VM_GROWSDOWN)
71751+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
71752+#ifdef CONFIG_STACK_GROWSUP
71753+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
71754+ return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
71755+#endif
71756+
71757+ return true;
71758+}
71759+
71760+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
71761+{
71762+ if (vma->vm_start < len)
71763+ return -ENOMEM;
71764+ if (!(vma->vm_flags & VM_GROWSDOWN))
71765+ return vma->vm_start - len;
71766+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
71767+ return vma->vm_start - len - sysctl_heap_stack_gap;
71768+ return -ENOMEM;
71769+}
71770+
71771 /* Get an address range which is currently unmapped.
71772 * For shmat() with addr=0.
71773 *
71774@@ -1377,18 +1571,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
71775 if (flags & MAP_FIXED)
71776 return addr;
71777
71778+#ifdef CONFIG_PAX_RANDMMAP
71779+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
71780+#endif
71781+
71782 if (addr) {
71783 addr = PAGE_ALIGN(addr);
71784- vma = find_vma(mm, addr);
71785- if (TASK_SIZE - len >= addr &&
71786- (!vma || addr + len <= vma->vm_start))
71787- return addr;
71788+ if (TASK_SIZE - len >= addr) {
71789+ vma = find_vma(mm, addr);
71790+ if (check_heap_stack_gap(vma, addr, len))
71791+ return addr;
71792+ }
71793 }
71794 if (len > mm->cached_hole_size) {
71795- start_addr = addr = mm->free_area_cache;
71796+ start_addr = addr = mm->free_area_cache;
71797 } else {
71798- start_addr = addr = TASK_UNMAPPED_BASE;
71799- mm->cached_hole_size = 0;
71800+ start_addr = addr = mm->mmap_base;
71801+ mm->cached_hole_size = 0;
71802 }
71803
71804 full_search:
71805@@ -1399,34 +1598,40 @@ full_search:
71806 * Start a new search - just in case we missed
71807 * some holes.
71808 */
71809- if (start_addr != TASK_UNMAPPED_BASE) {
71810- addr = TASK_UNMAPPED_BASE;
71811- start_addr = addr;
71812+ if (start_addr != mm->mmap_base) {
71813+ start_addr = addr = mm->mmap_base;
71814 mm->cached_hole_size = 0;
71815 goto full_search;
71816 }
71817 return -ENOMEM;
71818 }
71819- if (!vma || addr + len <= vma->vm_start) {
71820- /*
71821- * Remember the place where we stopped the search:
71822- */
71823- mm->free_area_cache = addr + len;
71824- return addr;
71825- }
71826+ if (check_heap_stack_gap(vma, addr, len))
71827+ break;
71828 if (addr + mm->cached_hole_size < vma->vm_start)
71829 mm->cached_hole_size = vma->vm_start - addr;
71830 addr = vma->vm_end;
71831 }
71832+
71833+ /*
71834+ * Remember the place where we stopped the search:
71835+ */
71836+ mm->free_area_cache = addr + len;
71837+ return addr;
71838 }
71839 #endif
71840
71841 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
71842 {
71843+
71844+#ifdef CONFIG_PAX_SEGMEXEC
71845+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
71846+ return;
71847+#endif
71848+
71849 /*
71850 * Is this a new hole at the lowest possible address?
71851 */
71852- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
71853+ if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
71854 mm->free_area_cache = addr;
71855 mm->cached_hole_size = ~0UL;
71856 }
71857@@ -1444,7 +1649,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
71858 {
71859 struct vm_area_struct *vma;
71860 struct mm_struct *mm = current->mm;
71861- unsigned long addr = addr0;
71862+ unsigned long base = mm->mmap_base, addr = addr0;
71863
71864 /* requested length too big for entire address space */
71865 if (len > TASK_SIZE)
71866@@ -1453,13 +1658,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
71867 if (flags & MAP_FIXED)
71868 return addr;
71869
71870+#ifdef CONFIG_PAX_RANDMMAP
71871+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
71872+#endif
71873+
71874 /* requesting a specific address */
71875 if (addr) {
71876 addr = PAGE_ALIGN(addr);
71877- vma = find_vma(mm, addr);
71878- if (TASK_SIZE - len >= addr &&
71879- (!vma || addr + len <= vma->vm_start))
71880- return addr;
71881+ if (TASK_SIZE - len >= addr) {
71882+ vma = find_vma(mm, addr);
71883+ if (check_heap_stack_gap(vma, addr, len))
71884+ return addr;
71885+ }
71886 }
71887
71888 /* check if free_area_cache is useful for us */
71889@@ -1474,7 +1684,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
71890 /* make sure it can fit in the remaining address space */
71891 if (addr > len) {
71892 vma = find_vma(mm, addr-len);
71893- if (!vma || addr <= vma->vm_start)
71894+ if (check_heap_stack_gap(vma, addr - len, len))
71895 /* remember the address as a hint for next time */
71896 return (mm->free_area_cache = addr-len);
71897 }
71898@@ -1491,7 +1701,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
71899 * return with success:
71900 */
71901 vma = find_vma(mm, addr);
71902- if (!vma || addr+len <= vma->vm_start)
71903+ if (check_heap_stack_gap(vma, addr, len))
71904 /* remember the address as a hint for next time */
71905 return (mm->free_area_cache = addr);
71906
71907@@ -1500,8 +1710,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
71908 mm->cached_hole_size = vma->vm_start - addr;
71909
71910 /* try just below the current vma->vm_start */
71911- addr = vma->vm_start-len;
71912- } while (len < vma->vm_start);
71913+ addr = skip_heap_stack_gap(vma, len);
71914+ } while (!IS_ERR_VALUE(addr));
71915
71916 bottomup:
71917 /*
71918@@ -1510,13 +1720,21 @@ bottomup:
71919 * can happen with large stack limits and large mmap()
71920 * allocations.
71921 */
71922+ mm->mmap_base = TASK_UNMAPPED_BASE;
71923+
71924+#ifdef CONFIG_PAX_RANDMMAP
71925+ if (mm->pax_flags & MF_PAX_RANDMMAP)
71926+ mm->mmap_base += mm->delta_mmap;
71927+#endif
71928+
71929+ mm->free_area_cache = mm->mmap_base;
71930 mm->cached_hole_size = ~0UL;
71931- mm->free_area_cache = TASK_UNMAPPED_BASE;
71932 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
71933 /*
71934 * Restore the topdown base:
71935 */
71936- mm->free_area_cache = mm->mmap_base;
71937+ mm->mmap_base = base;
71938+ mm->free_area_cache = base;
71939 mm->cached_hole_size = ~0UL;
71940
71941 return addr;
71942@@ -1525,6 +1743,12 @@ bottomup:
71943
71944 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
71945 {
71946+
71947+#ifdef CONFIG_PAX_SEGMEXEC
71948+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
71949+ return;
71950+#endif
71951+
71952 /*
71953 * Is this a new hole at the highest possible address?
71954 */
71955@@ -1532,8 +1756,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
71956 mm->free_area_cache = addr;
71957
71958 /* dont allow allocations above current base */
71959- if (mm->free_area_cache > mm->mmap_base)
71960+ if (mm->free_area_cache > mm->mmap_base) {
71961 mm->free_area_cache = mm->mmap_base;
71962+ mm->cached_hole_size = ~0UL;
71963+ }
71964 }
71965
71966 unsigned long
71967@@ -1629,6 +1855,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
71968 return vma;
71969 }
71970
71971+#ifdef CONFIG_PAX_SEGMEXEC
71972+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
71973+{
71974+ struct vm_area_struct *vma_m;
71975+
71976+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
71977+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
71978+ BUG_ON(vma->vm_mirror);
71979+ return NULL;
71980+ }
71981+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
71982+ vma_m = vma->vm_mirror;
71983+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
71984+ BUG_ON(vma->vm_file != vma_m->vm_file);
71985+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
71986+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
71987+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
71988+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
71989+ return vma_m;
71990+}
71991+#endif
71992+
71993 /*
71994 * Verify that the stack growth is acceptable and
71995 * update accounting. This is shared with both the
71996@@ -1645,6 +1893,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
71997 return -ENOMEM;
71998
71999 /* Stack limit test */
72000+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
72001 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
72002 return -ENOMEM;
72003
72004@@ -1655,6 +1904,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72005 locked = mm->locked_vm + grow;
72006 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
72007 limit >>= PAGE_SHIFT;
72008+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72009 if (locked > limit && !capable(CAP_IPC_LOCK))
72010 return -ENOMEM;
72011 }
72012@@ -1685,37 +1935,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72013 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
72014 * vma is the last one with address > vma->vm_end. Have to extend vma.
72015 */
72016+#ifndef CONFIG_IA64
72017+static
72018+#endif
72019 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72020 {
72021 int error;
72022+ bool locknext;
72023
72024 if (!(vma->vm_flags & VM_GROWSUP))
72025 return -EFAULT;
72026
72027+ /* Also guard against wrapping around to address 0. */
72028+ if (address < PAGE_ALIGN(address+1))
72029+ address = PAGE_ALIGN(address+1);
72030+ else
72031+ return -ENOMEM;
72032+
72033 /*
72034 * We must make sure the anon_vma is allocated
72035 * so that the anon_vma locking is not a noop.
72036 */
72037 if (unlikely(anon_vma_prepare(vma)))
72038 return -ENOMEM;
72039+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
72040+ if (locknext && anon_vma_prepare(vma->vm_next))
72041+ return -ENOMEM;
72042 vma_lock_anon_vma(vma);
72043+ if (locknext)
72044+ vma_lock_anon_vma(vma->vm_next);
72045
72046 /*
72047 * vma->vm_start/vm_end cannot change under us because the caller
72048 * is required to hold the mmap_sem in read mode. We need the
72049- * anon_vma lock to serialize against concurrent expand_stacks.
72050- * Also guard against wrapping around to address 0.
72051+ * anon_vma locks to serialize against concurrent expand_stacks
72052+ * and expand_upwards.
72053 */
72054- if (address < PAGE_ALIGN(address+4))
72055- address = PAGE_ALIGN(address+4);
72056- else {
72057- vma_unlock_anon_vma(vma);
72058- return -ENOMEM;
72059- }
72060 error = 0;
72061
72062 /* Somebody else might have raced and expanded it already */
72063- if (address > vma->vm_end) {
72064+ 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)
72065+ error = -ENOMEM;
72066+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
72067 unsigned long size, grow;
72068
72069 size = address - vma->vm_start;
72070@@ -1730,6 +1991,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72071 }
72072 }
72073 }
72074+ if (locknext)
72075+ vma_unlock_anon_vma(vma->vm_next);
72076 vma_unlock_anon_vma(vma);
72077 khugepaged_enter_vma_merge(vma);
72078 return error;
72079@@ -1743,6 +2006,8 @@ int expand_downwards(struct vm_area_struct *vma,
72080 unsigned long address)
72081 {
72082 int error;
72083+ bool lockprev = false;
72084+ struct vm_area_struct *prev;
72085
72086 /*
72087 * We must make sure the anon_vma is allocated
72088@@ -1756,6 +2021,15 @@ int expand_downwards(struct vm_area_struct *vma,
72089 if (error)
72090 return error;
72091
72092+ prev = vma->vm_prev;
72093+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
72094+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
72095+#endif
72096+ if (lockprev && anon_vma_prepare(prev))
72097+ return -ENOMEM;
72098+ if (lockprev)
72099+ vma_lock_anon_vma(prev);
72100+
72101 vma_lock_anon_vma(vma);
72102
72103 /*
72104@@ -1765,9 +2039,17 @@ int expand_downwards(struct vm_area_struct *vma,
72105 */
72106
72107 /* Somebody else might have raced and expanded it already */
72108- if (address < vma->vm_start) {
72109+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
72110+ error = -ENOMEM;
72111+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
72112 unsigned long size, grow;
72113
72114+#ifdef CONFIG_PAX_SEGMEXEC
72115+ struct vm_area_struct *vma_m;
72116+
72117+ vma_m = pax_find_mirror_vma(vma);
72118+#endif
72119+
72120 size = vma->vm_end - address;
72121 grow = (vma->vm_start - address) >> PAGE_SHIFT;
72122
72123@@ -1777,11 +2059,22 @@ int expand_downwards(struct vm_area_struct *vma,
72124 if (!error) {
72125 vma->vm_start = address;
72126 vma->vm_pgoff -= grow;
72127+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
72128+
72129+#ifdef CONFIG_PAX_SEGMEXEC
72130+ if (vma_m) {
72131+ vma_m->vm_start -= grow << PAGE_SHIFT;
72132+ vma_m->vm_pgoff -= grow;
72133+ }
72134+#endif
72135+
72136 perf_event_mmap(vma);
72137 }
72138 }
72139 }
72140 vma_unlock_anon_vma(vma);
72141+ if (lockprev)
72142+ vma_unlock_anon_vma(prev);
72143 khugepaged_enter_vma_merge(vma);
72144 return error;
72145 }
72146@@ -1851,6 +2144,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
72147 do {
72148 long nrpages = vma_pages(vma);
72149
72150+#ifdef CONFIG_PAX_SEGMEXEC
72151+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
72152+ vma = remove_vma(vma);
72153+ continue;
72154+ }
72155+#endif
72156+
72157 mm->total_vm -= nrpages;
72158 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
72159 vma = remove_vma(vma);
72160@@ -1896,6 +2196,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
72161 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
72162 vma->vm_prev = NULL;
72163 do {
72164+
72165+#ifdef CONFIG_PAX_SEGMEXEC
72166+ if (vma->vm_mirror) {
72167+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
72168+ vma->vm_mirror->vm_mirror = NULL;
72169+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
72170+ vma->vm_mirror = NULL;
72171+ }
72172+#endif
72173+
72174 rb_erase(&vma->vm_rb, &mm->mm_rb);
72175 mm->map_count--;
72176 tail_vma = vma;
72177@@ -1924,14 +2234,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72178 struct vm_area_struct *new;
72179 int err = -ENOMEM;
72180
72181+#ifdef CONFIG_PAX_SEGMEXEC
72182+ struct vm_area_struct *vma_m, *new_m = NULL;
72183+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
72184+#endif
72185+
72186 if (is_vm_hugetlb_page(vma) && (addr &
72187 ~(huge_page_mask(hstate_vma(vma)))))
72188 return -EINVAL;
72189
72190+#ifdef CONFIG_PAX_SEGMEXEC
72191+ vma_m = pax_find_mirror_vma(vma);
72192+#endif
72193+
72194 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72195 if (!new)
72196 goto out_err;
72197
72198+#ifdef CONFIG_PAX_SEGMEXEC
72199+ if (vma_m) {
72200+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72201+ if (!new_m) {
72202+ kmem_cache_free(vm_area_cachep, new);
72203+ goto out_err;
72204+ }
72205+ }
72206+#endif
72207+
72208 /* most fields are the same, copy all, and then fixup */
72209 *new = *vma;
72210
72211@@ -1944,6 +2273,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72212 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
72213 }
72214
72215+#ifdef CONFIG_PAX_SEGMEXEC
72216+ if (vma_m) {
72217+ *new_m = *vma_m;
72218+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
72219+ new_m->vm_mirror = new;
72220+ new->vm_mirror = new_m;
72221+
72222+ if (new_below)
72223+ new_m->vm_end = addr_m;
72224+ else {
72225+ new_m->vm_start = addr_m;
72226+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
72227+ }
72228+ }
72229+#endif
72230+
72231 pol = mpol_dup(vma_policy(vma));
72232 if (IS_ERR(pol)) {
72233 err = PTR_ERR(pol);
72234@@ -1969,6 +2314,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72235 else
72236 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
72237
72238+#ifdef CONFIG_PAX_SEGMEXEC
72239+ if (!err && vma_m) {
72240+ if (anon_vma_clone(new_m, vma_m))
72241+ goto out_free_mpol;
72242+
72243+ mpol_get(pol);
72244+ vma_set_policy(new_m, pol);
72245+
72246+ if (new_m->vm_file) {
72247+ get_file(new_m->vm_file);
72248+ if (vma_m->vm_flags & VM_EXECUTABLE)
72249+ added_exe_file_vma(mm);
72250+ }
72251+
72252+ if (new_m->vm_ops && new_m->vm_ops->open)
72253+ new_m->vm_ops->open(new_m);
72254+
72255+ if (new_below)
72256+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
72257+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
72258+ else
72259+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
72260+
72261+ if (err) {
72262+ if (new_m->vm_ops && new_m->vm_ops->close)
72263+ new_m->vm_ops->close(new_m);
72264+ if (new_m->vm_file) {
72265+ if (vma_m->vm_flags & VM_EXECUTABLE)
72266+ removed_exe_file_vma(mm);
72267+ fput(new_m->vm_file);
72268+ }
72269+ mpol_put(pol);
72270+ }
72271+ }
72272+#endif
72273+
72274 /* Success. */
72275 if (!err)
72276 return 0;
72277@@ -1981,10 +2362,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72278 removed_exe_file_vma(mm);
72279 fput(new->vm_file);
72280 }
72281- unlink_anon_vmas(new);
72282 out_free_mpol:
72283 mpol_put(pol);
72284 out_free_vma:
72285+
72286+#ifdef CONFIG_PAX_SEGMEXEC
72287+ if (new_m) {
72288+ unlink_anon_vmas(new_m);
72289+ kmem_cache_free(vm_area_cachep, new_m);
72290+ }
72291+#endif
72292+
72293+ unlink_anon_vmas(new);
72294 kmem_cache_free(vm_area_cachep, new);
72295 out_err:
72296 return err;
72297@@ -1997,6 +2386,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72298 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72299 unsigned long addr, int new_below)
72300 {
72301+
72302+#ifdef CONFIG_PAX_SEGMEXEC
72303+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
72304+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
72305+ if (mm->map_count >= sysctl_max_map_count-1)
72306+ return -ENOMEM;
72307+ } else
72308+#endif
72309+
72310 if (mm->map_count >= sysctl_max_map_count)
72311 return -ENOMEM;
72312
72313@@ -2008,11 +2406,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72314 * work. This now handles partial unmappings.
72315 * Jeremy Fitzhardinge <jeremy@goop.org>
72316 */
72317+#ifdef CONFIG_PAX_SEGMEXEC
72318 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72319 {
72320+ int ret = __do_munmap(mm, start, len);
72321+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
72322+ return ret;
72323+
72324+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
72325+}
72326+
72327+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72328+#else
72329+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72330+#endif
72331+{
72332 unsigned long end;
72333 struct vm_area_struct *vma, *prev, *last;
72334
72335+ /*
72336+ * mm->mmap_sem is required to protect against another thread
72337+ * changing the mappings in case we sleep.
72338+ */
72339+ verify_mm_writelocked(mm);
72340+
72341 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
72342 return -EINVAL;
72343
72344@@ -2087,6 +2504,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72345 /* Fix up all other VM information */
72346 remove_vma_list(mm, vma);
72347
72348+ track_exec_limit(mm, start, end, 0UL);
72349+
72350 return 0;
72351 }
72352
72353@@ -2099,22 +2518,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
72354
72355 profile_munmap(addr);
72356
72357+#ifdef CONFIG_PAX_SEGMEXEC
72358+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
72359+ (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
72360+ return -EINVAL;
72361+#endif
72362+
72363 down_write(&mm->mmap_sem);
72364 ret = do_munmap(mm, addr, len);
72365 up_write(&mm->mmap_sem);
72366 return ret;
72367 }
72368
72369-static inline void verify_mm_writelocked(struct mm_struct *mm)
72370-{
72371-#ifdef CONFIG_DEBUG_VM
72372- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
72373- WARN_ON(1);
72374- up_read(&mm->mmap_sem);
72375- }
72376-#endif
72377-}
72378-
72379 /*
72380 * this is really a simplified "do_mmap". it only handles
72381 * anonymous maps. eventually we may be able to do some
72382@@ -2128,6 +2543,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72383 struct rb_node ** rb_link, * rb_parent;
72384 pgoff_t pgoff = addr >> PAGE_SHIFT;
72385 int error;
72386+ unsigned long charged;
72387
72388 len = PAGE_ALIGN(len);
72389 if (!len)
72390@@ -2139,16 +2555,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72391
72392 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
72393
72394+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
72395+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72396+ flags &= ~VM_EXEC;
72397+
72398+#ifdef CONFIG_PAX_MPROTECT
72399+ if (mm->pax_flags & MF_PAX_MPROTECT)
72400+ flags &= ~VM_MAYEXEC;
72401+#endif
72402+
72403+ }
72404+#endif
72405+
72406 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
72407 if (error & ~PAGE_MASK)
72408 return error;
72409
72410+ charged = len >> PAGE_SHIFT;
72411+
72412 /*
72413 * mlock MCL_FUTURE?
72414 */
72415 if (mm->def_flags & VM_LOCKED) {
72416 unsigned long locked, lock_limit;
72417- locked = len >> PAGE_SHIFT;
72418+ locked = charged;
72419 locked += mm->locked_vm;
72420 lock_limit = rlimit(RLIMIT_MEMLOCK);
72421 lock_limit >>= PAGE_SHIFT;
72422@@ -2165,22 +2595,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72423 /*
72424 * Clear old maps. this also does some error checking for us
72425 */
72426- munmap_back:
72427 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72428 if (vma && vma->vm_start < addr + len) {
72429 if (do_munmap(mm, addr, len))
72430 return -ENOMEM;
72431- goto munmap_back;
72432+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72433+ BUG_ON(vma && vma->vm_start < addr + len);
72434 }
72435
72436 /* Check against address space limits *after* clearing old maps... */
72437- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
72438+ if (!may_expand_vm(mm, charged))
72439 return -ENOMEM;
72440
72441 if (mm->map_count > sysctl_max_map_count)
72442 return -ENOMEM;
72443
72444- if (security_vm_enough_memory(len >> PAGE_SHIFT))
72445+ if (security_vm_enough_memory(charged))
72446 return -ENOMEM;
72447
72448 /* Can we just expand an old private anonymous mapping? */
72449@@ -2194,7 +2624,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72450 */
72451 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72452 if (!vma) {
72453- vm_unacct_memory(len >> PAGE_SHIFT);
72454+ vm_unacct_memory(charged);
72455 return -ENOMEM;
72456 }
72457
72458@@ -2208,11 +2638,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72459 vma_link(mm, vma, prev, rb_link, rb_parent);
72460 out:
72461 perf_event_mmap(vma);
72462- mm->total_vm += len >> PAGE_SHIFT;
72463+ mm->total_vm += charged;
72464 if (flags & VM_LOCKED) {
72465 if (!mlock_vma_pages_range(vma, addr, addr + len))
72466- mm->locked_vm += (len >> PAGE_SHIFT);
72467+ mm->locked_vm += charged;
72468 }
72469+ track_exec_limit(mm, addr, addr + len, flags);
72470 return addr;
72471 }
72472
72473@@ -2259,8 +2690,10 @@ void exit_mmap(struct mm_struct *mm)
72474 * Walk the list again, actually closing and freeing it,
72475 * with preemption enabled, without holding any MM locks.
72476 */
72477- while (vma)
72478+ while (vma) {
72479+ vma->vm_mirror = NULL;
72480 vma = remove_vma(vma);
72481+ }
72482
72483 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
72484 }
72485@@ -2274,6 +2707,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
72486 struct vm_area_struct * __vma, * prev;
72487 struct rb_node ** rb_link, * rb_parent;
72488
72489+#ifdef CONFIG_PAX_SEGMEXEC
72490+ struct vm_area_struct *vma_m = NULL;
72491+#endif
72492+
72493+ if (security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1))
72494+ return -EPERM;
72495+
72496 /*
72497 * The vm_pgoff of a purely anonymous vma should be irrelevant
72498 * until its first write fault, when page's anon_vma and index
72499@@ -2296,7 +2736,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
72500 if ((vma->vm_flags & VM_ACCOUNT) &&
72501 security_vm_enough_memory_mm(mm, vma_pages(vma)))
72502 return -ENOMEM;
72503+
72504+#ifdef CONFIG_PAX_SEGMEXEC
72505+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
72506+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72507+ if (!vma_m)
72508+ return -ENOMEM;
72509+ }
72510+#endif
72511+
72512 vma_link(mm, vma, prev, rb_link, rb_parent);
72513+
72514+#ifdef CONFIG_PAX_SEGMEXEC
72515+ if (vma_m)
72516+ BUG_ON(pax_mirror_vma(vma_m, vma));
72517+#endif
72518+
72519 return 0;
72520 }
72521
72522@@ -2315,6 +2770,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
72523 struct mempolicy *pol;
72524 bool faulted_in_anon_vma = true;
72525
72526+ BUG_ON(vma->vm_mirror);
72527+
72528 /*
72529 * If anonymous vma has not yet been faulted, update new pgoff
72530 * to match new location, to increase its chance of merging.
72531@@ -2382,6 +2839,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
72532 return NULL;
72533 }
72534
72535+#ifdef CONFIG_PAX_SEGMEXEC
72536+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
72537+{
72538+ struct vm_area_struct *prev_m;
72539+ struct rb_node **rb_link_m, *rb_parent_m;
72540+ struct mempolicy *pol_m;
72541+
72542+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
72543+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
72544+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
72545+ *vma_m = *vma;
72546+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
72547+ if (anon_vma_clone(vma_m, vma))
72548+ return -ENOMEM;
72549+ pol_m = vma_policy(vma_m);
72550+ mpol_get(pol_m);
72551+ vma_set_policy(vma_m, pol_m);
72552+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
72553+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
72554+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
72555+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
72556+ if (vma_m->vm_file)
72557+ get_file(vma_m->vm_file);
72558+ if (vma_m->vm_ops && vma_m->vm_ops->open)
72559+ vma_m->vm_ops->open(vma_m);
72560+ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
72561+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
72562+ vma_m->vm_mirror = vma;
72563+ vma->vm_mirror = vma_m;
72564+ return 0;
72565+}
72566+#endif
72567+
72568 /*
72569 * Return true if the calling process may expand its vm space by the passed
72570 * number of pages
72571@@ -2393,6 +2883,12 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
72572
72573 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
72574
72575+#ifdef CONFIG_PAX_RANDMMAP
72576+ if (mm->pax_flags & MF_PAX_RANDMMAP)
72577+ cur -= mm->brk_gap;
72578+#endif
72579+
72580+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
72581 if (cur + npages > lim)
72582 return 0;
72583 return 1;
72584@@ -2463,6 +2959,22 @@ int install_special_mapping(struct mm_struct *mm,
72585 vma->vm_start = addr;
72586 vma->vm_end = addr + len;
72587
72588+#ifdef CONFIG_PAX_MPROTECT
72589+ if (mm->pax_flags & MF_PAX_MPROTECT) {
72590+#ifndef CONFIG_PAX_MPROTECT_COMPAT
72591+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
72592+ return -EPERM;
72593+ if (!(vm_flags & VM_EXEC))
72594+ vm_flags &= ~VM_MAYEXEC;
72595+#else
72596+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
72597+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
72598+#endif
72599+ else
72600+ vm_flags &= ~VM_MAYWRITE;
72601+ }
72602+#endif
72603+
72604 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
72605 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
72606
72607diff --git a/mm/mprotect.c b/mm/mprotect.c
72608index f437d05..e3763f6 100644
72609--- a/mm/mprotect.c
72610+++ b/mm/mprotect.c
72611@@ -23,10 +23,16 @@
72612 #include <linux/mmu_notifier.h>
72613 #include <linux/migrate.h>
72614 #include <linux/perf_event.h>
72615+
72616+#ifdef CONFIG_PAX_MPROTECT
72617+#include <linux/elf.h>
72618+#endif
72619+
72620 #include <asm/uaccess.h>
72621 #include <asm/pgtable.h>
72622 #include <asm/cacheflush.h>
72623 #include <asm/tlbflush.h>
72624+#include <asm/mmu_context.h>
72625
72626 #ifndef pgprot_modify
72627 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
72628@@ -141,6 +147,48 @@ static void change_protection(struct vm_area_struct *vma,
72629 flush_tlb_range(vma, start, end);
72630 }
72631
72632+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
72633+/* called while holding the mmap semaphor for writing except stack expansion */
72634+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
72635+{
72636+ unsigned long oldlimit, newlimit = 0UL;
72637+
72638+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
72639+ return;
72640+
72641+ spin_lock(&mm->page_table_lock);
72642+ oldlimit = mm->context.user_cs_limit;
72643+ if ((prot & VM_EXEC) && oldlimit < end)
72644+ /* USER_CS limit moved up */
72645+ newlimit = end;
72646+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
72647+ /* USER_CS limit moved down */
72648+ newlimit = start;
72649+
72650+ if (newlimit) {
72651+ mm->context.user_cs_limit = newlimit;
72652+
72653+#ifdef CONFIG_SMP
72654+ wmb();
72655+ cpus_clear(mm->context.cpu_user_cs_mask);
72656+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
72657+#endif
72658+
72659+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
72660+ }
72661+ spin_unlock(&mm->page_table_lock);
72662+ if (newlimit == end) {
72663+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
72664+
72665+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
72666+ if (is_vm_hugetlb_page(vma))
72667+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
72668+ else
72669+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
72670+ }
72671+}
72672+#endif
72673+
72674 int
72675 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
72676 unsigned long start, unsigned long end, unsigned long newflags)
72677@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
72678 int error;
72679 int dirty_accountable = 0;
72680
72681+#ifdef CONFIG_PAX_SEGMEXEC
72682+ struct vm_area_struct *vma_m = NULL;
72683+ unsigned long start_m, end_m;
72684+
72685+ start_m = start + SEGMEXEC_TASK_SIZE;
72686+ end_m = end + SEGMEXEC_TASK_SIZE;
72687+#endif
72688+
72689 if (newflags == oldflags) {
72690 *pprev = vma;
72691 return 0;
72692 }
72693
72694+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
72695+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
72696+
72697+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
72698+ return -ENOMEM;
72699+
72700+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
72701+ return -ENOMEM;
72702+ }
72703+
72704 /*
72705 * If we make a private mapping writable we increase our commit;
72706 * but (without finer accounting) cannot reduce our commit if we
72707@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
72708 }
72709 }
72710
72711+#ifdef CONFIG_PAX_SEGMEXEC
72712+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
72713+ if (start != vma->vm_start) {
72714+ error = split_vma(mm, vma, start, 1);
72715+ if (error)
72716+ goto fail;
72717+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
72718+ *pprev = (*pprev)->vm_next;
72719+ }
72720+
72721+ if (end != vma->vm_end) {
72722+ error = split_vma(mm, vma, end, 0);
72723+ if (error)
72724+ goto fail;
72725+ }
72726+
72727+ if (pax_find_mirror_vma(vma)) {
72728+ error = __do_munmap(mm, start_m, end_m - start_m);
72729+ if (error)
72730+ goto fail;
72731+ } else {
72732+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72733+ if (!vma_m) {
72734+ error = -ENOMEM;
72735+ goto fail;
72736+ }
72737+ vma->vm_flags = newflags;
72738+ error = pax_mirror_vma(vma_m, vma);
72739+ if (error) {
72740+ vma->vm_flags = oldflags;
72741+ goto fail;
72742+ }
72743+ }
72744+ }
72745+#endif
72746+
72747 /*
72748 * First try to merge with previous and/or next vma.
72749 */
72750@@ -204,9 +306,21 @@ success:
72751 * vm_flags and vm_page_prot are protected by the mmap_sem
72752 * held in write mode.
72753 */
72754+
72755+#ifdef CONFIG_PAX_SEGMEXEC
72756+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
72757+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
72758+#endif
72759+
72760 vma->vm_flags = newflags;
72761+
72762+#ifdef CONFIG_PAX_MPROTECT
72763+ if (mm->binfmt && mm->binfmt->handle_mprotect)
72764+ mm->binfmt->handle_mprotect(vma, newflags);
72765+#endif
72766+
72767 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
72768- vm_get_page_prot(newflags));
72769+ vm_get_page_prot(vma->vm_flags));
72770
72771 if (vma_wants_writenotify(vma)) {
72772 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
72773@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
72774 end = start + len;
72775 if (end <= start)
72776 return -ENOMEM;
72777+
72778+#ifdef CONFIG_PAX_SEGMEXEC
72779+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
72780+ if (end > SEGMEXEC_TASK_SIZE)
72781+ return -EINVAL;
72782+ } else
72783+#endif
72784+
72785+ if (end > TASK_SIZE)
72786+ return -EINVAL;
72787+
72788 if (!arch_validate_prot(prot))
72789 return -EINVAL;
72790
72791@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
72792 /*
72793 * Does the application expect PROT_READ to imply PROT_EXEC:
72794 */
72795- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
72796+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
72797 prot |= PROT_EXEC;
72798
72799 vm_flags = calc_vm_prot_bits(prot);
72800@@ -288,6 +413,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
72801 if (start > vma->vm_start)
72802 prev = vma;
72803
72804+#ifdef CONFIG_PAX_MPROTECT
72805+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
72806+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
72807+#endif
72808+
72809 for (nstart = start ; ; ) {
72810 unsigned long newflags;
72811
72812@@ -297,6 +427,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
72813
72814 /* newflags >> 4 shift VM_MAY% in place of VM_% */
72815 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
72816+ if (prot & (PROT_WRITE | PROT_EXEC))
72817+ gr_log_rwxmprotect(vma->vm_file);
72818+
72819+ error = -EACCES;
72820+ goto out;
72821+ }
72822+
72823+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
72824 error = -EACCES;
72825 goto out;
72826 }
72827@@ -311,6 +449,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
72828 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
72829 if (error)
72830 goto out;
72831+
72832+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
72833+
72834 nstart = tmp;
72835
72836 if (nstart < prev->vm_end)
72837diff --git a/mm/mremap.c b/mm/mremap.c
72838index 87bb839..c3bfadb 100644
72839--- a/mm/mremap.c
72840+++ b/mm/mremap.c
72841@@ -106,6 +106,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
72842 continue;
72843 pte = ptep_get_and_clear(mm, old_addr, old_pte);
72844 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
72845+
72846+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
72847+ if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
72848+ pte = pte_exprotect(pte);
72849+#endif
72850+
72851 set_pte_at(mm, new_addr, new_pte, pte);
72852 }
72853
72854@@ -299,6 +305,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
72855 if (is_vm_hugetlb_page(vma))
72856 goto Einval;
72857
72858+#ifdef CONFIG_PAX_SEGMEXEC
72859+ if (pax_find_mirror_vma(vma))
72860+ goto Einval;
72861+#endif
72862+
72863 /* We can't remap across vm area boundaries */
72864 if (old_len > vma->vm_end - addr)
72865 goto Efault;
72866@@ -355,20 +366,25 @@ static unsigned long mremap_to(unsigned long addr,
72867 unsigned long ret = -EINVAL;
72868 unsigned long charged = 0;
72869 unsigned long map_flags;
72870+ unsigned long pax_task_size = TASK_SIZE;
72871
72872 if (new_addr & ~PAGE_MASK)
72873 goto out;
72874
72875- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
72876+#ifdef CONFIG_PAX_SEGMEXEC
72877+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
72878+ pax_task_size = SEGMEXEC_TASK_SIZE;
72879+#endif
72880+
72881+ pax_task_size -= PAGE_SIZE;
72882+
72883+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
72884 goto out;
72885
72886 /* Check if the location we're moving into overlaps the
72887 * old location at all, and fail if it does.
72888 */
72889- if ((new_addr <= addr) && (new_addr+new_len) > addr)
72890- goto out;
72891-
72892- if ((addr <= new_addr) && (addr+old_len) > new_addr)
72893+ if (addr + old_len > new_addr && new_addr + new_len > addr)
72894 goto out;
72895
72896 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
72897@@ -440,6 +456,7 @@ unsigned long do_mremap(unsigned long addr,
72898 struct vm_area_struct *vma;
72899 unsigned long ret = -EINVAL;
72900 unsigned long charged = 0;
72901+ unsigned long pax_task_size = TASK_SIZE;
72902
72903 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
72904 goto out;
72905@@ -458,6 +475,17 @@ unsigned long do_mremap(unsigned long addr,
72906 if (!new_len)
72907 goto out;
72908
72909+#ifdef CONFIG_PAX_SEGMEXEC
72910+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
72911+ pax_task_size = SEGMEXEC_TASK_SIZE;
72912+#endif
72913+
72914+ pax_task_size -= PAGE_SIZE;
72915+
72916+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
72917+ old_len > pax_task_size || addr > pax_task_size-old_len)
72918+ goto out;
72919+
72920 if (flags & MREMAP_FIXED) {
72921 if (flags & MREMAP_MAYMOVE)
72922 ret = mremap_to(addr, old_len, new_addr, new_len);
72923@@ -507,6 +535,7 @@ unsigned long do_mremap(unsigned long addr,
72924 addr + new_len);
72925 }
72926 ret = addr;
72927+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
72928 goto out;
72929 }
72930 }
72931@@ -533,7 +562,13 @@ unsigned long do_mremap(unsigned long addr,
72932 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
72933 if (ret)
72934 goto out;
72935+
72936+ map_flags = vma->vm_flags;
72937 ret = move_vma(vma, addr, old_len, new_len, new_addr);
72938+ if (!(ret & ~PAGE_MASK)) {
72939+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
72940+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
72941+ }
72942 }
72943 out:
72944 if (ret & ~PAGE_MASK)
72945diff --git a/mm/nommu.c b/mm/nommu.c
72946index f59e170..34e2a2b 100644
72947--- a/mm/nommu.c
72948+++ b/mm/nommu.c
72949@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
72950 int sysctl_overcommit_ratio = 50; /* default is 50% */
72951 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
72952 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
72953-int heap_stack_gap = 0;
72954
72955 atomic_long_t mmap_pages_allocated;
72956
72957@@ -827,15 +826,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
72958 EXPORT_SYMBOL(find_vma);
72959
72960 /*
72961- * find a VMA
72962- * - we don't extend stack VMAs under NOMMU conditions
72963- */
72964-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
72965-{
72966- return find_vma(mm, addr);
72967-}
72968-
72969-/*
72970 * expand a stack to a given address
72971 * - not supported under NOMMU conditions
72972 */
72973@@ -1555,6 +1545,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72974
72975 /* most fields are the same, copy all, and then fixup */
72976 *new = *vma;
72977+ INIT_LIST_HEAD(&new->anon_vma_chain);
72978 *region = *vma->vm_region;
72979 new->vm_region = region;
72980
72981diff --git a/mm/page_alloc.c b/mm/page_alloc.c
72982index a13ded1..b949d15 100644
72983--- a/mm/page_alloc.c
72984+++ b/mm/page_alloc.c
72985@@ -335,7 +335,7 @@ out:
72986 * This usage means that zero-order pages may not be compound.
72987 */
72988
72989-static void free_compound_page(struct page *page)
72990+void free_compound_page(struct page *page)
72991 {
72992 __free_pages_ok(page, compound_order(page));
72993 }
72994@@ -692,6 +692,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
72995 int i;
72996 int bad = 0;
72997
72998+#ifdef CONFIG_PAX_MEMORY_SANITIZE
72999+ unsigned long index = 1UL << order;
73000+#endif
73001+
73002 trace_mm_page_free(page, order);
73003 kmemcheck_free_shadow(page, order);
73004
73005@@ -707,6 +711,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73006 debug_check_no_obj_freed(page_address(page),
73007 PAGE_SIZE << order);
73008 }
73009+
73010+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73011+ for (; index; --index)
73012+ sanitize_highpage(page + index - 1);
73013+#endif
73014+
73015 arch_free_page(page, order);
73016 kernel_map_pages(page, 1 << order, 0);
73017
73018@@ -830,8 +840,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
73019 arch_alloc_page(page, order);
73020 kernel_map_pages(page, 1 << order, 1);
73021
73022+#ifndef CONFIG_PAX_MEMORY_SANITIZE
73023 if (gfp_flags & __GFP_ZERO)
73024 prep_zero_page(page, order, gfp_flags);
73025+#endif
73026
73027 if (order && (gfp_flags & __GFP_COMP))
73028 prep_compound_page(page, order);
73029@@ -3468,7 +3480,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
73030 unsigned long pfn;
73031
73032 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
73033+#ifdef CONFIG_X86_32
73034+ /* boot failures in VMware 8 on 32bit vanilla since
73035+ this change */
73036+ if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn)))
73037+#else
73038 if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
73039+#endif
73040 return 1;
73041 }
73042 return 0;
73043diff --git a/mm/percpu.c b/mm/percpu.c
73044index f47af91..7eeef99 100644
73045--- a/mm/percpu.c
73046+++ b/mm/percpu.c
73047@@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
73048 static unsigned int pcpu_high_unit_cpu __read_mostly;
73049
73050 /* the address of the first chunk which starts with the kernel static area */
73051-void *pcpu_base_addr __read_mostly;
73052+void *pcpu_base_addr __read_only;
73053 EXPORT_SYMBOL_GPL(pcpu_base_addr);
73054
73055 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
73056diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
73057index c20ff48..137702a 100644
73058--- a/mm/process_vm_access.c
73059+++ b/mm/process_vm_access.c
73060@@ -13,6 +13,7 @@
73061 #include <linux/uio.h>
73062 #include <linux/sched.h>
73063 #include <linux/highmem.h>
73064+#include <linux/security.h>
73065 #include <linux/ptrace.h>
73066 #include <linux/slab.h>
73067 #include <linux/syscalls.h>
73068@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73069 size_t iov_l_curr_offset = 0;
73070 ssize_t iov_len;
73071
73072+ return -ENOSYS; // PaX: until properly audited
73073+
73074 /*
73075 * Work out how many pages of struct pages we're going to need
73076 * when eventually calling get_user_pages
73077 */
73078 for (i = 0; i < riovcnt; i++) {
73079 iov_len = rvec[i].iov_len;
73080- if (iov_len > 0) {
73081- nr_pages_iov = ((unsigned long)rvec[i].iov_base
73082- + iov_len)
73083- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
73084- / PAGE_SIZE + 1;
73085- nr_pages = max(nr_pages, nr_pages_iov);
73086- }
73087+ if (iov_len <= 0)
73088+ continue;
73089+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
73090+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
73091+ nr_pages = max(nr_pages, nr_pages_iov);
73092 }
73093
73094 if (nr_pages == 0)
73095@@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73096 goto free_proc_pages;
73097 }
73098
73099+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
73100+ rc = -EPERM;
73101+ goto put_task_struct;
73102+ }
73103+
73104 mm = mm_access(task, PTRACE_MODE_ATTACH);
73105 if (!mm || IS_ERR(mm)) {
73106 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
73107diff --git a/mm/rmap.c b/mm/rmap.c
73108index c8454e0..b04f3a2 100644
73109--- a/mm/rmap.c
73110+++ b/mm/rmap.c
73111@@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73112 struct anon_vma *anon_vma = vma->anon_vma;
73113 struct anon_vma_chain *avc;
73114
73115+#ifdef CONFIG_PAX_SEGMEXEC
73116+ struct anon_vma_chain *avc_m = NULL;
73117+#endif
73118+
73119 might_sleep();
73120 if (unlikely(!anon_vma)) {
73121 struct mm_struct *mm = vma->vm_mm;
73122@@ -161,6 +165,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73123 if (!avc)
73124 goto out_enomem;
73125
73126+#ifdef CONFIG_PAX_SEGMEXEC
73127+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
73128+ if (!avc_m)
73129+ goto out_enomem_free_avc;
73130+#endif
73131+
73132 anon_vma = find_mergeable_anon_vma(vma);
73133 allocated = NULL;
73134 if (!anon_vma) {
73135@@ -174,6 +184,21 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73136 /* page_table_lock to protect against threads */
73137 spin_lock(&mm->page_table_lock);
73138 if (likely(!vma->anon_vma)) {
73139+
73140+#ifdef CONFIG_PAX_SEGMEXEC
73141+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
73142+
73143+ if (vma_m) {
73144+ BUG_ON(vma_m->anon_vma);
73145+ vma_m->anon_vma = anon_vma;
73146+ avc_m->anon_vma = anon_vma;
73147+ avc_m->vma = vma;
73148+ list_add(&avc_m->same_vma, &vma_m->anon_vma_chain);
73149+ list_add(&avc_m->same_anon_vma, &anon_vma->head);
73150+ avc_m = NULL;
73151+ }
73152+#endif
73153+
73154 vma->anon_vma = anon_vma;
73155 avc->anon_vma = anon_vma;
73156 avc->vma = vma;
73157@@ -187,12 +212,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73158
73159 if (unlikely(allocated))
73160 put_anon_vma(allocated);
73161+
73162+#ifdef CONFIG_PAX_SEGMEXEC
73163+ if (unlikely(avc_m))
73164+ anon_vma_chain_free(avc_m);
73165+#endif
73166+
73167 if (unlikely(avc))
73168 anon_vma_chain_free(avc);
73169 }
73170 return 0;
73171
73172 out_enomem_free_avc:
73173+
73174+#ifdef CONFIG_PAX_SEGMEXEC
73175+ if (avc_m)
73176+ anon_vma_chain_free(avc_m);
73177+#endif
73178+
73179 anon_vma_chain_free(avc);
73180 out_enomem:
73181 return -ENOMEM;
73182@@ -243,7 +280,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
73183 * Attach the anon_vmas from src to dst.
73184 * Returns 0 on success, -ENOMEM on failure.
73185 */
73186-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
73187+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
73188 {
73189 struct anon_vma_chain *avc, *pavc;
73190 struct anon_vma *root = NULL;
73191@@ -321,7 +358,7 @@ void anon_vma_moveto_tail(struct vm_area_struct *dst)
73192 * the corresponding VMA in the parent process is attached to.
73193 * Returns 0 on success, non-zero on failure.
73194 */
73195-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
73196+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
73197 {
73198 struct anon_vma_chain *avc;
73199 struct anon_vma *anon_vma;
73200diff --git a/mm/shmem.c b/mm/shmem.c
73201index 269d049..a9d2b50 100644
73202--- a/mm/shmem.c
73203+++ b/mm/shmem.c
73204@@ -31,7 +31,7 @@
73205 #include <linux/export.h>
73206 #include <linux/swap.h>
73207
73208-static struct vfsmount *shm_mnt;
73209+struct vfsmount *shm_mnt;
73210
73211 #ifdef CONFIG_SHMEM
73212 /*
73213@@ -74,7 +74,7 @@ static struct vfsmount *shm_mnt;
73214 #define BOGO_DIRENT_SIZE 20
73215
73216 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
73217-#define SHORT_SYMLINK_LEN 128
73218+#define SHORT_SYMLINK_LEN 64
73219
73220 struct shmem_xattr {
73221 struct list_head list; /* anchored by shmem_inode_info->xattr_list */
73222@@ -2180,8 +2180,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
73223 int err = -ENOMEM;
73224
73225 /* Round up to L1_CACHE_BYTES to resist false sharing */
73226- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
73227- L1_CACHE_BYTES), GFP_KERNEL);
73228+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
73229 if (!sbinfo)
73230 return -ENOMEM;
73231
73232diff --git a/mm/slab.c b/mm/slab.c
73233index f0bd785..348b96a 100644
73234--- a/mm/slab.c
73235+++ b/mm/slab.c
73236@@ -153,7 +153,7 @@
73237
73238 /* Legal flag mask for kmem_cache_create(). */
73239 #if DEBUG
73240-# define CREATE_MASK (SLAB_RED_ZONE | \
73241+# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
73242 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
73243 SLAB_CACHE_DMA | \
73244 SLAB_STORE_USER | \
73245@@ -161,7 +161,7 @@
73246 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73247 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
73248 #else
73249-# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
73250+# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
73251 SLAB_CACHE_DMA | \
73252 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
73253 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73254@@ -290,7 +290,7 @@ struct kmem_list3 {
73255 * Need this for bootstrapping a per node allocator.
73256 */
73257 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
73258-static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
73259+static struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
73260 #define CACHE_CACHE 0
73261 #define SIZE_AC MAX_NUMNODES
73262 #define SIZE_L3 (2 * MAX_NUMNODES)
73263@@ -391,10 +391,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
73264 if ((x)->max_freeable < i) \
73265 (x)->max_freeable = i; \
73266 } while (0)
73267-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
73268-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
73269-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
73270-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
73271+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
73272+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
73273+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
73274+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
73275 #else
73276 #define STATS_INC_ACTIVE(x) do { } while (0)
73277 #define STATS_DEC_ACTIVE(x) do { } while (0)
73278@@ -542,7 +542,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
73279 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
73280 */
73281 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
73282- const struct slab *slab, void *obj)
73283+ const struct slab *slab, const void *obj)
73284 {
73285 u32 offset = (obj - slab->s_mem);
73286 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
73287@@ -568,7 +568,7 @@ struct cache_names {
73288 static struct cache_names __initdata cache_names[] = {
73289 #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
73290 #include <linux/kmalloc_sizes.h>
73291- {NULL,}
73292+ {NULL}
73293 #undef CACHE
73294 };
73295
73296@@ -1588,7 +1588,7 @@ void __init kmem_cache_init(void)
73297 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
73298 sizes[INDEX_AC].cs_size,
73299 ARCH_KMALLOC_MINALIGN,
73300- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73301+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73302 NULL);
73303
73304 if (INDEX_AC != INDEX_L3) {
73305@@ -1596,7 +1596,7 @@ void __init kmem_cache_init(void)
73306 kmem_cache_create(names[INDEX_L3].name,
73307 sizes[INDEX_L3].cs_size,
73308 ARCH_KMALLOC_MINALIGN,
73309- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73310+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73311 NULL);
73312 }
73313
73314@@ -1614,7 +1614,7 @@ void __init kmem_cache_init(void)
73315 sizes->cs_cachep = kmem_cache_create(names->name,
73316 sizes->cs_size,
73317 ARCH_KMALLOC_MINALIGN,
73318- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73319+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73320 NULL);
73321 }
73322 #ifdef CONFIG_ZONE_DMA
73323@@ -4339,10 +4339,10 @@ static int s_show(struct seq_file *m, void *p)
73324 }
73325 /* cpu stats */
73326 {
73327- unsigned long allochit = atomic_read(&cachep->allochit);
73328- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
73329- unsigned long freehit = atomic_read(&cachep->freehit);
73330- unsigned long freemiss = atomic_read(&cachep->freemiss);
73331+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
73332+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
73333+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
73334+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
73335
73336 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
73337 allochit, allocmiss, freehit, freemiss);
73338@@ -4601,13 +4601,62 @@ static int __init slab_proc_init(void)
73339 {
73340 proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
73341 #ifdef CONFIG_DEBUG_SLAB_LEAK
73342- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
73343+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
73344 #endif
73345 return 0;
73346 }
73347 module_init(slab_proc_init);
73348 #endif
73349
73350+void check_object_size(const void *ptr, unsigned long n, bool to)
73351+{
73352+
73353+#ifdef CONFIG_PAX_USERCOPY
73354+ struct page *page;
73355+ struct kmem_cache *cachep = NULL;
73356+ struct slab *slabp;
73357+ unsigned int objnr;
73358+ unsigned long offset;
73359+ const char *type;
73360+
73361+ if (!n)
73362+ return;
73363+
73364+ type = "<null>";
73365+ if (ZERO_OR_NULL_PTR(ptr))
73366+ goto report;
73367+
73368+ if (!virt_addr_valid(ptr))
73369+ return;
73370+
73371+ page = virt_to_head_page(ptr);
73372+
73373+ type = "<process stack>";
73374+ if (!PageSlab(page)) {
73375+ if (object_is_on_stack(ptr, n) == -1)
73376+ goto report;
73377+ return;
73378+ }
73379+
73380+ cachep = page_get_cache(page);
73381+ type = cachep->name;
73382+ if (!(cachep->flags & SLAB_USERCOPY))
73383+ goto report;
73384+
73385+ slabp = page_get_slab(page);
73386+ objnr = obj_to_index(cachep, slabp, ptr);
73387+ BUG_ON(objnr >= cachep->num);
73388+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
73389+ if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
73390+ return;
73391+
73392+report:
73393+ pax_report_usercopy(ptr, n, to, type);
73394+#endif
73395+
73396+}
73397+EXPORT_SYMBOL(check_object_size);
73398+
73399 /**
73400 * ksize - get the actual amount of memory allocated for a given object
73401 * @objp: Pointer to the object
73402diff --git a/mm/slob.c b/mm/slob.c
73403index 8105be4..e045f96 100644
73404--- a/mm/slob.c
73405+++ b/mm/slob.c
73406@@ -29,7 +29,7 @@
73407 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
73408 * alloc_pages() directly, allocating compound pages so the page order
73409 * does not have to be separately tracked, and also stores the exact
73410- * allocation size in page->private so that it can be used to accurately
73411+ * allocation size in slob_page->size so that it can be used to accurately
73412 * provide ksize(). These objects are detected in kfree() because slob_page()
73413 * is false for them.
73414 *
73415@@ -58,6 +58,7 @@
73416 */
73417
73418 #include <linux/kernel.h>
73419+#include <linux/sched.h>
73420 #include <linux/slab.h>
73421 #include <linux/mm.h>
73422 #include <linux/swap.h> /* struct reclaim_state */
73423@@ -102,7 +103,8 @@ struct slob_page {
73424 unsigned long flags; /* mandatory */
73425 atomic_t _count; /* mandatory */
73426 slobidx_t units; /* free units left in page */
73427- unsigned long pad[2];
73428+ unsigned long pad[1];
73429+ unsigned long size; /* size when >=PAGE_SIZE */
73430 slob_t *free; /* first free slob_t in page */
73431 struct list_head list; /* linked list of free pages */
73432 };
73433@@ -135,7 +137,7 @@ static LIST_HEAD(free_slob_large);
73434 */
73435 static inline int is_slob_page(struct slob_page *sp)
73436 {
73437- return PageSlab((struct page *)sp);
73438+ return PageSlab((struct page *)sp) && !sp->size;
73439 }
73440
73441 static inline void set_slob_page(struct slob_page *sp)
73442@@ -150,7 +152,7 @@ static inline void clear_slob_page(struct slob_page *sp)
73443
73444 static inline struct slob_page *slob_page(const void *addr)
73445 {
73446- return (struct slob_page *)virt_to_page(addr);
73447+ return (struct slob_page *)virt_to_head_page(addr);
73448 }
73449
73450 /*
73451@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
73452 /*
73453 * Return the size of a slob block.
73454 */
73455-static slobidx_t slob_units(slob_t *s)
73456+static slobidx_t slob_units(const slob_t *s)
73457 {
73458 if (s->units > 0)
73459 return s->units;
73460@@ -220,7 +222,7 @@ static slobidx_t slob_units(slob_t *s)
73461 /*
73462 * Return the next free slob block pointer after this one.
73463 */
73464-static slob_t *slob_next(slob_t *s)
73465+static slob_t *slob_next(const slob_t *s)
73466 {
73467 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
73468 slobidx_t next;
73469@@ -235,7 +237,7 @@ static slob_t *slob_next(slob_t *s)
73470 /*
73471 * Returns true if s is the last free block in its page.
73472 */
73473-static int slob_last(slob_t *s)
73474+static int slob_last(const slob_t *s)
73475 {
73476 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
73477 }
73478@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
73479 if (!page)
73480 return NULL;
73481
73482+ set_slob_page(page);
73483 return page_address(page);
73484 }
73485
73486@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
73487 if (!b)
73488 return NULL;
73489 sp = slob_page(b);
73490- set_slob_page(sp);
73491
73492 spin_lock_irqsave(&slob_lock, flags);
73493 sp->units = SLOB_UNITS(PAGE_SIZE);
73494 sp->free = b;
73495+ sp->size = 0;
73496 INIT_LIST_HEAD(&sp->list);
73497 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
73498 set_slob_page_free(sp, slob_list);
73499@@ -476,10 +479,9 @@ out:
73500 * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
73501 */
73502
73503-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73504+static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
73505 {
73506- unsigned int *m;
73507- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73508+ slob_t *m;
73509 void *ret;
73510
73511 gfp &= gfp_allowed_mask;
73512@@ -494,7 +496,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73513
73514 if (!m)
73515 return NULL;
73516- *m = size;
73517+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
73518+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
73519+ m[0].units = size;
73520+ m[1].units = align;
73521 ret = (void *)m + align;
73522
73523 trace_kmalloc_node(_RET_IP_, ret,
73524@@ -506,16 +511,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73525 gfp |= __GFP_COMP;
73526 ret = slob_new_pages(gfp, order, node);
73527 if (ret) {
73528- struct page *page;
73529- page = virt_to_page(ret);
73530- page->private = size;
73531+ struct slob_page *sp;
73532+ sp = slob_page(ret);
73533+ sp->size = size;
73534 }
73535
73536 trace_kmalloc_node(_RET_IP_, ret,
73537 size, PAGE_SIZE << order, gfp, node);
73538 }
73539
73540- kmemleak_alloc(ret, size, 1, gfp);
73541+ return ret;
73542+}
73543+
73544+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73545+{
73546+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73547+ void *ret = __kmalloc_node_align(size, gfp, node, align);
73548+
73549+ if (!ZERO_OR_NULL_PTR(ret))
73550+ kmemleak_alloc(ret, size, 1, gfp);
73551 return ret;
73552 }
73553 EXPORT_SYMBOL(__kmalloc_node);
73554@@ -533,13 +547,92 @@ void kfree(const void *block)
73555 sp = slob_page(block);
73556 if (is_slob_page(sp)) {
73557 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73558- unsigned int *m = (unsigned int *)(block - align);
73559- slob_free(m, *m + align);
73560- } else
73561+ slob_t *m = (slob_t *)(block - align);
73562+ slob_free(m, m[0].units + align);
73563+ } else {
73564+ clear_slob_page(sp);
73565+ free_slob_page(sp);
73566+ sp->size = 0;
73567 put_page(&sp->page);
73568+ }
73569 }
73570 EXPORT_SYMBOL(kfree);
73571
73572+void check_object_size(const void *ptr, unsigned long n, bool to)
73573+{
73574+
73575+#ifdef CONFIG_PAX_USERCOPY
73576+ struct slob_page *sp;
73577+ const slob_t *free;
73578+ const void *base;
73579+ unsigned long flags;
73580+ const char *type;
73581+
73582+ if (!n)
73583+ return;
73584+
73585+ type = "<null>";
73586+ if (ZERO_OR_NULL_PTR(ptr))
73587+ goto report;
73588+
73589+ if (!virt_addr_valid(ptr))
73590+ return;
73591+
73592+ type = "<process stack>";
73593+ sp = slob_page(ptr);
73594+ if (!PageSlab((struct page *)sp)) {
73595+ if (object_is_on_stack(ptr, n) == -1)
73596+ goto report;
73597+ return;
73598+ }
73599+
73600+ type = "<slob>";
73601+ if (sp->size) {
73602+ base = page_address(&sp->page);
73603+ if (base <= ptr && n <= sp->size - (ptr - base))
73604+ return;
73605+ goto report;
73606+ }
73607+
73608+ /* some tricky double walking to find the chunk */
73609+ spin_lock_irqsave(&slob_lock, flags);
73610+ base = (void *)((unsigned long)ptr & PAGE_MASK);
73611+ free = sp->free;
73612+
73613+ while (!slob_last(free) && (void *)free <= ptr) {
73614+ base = free + slob_units(free);
73615+ free = slob_next(free);
73616+ }
73617+
73618+ while (base < (void *)free) {
73619+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
73620+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
73621+ int offset;
73622+
73623+ if (ptr < base + align)
73624+ break;
73625+
73626+ offset = ptr - base - align;
73627+ if (offset >= m) {
73628+ base += size;
73629+ continue;
73630+ }
73631+
73632+ if (n > m - offset)
73633+ break;
73634+
73635+ spin_unlock_irqrestore(&slob_lock, flags);
73636+ return;
73637+ }
73638+
73639+ spin_unlock_irqrestore(&slob_lock, flags);
73640+report:
73641+ pax_report_usercopy(ptr, n, to, type);
73642+#endif
73643+
73644+}
73645+EXPORT_SYMBOL(check_object_size);
73646+
73647 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
73648 size_t ksize(const void *block)
73649 {
73650@@ -552,10 +645,10 @@ size_t ksize(const void *block)
73651 sp = slob_page(block);
73652 if (is_slob_page(sp)) {
73653 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73654- unsigned int *m = (unsigned int *)(block - align);
73655- return SLOB_UNITS(*m) * SLOB_UNIT;
73656+ slob_t *m = (slob_t *)(block - align);
73657+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
73658 } else
73659- return sp->page.private;
73660+ return sp->size;
73661 }
73662 EXPORT_SYMBOL(ksize);
73663
73664@@ -571,8 +664,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
73665 {
73666 struct kmem_cache *c;
73667
73668+#ifdef CONFIG_PAX_USERCOPY
73669+ c = __kmalloc_node_align(sizeof(struct kmem_cache),
73670+ GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
73671+#else
73672 c = slob_alloc(sizeof(struct kmem_cache),
73673 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
73674+#endif
73675
73676 if (c) {
73677 c->name = name;
73678@@ -614,17 +712,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
73679
73680 lockdep_trace_alloc(flags);
73681
73682+#ifdef CONFIG_PAX_USERCOPY
73683+ b = __kmalloc_node_align(c->size, flags, node, c->align);
73684+#else
73685 if (c->size < PAGE_SIZE) {
73686 b = slob_alloc(c->size, flags, c->align, node);
73687 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
73688 SLOB_UNITS(c->size) * SLOB_UNIT,
73689 flags, node);
73690 } else {
73691+ struct slob_page *sp;
73692+
73693 b = slob_new_pages(flags, get_order(c->size), node);
73694+ sp = slob_page(b);
73695+ sp->size = c->size;
73696 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
73697 PAGE_SIZE << get_order(c->size),
73698 flags, node);
73699 }
73700+#endif
73701
73702 if (c->ctor)
73703 c->ctor(b);
73704@@ -636,10 +742,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
73705
73706 static void __kmem_cache_free(void *b, int size)
73707 {
73708- if (size < PAGE_SIZE)
73709+ struct slob_page *sp = slob_page(b);
73710+
73711+ if (is_slob_page(sp))
73712 slob_free(b, size);
73713- else
73714+ else {
73715+ clear_slob_page(sp);
73716+ free_slob_page(sp);
73717+ sp->size = 0;
73718 slob_free_pages(b, get_order(size));
73719+ }
73720 }
73721
73722 static void kmem_rcu_free(struct rcu_head *head)
73723@@ -652,17 +764,31 @@ static void kmem_rcu_free(struct rcu_head *head)
73724
73725 void kmem_cache_free(struct kmem_cache *c, void *b)
73726 {
73727+ int size = c->size;
73728+
73729+#ifdef CONFIG_PAX_USERCOPY
73730+ if (size + c->align < PAGE_SIZE) {
73731+ size += c->align;
73732+ b -= c->align;
73733+ }
73734+#endif
73735+
73736 kmemleak_free_recursive(b, c->flags);
73737 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
73738 struct slob_rcu *slob_rcu;
73739- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
73740- slob_rcu->size = c->size;
73741+ slob_rcu = b + (size - sizeof(struct slob_rcu));
73742+ slob_rcu->size = size;
73743 call_rcu(&slob_rcu->head, kmem_rcu_free);
73744 } else {
73745- __kmem_cache_free(b, c->size);
73746+ __kmem_cache_free(b, size);
73747 }
73748
73749+#ifdef CONFIG_PAX_USERCOPY
73750+ trace_kfree(_RET_IP_, b);
73751+#else
73752 trace_kmem_cache_free(_RET_IP_, b);
73753+#endif
73754+
73755 }
73756 EXPORT_SYMBOL(kmem_cache_free);
73757
73758diff --git a/mm/slub.c b/mm/slub.c
73759index 0342a5d..8180ae9 100644
73760--- a/mm/slub.c
73761+++ b/mm/slub.c
73762@@ -208,7 +208,7 @@ struct track {
73763
73764 enum track_item { TRACK_ALLOC, TRACK_FREE };
73765
73766-#ifdef CONFIG_SYSFS
73767+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
73768 static int sysfs_slab_add(struct kmem_cache *);
73769 static int sysfs_slab_alias(struct kmem_cache *, const char *);
73770 static void sysfs_slab_remove(struct kmem_cache *);
73771@@ -532,7 +532,7 @@ static void print_track(const char *s, struct track *t)
73772 if (!t->addr)
73773 return;
73774
73775- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
73776+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
73777 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
73778 #ifdef CONFIG_STACKTRACE
73779 {
73780@@ -2571,6 +2571,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
73781
73782 page = virt_to_head_page(x);
73783
73784+ BUG_ON(!PageSlab(page));
73785+
73786 slab_free(s, page, x, _RET_IP_);
73787
73788 trace_kmem_cache_free(_RET_IP_, x);
73789@@ -2604,7 +2606,7 @@ static int slub_min_objects;
73790 * Merge control. If this is set then no merging of slab caches will occur.
73791 * (Could be removed. This was introduced to pacify the merge skeptics.)
73792 */
73793-static int slub_nomerge;
73794+static int slub_nomerge = 1;
73795
73796 /*
73797 * Calculate the order of allocation given an slab object size.
73798@@ -3057,7 +3059,7 @@ static int kmem_cache_open(struct kmem_cache *s,
73799 else
73800 s->cpu_partial = 30;
73801
73802- s->refcount = 1;
73803+ atomic_set(&s->refcount, 1);
73804 #ifdef CONFIG_NUMA
73805 s->remote_node_defrag_ratio = 1000;
73806 #endif
73807@@ -3161,8 +3163,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
73808 void kmem_cache_destroy(struct kmem_cache *s)
73809 {
73810 down_write(&slub_lock);
73811- s->refcount--;
73812- if (!s->refcount) {
73813+ if (atomic_dec_and_test(&s->refcount)) {
73814 list_del(&s->list);
73815 up_write(&slub_lock);
73816 if (kmem_cache_close(s)) {
73817@@ -3373,6 +3374,50 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
73818 EXPORT_SYMBOL(__kmalloc_node);
73819 #endif
73820
73821+void check_object_size(const void *ptr, unsigned long n, bool to)
73822+{
73823+
73824+#ifdef CONFIG_PAX_USERCOPY
73825+ struct page *page;
73826+ struct kmem_cache *s = NULL;
73827+ unsigned long offset;
73828+ const char *type;
73829+
73830+ if (!n)
73831+ return;
73832+
73833+ type = "<null>";
73834+ if (ZERO_OR_NULL_PTR(ptr))
73835+ goto report;
73836+
73837+ if (!virt_addr_valid(ptr))
73838+ return;
73839+
73840+ page = virt_to_head_page(ptr);
73841+
73842+ type = "<process stack>";
73843+ if (!PageSlab(page)) {
73844+ if (object_is_on_stack(ptr, n) == -1)
73845+ goto report;
73846+ return;
73847+ }
73848+
73849+ s = page->slab;
73850+ type = s->name;
73851+ if (!(s->flags & SLAB_USERCOPY))
73852+ goto report;
73853+
73854+ offset = (ptr - page_address(page)) % s->size;
73855+ if (offset <= s->objsize && n <= s->objsize - offset)
73856+ return;
73857+
73858+report:
73859+ pax_report_usercopy(ptr, n, to, type);
73860+#endif
73861+
73862+}
73863+EXPORT_SYMBOL(check_object_size);
73864+
73865 size_t ksize(const void *object)
73866 {
73867 struct page *page;
73868@@ -3647,7 +3692,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
73869 int node;
73870
73871 list_add(&s->list, &slab_caches);
73872- s->refcount = -1;
73873+ atomic_set(&s->refcount, -1);
73874
73875 for_each_node_state(node, N_NORMAL_MEMORY) {
73876 struct kmem_cache_node *n = get_node(s, node);
73877@@ -3767,17 +3812,17 @@ void __init kmem_cache_init(void)
73878
73879 /* Caches that are not of the two-to-the-power-of size */
73880 if (KMALLOC_MIN_SIZE <= 32) {
73881- kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, 0);
73882+ kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, SLAB_USERCOPY);
73883 caches++;
73884 }
73885
73886 if (KMALLOC_MIN_SIZE <= 64) {
73887- kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, 0);
73888+ kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, SLAB_USERCOPY);
73889 caches++;
73890 }
73891
73892 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
73893- kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, 0);
73894+ kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, SLAB_USERCOPY);
73895 caches++;
73896 }
73897
73898@@ -3845,7 +3890,7 @@ static int slab_unmergeable(struct kmem_cache *s)
73899 /*
73900 * We may have set a slab to be unmergeable during bootstrap.
73901 */
73902- if (s->refcount < 0)
73903+ if (atomic_read(&s->refcount) < 0)
73904 return 1;
73905
73906 return 0;
73907@@ -3904,7 +3949,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
73908 down_write(&slub_lock);
73909 s = find_mergeable(size, align, flags, name, ctor);
73910 if (s) {
73911- s->refcount++;
73912+ atomic_inc(&s->refcount);
73913 /*
73914 * Adjust the object sizes so that we clear
73915 * the complete object on kzalloc.
73916@@ -3913,7 +3958,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
73917 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
73918
73919 if (sysfs_slab_alias(s, name)) {
73920- s->refcount--;
73921+ atomic_dec(&s->refcount);
73922 goto err;
73923 }
73924 up_write(&slub_lock);
73925@@ -4042,7 +4087,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
73926 }
73927 #endif
73928
73929-#ifdef CONFIG_SYSFS
73930+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
73931 static int count_inuse(struct page *page)
73932 {
73933 return page->inuse;
73934@@ -4429,12 +4474,12 @@ static void resiliency_test(void)
73935 validate_slab_cache(kmalloc_caches[9]);
73936 }
73937 #else
73938-#ifdef CONFIG_SYSFS
73939+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
73940 static void resiliency_test(void) {};
73941 #endif
73942 #endif
73943
73944-#ifdef CONFIG_SYSFS
73945+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
73946 enum slab_stat_type {
73947 SL_ALL, /* All slabs */
73948 SL_PARTIAL, /* Only partially allocated slabs */
73949@@ -4677,7 +4722,7 @@ SLAB_ATTR_RO(ctor);
73950
73951 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
73952 {
73953- return sprintf(buf, "%d\n", s->refcount - 1);
73954+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
73955 }
73956 SLAB_ATTR_RO(aliases);
73957
73958@@ -5244,6 +5289,7 @@ static char *create_unique_id(struct kmem_cache *s)
73959 return name;
73960 }
73961
73962+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
73963 static int sysfs_slab_add(struct kmem_cache *s)
73964 {
73965 int err;
73966@@ -5306,6 +5352,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
73967 kobject_del(&s->kobj);
73968 kobject_put(&s->kobj);
73969 }
73970+#endif
73971
73972 /*
73973 * Need to buffer aliases during bootup until sysfs becomes
73974@@ -5319,6 +5366,7 @@ struct saved_alias {
73975
73976 static struct saved_alias *alias_list;
73977
73978+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
73979 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
73980 {
73981 struct saved_alias *al;
73982@@ -5341,6 +5389,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
73983 alias_list = al;
73984 return 0;
73985 }
73986+#endif
73987
73988 static int __init slab_sysfs_init(void)
73989 {
73990diff --git a/mm/swap.c b/mm/swap.c
73991index 14380e9..e244704 100644
73992--- a/mm/swap.c
73993+++ b/mm/swap.c
73994@@ -30,6 +30,7 @@
73995 #include <linux/backing-dev.h>
73996 #include <linux/memcontrol.h>
73997 #include <linux/gfp.h>
73998+#include <linux/hugetlb.h>
73999
74000 #include "internal.h"
74001
74002@@ -70,6 +71,8 @@ static void __put_compound_page(struct page *page)
74003
74004 __page_cache_release(page);
74005 dtor = get_compound_page_dtor(page);
74006+ if (!PageHuge(page))
74007+ BUG_ON(dtor != free_compound_page);
74008 (*dtor)(page);
74009 }
74010
74011diff --git a/mm/swapfile.c b/mm/swapfile.c
74012index f31b29d..8bdcae2 100644
74013--- a/mm/swapfile.c
74014+++ b/mm/swapfile.c
74015@@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
74016
74017 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
74018 /* Activity counter to indicate that a swapon or swapoff has occurred */
74019-static atomic_t proc_poll_event = ATOMIC_INIT(0);
74020+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
74021
74022 static inline unsigned char swap_count(unsigned char ent)
74023 {
74024@@ -1669,7 +1669,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
74025 }
74026 filp_close(swap_file, NULL);
74027 err = 0;
74028- atomic_inc(&proc_poll_event);
74029+ atomic_inc_unchecked(&proc_poll_event);
74030 wake_up_interruptible(&proc_poll_wait);
74031
74032 out_dput:
74033@@ -1685,8 +1685,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
74034
74035 poll_wait(file, &proc_poll_wait, wait);
74036
74037- if (seq->poll_event != atomic_read(&proc_poll_event)) {
74038- seq->poll_event = atomic_read(&proc_poll_event);
74039+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
74040+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74041 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
74042 }
74043
74044@@ -1784,7 +1784,7 @@ static int swaps_open(struct inode *inode, struct file *file)
74045 return ret;
74046
74047 seq = file->private_data;
74048- seq->poll_event = atomic_read(&proc_poll_event);
74049+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74050 return 0;
74051 }
74052
74053@@ -2122,7 +2122,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
74054 (p->flags & SWP_DISCARDABLE) ? "D" : "");
74055
74056 mutex_unlock(&swapon_mutex);
74057- atomic_inc(&proc_poll_event);
74058+ atomic_inc_unchecked(&proc_poll_event);
74059 wake_up_interruptible(&proc_poll_wait);
74060
74061 if (S_ISREG(inode->i_mode))
74062diff --git a/mm/util.c b/mm/util.c
74063index 136ac4f..f917fa9 100644
74064--- a/mm/util.c
74065+++ b/mm/util.c
74066@@ -243,6 +243,12 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
74067 void arch_pick_mmap_layout(struct mm_struct *mm)
74068 {
74069 mm->mmap_base = TASK_UNMAPPED_BASE;
74070+
74071+#ifdef CONFIG_PAX_RANDMMAP
74072+ if (mm->pax_flags & MF_PAX_RANDMMAP)
74073+ mm->mmap_base += mm->delta_mmap;
74074+#endif
74075+
74076 mm->get_unmapped_area = arch_get_unmapped_area;
74077 mm->unmap_area = arch_unmap_area;
74078 }
74079diff --git a/mm/vmalloc.c b/mm/vmalloc.c
74080index 86ce9a5..bc498f3 100644
74081--- a/mm/vmalloc.c
74082+++ b/mm/vmalloc.c
74083@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
74084
74085 pte = pte_offset_kernel(pmd, addr);
74086 do {
74087- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74088- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74089+
74090+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74091+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
74092+ BUG_ON(!pte_exec(*pte));
74093+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
74094+ continue;
74095+ }
74096+#endif
74097+
74098+ {
74099+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74100+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74101+ }
74102 } while (pte++, addr += PAGE_SIZE, addr != end);
74103 }
74104
74105@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74106 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
74107 {
74108 pte_t *pte;
74109+ int ret = -ENOMEM;
74110
74111 /*
74112 * nr is a running index into the array which helps higher level
74113@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74114 pte = pte_alloc_kernel(pmd, addr);
74115 if (!pte)
74116 return -ENOMEM;
74117+
74118+ pax_open_kernel();
74119 do {
74120 struct page *page = pages[*nr];
74121
74122- if (WARN_ON(!pte_none(*pte)))
74123- return -EBUSY;
74124- if (WARN_ON(!page))
74125- return -ENOMEM;
74126+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74127+ if (pgprot_val(prot) & _PAGE_NX)
74128+#endif
74129+
74130+ if (WARN_ON(!pte_none(*pte))) {
74131+ ret = -EBUSY;
74132+ goto out;
74133+ }
74134+ if (WARN_ON(!page)) {
74135+ ret = -ENOMEM;
74136+ goto out;
74137+ }
74138 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
74139 (*nr)++;
74140 } while (pte++, addr += PAGE_SIZE, addr != end);
74141- return 0;
74142+ ret = 0;
74143+out:
74144+ pax_close_kernel();
74145+ return ret;
74146 }
74147
74148 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
74149@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x)
74150 * and fall back on vmalloc() if that fails. Others
74151 * just put it in the vmalloc space.
74152 */
74153-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
74154+#ifdef CONFIG_MODULES
74155+#ifdef MODULES_VADDR
74156 unsigned long addr = (unsigned long)x;
74157 if (addr >= MODULES_VADDR && addr < MODULES_END)
74158 return 1;
74159 #endif
74160+
74161+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74162+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
74163+ return 1;
74164+#endif
74165+
74166+#endif
74167+
74168 return is_vmalloc_addr(x);
74169 }
74170
74171@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
74172
74173 if (!pgd_none(*pgd)) {
74174 pud_t *pud = pud_offset(pgd, addr);
74175+#ifdef CONFIG_X86
74176+ if (!pud_large(*pud))
74177+#endif
74178 if (!pud_none(*pud)) {
74179 pmd_t *pmd = pmd_offset(pud, addr);
74180+#ifdef CONFIG_X86
74181+ if (!pmd_large(*pmd))
74182+#endif
74183 if (!pmd_none(*pmd)) {
74184 pte_t *ptep, pte;
74185
74186@@ -1319,6 +1359,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
74187 struct vm_struct *area;
74188
74189 BUG_ON(in_interrupt());
74190+
74191+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74192+ if (flags & VM_KERNEXEC) {
74193+ if (start != VMALLOC_START || end != VMALLOC_END)
74194+ return NULL;
74195+ start = (unsigned long)MODULES_EXEC_VADDR;
74196+ end = (unsigned long)MODULES_EXEC_END;
74197+ }
74198+#endif
74199+
74200 if (flags & VM_IOREMAP) {
74201 int bit = fls(size);
74202
74203@@ -1551,6 +1601,11 @@ void *vmap(struct page **pages, unsigned int count,
74204 if (count > totalram_pages)
74205 return NULL;
74206
74207+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74208+ if (!(pgprot_val(prot) & _PAGE_NX))
74209+ flags |= VM_KERNEXEC;
74210+#endif
74211+
74212 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
74213 __builtin_return_address(0));
74214 if (!area)
74215@@ -1652,6 +1707,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
74216 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
74217 goto fail;
74218
74219+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74220+ if (!(pgprot_val(prot) & _PAGE_NX))
74221+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
74222+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
74223+ else
74224+#endif
74225+
74226 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
74227 start, end, node, gfp_mask, caller);
74228 if (!area)
74229@@ -1825,10 +1887,9 @@ EXPORT_SYMBOL(vzalloc_node);
74230 * For tight control over page level allocator and protection flags
74231 * use __vmalloc() instead.
74232 */
74233-
74234 void *vmalloc_exec(unsigned long size)
74235 {
74236- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
74237+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
74238 -1, __builtin_return_address(0));
74239 }
74240
74241@@ -2123,6 +2184,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
74242 unsigned long uaddr = vma->vm_start;
74243 unsigned long usize = vma->vm_end - vma->vm_start;
74244
74245+ BUG_ON(vma->vm_mirror);
74246+
74247 if ((PAGE_SIZE-1) & (unsigned long)addr)
74248 return -EINVAL;
74249
74250diff --git a/mm/vmstat.c b/mm/vmstat.c
74251index f600557..1459fc8 100644
74252--- a/mm/vmstat.c
74253+++ b/mm/vmstat.c
74254@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
74255 *
74256 * vm_stat contains the global counters
74257 */
74258-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
74259+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
74260 EXPORT_SYMBOL(vm_stat);
74261
74262 #ifdef CONFIG_SMP
74263@@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
74264 v = p->vm_stat_diff[i];
74265 p->vm_stat_diff[i] = 0;
74266 local_irq_restore(flags);
74267- atomic_long_add(v, &zone->vm_stat[i]);
74268+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
74269 global_diff[i] += v;
74270 #ifdef CONFIG_NUMA
74271 /* 3 seconds idle till flush */
74272@@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
74273
74274 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
74275 if (global_diff[i])
74276- atomic_long_add(global_diff[i], &vm_stat[i]);
74277+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
74278 }
74279
74280 #endif
74281@@ -1208,10 +1208,20 @@ static int __init setup_vmstat(void)
74282 start_cpu_timer(cpu);
74283 #endif
74284 #ifdef CONFIG_PROC_FS
74285- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
74286- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
74287- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
74288- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
74289+ {
74290+ mode_t gr_mode = S_IRUGO;
74291+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74292+ gr_mode = S_IRUSR;
74293+#endif
74294+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
74295+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
74296+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74297+ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
74298+#else
74299+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
74300+#endif
74301+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
74302+ }
74303 #endif
74304 return 0;
74305 }
74306diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
74307index efea35b..9c8dd0b 100644
74308--- a/net/8021q/vlan.c
74309+++ b/net/8021q/vlan.c
74310@@ -554,8 +554,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
74311 err = -EPERM;
74312 if (!capable(CAP_NET_ADMIN))
74313 break;
74314- if ((args.u.name_type >= 0) &&
74315- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
74316+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
74317 struct vlan_net *vn;
74318
74319 vn = net_generic(net, vlan_net_id);
74320diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
74321index fccae26..e7ece2f 100644
74322--- a/net/9p/trans_fd.c
74323+++ b/net/9p/trans_fd.c
74324@@ -425,7 +425,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
74325 oldfs = get_fs();
74326 set_fs(get_ds());
74327 /* The cast to a user pointer is valid due to the set_fs() */
74328- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
74329+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
74330 set_fs(oldfs);
74331
74332 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
74333diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
74334index 876fbe8..8bbea9f 100644
74335--- a/net/atm/atm_misc.c
74336+++ b/net/atm/atm_misc.c
74337@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
74338 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
74339 return 1;
74340 atm_return(vcc, truesize);
74341- atomic_inc(&vcc->stats->rx_drop);
74342+ atomic_inc_unchecked(&vcc->stats->rx_drop);
74343 return 0;
74344 }
74345 EXPORT_SYMBOL(atm_charge);
74346@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
74347 }
74348 }
74349 atm_return(vcc, guess);
74350- atomic_inc(&vcc->stats->rx_drop);
74351+ atomic_inc_unchecked(&vcc->stats->rx_drop);
74352 return NULL;
74353 }
74354 EXPORT_SYMBOL(atm_alloc_charge);
74355@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
74356
74357 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
74358 {
74359-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
74360+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
74361 __SONET_ITEMS
74362 #undef __HANDLE_ITEM
74363 }
74364@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
74365
74366 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
74367 {
74368-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
74369+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
74370 __SONET_ITEMS
74371 #undef __HANDLE_ITEM
74372 }
74373diff --git a/net/atm/lec.h b/net/atm/lec.h
74374index dfc0719..47c5322 100644
74375--- a/net/atm/lec.h
74376+++ b/net/atm/lec.h
74377@@ -48,7 +48,7 @@ struct lane2_ops {
74378 const u8 *tlvs, u32 sizeoftlvs);
74379 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
74380 const u8 *tlvs, u32 sizeoftlvs);
74381-};
74382+} __no_const;
74383
74384 /*
74385 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
74386diff --git a/net/atm/mpc.h b/net/atm/mpc.h
74387index 0919a88..a23d54e 100644
74388--- a/net/atm/mpc.h
74389+++ b/net/atm/mpc.h
74390@@ -33,7 +33,7 @@ struct mpoa_client {
74391 struct mpc_parameters parameters; /* parameters for this client */
74392
74393 const struct net_device_ops *old_ops;
74394- struct net_device_ops new_ops;
74395+ net_device_ops_no_const new_ops;
74396 };
74397
74398
74399diff --git a/net/atm/proc.c b/net/atm/proc.c
74400index 0d020de..011c7bb 100644
74401--- a/net/atm/proc.c
74402+++ b/net/atm/proc.c
74403@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
74404 const struct k_atm_aal_stats *stats)
74405 {
74406 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
74407- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
74408- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
74409- atomic_read(&stats->rx_drop));
74410+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
74411+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
74412+ atomic_read_unchecked(&stats->rx_drop));
74413 }
74414
74415 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
74416diff --git a/net/atm/resources.c b/net/atm/resources.c
74417index 23f45ce..c748f1a 100644
74418--- a/net/atm/resources.c
74419+++ b/net/atm/resources.c
74420@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
74421 static void copy_aal_stats(struct k_atm_aal_stats *from,
74422 struct atm_aal_stats *to)
74423 {
74424-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
74425+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
74426 __AAL_STAT_ITEMS
74427 #undef __HANDLE_ITEM
74428 }
74429@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
74430 static void subtract_aal_stats(struct k_atm_aal_stats *from,
74431 struct atm_aal_stats *to)
74432 {
74433-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
74434+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
74435 __AAL_STAT_ITEMS
74436 #undef __HANDLE_ITEM
74437 }
74438diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
74439index 3512e25..2b33401 100644
74440--- a/net/batman-adv/bat_iv_ogm.c
74441+++ b/net/batman-adv/bat_iv_ogm.c
74442@@ -541,7 +541,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
74443
74444 /* change sequence number to network order */
74445 batman_ogm_packet->seqno =
74446- htonl((uint32_t)atomic_read(&hard_iface->seqno));
74447+ htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
74448
74449 batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
74450 batman_ogm_packet->tt_crc = htons((uint16_t)
74451@@ -561,7 +561,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
74452 else
74453 batman_ogm_packet->gw_flags = NO_FLAGS;
74454
74455- atomic_inc(&hard_iface->seqno);
74456+ atomic_inc_unchecked(&hard_iface->seqno);
74457
74458 slide_own_bcast_window(hard_iface);
74459 bat_ogm_queue_add(bat_priv, hard_iface->packet_buff,
74460@@ -922,7 +922,7 @@ static void bat_ogm_process(const struct ethhdr *ethhdr,
74461 return;
74462
74463 /* could be changed by schedule_own_packet() */
74464- if_incoming_seqno = atomic_read(&if_incoming->seqno);
74465+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->seqno);
74466
74467 has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
74468
74469diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
74470index 7704df4..beb4e16 100644
74471--- a/net/batman-adv/hard-interface.c
74472+++ b/net/batman-adv/hard-interface.c
74473@@ -326,8 +326,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
74474 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
74475 dev_add_pack(&hard_iface->batman_adv_ptype);
74476
74477- atomic_set(&hard_iface->seqno, 1);
74478- atomic_set(&hard_iface->frag_seqno, 1);
74479+ atomic_set_unchecked(&hard_iface->seqno, 1);
74480+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
74481 bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
74482 hard_iface->net_dev->name);
74483
74484diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
74485index 987c75a..20d6f36 100644
74486--- a/net/batman-adv/soft-interface.c
74487+++ b/net/batman-adv/soft-interface.c
74488@@ -645,7 +645,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
74489
74490 /* set broadcast sequence number */
74491 bcast_packet->seqno =
74492- htonl(atomic_inc_return(&bat_priv->bcast_seqno));
74493+ htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
74494
74495 add_bcast_packet_to_list(bat_priv, skb, 1);
74496
74497@@ -843,7 +843,7 @@ struct net_device *softif_create(const char *name)
74498 atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
74499
74500 atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
74501- atomic_set(&bat_priv->bcast_seqno, 1);
74502+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
74503 atomic_set(&bat_priv->ttvn, 0);
74504 atomic_set(&bat_priv->tt_local_changes, 0);
74505 atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
74506diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
74507index e9eb043..d174eeb 100644
74508--- a/net/batman-adv/types.h
74509+++ b/net/batman-adv/types.h
74510@@ -38,8 +38,8 @@ struct hard_iface {
74511 int16_t if_num;
74512 char if_status;
74513 struct net_device *net_dev;
74514- atomic_t seqno;
74515- atomic_t frag_seqno;
74516+ atomic_unchecked_t seqno;
74517+ atomic_unchecked_t frag_seqno;
74518 unsigned char *packet_buff;
74519 int packet_len;
74520 struct kobject *hardif_obj;
74521@@ -154,7 +154,7 @@ struct bat_priv {
74522 atomic_t orig_interval; /* uint */
74523 atomic_t hop_penalty; /* uint */
74524 atomic_t log_level; /* uint */
74525- atomic_t bcast_seqno;
74526+ atomic_unchecked_t bcast_seqno;
74527 atomic_t bcast_queue_left;
74528 atomic_t batman_queue_left;
74529 atomic_t ttvn; /* translation table version number */
74530diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
74531index 07d1c1d..7e9bea9 100644
74532--- a/net/batman-adv/unicast.c
74533+++ b/net/batman-adv/unicast.c
74534@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
74535 frag1->flags = UNI_FRAG_HEAD | large_tail;
74536 frag2->flags = large_tail;
74537
74538- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
74539+ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
74540 frag1->seqno = htons(seqno - 1);
74541 frag2->seqno = htons(seqno);
74542
74543diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
74544index 280953b..cd219bb 100644
74545--- a/net/bluetooth/hci_conn.c
74546+++ b/net/bluetooth/hci_conn.c
74547@@ -234,7 +234,7 @@ void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16])
74548 memset(&cp, 0, sizeof(cp));
74549
74550 cp.handle = cpu_to_le16(conn->handle);
74551- memcpy(cp.ltk, ltk, sizeof(ltk));
74552+ memcpy(cp.ltk, ltk, sizeof(cp.ltk));
74553
74554 hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
74555 }
74556diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
74557index 32d338c..d24bcdb 100644
74558--- a/net/bluetooth/l2cap_core.c
74559+++ b/net/bluetooth/l2cap_core.c
74560@@ -2418,8 +2418,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
74561 break;
74562
74563 case L2CAP_CONF_RFC:
74564- if (olen == sizeof(rfc))
74565- memcpy(&rfc, (void *)val, olen);
74566+ if (olen != sizeof(rfc))
74567+ break;
74568+
74569+ memcpy(&rfc, (void *)val, olen);
74570
74571 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
74572 rfc.mode != chan->mode)
74573@@ -2537,8 +2539,10 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
74574
74575 switch (type) {
74576 case L2CAP_CONF_RFC:
74577- if (olen == sizeof(rfc))
74578- memcpy(&rfc, (void *)val, olen);
74579+ if (olen != sizeof(rfc))
74580+ break;
74581+
74582+ memcpy(&rfc, (void *)val, olen);
74583 goto done;
74584 }
74585 }
74586diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
74587index 5449294..7da9a5f 100644
74588--- a/net/bridge/netfilter/ebt_ulog.c
74589+++ b/net/bridge/netfilter/ebt_ulog.c
74590@@ -96,6 +96,7 @@ static void ulog_timer(unsigned long data)
74591 spin_unlock_bh(&ulog_buffers[data].lock);
74592 }
74593
74594+static struct sk_buff *ulog_alloc_skb(unsigned int size) __size_overflow(1);
74595 static struct sk_buff *ulog_alloc_skb(unsigned int size)
74596 {
74597 struct sk_buff *skb;
74598diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
74599index 5fe2ff3..10968b5 100644
74600--- a/net/bridge/netfilter/ebtables.c
74601+++ b/net/bridge/netfilter/ebtables.c
74602@@ -1523,7 +1523,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
74603 tmp.valid_hooks = t->table->valid_hooks;
74604 }
74605 mutex_unlock(&ebt_mutex);
74606- if (copy_to_user(user, &tmp, *len) != 0){
74607+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
74608 BUGPRINT("c2u Didn't work\n");
74609 ret = -EFAULT;
74610 break;
74611diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
74612index a97d97a..6f679ed 100644
74613--- a/net/caif/caif_socket.c
74614+++ b/net/caif/caif_socket.c
74615@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
74616 #ifdef CONFIG_DEBUG_FS
74617 struct debug_fs_counter {
74618 atomic_t caif_nr_socks;
74619- atomic_t caif_sock_create;
74620- atomic_t num_connect_req;
74621- atomic_t num_connect_resp;
74622- atomic_t num_connect_fail_resp;
74623- atomic_t num_disconnect;
74624- atomic_t num_remote_shutdown_ind;
74625- atomic_t num_tx_flow_off_ind;
74626- atomic_t num_tx_flow_on_ind;
74627- atomic_t num_rx_flow_off;
74628- atomic_t num_rx_flow_on;
74629+ atomic_unchecked_t caif_sock_create;
74630+ atomic_unchecked_t num_connect_req;
74631+ atomic_unchecked_t num_connect_resp;
74632+ atomic_unchecked_t num_connect_fail_resp;
74633+ atomic_unchecked_t num_disconnect;
74634+ atomic_unchecked_t num_remote_shutdown_ind;
74635+ atomic_unchecked_t num_tx_flow_off_ind;
74636+ atomic_unchecked_t num_tx_flow_on_ind;
74637+ atomic_unchecked_t num_rx_flow_off;
74638+ atomic_unchecked_t num_rx_flow_on;
74639 };
74640 static struct debug_fs_counter cnt;
74641 #define dbfs_atomic_inc(v) atomic_inc_return(v)
74642+#define dbfs_atomic_inc_unchecked(v) atomic_inc_return_unchecked(v)
74643 #define dbfs_atomic_dec(v) atomic_dec_return(v)
74644 #else
74645 #define dbfs_atomic_inc(v) 0
74646@@ -161,7 +162,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
74647 atomic_read(&cf_sk->sk.sk_rmem_alloc),
74648 sk_rcvbuf_lowwater(cf_sk));
74649 set_rx_flow_off(cf_sk);
74650- dbfs_atomic_inc(&cnt.num_rx_flow_off);
74651+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
74652 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
74653 }
74654
74655@@ -172,7 +173,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
74656 set_rx_flow_off(cf_sk);
74657 if (net_ratelimit())
74658 pr_debug("sending flow OFF due to rmem_schedule\n");
74659- dbfs_atomic_inc(&cnt.num_rx_flow_off);
74660+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
74661 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
74662 }
74663 skb->dev = NULL;
74664@@ -233,14 +234,14 @@ static void caif_ctrl_cb(struct cflayer *layr,
74665 switch (flow) {
74666 case CAIF_CTRLCMD_FLOW_ON_IND:
74667 /* OK from modem to start sending again */
74668- dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
74669+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_on_ind);
74670 set_tx_flow_on(cf_sk);
74671 cf_sk->sk.sk_state_change(&cf_sk->sk);
74672 break;
74673
74674 case CAIF_CTRLCMD_FLOW_OFF_IND:
74675 /* Modem asks us to shut up */
74676- dbfs_atomic_inc(&cnt.num_tx_flow_off_ind);
74677+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_off_ind);
74678 set_tx_flow_off(cf_sk);
74679 cf_sk->sk.sk_state_change(&cf_sk->sk);
74680 break;
74681@@ -249,7 +250,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
74682 /* We're now connected */
74683 caif_client_register_refcnt(&cf_sk->layer,
74684 cfsk_hold, cfsk_put);
74685- dbfs_atomic_inc(&cnt.num_connect_resp);
74686+ dbfs_atomic_inc_unchecked(&cnt.num_connect_resp);
74687 cf_sk->sk.sk_state = CAIF_CONNECTED;
74688 set_tx_flow_on(cf_sk);
74689 cf_sk->sk.sk_state_change(&cf_sk->sk);
74690@@ -263,7 +264,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
74691
74692 case CAIF_CTRLCMD_INIT_FAIL_RSP:
74693 /* Connect request failed */
74694- dbfs_atomic_inc(&cnt.num_connect_fail_resp);
74695+ dbfs_atomic_inc_unchecked(&cnt.num_connect_fail_resp);
74696 cf_sk->sk.sk_err = ECONNREFUSED;
74697 cf_sk->sk.sk_state = CAIF_DISCONNECTED;
74698 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
74699@@ -277,7 +278,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
74700
74701 case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
74702 /* Modem has closed this connection, or device is down. */
74703- dbfs_atomic_inc(&cnt.num_remote_shutdown_ind);
74704+ dbfs_atomic_inc_unchecked(&cnt.num_remote_shutdown_ind);
74705 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
74706 cf_sk->sk.sk_err = ECONNRESET;
74707 set_rx_flow_on(cf_sk);
74708@@ -297,7 +298,7 @@ static void caif_check_flow_release(struct sock *sk)
74709 return;
74710
74711 if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) {
74712- dbfs_atomic_inc(&cnt.num_rx_flow_on);
74713+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_on);
74714 set_rx_flow_on(cf_sk);
74715 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ);
74716 }
74717@@ -856,7 +857,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
74718 /*ifindex = id of the interface.*/
74719 cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;
74720
74721- dbfs_atomic_inc(&cnt.num_connect_req);
74722+ dbfs_atomic_inc_unchecked(&cnt.num_connect_req);
74723 cf_sk->layer.receive = caif_sktrecv_cb;
74724
74725 err = caif_connect_client(sock_net(sk), &cf_sk->conn_req,
74726@@ -945,7 +946,7 @@ static int caif_release(struct socket *sock)
74727 spin_unlock_bh(&sk->sk_receive_queue.lock);
74728 sock->sk = NULL;
74729
74730- dbfs_atomic_inc(&cnt.num_disconnect);
74731+ dbfs_atomic_inc_unchecked(&cnt.num_disconnect);
74732
74733 WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
74734 if (cf_sk->debugfs_socket_dir != NULL)
74735@@ -1124,7 +1125,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol,
74736 cf_sk->conn_req.protocol = protocol;
74737 /* Increase the number of sockets created. */
74738 dbfs_atomic_inc(&cnt.caif_nr_socks);
74739- num = dbfs_atomic_inc(&cnt.caif_sock_create);
74740+ num = dbfs_atomic_inc_unchecked(&cnt.caif_sock_create);
74741 #ifdef CONFIG_DEBUG_FS
74742 if (!IS_ERR(debugfsdir)) {
74743
74744diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
74745index 5cf5222..6f704ad 100644
74746--- a/net/caif/cfctrl.c
74747+++ b/net/caif/cfctrl.c
74748@@ -9,6 +9,7 @@
74749 #include <linux/stddef.h>
74750 #include <linux/spinlock.h>
74751 #include <linux/slab.h>
74752+#include <linux/sched.h>
74753 #include <net/caif/caif_layer.h>
74754 #include <net/caif/cfpkt.h>
74755 #include <net/caif/cfctrl.h>
74756@@ -42,8 +43,8 @@ struct cflayer *cfctrl_create(void)
74757 memset(&dev_info, 0, sizeof(dev_info));
74758 dev_info.id = 0xff;
74759 cfsrvl_init(&this->serv, 0, &dev_info, false);
74760- atomic_set(&this->req_seq_no, 1);
74761- atomic_set(&this->rsp_seq_no, 1);
74762+ atomic_set_unchecked(&this->req_seq_no, 1);
74763+ atomic_set_unchecked(&this->rsp_seq_no, 1);
74764 this->serv.layer.receive = cfctrl_recv;
74765 sprintf(this->serv.layer.name, "ctrl");
74766 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
74767@@ -129,8 +130,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
74768 struct cfctrl_request_info *req)
74769 {
74770 spin_lock_bh(&ctrl->info_list_lock);
74771- atomic_inc(&ctrl->req_seq_no);
74772- req->sequence_no = atomic_read(&ctrl->req_seq_no);
74773+ atomic_inc_unchecked(&ctrl->req_seq_no);
74774+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
74775 list_add_tail(&req->list, &ctrl->list);
74776 spin_unlock_bh(&ctrl->info_list_lock);
74777 }
74778@@ -148,7 +149,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
74779 if (p != first)
74780 pr_warn("Requests are not received in order\n");
74781
74782- atomic_set(&ctrl->rsp_seq_no,
74783+ atomic_set_unchecked(&ctrl->rsp_seq_no,
74784 p->sequence_no);
74785 list_del(&p->list);
74786 goto out;
74787diff --git a/net/can/gw.c b/net/can/gw.c
74788index 3d79b12..8de85fa 100644
74789--- a/net/can/gw.c
74790+++ b/net/can/gw.c
74791@@ -96,7 +96,7 @@ struct cf_mod {
74792 struct {
74793 void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);
74794 void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);
74795- } csumfunc;
74796+ } __no_const csumfunc;
74797 };
74798
74799
74800diff --git a/net/compat.c b/net/compat.c
74801index 6def90e..c6992fa 100644
74802--- a/net/compat.c
74803+++ b/net/compat.c
74804@@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
74805 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
74806 __get_user(kmsg->msg_flags, &umsg->msg_flags))
74807 return -EFAULT;
74808- kmsg->msg_name = compat_ptr(tmp1);
74809- kmsg->msg_iov = compat_ptr(tmp2);
74810- kmsg->msg_control = compat_ptr(tmp3);
74811+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
74812+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
74813+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
74814 return 0;
74815 }
74816
74817@@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
74818
74819 if (kern_msg->msg_namelen) {
74820 if (mode == VERIFY_READ) {
74821- int err = move_addr_to_kernel(kern_msg->msg_name,
74822+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
74823 kern_msg->msg_namelen,
74824 kern_address);
74825 if (err < 0)
74826@@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
74827 kern_msg->msg_name = NULL;
74828
74829 tot_len = iov_from_user_compat_to_kern(kern_iov,
74830- (struct compat_iovec __user *)kern_msg->msg_iov,
74831+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
74832 kern_msg->msg_iovlen);
74833 if (tot_len >= 0)
74834 kern_msg->msg_iov = kern_iov;
74835@@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
74836
74837 #define CMSG_COMPAT_FIRSTHDR(msg) \
74838 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
74839- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
74840+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
74841 (struct compat_cmsghdr __user *)NULL)
74842
74843 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
74844 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
74845 (ucmlen) <= (unsigned long) \
74846 ((mhdr)->msg_controllen - \
74847- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
74848+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
74849
74850 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
74851 struct compat_cmsghdr __user *cmsg, int cmsg_len)
74852 {
74853 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
74854- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
74855+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
74856 msg->msg_controllen)
74857 return NULL;
74858 return (struct compat_cmsghdr __user *)ptr;
74859@@ -221,7 +221,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
74860 {
74861 struct compat_timeval ctv;
74862 struct compat_timespec cts[3];
74863- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
74864+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
74865 struct compat_cmsghdr cmhdr;
74866 int cmlen;
74867
74868@@ -273,7 +273,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
74869
74870 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
74871 {
74872- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
74873+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
74874 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
74875 int fdnum = scm->fp->count;
74876 struct file **fp = scm->fp->fp;
74877@@ -370,7 +370,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
74878 return -EFAULT;
74879 old_fs = get_fs();
74880 set_fs(KERNEL_DS);
74881- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
74882+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
74883 set_fs(old_fs);
74884
74885 return err;
74886@@ -431,7 +431,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
74887 len = sizeof(ktime);
74888 old_fs = get_fs();
74889 set_fs(KERNEL_DS);
74890- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
74891+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
74892 set_fs(old_fs);
74893
74894 if (!err) {
74895@@ -566,7 +566,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
74896 case MCAST_JOIN_GROUP:
74897 case MCAST_LEAVE_GROUP:
74898 {
74899- struct compat_group_req __user *gr32 = (void *)optval;
74900+ struct compat_group_req __user *gr32 = (void __user *)optval;
74901 struct group_req __user *kgr =
74902 compat_alloc_user_space(sizeof(struct group_req));
74903 u32 interface;
74904@@ -587,7 +587,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
74905 case MCAST_BLOCK_SOURCE:
74906 case MCAST_UNBLOCK_SOURCE:
74907 {
74908- struct compat_group_source_req __user *gsr32 = (void *)optval;
74909+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
74910 struct group_source_req __user *kgsr = compat_alloc_user_space(
74911 sizeof(struct group_source_req));
74912 u32 interface;
74913@@ -608,7 +608,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
74914 }
74915 case MCAST_MSFILTER:
74916 {
74917- struct compat_group_filter __user *gf32 = (void *)optval;
74918+ struct compat_group_filter __user *gf32 = (void __user *)optval;
74919 struct group_filter __user *kgf;
74920 u32 interface, fmode, numsrc;
74921
74922@@ -646,7 +646,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
74923 char __user *optval, int __user *optlen,
74924 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
74925 {
74926- struct compat_group_filter __user *gf32 = (void *)optval;
74927+ struct compat_group_filter __user *gf32 = (void __user *)optval;
74928 struct group_filter __user *kgf;
74929 int __user *koptlen;
74930 u32 interface, fmode, numsrc;
74931diff --git a/net/core/datagram.c b/net/core/datagram.c
74932index 68bbf9f..5ef0d12 100644
74933--- a/net/core/datagram.c
74934+++ b/net/core/datagram.c
74935@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
74936 }
74937
74938 kfree_skb(skb);
74939- atomic_inc(&sk->sk_drops);
74940+ atomic_inc_unchecked(&sk->sk_drops);
74941 sk_mem_reclaim_partial(sk);
74942
74943 return err;
74944diff --git a/net/core/dev.c b/net/core/dev.c
74945index 7f72c9c..e29943b 100644
74946--- a/net/core/dev.c
74947+++ b/net/core/dev.c
74948@@ -1138,10 +1138,14 @@ void dev_load(struct net *net, const char *name)
74949 if (no_module && capable(CAP_NET_ADMIN))
74950 no_module = request_module("netdev-%s", name);
74951 if (no_module && capable(CAP_SYS_MODULE)) {
74952+#ifdef CONFIG_GRKERNSEC_MODHARDEN
74953+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
74954+#else
74955 if (!request_module("%s", name))
74956 pr_err("Loading kernel module for a network device "
74957 "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
74958 "instead\n", name);
74959+#endif
74960 }
74961 }
74962 EXPORT_SYMBOL(dev_load);
74963@@ -1585,7 +1589,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
74964 {
74965 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
74966 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
74967- atomic_long_inc(&dev->rx_dropped);
74968+ atomic_long_inc_unchecked(&dev->rx_dropped);
74969 kfree_skb(skb);
74970 return NET_RX_DROP;
74971 }
74972@@ -1595,7 +1599,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
74973 nf_reset(skb);
74974
74975 if (unlikely(!is_skb_forwardable(dev, skb))) {
74976- atomic_long_inc(&dev->rx_dropped);
74977+ atomic_long_inc_unchecked(&dev->rx_dropped);
74978 kfree_skb(skb);
74979 return NET_RX_DROP;
74980 }
74981@@ -2057,7 +2061,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
74982
74983 struct dev_gso_cb {
74984 void (*destructor)(struct sk_buff *skb);
74985-};
74986+} __no_const;
74987
74988 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
74989
74990@@ -2913,7 +2917,7 @@ enqueue:
74991
74992 local_irq_restore(flags);
74993
74994- atomic_long_inc(&skb->dev->rx_dropped);
74995+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
74996 kfree_skb(skb);
74997 return NET_RX_DROP;
74998 }
74999@@ -2985,7 +2989,7 @@ int netif_rx_ni(struct sk_buff *skb)
75000 }
75001 EXPORT_SYMBOL(netif_rx_ni);
75002
75003-static void net_tx_action(struct softirq_action *h)
75004+static void net_tx_action(void)
75005 {
75006 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75007
75008@@ -3273,7 +3277,7 @@ ncls:
75009 if (pt_prev) {
75010 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
75011 } else {
75012- atomic_long_inc(&skb->dev->rx_dropped);
75013+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75014 kfree_skb(skb);
75015 /* Jamal, now you will not able to escape explaining
75016 * me how you were going to use this. :-)
75017@@ -3833,7 +3837,7 @@ void netif_napi_del(struct napi_struct *napi)
75018 }
75019 EXPORT_SYMBOL(netif_napi_del);
75020
75021-static void net_rx_action(struct softirq_action *h)
75022+static void net_rx_action(void)
75023 {
75024 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75025 unsigned long time_limit = jiffies + 2;
75026@@ -5858,7 +5862,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
75027 } else {
75028 netdev_stats_to_stats64(storage, &dev->stats);
75029 }
75030- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
75031+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
75032 return storage;
75033 }
75034 EXPORT_SYMBOL(dev_get_stats);
75035diff --git a/net/core/flow.c b/net/core/flow.c
75036index e318c7e..168b1d0 100644
75037--- a/net/core/flow.c
75038+++ b/net/core/flow.c
75039@@ -61,7 +61,7 @@ struct flow_cache {
75040 struct timer_list rnd_timer;
75041 };
75042
75043-atomic_t flow_cache_genid = ATOMIC_INIT(0);
75044+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
75045 EXPORT_SYMBOL(flow_cache_genid);
75046 static struct flow_cache flow_cache_global;
75047 static struct kmem_cache *flow_cachep __read_mostly;
75048@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
75049
75050 static int flow_entry_valid(struct flow_cache_entry *fle)
75051 {
75052- if (atomic_read(&flow_cache_genid) != fle->genid)
75053+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
75054 return 0;
75055 if (fle->object && !fle->object->ops->check(fle->object))
75056 return 0;
75057@@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
75058 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
75059 fcp->hash_count++;
75060 }
75061- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
75062+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
75063 flo = fle->object;
75064 if (!flo)
75065 goto ret_object;
75066@@ -280,7 +280,7 @@ nocache:
75067 }
75068 flo = resolver(net, key, family, dir, flo, ctx);
75069 if (fle) {
75070- fle->genid = atomic_read(&flow_cache_genid);
75071+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
75072 if (!IS_ERR(flo))
75073 fle->object = flo;
75074 else
75075diff --git a/net/core/iovec.c b/net/core/iovec.c
75076index c40f27e..7f49254 100644
75077--- a/net/core/iovec.c
75078+++ b/net/core/iovec.c
75079@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
75080 if (m->msg_namelen) {
75081 if (mode == VERIFY_READ) {
75082 void __user *namep;
75083- namep = (void __user __force *) m->msg_name;
75084+ namep = (void __force_user *) m->msg_name;
75085 err = move_addr_to_kernel(namep, m->msg_namelen,
75086 address);
75087 if (err < 0)
75088@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
75089 }
75090
75091 size = m->msg_iovlen * sizeof(struct iovec);
75092- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
75093+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
75094 return -EFAULT;
75095
75096 m->msg_iov = iov;
75097diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
75098index 5c30296..ebe7b61 100644
75099--- a/net/core/rtnetlink.c
75100+++ b/net/core/rtnetlink.c
75101@@ -57,7 +57,7 @@ struct rtnl_link {
75102 rtnl_doit_func doit;
75103 rtnl_dumpit_func dumpit;
75104 rtnl_calcit_func calcit;
75105-};
75106+} __no_const;
75107
75108 static DEFINE_MUTEX(rtnl_mutex);
75109
75110diff --git a/net/core/scm.c b/net/core/scm.c
75111index ff52ad0..aff1c0f 100644
75112--- a/net/core/scm.c
75113+++ b/net/core/scm.c
75114@@ -220,7 +220,7 @@ EXPORT_SYMBOL(__scm_send);
75115 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75116 {
75117 struct cmsghdr __user *cm
75118- = (__force struct cmsghdr __user *)msg->msg_control;
75119+ = (struct cmsghdr __force_user *)msg->msg_control;
75120 struct cmsghdr cmhdr;
75121 int cmlen = CMSG_LEN(len);
75122 int err;
75123@@ -243,7 +243,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75124 err = -EFAULT;
75125 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
75126 goto out;
75127- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
75128+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
75129 goto out;
75130 cmlen = CMSG_SPACE(len);
75131 if (msg->msg_controllen < cmlen)
75132@@ -259,7 +259,7 @@ EXPORT_SYMBOL(put_cmsg);
75133 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75134 {
75135 struct cmsghdr __user *cm
75136- = (__force struct cmsghdr __user*)msg->msg_control;
75137+ = (struct cmsghdr __force_user *)msg->msg_control;
75138
75139 int fdmax = 0;
75140 int fdnum = scm->fp->count;
75141@@ -279,7 +279,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75142 if (fdnum < fdmax)
75143 fdmax = fdnum;
75144
75145- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
75146+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
75147 i++, cmfptr++)
75148 {
75149 int new_fd;
75150diff --git a/net/core/sock.c b/net/core/sock.c
75151index 02f8dfe..86dfd4a 100644
75152--- a/net/core/sock.c
75153+++ b/net/core/sock.c
75154@@ -341,7 +341,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75155 struct sk_buff_head *list = &sk->sk_receive_queue;
75156
75157 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
75158- atomic_inc(&sk->sk_drops);
75159+ atomic_inc_unchecked(&sk->sk_drops);
75160 trace_sock_rcvqueue_full(sk, skb);
75161 return -ENOMEM;
75162 }
75163@@ -351,7 +351,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75164 return err;
75165
75166 if (!sk_rmem_schedule(sk, skb->truesize)) {
75167- atomic_inc(&sk->sk_drops);
75168+ atomic_inc_unchecked(&sk->sk_drops);
75169 return -ENOBUFS;
75170 }
75171
75172@@ -371,7 +371,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75173 skb_dst_force(skb);
75174
75175 spin_lock_irqsave(&list->lock, flags);
75176- skb->dropcount = atomic_read(&sk->sk_drops);
75177+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
75178 __skb_queue_tail(list, skb);
75179 spin_unlock_irqrestore(&list->lock, flags);
75180
75181@@ -391,7 +391,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
75182 skb->dev = NULL;
75183
75184 if (sk_rcvqueues_full(sk, skb)) {
75185- atomic_inc(&sk->sk_drops);
75186+ atomic_inc_unchecked(&sk->sk_drops);
75187 goto discard_and_relse;
75188 }
75189 if (nested)
75190@@ -409,7 +409,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
75191 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
75192 } else if (sk_add_backlog(sk, skb)) {
75193 bh_unlock_sock(sk);
75194- atomic_inc(&sk->sk_drops);
75195+ atomic_inc_unchecked(&sk->sk_drops);
75196 goto discard_and_relse;
75197 }
75198
75199@@ -974,7 +974,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75200 if (len > sizeof(peercred))
75201 len = sizeof(peercred);
75202 cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
75203- if (copy_to_user(optval, &peercred, len))
75204+ if (len > sizeof(peercred) || copy_to_user(optval, &peercred, len))
75205 return -EFAULT;
75206 goto lenout;
75207 }
75208@@ -987,7 +987,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75209 return -ENOTCONN;
75210 if (lv < len)
75211 return -EINVAL;
75212- if (copy_to_user(optval, address, len))
75213+ if (len > sizeof(address) || copy_to_user(optval, address, len))
75214 return -EFAULT;
75215 goto lenout;
75216 }
75217@@ -1024,7 +1024,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75218
75219 if (len > lv)
75220 len = lv;
75221- if (copy_to_user(optval, &v, len))
75222+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
75223 return -EFAULT;
75224 lenout:
75225 if (put_user(len, optlen))
75226@@ -2108,7 +2108,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
75227 */
75228 smp_wmb();
75229 atomic_set(&sk->sk_refcnt, 1);
75230- atomic_set(&sk->sk_drops, 0);
75231+ atomic_set_unchecked(&sk->sk_drops, 0);
75232 }
75233 EXPORT_SYMBOL(sock_init_data);
75234
75235diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
75236index b9868e1..849f809 100644
75237--- a/net/core/sock_diag.c
75238+++ b/net/core/sock_diag.c
75239@@ -16,20 +16,27 @@ static DEFINE_MUTEX(sock_diag_table_mutex);
75240
75241 int sock_diag_check_cookie(void *sk, __u32 *cookie)
75242 {
75243+#ifndef CONFIG_GRKERNSEC_HIDESYM
75244 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
75245 cookie[1] != INET_DIAG_NOCOOKIE) &&
75246 ((u32)(unsigned long)sk != cookie[0] ||
75247 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
75248 return -ESTALE;
75249 else
75250+#endif
75251 return 0;
75252 }
75253 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
75254
75255 void sock_diag_save_cookie(void *sk, __u32 *cookie)
75256 {
75257+#ifdef CONFIG_GRKERNSEC_HIDESYM
75258+ cookie[0] = 0;
75259+ cookie[1] = 0;
75260+#else
75261 cookie[0] = (u32)(unsigned long)sk;
75262 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
75263+#endif
75264 }
75265 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
75266
75267diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
75268index 02e75d1..9a57a7c 100644
75269--- a/net/decnet/sysctl_net_decnet.c
75270+++ b/net/decnet/sysctl_net_decnet.c
75271@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
75272
75273 if (len > *lenp) len = *lenp;
75274
75275- if (copy_to_user(buffer, addr, len))
75276+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
75277 return -EFAULT;
75278
75279 *lenp = len;
75280@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
75281
75282 if (len > *lenp) len = *lenp;
75283
75284- if (copy_to_user(buffer, devname, len))
75285+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
75286 return -EFAULT;
75287
75288 *lenp = len;
75289diff --git a/net/econet/Kconfig b/net/econet/Kconfig
75290index 39a2d29..f39c0fe 100644
75291--- a/net/econet/Kconfig
75292+++ b/net/econet/Kconfig
75293@@ -4,7 +4,7 @@
75294
75295 config ECONET
75296 tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
75297- depends on EXPERIMENTAL && INET
75298+ depends on EXPERIMENTAL && INET && BROKEN
75299 ---help---
75300 Econet is a fairly old and slow networking protocol mainly used by
75301 Acorn computers to access file and print servers. It uses native
75302diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
75303index 36d1440..44ff28b 100644
75304--- a/net/ipv4/ah4.c
75305+++ b/net/ipv4/ah4.c
75306@@ -19,6 +19,8 @@ struct ah_skb_cb {
75307 #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
75308
75309 static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75310+ unsigned int size) __size_overflow(3);
75311+static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75312 unsigned int size)
75313 {
75314 unsigned int len;
75315diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
75316index 92fc5f6..b790d91 100644
75317--- a/net/ipv4/fib_frontend.c
75318+++ b/net/ipv4/fib_frontend.c
75319@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
75320 #ifdef CONFIG_IP_ROUTE_MULTIPATH
75321 fib_sync_up(dev);
75322 #endif
75323- atomic_inc(&net->ipv4.dev_addr_genid);
75324+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75325 rt_cache_flush(dev_net(dev), -1);
75326 break;
75327 case NETDEV_DOWN:
75328 fib_del_ifaddr(ifa, NULL);
75329- atomic_inc(&net->ipv4.dev_addr_genid);
75330+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75331 if (ifa->ifa_dev->ifa_list == NULL) {
75332 /* Last address was deleted from this interface.
75333 * Disable IP.
75334@@ -1011,7 +1011,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
75335 #ifdef CONFIG_IP_ROUTE_MULTIPATH
75336 fib_sync_up(dev);
75337 #endif
75338- atomic_inc(&net->ipv4.dev_addr_genid);
75339+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75340 rt_cache_flush(dev_net(dev), -1);
75341 break;
75342 case NETDEV_DOWN:
75343diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
75344index 80106d8..232e898 100644
75345--- a/net/ipv4/fib_semantics.c
75346+++ b/net/ipv4/fib_semantics.c
75347@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
75348 nh->nh_saddr = inet_select_addr(nh->nh_dev,
75349 nh->nh_gw,
75350 nh->nh_parent->fib_scope);
75351- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
75352+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
75353
75354 return nh->nh_saddr;
75355 }
75356diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
75357index 984ec65..97ac518 100644
75358--- a/net/ipv4/inet_hashtables.c
75359+++ b/net/ipv4/inet_hashtables.c
75360@@ -18,12 +18,15 @@
75361 #include <linux/sched.h>
75362 #include <linux/slab.h>
75363 #include <linux/wait.h>
75364+#include <linux/security.h>
75365
75366 #include <net/inet_connection_sock.h>
75367 #include <net/inet_hashtables.h>
75368 #include <net/secure_seq.h>
75369 #include <net/ip.h>
75370
75371+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
75372+
75373 /*
75374 * Allocate and initialize a new local port bind bucket.
75375 * The bindhash mutex for snum's hash chain must be held here.
75376@@ -530,6 +533,8 @@ ok:
75377 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
75378 spin_unlock(&head->lock);
75379
75380+ gr_update_task_in_ip_table(current, inet_sk(sk));
75381+
75382 if (tw) {
75383 inet_twsk_deschedule(tw, death_row);
75384 while (twrefcnt) {
75385diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
75386index d4d61b6..b81aec8 100644
75387--- a/net/ipv4/inetpeer.c
75388+++ b/net/ipv4/inetpeer.c
75389@@ -487,8 +487,8 @@ relookup:
75390 if (p) {
75391 p->daddr = *daddr;
75392 atomic_set(&p->refcnt, 1);
75393- atomic_set(&p->rid, 0);
75394- atomic_set(&p->ip_id_count,
75395+ atomic_set_unchecked(&p->rid, 0);
75396+ atomic_set_unchecked(&p->ip_id_count,
75397 (daddr->family == AF_INET) ?
75398 secure_ip_id(daddr->addr.a4) :
75399 secure_ipv6_id(daddr->addr.a6));
75400diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
75401index 1f23a57..7180dfe 100644
75402--- a/net/ipv4/ip_fragment.c
75403+++ b/net/ipv4/ip_fragment.c
75404@@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
75405 return 0;
75406
75407 start = qp->rid;
75408- end = atomic_inc_return(&peer->rid);
75409+ end = atomic_inc_return_unchecked(&peer->rid);
75410 qp->rid = end;
75411
75412 rc = qp->q.fragments && (end - start) > max;
75413diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
75414index 8aa87c1..35c3248 100644
75415--- a/net/ipv4/ip_sockglue.c
75416+++ b/net/ipv4/ip_sockglue.c
75417@@ -1112,7 +1112,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
75418 len = min_t(unsigned int, len, opt->optlen);
75419 if (put_user(len, optlen))
75420 return -EFAULT;
75421- if (copy_to_user(optval, opt->__data, len))
75422+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
75423+ copy_to_user(optval, opt->__data, len))
75424 return -EFAULT;
75425 return 0;
75426 }
75427@@ -1240,7 +1241,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
75428 if (sk->sk_type != SOCK_STREAM)
75429 return -ENOPROTOOPT;
75430
75431- msg.msg_control = optval;
75432+ msg.msg_control = (void __force_kernel *)optval;
75433 msg.msg_controllen = len;
75434 msg.msg_flags = flags;
75435
75436diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
75437index 6e412a6..6640538 100644
75438--- a/net/ipv4/ipconfig.c
75439+++ b/net/ipv4/ipconfig.c
75440@@ -318,7 +318,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
75441
75442 mm_segment_t oldfs = get_fs();
75443 set_fs(get_ds());
75444- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
75445+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
75446 set_fs(oldfs);
75447 return res;
75448 }
75449@@ -329,7 +329,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
75450
75451 mm_segment_t oldfs = get_fs();
75452 set_fs(get_ds());
75453- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
75454+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
75455 set_fs(oldfs);
75456 return res;
75457 }
75458@@ -340,7 +340,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
75459
75460 mm_segment_t oldfs = get_fs();
75461 set_fs(get_ds());
75462- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
75463+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
75464 set_fs(oldfs);
75465 return res;
75466 }
75467diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
75468index fd7a3f6..a1b1013 100644
75469--- a/net/ipv4/netfilter/arp_tables.c
75470+++ b/net/ipv4/netfilter/arp_tables.c
75471@@ -757,6 +757,9 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
75472
75473 static int copy_entries_to_user(unsigned int total_size,
75474 const struct xt_table *table,
75475+ void __user *userptr) __size_overflow(1);
75476+static int copy_entries_to_user(unsigned int total_size,
75477+ const struct xt_table *table,
75478 void __user *userptr)
75479 {
75480 unsigned int off, num;
75481@@ -984,6 +987,11 @@ static int __do_replace(struct net *net, const char *name,
75482 unsigned int valid_hooks,
75483 struct xt_table_info *newinfo,
75484 unsigned int num_counters,
75485+ void __user *counters_ptr) __size_overflow(5);
75486+static int __do_replace(struct net *net, const char *name,
75487+ unsigned int valid_hooks,
75488+ struct xt_table_info *newinfo,
75489+ unsigned int num_counters,
75490 void __user *counters_ptr)
75491 {
75492 int ret;
75493@@ -1104,6 +1112,8 @@ static int do_replace(struct net *net, const void __user *user,
75494 }
75495
75496 static int do_add_counters(struct net *net, const void __user *user,
75497+ unsigned int len, int compat) __size_overflow(3);
75498+static int do_add_counters(struct net *net, const void __user *user,
75499 unsigned int len, int compat)
75500 {
75501 unsigned int i, curcpu;
75502diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
75503index 24e556e..b073356 100644
75504--- a/net/ipv4/netfilter/ip_tables.c
75505+++ b/net/ipv4/netfilter/ip_tables.c
75506@@ -923,6 +923,10 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
75507 static int
75508 copy_entries_to_user(unsigned int total_size,
75509 const struct xt_table *table,
75510+ void __user *userptr) __size_overflow(1);
75511+static int
75512+copy_entries_to_user(unsigned int total_size,
75513+ const struct xt_table *table,
75514 void __user *userptr)
75515 {
75516 unsigned int off, num;
75517@@ -1172,6 +1176,10 @@ get_entries(struct net *net, struct ipt_get_entries __user *uptr,
75518 static int
75519 __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
75520 struct xt_table_info *newinfo, unsigned int num_counters,
75521+ void __user *counters_ptr) __size_overflow(5);
75522+static int
75523+__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
75524+ struct xt_table_info *newinfo, unsigned int num_counters,
75525 void __user *counters_ptr)
75526 {
75527 int ret;
75528@@ -1293,6 +1301,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
75529
75530 static int
75531 do_add_counters(struct net *net, const void __user *user,
75532+ unsigned int len, int compat) __size_overflow(3);
75533+static int
75534+do_add_counters(struct net *net, const void __user *user,
75535 unsigned int len, int compat)
75536 {
75537 unsigned int i, curcpu;
75538diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
75539index ba5756d..8d34d74 100644
75540--- a/net/ipv4/netfilter/ipt_ULOG.c
75541+++ b/net/ipv4/netfilter/ipt_ULOG.c
75542@@ -125,6 +125,7 @@ static void ulog_timer(unsigned long data)
75543 spin_unlock_bh(&ulog_lock);
75544 }
75545
75546+static struct sk_buff *ulog_alloc_skb(unsigned int size) __size_overflow(1);
75547 static struct sk_buff *ulog_alloc_skb(unsigned int size)
75548 {
75549 struct sk_buff *skb;
75550diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
75551index 2133c30..0e8047e 100644
75552--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
75553+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
75554@@ -435,6 +435,10 @@ static unsigned char asn1_subid_decode(struct asn1_ctx *ctx,
75555 static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
75556 unsigned char *eoc,
75557 unsigned long **oid,
75558+ unsigned int *len) __size_overflow(2);
75559+static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
75560+ unsigned char *eoc,
75561+ unsigned long **oid,
75562 unsigned int *len)
75563 {
75564 unsigned long subid;
75565diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
75566index b072386..abdebcf 100644
75567--- a/net/ipv4/ping.c
75568+++ b/net/ipv4/ping.c
75569@@ -838,7 +838,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
75570 sk_rmem_alloc_get(sp),
75571 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
75572 atomic_read(&sp->sk_refcnt), sp,
75573- atomic_read(&sp->sk_drops), len);
75574+ atomic_read_unchecked(&sp->sk_drops), len);
75575 }
75576
75577 static int ping_seq_show(struct seq_file *seq, void *v)
75578diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
75579index 3ccda5a..3c1e61d 100644
75580--- a/net/ipv4/raw.c
75581+++ b/net/ipv4/raw.c
75582@@ -304,7 +304,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
75583 int raw_rcv(struct sock *sk, struct sk_buff *skb)
75584 {
75585 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
75586- atomic_inc(&sk->sk_drops);
75587+ atomic_inc_unchecked(&sk->sk_drops);
75588 kfree_skb(skb);
75589 return NET_RX_DROP;
75590 }
75591@@ -742,16 +742,20 @@ static int raw_init(struct sock *sk)
75592
75593 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
75594 {
75595+ struct icmp_filter filter;
75596+
75597 if (optlen > sizeof(struct icmp_filter))
75598 optlen = sizeof(struct icmp_filter);
75599- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
75600+ if (copy_from_user(&filter, optval, optlen))
75601 return -EFAULT;
75602+ raw_sk(sk)->filter = filter;
75603 return 0;
75604 }
75605
75606 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
75607 {
75608 int len, ret = -EFAULT;
75609+ struct icmp_filter filter;
75610
75611 if (get_user(len, optlen))
75612 goto out;
75613@@ -761,8 +765,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
75614 if (len > sizeof(struct icmp_filter))
75615 len = sizeof(struct icmp_filter);
75616 ret = -EFAULT;
75617- if (put_user(len, optlen) ||
75618- copy_to_user(optval, &raw_sk(sk)->filter, len))
75619+ filter = raw_sk(sk)->filter;
75620+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
75621 goto out;
75622 ret = 0;
75623 out: return ret;
75624@@ -990,7 +994,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
75625 sk_wmem_alloc_get(sp),
75626 sk_rmem_alloc_get(sp),
75627 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
75628- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
75629+ atomic_read(&sp->sk_refcnt),
75630+#ifdef CONFIG_GRKERNSEC_HIDESYM
75631+ NULL,
75632+#else
75633+ sp,
75634+#endif
75635+ atomic_read_unchecked(&sp->sk_drops));
75636 }
75637
75638 static int raw_seq_show(struct seq_file *seq, void *v)
75639diff --git a/net/ipv4/route.c b/net/ipv4/route.c
75640index 0197747..7adb0dc 100644
75641--- a/net/ipv4/route.c
75642+++ b/net/ipv4/route.c
75643@@ -311,7 +311,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
75644
75645 static inline int rt_genid(struct net *net)
75646 {
75647- return atomic_read(&net->ipv4.rt_genid);
75648+ return atomic_read_unchecked(&net->ipv4.rt_genid);
75649 }
75650
75651 #ifdef CONFIG_PROC_FS
75652@@ -935,7 +935,7 @@ static void rt_cache_invalidate(struct net *net)
75653 unsigned char shuffle;
75654
75655 get_random_bytes(&shuffle, sizeof(shuffle));
75656- atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
75657+ atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
75658 inetpeer_invalidate_tree(AF_INET);
75659 }
75660
75661@@ -3010,7 +3010,7 @@ static int rt_fill_info(struct net *net,
75662 error = rt->dst.error;
75663 if (peer) {
75664 inet_peer_refcheck(rt->peer);
75665- id = atomic_read(&peer->ip_id_count) & 0xffff;
75666+ id = atomic_read_unchecked(&peer->ip_id_count) & 0xffff;
75667 if (peer->tcp_ts_stamp) {
75668 ts = peer->tcp_ts;
75669 tsage = get_seconds() - peer->tcp_ts_stamp;
75670diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
75671index fd54c5f..96d6407 100644
75672--- a/net/ipv4/tcp_ipv4.c
75673+++ b/net/ipv4/tcp_ipv4.c
75674@@ -88,6 +88,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
75675 int sysctl_tcp_low_latency __read_mostly;
75676 EXPORT_SYMBOL(sysctl_tcp_low_latency);
75677
75678+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75679+extern int grsec_enable_blackhole;
75680+#endif
75681
75682 #ifdef CONFIG_TCP_MD5SIG
75683 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
75684@@ -1638,6 +1641,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
75685 return 0;
75686
75687 reset:
75688+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75689+ if (!grsec_enable_blackhole)
75690+#endif
75691 tcp_v4_send_reset(rsk, skb);
75692 discard:
75693 kfree_skb(skb);
75694@@ -1700,12 +1706,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
75695 TCP_SKB_CB(skb)->sacked = 0;
75696
75697 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
75698- if (!sk)
75699+ if (!sk) {
75700+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75701+ ret = 1;
75702+#endif
75703 goto no_tcp_socket;
75704-
75705+ }
75706 process:
75707- if (sk->sk_state == TCP_TIME_WAIT)
75708+ if (sk->sk_state == TCP_TIME_WAIT) {
75709+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75710+ ret = 2;
75711+#endif
75712 goto do_time_wait;
75713+ }
75714
75715 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
75716 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
75717@@ -1755,6 +1768,10 @@ no_tcp_socket:
75718 bad_packet:
75719 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
75720 } else {
75721+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75722+ if (!grsec_enable_blackhole || (ret == 1 &&
75723+ (skb->dev->flags & IFF_LOOPBACK)))
75724+#endif
75725 tcp_v4_send_reset(NULL, skb);
75726 }
75727
75728@@ -2417,7 +2434,11 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
75729 0, /* non standard timer */
75730 0, /* open_requests have no inode */
75731 atomic_read(&sk->sk_refcnt),
75732+#ifdef CONFIG_GRKERNSEC_HIDESYM
75733+ NULL,
75734+#else
75735 req,
75736+#endif
75737 len);
75738 }
75739
75740@@ -2467,7 +2488,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
75741 sock_i_uid(sk),
75742 icsk->icsk_probes_out,
75743 sock_i_ino(sk),
75744- atomic_read(&sk->sk_refcnt), sk,
75745+ atomic_read(&sk->sk_refcnt),
75746+#ifdef CONFIG_GRKERNSEC_HIDESYM
75747+ NULL,
75748+#else
75749+ sk,
75750+#endif
75751 jiffies_to_clock_t(icsk->icsk_rto),
75752 jiffies_to_clock_t(icsk->icsk_ack.ato),
75753 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
75754@@ -2495,7 +2521,13 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
75755 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
75756 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
75757 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
75758- atomic_read(&tw->tw_refcnt), tw, len);
75759+ atomic_read(&tw->tw_refcnt),
75760+#ifdef CONFIG_GRKERNSEC_HIDESYM
75761+ NULL,
75762+#else
75763+ tw,
75764+#endif
75765+ len);
75766 }
75767
75768 #define TMPSZ 150
75769diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
75770index 550e755..25721b3 100644
75771--- a/net/ipv4/tcp_minisocks.c
75772+++ b/net/ipv4/tcp_minisocks.c
75773@@ -27,6 +27,10 @@
75774 #include <net/inet_common.h>
75775 #include <net/xfrm.h>
75776
75777+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75778+extern int grsec_enable_blackhole;
75779+#endif
75780+
75781 int sysctl_tcp_syncookies __read_mostly = 1;
75782 EXPORT_SYMBOL(sysctl_tcp_syncookies);
75783
75784@@ -753,6 +757,10 @@ listen_overflow:
75785
75786 embryonic_reset:
75787 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
75788+
75789+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75790+ if (!grsec_enable_blackhole)
75791+#endif
75792 if (!(flg & TCP_FLAG_RST))
75793 req->rsk_ops->send_reset(sk, skb);
75794
75795diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
75796index 85ee7eb..53277ab 100644
75797--- a/net/ipv4/tcp_probe.c
75798+++ b/net/ipv4/tcp_probe.c
75799@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
75800 if (cnt + width >= len)
75801 break;
75802
75803- if (copy_to_user(buf + cnt, tbuf, width))
75804+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
75805 return -EFAULT;
75806 cnt += width;
75807 }
75808diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
75809index cd2e072..1fffee2 100644
75810--- a/net/ipv4/tcp_timer.c
75811+++ b/net/ipv4/tcp_timer.c
75812@@ -22,6 +22,10 @@
75813 #include <linux/gfp.h>
75814 #include <net/tcp.h>
75815
75816+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75817+extern int grsec_lastack_retries;
75818+#endif
75819+
75820 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
75821 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
75822 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
75823@@ -196,6 +200,13 @@ static int tcp_write_timeout(struct sock *sk)
75824 }
75825 }
75826
75827+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75828+ if ((sk->sk_state == TCP_LAST_ACK) &&
75829+ (grsec_lastack_retries > 0) &&
75830+ (grsec_lastack_retries < retry_until))
75831+ retry_until = grsec_lastack_retries;
75832+#endif
75833+
75834 if (retransmits_timed_out(sk, retry_until,
75835 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
75836 /* Has it gone just too far? */
75837diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
75838index 5d075b5..d907d5f 100644
75839--- a/net/ipv4/udp.c
75840+++ b/net/ipv4/udp.c
75841@@ -86,6 +86,7 @@
75842 #include <linux/types.h>
75843 #include <linux/fcntl.h>
75844 #include <linux/module.h>
75845+#include <linux/security.h>
75846 #include <linux/socket.h>
75847 #include <linux/sockios.h>
75848 #include <linux/igmp.h>
75849@@ -108,6 +109,10 @@
75850 #include <trace/events/udp.h>
75851 #include "udp_impl.h"
75852
75853+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75854+extern int grsec_enable_blackhole;
75855+#endif
75856+
75857 struct udp_table udp_table __read_mostly;
75858 EXPORT_SYMBOL(udp_table);
75859
75860@@ -566,6 +571,9 @@ found:
75861 return s;
75862 }
75863
75864+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
75865+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
75866+
75867 /*
75868 * This routine is called by the ICMP module when it gets some
75869 * sort of error condition. If err < 0 then the socket should
75870@@ -857,9 +865,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
75871 dport = usin->sin_port;
75872 if (dport == 0)
75873 return -EINVAL;
75874+
75875+ err = gr_search_udp_sendmsg(sk, usin);
75876+ if (err)
75877+ return err;
75878 } else {
75879 if (sk->sk_state != TCP_ESTABLISHED)
75880 return -EDESTADDRREQ;
75881+
75882+ err = gr_search_udp_sendmsg(sk, NULL);
75883+ if (err)
75884+ return err;
75885+
75886 daddr = inet->inet_daddr;
75887 dport = inet->inet_dport;
75888 /* Open fast path for connected socket.
75889@@ -1100,7 +1117,7 @@ static unsigned int first_packet_length(struct sock *sk)
75890 udp_lib_checksum_complete(skb)) {
75891 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
75892 IS_UDPLITE(sk));
75893- atomic_inc(&sk->sk_drops);
75894+ atomic_inc_unchecked(&sk->sk_drops);
75895 __skb_unlink(skb, rcvq);
75896 __skb_queue_tail(&list_kill, skb);
75897 }
75898@@ -1186,6 +1203,10 @@ try_again:
75899 if (!skb)
75900 goto out;
75901
75902+ err = gr_search_udp_recvmsg(sk, skb);
75903+ if (err)
75904+ goto out_free;
75905+
75906 ulen = skb->len - sizeof(struct udphdr);
75907 copied = len;
75908 if (copied > ulen)
75909@@ -1489,7 +1510,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75910
75911 drop:
75912 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
75913- atomic_inc(&sk->sk_drops);
75914+ atomic_inc_unchecked(&sk->sk_drops);
75915 kfree_skb(skb);
75916 return -1;
75917 }
75918@@ -1508,7 +1529,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
75919 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
75920
75921 if (!skb1) {
75922- atomic_inc(&sk->sk_drops);
75923+ atomic_inc_unchecked(&sk->sk_drops);
75924 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
75925 IS_UDPLITE(sk));
75926 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
75927@@ -1677,6 +1698,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
75928 goto csum_error;
75929
75930 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
75931+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75932+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
75933+#endif
75934 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
75935
75936 /*
75937@@ -2100,8 +2124,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
75938 sk_wmem_alloc_get(sp),
75939 sk_rmem_alloc_get(sp),
75940 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
75941- atomic_read(&sp->sk_refcnt), sp,
75942- atomic_read(&sp->sk_drops), len);
75943+ atomic_read(&sp->sk_refcnt),
75944+#ifdef CONFIG_GRKERNSEC_HIDESYM
75945+ NULL,
75946+#else
75947+ sp,
75948+#endif
75949+ atomic_read_unchecked(&sp->sk_drops), len);
75950 }
75951
75952 int udp4_seq_show(struct seq_file *seq, void *v)
75953diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
75954index 6b8ebc5..1d624f4 100644
75955--- a/net/ipv6/addrconf.c
75956+++ b/net/ipv6/addrconf.c
75957@@ -2145,7 +2145,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
75958 p.iph.ihl = 5;
75959 p.iph.protocol = IPPROTO_IPV6;
75960 p.iph.ttl = 64;
75961- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
75962+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
75963
75964 if (ops->ndo_do_ioctl) {
75965 mm_segment_t oldfs = get_fs();
75966diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
75967index 2ae79db..8f101bf 100644
75968--- a/net/ipv6/ah6.c
75969+++ b/net/ipv6/ah6.c
75970@@ -56,6 +56,8 @@ struct ah_skb_cb {
75971 #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
75972
75973 static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75974+ unsigned int size) __size_overflow(3);
75975+static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75976 unsigned int size)
75977 {
75978 unsigned int len;
75979diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
75980index 02dd203..e03fcc9 100644
75981--- a/net/ipv6/inet6_connection_sock.c
75982+++ b/net/ipv6/inet6_connection_sock.c
75983@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
75984 #ifdef CONFIG_XFRM
75985 {
75986 struct rt6_info *rt = (struct rt6_info *)dst;
75987- rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
75988+ rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
75989 }
75990 #endif
75991 }
75992@@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
75993 #ifdef CONFIG_XFRM
75994 if (dst) {
75995 struct rt6_info *rt = (struct rt6_info *)dst;
75996- if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
75997+ if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
75998 __sk_dst_reset(sk);
75999 dst = NULL;
76000 }
76001diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
76002index 18a2719..779f36a 100644
76003--- a/net/ipv6/ipv6_sockglue.c
76004+++ b/net/ipv6/ipv6_sockglue.c
76005@@ -960,7 +960,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
76006 if (sk->sk_type != SOCK_STREAM)
76007 return -ENOPROTOOPT;
76008
76009- msg.msg_control = optval;
76010+ msg.msg_control = (void __force_kernel *)optval;
76011 msg.msg_controllen = len;
76012 msg.msg_flags = flags;
76013
76014diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
76015index 94874b0..108a94d 100644
76016--- a/net/ipv6/netfilter/ip6_tables.c
76017+++ b/net/ipv6/netfilter/ip6_tables.c
76018@@ -945,6 +945,10 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
76019 static int
76020 copy_entries_to_user(unsigned int total_size,
76021 const struct xt_table *table,
76022+ void __user *userptr) __size_overflow(1);
76023+static int
76024+copy_entries_to_user(unsigned int total_size,
76025+ const struct xt_table *table,
76026 void __user *userptr)
76027 {
76028 unsigned int off, num;
76029@@ -1194,6 +1198,10 @@ get_entries(struct net *net, struct ip6t_get_entries __user *uptr,
76030 static int
76031 __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76032 struct xt_table_info *newinfo, unsigned int num_counters,
76033+ void __user *counters_ptr) __size_overflow(5);
76034+static int
76035+__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76036+ struct xt_table_info *newinfo, unsigned int num_counters,
76037 void __user *counters_ptr)
76038 {
76039 int ret;
76040@@ -1315,6 +1323,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
76041
76042 static int
76043 do_add_counters(struct net *net, const void __user *user, unsigned int len,
76044+ int compat) __size_overflow(3);
76045+static int
76046+do_add_counters(struct net *net, const void __user *user, unsigned int len,
76047 int compat)
76048 {
76049 unsigned int i, curcpu;
76050diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
76051index d02f7e4..2d2a0f1 100644
76052--- a/net/ipv6/raw.c
76053+++ b/net/ipv6/raw.c
76054@@ -377,7 +377,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
76055 {
76056 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
76057 skb_checksum_complete(skb)) {
76058- atomic_inc(&sk->sk_drops);
76059+ atomic_inc_unchecked(&sk->sk_drops);
76060 kfree_skb(skb);
76061 return NET_RX_DROP;
76062 }
76063@@ -405,7 +405,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76064 struct raw6_sock *rp = raw6_sk(sk);
76065
76066 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
76067- atomic_inc(&sk->sk_drops);
76068+ atomic_inc_unchecked(&sk->sk_drops);
76069 kfree_skb(skb);
76070 return NET_RX_DROP;
76071 }
76072@@ -429,7 +429,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76073
76074 if (inet->hdrincl) {
76075 if (skb_checksum_complete(skb)) {
76076- atomic_inc(&sk->sk_drops);
76077+ atomic_inc_unchecked(&sk->sk_drops);
76078 kfree_skb(skb);
76079 return NET_RX_DROP;
76080 }
76081@@ -602,7 +602,7 @@ out:
76082 return err;
76083 }
76084
76085-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
76086+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
76087 struct flowi6 *fl6, struct dst_entry **dstp,
76088 unsigned int flags)
76089 {
76090@@ -912,12 +912,15 @@ do_confirm:
76091 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
76092 char __user *optval, int optlen)
76093 {
76094+ struct icmp6_filter filter;
76095+
76096 switch (optname) {
76097 case ICMPV6_FILTER:
76098 if (optlen > sizeof(struct icmp6_filter))
76099 optlen = sizeof(struct icmp6_filter);
76100- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
76101+ if (copy_from_user(&filter, optval, optlen))
76102 return -EFAULT;
76103+ raw6_sk(sk)->filter = filter;
76104 return 0;
76105 default:
76106 return -ENOPROTOOPT;
76107@@ -930,6 +933,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76108 char __user *optval, int __user *optlen)
76109 {
76110 int len;
76111+ struct icmp6_filter filter;
76112
76113 switch (optname) {
76114 case ICMPV6_FILTER:
76115@@ -941,7 +945,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76116 len = sizeof(struct icmp6_filter);
76117 if (put_user(len, optlen))
76118 return -EFAULT;
76119- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
76120+ filter = raw6_sk(sk)->filter;
76121+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
76122 return -EFAULT;
76123 return 0;
76124 default:
76125@@ -1248,7 +1253,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
76126 0, 0L, 0,
76127 sock_i_uid(sp), 0,
76128 sock_i_ino(sp),
76129- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76130+ atomic_read(&sp->sk_refcnt),
76131+#ifdef CONFIG_GRKERNSEC_HIDESYM
76132+ NULL,
76133+#else
76134+ sp,
76135+#endif
76136+ atomic_read_unchecked(&sp->sk_drops));
76137 }
76138
76139 static int raw6_seq_show(struct seq_file *seq, void *v)
76140diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
76141index a89ca8d..12e66b0 100644
76142--- a/net/ipv6/tcp_ipv6.c
76143+++ b/net/ipv6/tcp_ipv6.c
76144@@ -94,6 +94,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
76145 }
76146 #endif
76147
76148+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76149+extern int grsec_enable_blackhole;
76150+#endif
76151+
76152 static void tcp_v6_hash(struct sock *sk)
76153 {
76154 if (sk->sk_state != TCP_CLOSE) {
76155@@ -1654,6 +1658,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
76156 return 0;
76157
76158 reset:
76159+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76160+ if (!grsec_enable_blackhole)
76161+#endif
76162 tcp_v6_send_reset(sk, skb);
76163 discard:
76164 if (opt_skb)
76165@@ -1733,12 +1740,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
76166 TCP_SKB_CB(skb)->sacked = 0;
76167
76168 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76169- if (!sk)
76170+ if (!sk) {
76171+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76172+ ret = 1;
76173+#endif
76174 goto no_tcp_socket;
76175+ }
76176
76177 process:
76178- if (sk->sk_state == TCP_TIME_WAIT)
76179+ if (sk->sk_state == TCP_TIME_WAIT) {
76180+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76181+ ret = 2;
76182+#endif
76183 goto do_time_wait;
76184+ }
76185
76186 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
76187 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76188@@ -1786,6 +1801,10 @@ no_tcp_socket:
76189 bad_packet:
76190 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76191 } else {
76192+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76193+ if (!grsec_enable_blackhole || (ret == 1 &&
76194+ (skb->dev->flags & IFF_LOOPBACK)))
76195+#endif
76196 tcp_v6_send_reset(NULL, skb);
76197 }
76198
76199@@ -2047,7 +2066,13 @@ static void get_openreq6(struct seq_file *seq,
76200 uid,
76201 0, /* non standard timer */
76202 0, /* open_requests have no inode */
76203- 0, req);
76204+ 0,
76205+#ifdef CONFIG_GRKERNSEC_HIDESYM
76206+ NULL
76207+#else
76208+ req
76209+#endif
76210+ );
76211 }
76212
76213 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76214@@ -2097,7 +2122,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76215 sock_i_uid(sp),
76216 icsk->icsk_probes_out,
76217 sock_i_ino(sp),
76218- atomic_read(&sp->sk_refcnt), sp,
76219+ atomic_read(&sp->sk_refcnt),
76220+#ifdef CONFIG_GRKERNSEC_HIDESYM
76221+ NULL,
76222+#else
76223+ sp,
76224+#endif
76225 jiffies_to_clock_t(icsk->icsk_rto),
76226 jiffies_to_clock_t(icsk->icsk_ack.ato),
76227 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
76228@@ -2132,7 +2162,13 @@ static void get_timewait6_sock(struct seq_file *seq,
76229 dest->s6_addr32[2], dest->s6_addr32[3], destp,
76230 tw->tw_substate, 0, 0,
76231 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76232- atomic_read(&tw->tw_refcnt), tw);
76233+ atomic_read(&tw->tw_refcnt),
76234+#ifdef CONFIG_GRKERNSEC_HIDESYM
76235+ NULL
76236+#else
76237+ tw
76238+#endif
76239+ );
76240 }
76241
76242 static int tcp6_seq_show(struct seq_file *seq, void *v)
76243diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
76244index 4f96b5c..75543d7 100644
76245--- a/net/ipv6/udp.c
76246+++ b/net/ipv6/udp.c
76247@@ -50,6 +50,10 @@
76248 #include <linux/seq_file.h>
76249 #include "udp_impl.h"
76250
76251+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76252+extern int grsec_enable_blackhole;
76253+#endif
76254+
76255 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
76256 {
76257 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
76258@@ -551,7 +555,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
76259
76260 return 0;
76261 drop:
76262- atomic_inc(&sk->sk_drops);
76263+ atomic_inc_unchecked(&sk->sk_drops);
76264 drop_no_sk_drops_inc:
76265 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76266 kfree_skb(skb);
76267@@ -627,7 +631,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76268 continue;
76269 }
76270 drop:
76271- atomic_inc(&sk->sk_drops);
76272+ atomic_inc_unchecked(&sk->sk_drops);
76273 UDP6_INC_STATS_BH(sock_net(sk),
76274 UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
76275 UDP6_INC_STATS_BH(sock_net(sk),
76276@@ -782,6 +786,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76277 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
76278 proto == IPPROTO_UDPLITE);
76279
76280+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76281+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76282+#endif
76283 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
76284
76285 kfree_skb(skb);
76286@@ -798,7 +805,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76287 if (!sock_owned_by_user(sk))
76288 udpv6_queue_rcv_skb(sk, skb);
76289 else if (sk_add_backlog(sk, skb)) {
76290- atomic_inc(&sk->sk_drops);
76291+ atomic_inc_unchecked(&sk->sk_drops);
76292 bh_unlock_sock(sk);
76293 sock_put(sk);
76294 goto discard;
76295@@ -1410,8 +1417,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
76296 0, 0L, 0,
76297 sock_i_uid(sp), 0,
76298 sock_i_ino(sp),
76299- atomic_read(&sp->sk_refcnt), sp,
76300- atomic_read(&sp->sk_drops));
76301+ atomic_read(&sp->sk_refcnt),
76302+#ifdef CONFIG_GRKERNSEC_HIDESYM
76303+ NULL,
76304+#else
76305+ sp,
76306+#endif
76307+ atomic_read_unchecked(&sp->sk_drops));
76308 }
76309
76310 int udp6_seq_show(struct seq_file *seq, void *v)
76311diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
76312index 253695d..9481ce8 100644
76313--- a/net/irda/ircomm/ircomm_tty.c
76314+++ b/net/irda/ircomm/ircomm_tty.c
76315@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76316 add_wait_queue(&self->open_wait, &wait);
76317
76318 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
76319- __FILE__,__LINE__, tty->driver->name, self->open_count );
76320+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76321
76322 /* As far as I can see, we protect open_count - Jean II */
76323 spin_lock_irqsave(&self->spinlock, flags);
76324 if (!tty_hung_up_p(filp)) {
76325 extra_count = 1;
76326- self->open_count--;
76327+ local_dec(&self->open_count);
76328 }
76329 spin_unlock_irqrestore(&self->spinlock, flags);
76330- self->blocked_open++;
76331+ local_inc(&self->blocked_open);
76332
76333 while (1) {
76334 if (tty->termios->c_cflag & CBAUD) {
76335@@ -331,7 +331,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76336 }
76337
76338 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
76339- __FILE__,__LINE__, tty->driver->name, self->open_count );
76340+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76341
76342 schedule();
76343 }
76344@@ -342,13 +342,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76345 if (extra_count) {
76346 /* ++ is not atomic, so this should be protected - Jean II */
76347 spin_lock_irqsave(&self->spinlock, flags);
76348- self->open_count++;
76349+ local_inc(&self->open_count);
76350 spin_unlock_irqrestore(&self->spinlock, flags);
76351 }
76352- self->blocked_open--;
76353+ local_dec(&self->blocked_open);
76354
76355 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
76356- __FILE__,__LINE__, tty->driver->name, self->open_count);
76357+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
76358
76359 if (!retval)
76360 self->flags |= ASYNC_NORMAL_ACTIVE;
76361@@ -417,14 +417,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
76362 }
76363 /* ++ is not atomic, so this should be protected - Jean II */
76364 spin_lock_irqsave(&self->spinlock, flags);
76365- self->open_count++;
76366+ local_inc(&self->open_count);
76367
76368 tty->driver_data = self;
76369 self->tty = tty;
76370 spin_unlock_irqrestore(&self->spinlock, flags);
76371
76372 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
76373- self->line, self->open_count);
76374+ self->line, local_read(&self->open_count));
76375
76376 /* Not really used by us, but lets do it anyway */
76377 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
76378@@ -510,7 +510,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76379 return;
76380 }
76381
76382- if ((tty->count == 1) && (self->open_count != 1)) {
76383+ if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
76384 /*
76385 * Uh, oh. tty->count is 1, which means that the tty
76386 * structure will be freed. state->count should always
76387@@ -520,16 +520,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76388 */
76389 IRDA_DEBUG(0, "%s(), bad serial port count; "
76390 "tty->count is 1, state->count is %d\n", __func__ ,
76391- self->open_count);
76392- self->open_count = 1;
76393+ local_read(&self->open_count));
76394+ local_set(&self->open_count, 1);
76395 }
76396
76397- if (--self->open_count < 0) {
76398+ if (local_dec_return(&self->open_count) < 0) {
76399 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
76400- __func__, self->line, self->open_count);
76401- self->open_count = 0;
76402+ __func__, self->line, local_read(&self->open_count));
76403+ local_set(&self->open_count, 0);
76404 }
76405- if (self->open_count) {
76406+ if (local_read(&self->open_count)) {
76407 spin_unlock_irqrestore(&self->spinlock, flags);
76408
76409 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
76410@@ -561,7 +561,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76411 tty->closing = 0;
76412 self->tty = NULL;
76413
76414- if (self->blocked_open) {
76415+ if (local_read(&self->blocked_open)) {
76416 if (self->close_delay)
76417 schedule_timeout_interruptible(self->close_delay);
76418 wake_up_interruptible(&self->open_wait);
76419@@ -1013,7 +1013,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
76420 spin_lock_irqsave(&self->spinlock, flags);
76421 self->flags &= ~ASYNC_NORMAL_ACTIVE;
76422 self->tty = NULL;
76423- self->open_count = 0;
76424+ local_set(&self->open_count, 0);
76425 spin_unlock_irqrestore(&self->spinlock, flags);
76426
76427 wake_up_interruptible(&self->open_wait);
76428@@ -1360,7 +1360,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
76429 seq_putc(m, '\n');
76430
76431 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
76432- seq_printf(m, "Open count: %d\n", self->open_count);
76433+ seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
76434 seq_printf(m, "Max data size: %d\n", self->max_data_size);
76435 seq_printf(m, "Max header size: %d\n", self->max_header_size);
76436
76437diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
76438index d5c5b8f..33beff0 100644
76439--- a/net/iucv/af_iucv.c
76440+++ b/net/iucv/af_iucv.c
76441@@ -764,10 +764,10 @@ static int iucv_sock_autobind(struct sock *sk)
76442
76443 write_lock_bh(&iucv_sk_list.lock);
76444
76445- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
76446+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
76447 while (__iucv_get_sock_by_name(name)) {
76448 sprintf(name, "%08x",
76449- atomic_inc_return(&iucv_sk_list.autobind_name));
76450+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
76451 }
76452
76453 write_unlock_bh(&iucv_sk_list.lock);
76454diff --git a/net/key/af_key.c b/net/key/af_key.c
76455index 11dbb22..c20f667 100644
76456--- a/net/key/af_key.c
76457+++ b/net/key/af_key.c
76458@@ -3016,10 +3016,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
76459 static u32 get_acqseq(void)
76460 {
76461 u32 res;
76462- static atomic_t acqseq;
76463+ static atomic_unchecked_t acqseq;
76464
76465 do {
76466- res = atomic_inc_return(&acqseq);
76467+ res = atomic_inc_return_unchecked(&acqseq);
76468 } while (!res);
76469 return res;
76470 }
76471diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
76472index 2f0642d..e5c6fba 100644
76473--- a/net/mac80211/ieee80211_i.h
76474+++ b/net/mac80211/ieee80211_i.h
76475@@ -28,6 +28,7 @@
76476 #include <net/ieee80211_radiotap.h>
76477 #include <net/cfg80211.h>
76478 #include <net/mac80211.h>
76479+#include <asm/local.h>
76480 #include "key.h"
76481 #include "sta_info.h"
76482
76483@@ -781,7 +782,7 @@ struct ieee80211_local {
76484 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
76485 spinlock_t queue_stop_reason_lock;
76486
76487- int open_count;
76488+ local_t open_count;
76489 int monitors, cooked_mntrs;
76490 /* number of interfaces with corresponding FIF_ flags */
76491 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
76492diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
76493index 8e2137b..2974283 100644
76494--- a/net/mac80211/iface.c
76495+++ b/net/mac80211/iface.c
76496@@ -222,7 +222,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76497 break;
76498 }
76499
76500- if (local->open_count == 0) {
76501+ if (local_read(&local->open_count) == 0) {
76502 res = drv_start(local);
76503 if (res)
76504 goto err_del_bss;
76505@@ -246,7 +246,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76506 memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
76507
76508 if (!is_valid_ether_addr(dev->dev_addr)) {
76509- if (!local->open_count)
76510+ if (!local_read(&local->open_count))
76511 drv_stop(local);
76512 return -EADDRNOTAVAIL;
76513 }
76514@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76515 mutex_unlock(&local->mtx);
76516
76517 if (coming_up)
76518- local->open_count++;
76519+ local_inc(&local->open_count);
76520
76521 if (hw_reconf_flags)
76522 ieee80211_hw_config(local, hw_reconf_flags);
76523@@ -360,7 +360,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76524 err_del_interface:
76525 drv_remove_interface(local, sdata);
76526 err_stop:
76527- if (!local->open_count)
76528+ if (!local_read(&local->open_count))
76529 drv_stop(local);
76530 err_del_bss:
76531 sdata->bss = NULL;
76532@@ -489,7 +489,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
76533 }
76534
76535 if (going_down)
76536- local->open_count--;
76537+ local_dec(&local->open_count);
76538
76539 switch (sdata->vif.type) {
76540 case NL80211_IFTYPE_AP_VLAN:
76541@@ -548,7 +548,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
76542
76543 ieee80211_recalc_ps(local, -1);
76544
76545- if (local->open_count == 0) {
76546+ if (local_read(&local->open_count) == 0) {
76547 if (local->ops->napi_poll)
76548 napi_disable(&local->napi);
76549 ieee80211_clear_tx_pending(local);
76550diff --git a/net/mac80211/main.c b/net/mac80211/main.c
76551index b142bd4..a651749 100644
76552--- a/net/mac80211/main.c
76553+++ b/net/mac80211/main.c
76554@@ -166,7 +166,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
76555 local->hw.conf.power_level = power;
76556 }
76557
76558- if (changed && local->open_count) {
76559+ if (changed && local_read(&local->open_count)) {
76560 ret = drv_config(local, changed);
76561 /*
76562 * Goal:
76563diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
76564index 596efaf..8f1911f 100644
76565--- a/net/mac80211/pm.c
76566+++ b/net/mac80211/pm.c
76567@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
76568 struct ieee80211_sub_if_data *sdata;
76569 struct sta_info *sta;
76570
76571- if (!local->open_count)
76572+ if (!local_read(&local->open_count))
76573 goto suspend;
76574
76575 ieee80211_scan_cancel(local);
76576@@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
76577 cancel_work_sync(&local->dynamic_ps_enable_work);
76578 del_timer_sync(&local->dynamic_ps_timer);
76579
76580- local->wowlan = wowlan && local->open_count;
76581+ local->wowlan = wowlan && local_read(&local->open_count);
76582 if (local->wowlan) {
76583 int err = drv_suspend(local, wowlan);
76584 if (err < 0) {
76585@@ -129,7 +129,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
76586 }
76587
76588 /* stop hardware - this must stop RX */
76589- if (local->open_count)
76590+ if (local_read(&local->open_count))
76591 ieee80211_stop_device(local);
76592
76593 suspend:
76594diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
76595index f9b8e81..bb89b46 100644
76596--- a/net/mac80211/rate.c
76597+++ b/net/mac80211/rate.c
76598@@ -401,7 +401,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
76599
76600 ASSERT_RTNL();
76601
76602- if (local->open_count)
76603+ if (local_read(&local->open_count))
76604 return -EBUSY;
76605
76606 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
76607diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
76608index c97a065..ff61928 100644
76609--- a/net/mac80211/rc80211_pid_debugfs.c
76610+++ b/net/mac80211/rc80211_pid_debugfs.c
76611@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
76612
76613 spin_unlock_irqrestore(&events->lock, status);
76614
76615- if (copy_to_user(buf, pb, p))
76616+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
76617 return -EFAULT;
76618
76619 return p;
76620diff --git a/net/mac80211/util.c b/net/mac80211/util.c
76621index 9919892..8c49803 100644
76622--- a/net/mac80211/util.c
76623+++ b/net/mac80211/util.c
76624@@ -1143,7 +1143,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
76625 }
76626 #endif
76627 /* everything else happens only if HW was up & running */
76628- if (!local->open_count)
76629+ if (!local_read(&local->open_count))
76630 goto wake_up;
76631
76632 /*
76633diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
76634index f8ac4ef..b02560b 100644
76635--- a/net/netfilter/Kconfig
76636+++ b/net/netfilter/Kconfig
76637@@ -806,6 +806,16 @@ config NETFILTER_XT_MATCH_ESP
76638
76639 To compile it as a module, choose M here. If unsure, say N.
76640
76641+config NETFILTER_XT_MATCH_GRADM
76642+ tristate '"gradm" match support'
76643+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
76644+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
76645+ ---help---
76646+ The gradm match allows to match on grsecurity RBAC being enabled.
76647+ It is useful when iptables rules are applied early on bootup to
76648+ prevent connections to the machine (except from a trusted host)
76649+ while the RBAC system is disabled.
76650+
76651 config NETFILTER_XT_MATCH_HASHLIMIT
76652 tristate '"hashlimit" match support'
76653 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
76654diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
76655index 40f4c3d..0d5dd6b 100644
76656--- a/net/netfilter/Makefile
76657+++ b/net/netfilter/Makefile
76658@@ -83,6 +83,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
76659 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
76660 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
76661 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
76662+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
76663 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
76664 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
76665 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
76666diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
76667index 29fa5ba..8debc79 100644
76668--- a/net/netfilter/ipvs/ip_vs_conn.c
76669+++ b/net/netfilter/ipvs/ip_vs_conn.c
76670@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
76671 /* Increase the refcnt counter of the dest */
76672 atomic_inc(&dest->refcnt);
76673
76674- conn_flags = atomic_read(&dest->conn_flags);
76675+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
76676 if (cp->protocol != IPPROTO_UDP)
76677 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
76678 /* Bind with the destination and its corresponding transmitter */
76679@@ -869,7 +869,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
76680 atomic_set(&cp->refcnt, 1);
76681
76682 atomic_set(&cp->n_control, 0);
76683- atomic_set(&cp->in_pkts, 0);
76684+ atomic_set_unchecked(&cp->in_pkts, 0);
76685
76686 atomic_inc(&ipvs->conn_count);
76687 if (flags & IP_VS_CONN_F_NO_CPORT)
76688@@ -1149,7 +1149,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
76689
76690 /* Don't drop the entry if its number of incoming packets is not
76691 located in [0, 8] */
76692- i = atomic_read(&cp->in_pkts);
76693+ i = atomic_read_unchecked(&cp->in_pkts);
76694 if (i > 8 || i < 0) return 0;
76695
76696 if (!todrop_rate[i]) return 0;
76697diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
76698index 2555816..31492d9 100644
76699--- a/net/netfilter/ipvs/ip_vs_core.c
76700+++ b/net/netfilter/ipvs/ip_vs_core.c
76701@@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
76702 ret = cp->packet_xmit(skb, cp, pd->pp);
76703 /* do not touch skb anymore */
76704
76705- atomic_inc(&cp->in_pkts);
76706+ atomic_inc_unchecked(&cp->in_pkts);
76707 ip_vs_conn_put(cp);
76708 return ret;
76709 }
76710@@ -1611,7 +1611,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
76711 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
76712 pkts = sysctl_sync_threshold(ipvs);
76713 else
76714- pkts = atomic_add_return(1, &cp->in_pkts);
76715+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
76716
76717 if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
76718 cp->protocol == IPPROTO_SCTP) {
76719diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
76720index b3afe18..08ec940 100644
76721--- a/net/netfilter/ipvs/ip_vs_ctl.c
76722+++ b/net/netfilter/ipvs/ip_vs_ctl.c
76723@@ -788,7 +788,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
76724 ip_vs_rs_hash(ipvs, dest);
76725 write_unlock_bh(&ipvs->rs_lock);
76726 }
76727- atomic_set(&dest->conn_flags, conn_flags);
76728+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
76729
76730 /* bind the service */
76731 if (!dest->svc) {
76732@@ -2028,7 +2028,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
76733 " %-7s %-6d %-10d %-10d\n",
76734 &dest->addr.in6,
76735 ntohs(dest->port),
76736- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
76737+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
76738 atomic_read(&dest->weight),
76739 atomic_read(&dest->activeconns),
76740 atomic_read(&dest->inactconns));
76741@@ -2039,7 +2039,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
76742 "%-7s %-6d %-10d %-10d\n",
76743 ntohl(dest->addr.ip),
76744 ntohs(dest->port),
76745- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
76746+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
76747 atomic_read(&dest->weight),
76748 atomic_read(&dest->activeconns),
76749 atomic_read(&dest->inactconns));
76750@@ -2509,7 +2509,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
76751
76752 entry.addr = dest->addr.ip;
76753 entry.port = dest->port;
76754- entry.conn_flags = atomic_read(&dest->conn_flags);
76755+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
76756 entry.weight = atomic_read(&dest->weight);
76757 entry.u_threshold = dest->u_threshold;
76758 entry.l_threshold = dest->l_threshold;
76759@@ -3042,7 +3042,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
76760 NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
76761
76762 NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
76763- atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
76764+ atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
76765 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
76766 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
76767 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
76768diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
76769index 8a0d6d6..90ec197 100644
76770--- a/net/netfilter/ipvs/ip_vs_sync.c
76771+++ b/net/netfilter/ipvs/ip_vs_sync.c
76772@@ -649,7 +649,7 @@ control:
76773 * i.e only increment in_pkts for Templates.
76774 */
76775 if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
76776- int pkts = atomic_add_return(1, &cp->in_pkts);
76777+ int pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
76778
76779 if (pkts % sysctl_sync_period(ipvs) != 1)
76780 return;
76781@@ -795,7 +795,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
76782
76783 if (opt)
76784 memcpy(&cp->in_seq, opt, sizeof(*opt));
76785- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
76786+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
76787 cp->state = state;
76788 cp->old_state = cp->state;
76789 /*
76790diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
76791index 7fd66de..e6fb361 100644
76792--- a/net/netfilter/ipvs/ip_vs_xmit.c
76793+++ b/net/netfilter/ipvs/ip_vs_xmit.c
76794@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
76795 else
76796 rc = NF_ACCEPT;
76797 /* do not touch skb anymore */
76798- atomic_inc(&cp->in_pkts);
76799+ atomic_inc_unchecked(&cp->in_pkts);
76800 goto out;
76801 }
76802
76803@@ -1272,7 +1272,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
76804 else
76805 rc = NF_ACCEPT;
76806 /* do not touch skb anymore */
76807- atomic_inc(&cp->in_pkts);
76808+ atomic_inc_unchecked(&cp->in_pkts);
76809 goto out;
76810 }
76811
76812diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
76813index 66b2c54..c7884e3 100644
76814--- a/net/netfilter/nfnetlink_log.c
76815+++ b/net/netfilter/nfnetlink_log.c
76816@@ -70,7 +70,7 @@ struct nfulnl_instance {
76817 };
76818
76819 static DEFINE_SPINLOCK(instances_lock);
76820-static atomic_t global_seq;
76821+static atomic_unchecked_t global_seq;
76822
76823 #define INSTANCE_BUCKETS 16
76824 static struct hlist_head instance_table[INSTANCE_BUCKETS];
76825@@ -502,7 +502,7 @@ __build_packet_message(struct nfulnl_instance *inst,
76826 /* global sequence number */
76827 if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
76828 NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
76829- htonl(atomic_inc_return(&global_seq)));
76830+ htonl(atomic_inc_return_unchecked(&global_seq)));
76831
76832 if (data_len) {
76833 struct nlattr *nla;
76834diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
76835new file mode 100644
76836index 0000000..6905327
76837--- /dev/null
76838+++ b/net/netfilter/xt_gradm.c
76839@@ -0,0 +1,51 @@
76840+/*
76841+ * gradm match for netfilter
76842