]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-2.9-3.2.11-201203162123.patch
projects / thirdparty / grsecurity-scrape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-2.9-3.2.11-201203162123.patch
CommitLineData
cc0d37e9
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index dfa6fc6..df93044 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -2,9 +2,11 @@
6 *.aux
7 *.bin
8 *.bz2
9+*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13+*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17@@ -14,6 +16,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21+*.gmo
22 *.grep
23 *.grp
24 *.gz
25@@ -48,9 +51,11 @@
26 *.tab.h
27 *.tex
28 *.ver
29+*.vim
30 *.xml
31 *.xz
32 *_MODULES
33+*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37@@ -70,6 +75,7 @@ Kerntypes
38 Module.markers
39 Module.symvers
40 PENDING
41+PERF*
42 SCCS
43 System.map*
44 TAGS
45@@ -93,19 +99,24 @@ bounds.h
46 bsetup
47 btfixupprep
48 build
49+builtin-policy.h
50 bvmlinux
51 bzImage*
52 capability_names.h
53 capflags.c
54 classlist.h*
55+clut_vga16.c
56+common-cmds.h
57 comp*.log
58 compile.h*
59 conf
60 config
61 config-*
62 config_data.h*
63+config.c
64 config.mak
65 config.mak.autogen
66+config.tmp
67 conmakehash
68 consolemap_deftbl.c*
69 cpustr.h
70@@ -116,9 +127,11 @@ devlist.h*
71 dnotify_test
72 docproc
73 dslm
74+dtc-lexer.lex.c
75 elf2ecoff
76 elfconfig.h*
77 evergreen_reg_safe.h
78+exception_policy.conf
79 fixdep
80 flask.h
81 fore200e_mkfirm
82@@ -126,12 +139,15 @@ fore200e_pca_fw.c*
83 gconf
84 gconf.glade.h
85 gen-devlist
86+gen-kdb_cmds.c
87 gen_crc32table
88 gen_init_cpio
89 generated
90 genheaders
91 genksyms
92 *_gray256.c
93+hash
94+hid-example
95 hpet_example
96 hugepage-mmap
97 hugepage-shm
98@@ -146,7 +162,7 @@ int32.c
99 int4.c
100 int8.c
101 kallsyms
102-kconfig
103+kern_constants.h
104 keywords.c
105 ksym.c*
106 ksym.h*
107@@ -154,7 +170,7 @@ kxgettext
108 lkc_defs.h
109 lex.c
110 lex.*.c
111-linux
112+lib1funcs.S
113 logo_*.c
114 logo_*_clut224.c
115 logo_*_mono.c
116@@ -166,14 +182,15 @@ machtypes.h
117 map
118 map_hugetlb
119 maui_boot.h
120-media
121 mconf
122+mdp
123 miboot*
124 mk_elfconfig
125 mkboot
126 mkbugboot
127 mkcpustr
128 mkdep
129+mkpiggy
130 mkprep
131 mkregtable
132 mktables
133@@ -209,6 +226,7 @@ r300_reg_safe.h
134 r420_reg_safe.h
135 r600_reg_safe.h
136 recordmcount
137+regdb.c
138 relocs
139 rlim_names.h
140 rn50_reg_safe.h
141@@ -219,6 +237,7 @@ setup
142 setup.bin
143 setup.elf
144 sImage
145+slabinfo
146 sm_tbl*
147 split-include
148 syscalltab.h
149@@ -229,6 +248,7 @@ tftpboot.img
150 timeconst.h
151 times.h*
152 trix_boot.h
153+user_constants.h
154 utsrelease.h*
155 vdso-syms.lds
156 vdso.lds
157@@ -246,7 +266,9 @@ vmlinux
158 vmlinux-*
159 vmlinux.aout
160 vmlinux.bin.all
161+vmlinux.bin.bz2
162 vmlinux.lds
163+vmlinux.relocs
164 vmlinuz
165 voffset.h
166 vsyscall.lds
167@@ -254,9 +276,11 @@ vsyscall_32.lds
168 wanxlfw.inc
169 uImage
170 unifdef
171+utsrelease.h
172 wakeup.bin
173 wakeup.elf
174 wakeup.lds
175 zImage*
176 zconf.hash.c
177+zconf.lex.c
178 zoffset.h
179diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
180index 81c287f..d456d02 100644
181--- a/Documentation/kernel-parameters.txt
182+++ b/Documentation/kernel-parameters.txt
183@@ -1935,6 +1935,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
184 the specified number of seconds. This is to be used if
185 your oopses keep scrolling off the screen.
186
187+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
188+ virtualization environments that don't cope well with the
189+ expand down segment used by UDEREF on X86-32 or the frequent
190+ page table updates on X86-64.
191+
192+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
193+
194 pcbit= [HW,ISDN]
195
196 pcd. [PARIDE]
197diff --git a/Makefile b/Makefile
198index 4b76371..b091a81 100644
199--- a/Makefile
200+++ b/Makefile
201@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
202
203 HOSTCC = gcc
204 HOSTCXX = g++
205-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
206-HOSTCXXFLAGS = -O2
207+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
208+HOSTCLFAGS += $(call cc-option, -Wno-empty-body)
209+HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
210
211 # Decide whether to build built-in, modular, or both.
212 # Normally, just do built-in.
213@@ -407,8 +408,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exc
214 # Rules shared between *config targets and build targets
215
216 # Basic helpers built in scripts/
217-PHONY += scripts_basic
218-scripts_basic:
219+PHONY += scripts_basic gcc-plugins
220+scripts_basic: gcc-plugins
221 $(Q)$(MAKE) $(build)=scripts/basic
222 $(Q)rm -f .tmp_quiet_recordmcount
223
224@@ -564,6 +565,53 @@ else
225 KBUILD_CFLAGS += -O2
226 endif
227
228+ifndef DISABLE_PAX_PLUGINS
229+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
230+ifndef DISABLE_PAX_CONSTIFY_PLUGIN
231+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
232+endif
233+ifdef CONFIG_PAX_MEMORY_STACKLEAK
234+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
235+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
236+endif
237+ifdef CONFIG_KALLOCSTAT_PLUGIN
238+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
239+endif
240+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
241+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
242+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
243+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
244+endif
245+ifdef CONFIG_CHECKER_PLUGIN
246+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
247+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
248+endif
249+endif
250+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
251+ifdef CONFIG_PAX_SIZE_OVERFLOW
252+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
253+endif
254+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
255+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS) $(SIZE_OVERFLOW_PLUGIN_CFLAGS)
256+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
257+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN SIZE_OVERFLOW_PLUGIN
258+ifeq ($(KBUILD_EXTMOD),)
259+gcc-plugins:
260+ $(Q)$(MAKE) $(build)=tools/gcc
261+else
262+gcc-plugins: ;
263+endif
264+else
265+gcc-plugins:
266+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
267+ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev. If you choose to ignore this error and lessen the improvements provided by this patch, re-run make with the DISABLE_PAX_PLUGINS=y argument.))
268+else
269+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
270+endif
271+ $(Q)echo "PAX_MEMORY_STACKLEAK and other features will be less secure"
272+endif
273+endif
274+
275 include $(srctree)/arch/$(SRCARCH)/Makefile
276
277 ifneq ($(CONFIG_FRAME_WARN),0)
278@@ -708,7 +756,7 @@ export mod_strip_cmd
279
280
281 ifeq ($(KBUILD_EXTMOD),)
282-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
283+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
284
285 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
286 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
287@@ -932,6 +980,8 @@ vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
288
289 # The actual objects are generated when descending,
290 # make sure no implicit rule kicks in
291+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
292+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
293 $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
294
295 # Handle descending into subdirectories listed in $(vmlinux-dirs)
296@@ -941,7 +991,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
297 # Error messages still appears in the original language
298
299 PHONY += $(vmlinux-dirs)
300-$(vmlinux-dirs): prepare scripts
301+$(vmlinux-dirs): gcc-plugins prepare scripts
302 $(Q)$(MAKE) $(build)=$@
303
304 # Store (new) KERNELRELASE string in include/config/kernel.release
305@@ -985,6 +1035,7 @@ prepare0: archprepare FORCE
306 $(Q)$(MAKE) $(build)=.
307
308 # All the preparing..
309+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
310 prepare: prepare0
311
312 # Generate some files
313@@ -1086,6 +1137,8 @@ all: modules
314 # using awk while concatenating to the final file.
315
316 PHONY += modules
317+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
318+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
319 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
320 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
321 @$(kecho) ' Building modules, stage 2.';
322@@ -1101,7 +1154,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
323
324 # Target to prepare building external modules
325 PHONY += modules_prepare
326-modules_prepare: prepare scripts
327+modules_prepare: gcc-plugins prepare scripts
328
329 # Target to install modules
330 PHONY += modules_install
331@@ -1198,6 +1251,7 @@ distclean: mrproper
332 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
333 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
334 -o -name '.*.rej' \
335+ -o -name '.*.rej' -o -name '*.so' \
336 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
337 -type f -print | xargs rm -f
338
339@@ -1358,6 +1412,8 @@ PHONY += $(module-dirs) modules
340 $(module-dirs): crmodverdir $(objtree)/Module.symvers
341 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
342
343+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
344+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
345 modules: $(module-dirs)
346 @$(kecho) ' Building modules, stage 2.';
347 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
348@@ -1484,17 +1540,21 @@ else
349 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
350 endif
351
352-%.s: %.c prepare scripts FORCE
353+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
354+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
355+%.s: %.c gcc-plugins prepare scripts FORCE
356 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
357 %.i: %.c prepare scripts FORCE
358 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
359-%.o: %.c prepare scripts FORCE
360+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
361+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
362+%.o: %.c gcc-plugins prepare scripts FORCE
363 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
364 %.lst: %.c prepare scripts FORCE
365 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
366-%.s: %.S prepare scripts FORCE
367+%.s: %.S gcc-plugins prepare scripts FORCE
368 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
369-%.o: %.S prepare scripts FORCE
370+%.o: %.S gcc-plugins prepare scripts FORCE
371 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
372 %.symtypes: %.c prepare scripts FORCE
373 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
374@@ -1504,11 +1564,15 @@ endif
375 $(cmd_crmodverdir)
376 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
377 $(build)=$(build-dir)
378-%/: prepare scripts FORCE
379+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
380+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
381+%/: gcc-plugins prepare scripts FORCE
382 $(cmd_crmodverdir)
383 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
384 $(build)=$(build-dir)
385-%.ko: prepare scripts FORCE
386+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
387+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
388+%.ko: gcc-plugins prepare scripts FORCE
389 $(cmd_crmodverdir)
390 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
391 $(build)=$(build-dir) $(@:.ko=.o)
392diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
393index 640f909..48b6597 100644
394--- a/arch/alpha/include/asm/atomic.h
395+++ b/arch/alpha/include/asm/atomic.h
396@@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
397 #define atomic_dec(v) atomic_sub(1,(v))
398 #define atomic64_dec(v) atomic64_sub(1,(v))
399
400+#define atomic64_read_unchecked(v) atomic64_read(v)
401+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
402+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
403+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
404+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
405+#define atomic64_inc_unchecked(v) atomic64_inc(v)
406+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
407+#define atomic64_dec_unchecked(v) atomic64_dec(v)
408+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
409+
410 #define smp_mb__before_atomic_dec() smp_mb()
411 #define smp_mb__after_atomic_dec() smp_mb()
412 #define smp_mb__before_atomic_inc() smp_mb()
413diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
414index ad368a9..fbe0f25 100644
415--- a/arch/alpha/include/asm/cache.h
416+++ b/arch/alpha/include/asm/cache.h
417@@ -4,19 +4,19 @@
418 #ifndef __ARCH_ALPHA_CACHE_H
419 #define __ARCH_ALPHA_CACHE_H
420
421+#include <linux/const.h>
422
423 /* Bytes per L1 (data) cache line. */
424 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
425-# define L1_CACHE_BYTES 64
426 # define L1_CACHE_SHIFT 6
427 #else
428 /* Both EV4 and EV5 are write-through, read-allocate,
429 direct-mapped, physical.
430 */
431-# define L1_CACHE_BYTES 32
432 # define L1_CACHE_SHIFT 5
433 #endif
434
435+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
436 #define SMP_CACHE_BYTES L1_CACHE_BYTES
437
438 #endif
439diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
440index da5449e..7418343 100644
441--- a/arch/alpha/include/asm/elf.h
442+++ b/arch/alpha/include/asm/elf.h
443@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
444
445 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
446
447+#ifdef CONFIG_PAX_ASLR
448+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
449+
450+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
451+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
452+#endif
453+
454 /* $0 is set by ld.so to a pointer to a function which might be
455 registered using atexit. This provides a mean for the dynamic
456 linker to call DT_FINI functions for shared libraries that have
457diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
458index de98a73..bd4f1f8 100644
459--- a/arch/alpha/include/asm/pgtable.h
460+++ b/arch/alpha/include/asm/pgtable.h
461@@ -101,6 +101,17 @@ struct vm_area_struct;
462 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
463 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
464 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
465+
466+#ifdef CONFIG_PAX_PAGEEXEC
467+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
468+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
469+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
470+#else
471+# define PAGE_SHARED_NOEXEC PAGE_SHARED
472+# define PAGE_COPY_NOEXEC PAGE_COPY
473+# define PAGE_READONLY_NOEXEC PAGE_READONLY
474+#endif
475+
476 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
477
478 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
479diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
480index 2fd00b7..cfd5069 100644
481--- a/arch/alpha/kernel/module.c
482+++ b/arch/alpha/kernel/module.c
483@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
484
485 /* The small sections were sorted to the end of the segment.
486 The following should definitely cover them. */
487- gp = (u64)me->module_core + me->core_size - 0x8000;
488+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
489 got = sechdrs[me->arch.gotsecindex].sh_addr;
490
491 for (i = 0; i < n; i++) {
492diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
493index 01e8715..be0e80f 100644
494--- a/arch/alpha/kernel/osf_sys.c
495+++ b/arch/alpha/kernel/osf_sys.c
496@@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
497 /* At this point: (!vma || addr < vma->vm_end). */
498 if (limit - len < addr)
499 return -ENOMEM;
500- if (!vma || addr + len <= vma->vm_start)
501+ if (check_heap_stack_gap(vma, addr, len))
502 return addr;
503 addr = vma->vm_end;
504 vma = vma->vm_next;
505@@ -1183,6 +1183,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
506 merely specific addresses, but regions of memory -- perhaps
507 this feature should be incorporated into all ports? */
508
509+#ifdef CONFIG_PAX_RANDMMAP
510+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
511+#endif
512+
513 if (addr) {
514 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
515 if (addr != (unsigned long) -ENOMEM)
516@@ -1190,8 +1194,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
517 }
518
519 /* Next, try allocating at TASK_UNMAPPED_BASE. */
520- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
521- len, limit);
522+ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
523+
524 if (addr != (unsigned long) -ENOMEM)
525 return addr;
526
527diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
528index fadd5f8..904e73a 100644
529--- a/arch/alpha/mm/fault.c
530+++ b/arch/alpha/mm/fault.c
531@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
532 __reload_thread(pcb);
533 }
534
535+#ifdef CONFIG_PAX_PAGEEXEC
536+/*
537+ * PaX: decide what to do with offenders (regs->pc = fault address)
538+ *
539+ * returns 1 when task should be killed
540+ * 2 when patched PLT trampoline was detected
541+ * 3 when unpatched PLT trampoline was detected
542+ */
543+static int pax_handle_fetch_fault(struct pt_regs *regs)
544+{
545+
546+#ifdef CONFIG_PAX_EMUPLT
547+ int err;
548+
549+ do { /* PaX: patched PLT emulation #1 */
550+ unsigned int ldah, ldq, jmp;
551+
552+ err = get_user(ldah, (unsigned int *)regs->pc);
553+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
554+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
555+
556+ if (err)
557+ break;
558+
559+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
560+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
561+ jmp == 0x6BFB0000U)
562+ {
563+ unsigned long r27, addr;
564+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
565+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
566+
567+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
568+ err = get_user(r27, (unsigned long *)addr);
569+ if (err)
570+ break;
571+
572+ regs->r27 = r27;
573+ regs->pc = r27;
574+ return 2;
575+ }
576+ } while (0);
577+
578+ do { /* PaX: patched PLT emulation #2 */
579+ unsigned int ldah, lda, br;
580+
581+ err = get_user(ldah, (unsigned int *)regs->pc);
582+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
583+ err |= get_user(br, (unsigned int *)(regs->pc+8));
584+
585+ if (err)
586+ break;
587+
588+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
589+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
590+ (br & 0xFFE00000U) == 0xC3E00000U)
591+ {
592+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
593+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
594+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
595+
596+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
597+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
598+ return 2;
599+ }
600+ } while (0);
601+
602+ do { /* PaX: unpatched PLT emulation */
603+ unsigned int br;
604+
605+ err = get_user(br, (unsigned int *)regs->pc);
606+
607+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
608+ unsigned int br2, ldq, nop, jmp;
609+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
610+
611+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
612+ err = get_user(br2, (unsigned int *)addr);
613+ err |= get_user(ldq, (unsigned int *)(addr+4));
614+ err |= get_user(nop, (unsigned int *)(addr+8));
615+ err |= get_user(jmp, (unsigned int *)(addr+12));
616+ err |= get_user(resolver, (unsigned long *)(addr+16));
617+
618+ if (err)
619+ break;
620+
621+ if (br2 == 0xC3600000U &&
622+ ldq == 0xA77B000CU &&
623+ nop == 0x47FF041FU &&
624+ jmp == 0x6B7B0000U)
625+ {
626+ regs->r28 = regs->pc+4;
627+ regs->r27 = addr+16;
628+ regs->pc = resolver;
629+ return 3;
630+ }
631+ }
632+ } while (0);
633+#endif
634+
635+ return 1;
636+}
637+
638+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
639+{
640+ unsigned long i;
641+
642+ printk(KERN_ERR "PAX: bytes at PC: ");
643+ for (i = 0; i < 5; i++) {
644+ unsigned int c;
645+ if (get_user(c, (unsigned int *)pc+i))
646+ printk(KERN_CONT "???????? ");
647+ else
648+ printk(KERN_CONT "%08x ", c);
649+ }
650+ printk("\n");
651+}
652+#endif
653
654 /*
655 * This routine handles page faults. It determines the address,
656@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
657 good_area:
658 si_code = SEGV_ACCERR;
659 if (cause < 0) {
660- if (!(vma->vm_flags & VM_EXEC))
661+ if (!(vma->vm_flags & VM_EXEC)) {
662+
663+#ifdef CONFIG_PAX_PAGEEXEC
664+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
665+ goto bad_area;
666+
667+ up_read(&mm->mmap_sem);
668+ switch (pax_handle_fetch_fault(regs)) {
669+
670+#ifdef CONFIG_PAX_EMUPLT
671+ case 2:
672+ case 3:
673+ return;
674+#endif
675+
676+ }
677+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
678+ do_group_exit(SIGKILL);
679+#else
680 goto bad_area;
681+#endif
682+
683+ }
684 } else if (!cause) {
685 /* Allow reads even for write-only mappings */
686 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
687diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
688index 86976d0..683de93 100644
689--- a/arch/arm/include/asm/atomic.h
690+++ b/arch/arm/include/asm/atomic.h
691@@ -15,6 +15,10 @@
692 #include <linux/types.h>
693 #include <asm/system.h>
694
695+#ifdef CONFIG_GENERIC_ATOMIC64
696+#include <asm-generic/atomic64.h>
697+#endif
698+
699 #define ATOMIC_INIT(i) { (i) }
700
701 #ifdef __KERNEL__
702@@ -25,7 +29,15 @@
703 * atomic_set() is the clrex or dummy strex done on every exception return.
704 */
705 #define atomic_read(v) (*(volatile int *)&(v)->counter)
706+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
707+{
708+ return v->counter;
709+}
710 #define atomic_set(v,i) (((v)->counter) = (i))
711+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
712+{
713+ v->counter = i;
714+}
715
716 #if __LINUX_ARM_ARCH__ >= 6
717
718@@ -40,6 +52,35 @@ static inline void atomic_add(int i, atomic_t *v)
719 int result;
720
721 __asm__ __volatile__("@ atomic_add\n"
722+"1: ldrex %1, [%3]\n"
723+" adds %0, %1, %4\n"
724+
725+#ifdef CONFIG_PAX_REFCOUNT
726+" bvc 3f\n"
727+"2: bkpt 0xf103\n"
728+"3:\n"
729+#endif
730+
731+" strex %1, %0, [%3]\n"
732+" teq %1, #0\n"
733+" bne 1b"
734+
735+#ifdef CONFIG_PAX_REFCOUNT
736+"\n4:\n"
737+ _ASM_EXTABLE(2b, 4b)
738+#endif
739+
740+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
741+ : "r" (&v->counter), "Ir" (i)
742+ : "cc");
743+}
744+
745+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
746+{
747+ unsigned long tmp;
748+ int result;
749+
750+ __asm__ __volatile__("@ atomic_add_unchecked\n"
751 "1: ldrex %0, [%3]\n"
752 " add %0, %0, %4\n"
753 " strex %1, %0, [%3]\n"
754@@ -58,6 +99,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
755 smp_mb();
756
757 __asm__ __volatile__("@ atomic_add_return\n"
758+"1: ldrex %1, [%3]\n"
759+" adds %0, %1, %4\n"
760+
761+#ifdef CONFIG_PAX_REFCOUNT
762+" bvc 3f\n"
763+" mov %0, %1\n"
764+"2: bkpt 0xf103\n"
765+"3:\n"
766+#endif
767+
768+" strex %1, %0, [%3]\n"
769+" teq %1, #0\n"
770+" bne 1b"
771+
772+#ifdef CONFIG_PAX_REFCOUNT
773+"\n4:\n"
774+ _ASM_EXTABLE(2b, 4b)
775+#endif
776+
777+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
778+ : "r" (&v->counter), "Ir" (i)
779+ : "cc");
780+
781+ smp_mb();
782+
783+ return result;
784+}
785+
786+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
787+{
788+ unsigned long tmp;
789+ int result;
790+
791+ smp_mb();
792+
793+ __asm__ __volatile__("@ atomic_add_return_unchecked\n"
794 "1: ldrex %0, [%3]\n"
795 " add %0, %0, %4\n"
796 " strex %1, %0, [%3]\n"
797@@ -78,6 +155,35 @@ static inline void atomic_sub(int i, atomic_t *v)
798 int result;
799
800 __asm__ __volatile__("@ atomic_sub\n"
801+"1: ldrex %1, [%3]\n"
802+" subs %0, %1, %4\n"
803+
804+#ifdef CONFIG_PAX_REFCOUNT
805+" bvc 3f\n"
806+"2: bkpt 0xf103\n"
807+"3:\n"
808+#endif
809+
810+" strex %1, %0, [%3]\n"
811+" teq %1, #0\n"
812+" bne 1b"
813+
814+#ifdef CONFIG_PAX_REFCOUNT
815+"\n4:\n"
816+ _ASM_EXTABLE(2b, 4b)
817+#endif
818+
819+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
820+ : "r" (&v->counter), "Ir" (i)
821+ : "cc");
822+}
823+
824+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
825+{
826+ unsigned long tmp;
827+ int result;
828+
829+ __asm__ __volatile__("@ atomic_sub_unchecked\n"
830 "1: ldrex %0, [%3]\n"
831 " sub %0, %0, %4\n"
832 " strex %1, %0, [%3]\n"
833@@ -96,11 +202,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
834 smp_mb();
835
836 __asm__ __volatile__("@ atomic_sub_return\n"
837-"1: ldrex %0, [%3]\n"
838-" sub %0, %0, %4\n"
839+"1: ldrex %1, [%3]\n"
840+" sub %0, %1, %4\n"
841+
842+#ifdef CONFIG_PAX_REFCOUNT
843+" bvc 3f\n"
844+" mov %0, %1\n"
845+"2: bkpt 0xf103\n"
846+"3:\n"
847+#endif
848+
849 " strex %1, %0, [%3]\n"
850 " teq %1, #0\n"
851 " bne 1b"
852+
853+#ifdef CONFIG_PAX_REFCOUNT
854+"\n4:\n"
855+ _ASM_EXTABLE(2b, 4b)
856+#endif
857+
858 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
859 : "r" (&v->counter), "Ir" (i)
860 : "cc");
861@@ -132,6 +252,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
862 return oldval;
863 }
864
865+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
866+{
867+ unsigned long oldval, res;
868+
869+ smp_mb();
870+
871+ do {
872+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
873+ "ldrex %1, [%3]\n"
874+ "mov %0, #0\n"
875+ "teq %1, %4\n"
876+ "strexeq %0, %5, [%3]\n"
877+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
878+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
879+ : "cc");
880+ } while (res);
881+
882+ smp_mb();
883+
884+ return oldval;
885+}
886+
887 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
888 {
889 unsigned long tmp, tmp2;
890@@ -207,6 +349,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
891 #endif /* __LINUX_ARM_ARCH__ */
892
893 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
894+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
895+{
896+ return xchg(&v->counter, new);
897+}
898
899 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
900 {
901@@ -219,11 +365,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
902 }
903
904 #define atomic_inc(v) atomic_add(1, v)
905+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
906+{
907+ atomic_add_unchecked(1, v);
908+}
909 #define atomic_dec(v) atomic_sub(1, v)
910+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
911+{
912+ atomic_sub_unchecked(1, v);
913+}
914
915 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
916+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
917+{
918+ return atomic_add_return_unchecked(1, v) == 0;
919+}
920 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
921 #define atomic_inc_return(v) (atomic_add_return(1, v))
922+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
923+{
924+ return atomic_add_return_unchecked(1, v);
925+}
926 #define atomic_dec_return(v) (atomic_sub_return(1, v))
927 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
928
929@@ -239,6 +401,14 @@ typedef struct {
930 u64 __aligned(8) counter;
931 } atomic64_t;
932
933+#ifdef CONFIG_PAX_REFCOUNT
934+typedef struct {
935+ u64 __aligned(8) counter;
936+} atomic64_unchecked_t;
937+#else
938+typedef atomic64_t atomic64_unchecked_t;
939+#endif
940+
941 #define ATOMIC64_INIT(i) { (i) }
942
943 static inline u64 atomic64_read(atomic64_t *v)
944@@ -254,6 +424,19 @@ static inline u64 atomic64_read(atomic64_t *v)
945 return result;
946 }
947
948+static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *v)
949+{
950+ u64 result;
951+
952+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
953+" ldrexd %0, %H0, [%1]"
954+ : "=&r" (result)
955+ : "r" (&v->counter), "Qo" (v->counter)
956+ );
957+
958+ return result;
959+}
960+
961 static inline void atomic64_set(atomic64_t *v, u64 i)
962 {
963 u64 tmp;
964@@ -268,6 +451,20 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
965 : "cc");
966 }
967
968+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
969+{
970+ u64 tmp;
971+
972+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
973+"1: ldrexd %0, %H0, [%2]\n"
974+" strexd %0, %3, %H3, [%2]\n"
975+" teq %0, #0\n"
976+" bne 1b"
977+ : "=&r" (tmp), "=Qo" (v->counter)
978+ : "r" (&v->counter), "r" (i)
979+ : "cc");
980+}
981+
982 static inline void atomic64_add(u64 i, atomic64_t *v)
983 {
984 u64 result;
985@@ -276,6 +473,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
986 __asm__ __volatile__("@ atomic64_add\n"
987 "1: ldrexd %0, %H0, [%3]\n"
988 " adds %0, %0, %4\n"
989+" adcs %H0, %H0, %H4\n"
990+
991+#ifdef CONFIG_PAX_REFCOUNT
992+" bvc 3f\n"
993+"2: bkpt 0xf103\n"
994+"3:\n"
995+#endif
996+
997+" strexd %1, %0, %H0, [%3]\n"
998+" teq %1, #0\n"
999+" bne 1b"
1000+
1001+#ifdef CONFIG_PAX_REFCOUNT
1002+"\n4:\n"
1003+ _ASM_EXTABLE(2b, 4b)
1004+#endif
1005+
1006+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1007+ : "r" (&v->counter), "r" (i)
1008+ : "cc");
1009+}
1010+
1011+static inline void atomic64_add_unchecked(u64 i, atomic64_unchecked_t *v)
1012+{
1013+ u64 result;
1014+ unsigned long tmp;
1015+
1016+ __asm__ __volatile__("@ atomic64_add_unchecked\n"
1017+"1: ldrexd %0, %H0, [%3]\n"
1018+" adds %0, %0, %4\n"
1019 " adc %H0, %H0, %H4\n"
1020 " strexd %1, %0, %H0, [%3]\n"
1021 " teq %1, #0\n"
1022@@ -287,12 +514,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1023
1024 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
1025 {
1026- u64 result;
1027- unsigned long tmp;
1028+ u64 result, tmp;
1029
1030 smp_mb();
1031
1032 __asm__ __volatile__("@ atomic64_add_return\n"
1033+"1: ldrexd %1, %H1, [%3]\n"
1034+" adds %0, %1, %4\n"
1035+" adcs %H0, %H1, %H4\n"
1036+
1037+#ifdef CONFIG_PAX_REFCOUNT
1038+" bvc 3f\n"
1039+" mov %0, %1\n"
1040+" mov %H0, %H1\n"
1041+"2: bkpt 0xf103\n"
1042+"3:\n"
1043+#endif
1044+
1045+" strexd %1, %0, %H0, [%3]\n"
1046+" teq %1, #0\n"
1047+" bne 1b"
1048+
1049+#ifdef CONFIG_PAX_REFCOUNT
1050+"\n4:\n"
1051+ _ASM_EXTABLE(2b, 4b)
1052+#endif
1053+
1054+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1055+ : "r" (&v->counter), "r" (i)
1056+ : "cc");
1057+
1058+ smp_mb();
1059+
1060+ return result;
1061+}
1062+
1063+static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
1064+{
1065+ u64 result;
1066+ unsigned long tmp;
1067+
1068+ smp_mb();
1069+
1070+ __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1071 "1: ldrexd %0, %H0, [%3]\n"
1072 " adds %0, %0, %4\n"
1073 " adc %H0, %H0, %H4\n"
1074@@ -316,6 +580,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1075 __asm__ __volatile__("@ atomic64_sub\n"
1076 "1: ldrexd %0, %H0, [%3]\n"
1077 " subs %0, %0, %4\n"
1078+" sbcs %H0, %H0, %H4\n"
1079+
1080+#ifdef CONFIG_PAX_REFCOUNT
1081+" bvc 3f\n"
1082+"2: bkpt 0xf103\n"
1083+"3:\n"
1084+#endif
1085+
1086+" strexd %1, %0, %H0, [%3]\n"
1087+" teq %1, #0\n"
1088+" bne 1b"
1089+
1090+#ifdef CONFIG_PAX_REFCOUNT
1091+"\n4:\n"
1092+ _ASM_EXTABLE(2b, 4b)
1093+#endif
1094+
1095+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1096+ : "r" (&v->counter), "r" (i)
1097+ : "cc");
1098+}
1099+
1100+static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
1101+{
1102+ u64 result;
1103+ unsigned long tmp;
1104+
1105+ __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1106+"1: ldrexd %0, %H0, [%3]\n"
1107+" subs %0, %0, %4\n"
1108 " sbc %H0, %H0, %H4\n"
1109 " strexd %1, %0, %H0, [%3]\n"
1110 " teq %1, #0\n"
1111@@ -327,18 +621,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1112
1113 static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
1114 {
1115- u64 result;
1116- unsigned long tmp;
1117+ u64 result, tmp;
1118
1119 smp_mb();
1120
1121 __asm__ __volatile__("@ atomic64_sub_return\n"
1122-"1: ldrexd %0, %H0, [%3]\n"
1123-" subs %0, %0, %4\n"
1124-" sbc %H0, %H0, %H4\n"
1125+"1: ldrexd %1, %H1, [%3]\n"
1126+" subs %0, %1, %4\n"
1127+" sbc %H0, %H1, %H4\n"
1128+
1129+#ifdef CONFIG_PAX_REFCOUNT
1130+" bvc 3f\n"
1131+" mov %0, %1\n"
1132+" mov %H0, %H1\n"
1133+"2: bkpt 0xf103\n"
1134+"3:\n"
1135+#endif
1136+
1137 " strexd %1, %0, %H0, [%3]\n"
1138 " teq %1, #0\n"
1139 " bne 1b"
1140+
1141+#ifdef CONFIG_PAX_REFCOUNT
1142+"\n4:\n"
1143+ _ASM_EXTABLE(2b, 4b)
1144+#endif
1145+
1146 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1147 : "r" (&v->counter), "r" (i)
1148 : "cc");
1149@@ -372,6 +680,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
1150 return oldval;
1151 }
1152
1153+static inline u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old, u64 new)
1154+{
1155+ u64 oldval;
1156+ unsigned long res;
1157+
1158+ smp_mb();
1159+
1160+ do {
1161+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1162+ "ldrexd %1, %H1, [%3]\n"
1163+ "mov %0, #0\n"
1164+ "teq %1, %4\n"
1165+ "teqeq %H1, %H4\n"
1166+ "strexdeq %0, %5, %H5, [%3]"
1167+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1168+ : "r" (&ptr->counter), "r" (old), "r" (new)
1169+ : "cc");
1170+ } while (res);
1171+
1172+ smp_mb();
1173+
1174+ return oldval;
1175+}
1176+
1177 static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1178 {
1179 u64 result;
1180@@ -395,21 +727,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1181
1182 static inline u64 atomic64_dec_if_positive(atomic64_t *v)
1183 {
1184- u64 result;
1185- unsigned long tmp;
1186+ u64 result, tmp;
1187
1188 smp_mb();
1189
1190 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1191-"1: ldrexd %0, %H0, [%3]\n"
1192-" subs %0, %0, #1\n"
1193-" sbc %H0, %H0, #0\n"
1194+"1: ldrexd %1, %H1, [%3]\n"
1195+" subs %0, %1, #1\n"
1196+" sbc %H0, %H1, #0\n"
1197+
1198+#ifdef CONFIG_PAX_REFCOUNT
1199+" bvc 3f\n"
1200+" mov %0, %1\n"
1201+" mov %H0, %H1\n"
1202+"2: bkpt 0xf103\n"
1203+"3:\n"
1204+#endif
1205+
1206 " teq %H0, #0\n"
1207-" bmi 2f\n"
1208+" bmi 4f\n"
1209 " strexd %1, %0, %H0, [%3]\n"
1210 " teq %1, #0\n"
1211 " bne 1b\n"
1212-"2:"
1213+"4:\n"
1214+
1215+#ifdef CONFIG_PAX_REFCOUNT
1216+ _ASM_EXTABLE(2b, 4b)
1217+#endif
1218+
1219 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1220 : "r" (&v->counter)
1221 : "cc");
1222@@ -432,13 +777,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1223 " teq %0, %5\n"
1224 " teqeq %H0, %H5\n"
1225 " moveq %1, #0\n"
1226-" beq 2f\n"
1227+" beq 4f\n"
1228 " adds %0, %0, %6\n"
1229 " adc %H0, %H0, %H6\n"
1230+
1231+#ifdef CONFIG_PAX_REFCOUNT
1232+" bvc 3f\n"
1233+"2: bkpt 0xf103\n"
1234+"3:\n"
1235+#endif
1236+
1237 " strexd %2, %0, %H0, [%4]\n"
1238 " teq %2, #0\n"
1239 " bne 1b\n"
1240-"2:"
1241+"4:\n"
1242+
1243+#ifdef CONFIG_PAX_REFCOUNT
1244+ _ASM_EXTABLE(2b, 4b)
1245+#endif
1246+
1247 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1248 : "r" (&v->counter), "r" (u), "r" (a)
1249 : "cc");
1250@@ -451,10 +808,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1251
1252 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1253 #define atomic64_inc(v) atomic64_add(1LL, (v))
1254+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1255 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1256+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1257 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1258 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1259 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1260+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1261 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1262 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1263 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1264diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1265index 75fe66b..2255c86 100644
1266--- a/arch/arm/include/asm/cache.h
1267+++ b/arch/arm/include/asm/cache.h
1268@@ -4,8 +4,10 @@
1269 #ifndef __ASMARM_CACHE_H
1270 #define __ASMARM_CACHE_H
1271
1272+#include <linux/const.h>
1273+
1274 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1275-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1276+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1277
1278 /*
1279 * Memory returned by kmalloc() may be used for DMA, so we must make
1280diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1281index d5d8d5c..ad92c96 100644
1282--- a/arch/arm/include/asm/cacheflush.h
1283+++ b/arch/arm/include/asm/cacheflush.h
1284@@ -108,7 +108,7 @@ struct cpu_cache_fns {
1285 void (*dma_unmap_area)(const void *, size_t, int);
1286
1287 void (*dma_flush_range)(const void *, const void *);
1288-};
1289+} __no_const;
1290
1291 /*
1292 * Select the calling method
1293diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1294index 0e9ce8d..6ef1e03 100644
1295--- a/arch/arm/include/asm/elf.h
1296+++ b/arch/arm/include/asm/elf.h
1297@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1298 the loader. We need to make sure that it is out of the way of the program
1299 that it will "exec", and that there is sufficient room for the brk. */
1300
1301-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1302+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1303+
1304+#ifdef CONFIG_PAX_ASLR
1305+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1306+
1307+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1308+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1309+#endif
1310
1311 /* When the program starts, a1 contains a pointer to a function to be
1312 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1313@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1314 extern void elf_set_personality(const struct elf32_hdr *);
1315 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1316
1317-struct mm_struct;
1318-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1319-#define arch_randomize_brk arch_randomize_brk
1320-
1321 extern int vectors_user_mapping(void);
1322 #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
1323 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
1324diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1325index e51b1e8..32a3113 100644
1326--- a/arch/arm/include/asm/kmap_types.h
1327+++ b/arch/arm/include/asm/kmap_types.h
1328@@ -21,6 +21,7 @@ enum km_type {
1329 KM_L1_CACHE,
1330 KM_L2_CACHE,
1331 KM_KDB,
1332+ KM_CLEARPAGE,
1333 KM_TYPE_NR
1334 };
1335
1336diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1337index 53426c6..c7baff3 100644
1338--- a/arch/arm/include/asm/outercache.h
1339+++ b/arch/arm/include/asm/outercache.h
1340@@ -35,7 +35,7 @@ struct outer_cache_fns {
1341 #endif
1342 void (*set_debug)(unsigned long);
1343 void (*resume)(void);
1344-};
1345+} __no_const;
1346
1347 #ifdef CONFIG_OUTER_CACHE
1348
1349diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1350index ca94653..6ac0d56 100644
1351--- a/arch/arm/include/asm/page.h
1352+++ b/arch/arm/include/asm/page.h
1353@@ -123,7 +123,7 @@ struct cpu_user_fns {
1354 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1355 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1356 unsigned long vaddr, struct vm_area_struct *vma);
1357-};
1358+} __no_const;
1359
1360 #ifdef MULTI_USER
1361 extern struct cpu_user_fns cpu_user;
1362diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
1363index 984014b..a6d914f 100644
1364--- a/arch/arm/include/asm/system.h
1365+++ b/arch/arm/include/asm/system.h
1366@@ -90,6 +90,8 @@ void hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int,
1367
1368 #define xchg(ptr,x) \
1369 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1370+#define xchg_unchecked(ptr,x) \
1371+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1372
1373 extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
1374
1375@@ -101,7 +103,7 @@ extern int __pure cpu_architecture(void);
1376 extern void cpu_init(void);
1377
1378 void arm_machine_restart(char mode, const char *cmd);
1379-extern void (*arm_pm_restart)(char str, const char *cmd);
1380+extern void (*arm_pm_restart)(char str, const char *cmd) __noreturn;
1381
1382 #define UDBG_UNDEFINED (1 << 0)
1383 #define UDBG_SYSCALL (1 << 1)
1384@@ -526,6 +528,13 @@ static inline unsigned long long __cmpxchg64_mb(volatile void *ptr,
1385
1386 #endif /* __LINUX_ARM_ARCH__ >= 6 */
1387
1388+#define _ASM_EXTABLE(from, to) \
1389+" .pushsection __ex_table,\"a\"\n"\
1390+" .align 3\n" \
1391+" .long " #from ", " #to"\n" \
1392+" .popsection"
1393+
1394+
1395 #endif /* __ASSEMBLY__ */
1396
1397 #define arch_align_stack(x) (x)
1398diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
1399index b293616..96310e5 100644
1400--- a/arch/arm/include/asm/uaccess.h
1401+++ b/arch/arm/include/asm/uaccess.h
1402@@ -22,6 +22,8 @@
1403 #define VERIFY_READ 0
1404 #define VERIFY_WRITE 1
1405
1406+extern void check_object_size(const void *ptr, unsigned long n, bool to);
1407+
1408 /*
1409 * The exception table consists of pairs of addresses: the first is the
1410 * address of an instruction that is allowed to fault, and the second is
1411@@ -387,8 +389,23 @@ do { \
1412
1413
1414 #ifdef CONFIG_MMU
1415-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
1416-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
1417+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
1418+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
1419+
1420+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
1421+{
1422+ if (!__builtin_constant_p(n))
1423+ check_object_size(to, n, false);
1424+ return ___copy_from_user(to, from, n);
1425+}
1426+
1427+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
1428+{
1429+ if (!__builtin_constant_p(n))
1430+ check_object_size(from, n, true);
1431+ return ___copy_to_user(to, from, n);
1432+}
1433+
1434 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
1435 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
1436 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
1437@@ -403,6 +420,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
1438
1439 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
1440 {
1441+ if ((long)n < 0)
1442+ return n;
1443+
1444 if (access_ok(VERIFY_READ, from, n))
1445 n = __copy_from_user(to, from, n);
1446 else /* security hole - plug it */
1447@@ -412,6 +432,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
1448
1449 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
1450 {
1451+ if ((long)n < 0)
1452+ return n;
1453+
1454 if (access_ok(VERIFY_WRITE, to, n))
1455 n = __copy_to_user(to, from, n);
1456 return n;
1457diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
1458index 5b0bce6..becd81c 100644
1459--- a/arch/arm/kernel/armksyms.c
1460+++ b/arch/arm/kernel/armksyms.c
1461@@ -95,8 +95,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
1462 #ifdef CONFIG_MMU
1463 EXPORT_SYMBOL(copy_page);
1464
1465-EXPORT_SYMBOL(__copy_from_user);
1466-EXPORT_SYMBOL(__copy_to_user);
1467+EXPORT_SYMBOL(___copy_from_user);
1468+EXPORT_SYMBOL(___copy_to_user);
1469 EXPORT_SYMBOL(__clear_user);
1470
1471 EXPORT_SYMBOL(__get_user_1);
1472diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
1473index 3d0c6fb..9d326fa 100644
1474--- a/arch/arm/kernel/process.c
1475+++ b/arch/arm/kernel/process.c
1476@@ -28,7 +28,6 @@
1477 #include <linux/tick.h>
1478 #include <linux/utsname.h>
1479 #include <linux/uaccess.h>
1480-#include <linux/random.h>
1481 #include <linux/hw_breakpoint.h>
1482 #include <linux/cpuidle.h>
1483
1484@@ -92,7 +91,7 @@ static int __init hlt_setup(char *__unused)
1485 __setup("nohlt", nohlt_setup);
1486 __setup("hlt", hlt_setup);
1487
1488-void arm_machine_restart(char mode, const char *cmd)
1489+__noreturn void arm_machine_restart(char mode, const char *cmd)
1490 {
1491 /* Disable interrupts first */
1492 local_irq_disable();
1493@@ -134,7 +133,7 @@ void arm_machine_restart(char mode, const char *cmd)
1494 void (*pm_power_off)(void);
1495 EXPORT_SYMBOL(pm_power_off);
1496
1497-void (*arm_pm_restart)(char str, const char *cmd) = arm_machine_restart;
1498+void (*arm_pm_restart)(char str, const char *cmd) __noreturn = arm_machine_restart;
1499 EXPORT_SYMBOL_GPL(arm_pm_restart);
1500
1501 static void do_nothing(void *unused)
1502@@ -248,6 +247,7 @@ void machine_power_off(void)
1503 machine_shutdown();
1504 if (pm_power_off)
1505 pm_power_off();
1506+ BUG();
1507 }
1508
1509 void machine_restart(char *cmd)
1510@@ -484,12 +484,6 @@ unsigned long get_wchan(struct task_struct *p)
1511 return 0;
1512 }
1513
1514-unsigned long arch_randomize_brk(struct mm_struct *mm)
1515-{
1516- unsigned long range_end = mm->brk + 0x02000000;
1517- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
1518-}
1519-
1520 #ifdef CONFIG_MMU
1521 /*
1522 * The vectors page is always readable from user space for the
1523diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
1524index 8fc2c8f..064c150 100644
1525--- a/arch/arm/kernel/setup.c
1526+++ b/arch/arm/kernel/setup.c
1527@@ -108,13 +108,13 @@ struct processor processor __read_mostly;
1528 struct cpu_tlb_fns cpu_tlb __read_mostly;
1529 #endif
1530 #ifdef MULTI_USER
1531-struct cpu_user_fns cpu_user __read_mostly;
1532+struct cpu_user_fns cpu_user __read_only;
1533 #endif
1534 #ifdef MULTI_CACHE
1535-struct cpu_cache_fns cpu_cache __read_mostly;
1536+struct cpu_cache_fns cpu_cache __read_only;
1537 #endif
1538 #ifdef CONFIG_OUTER_CACHE
1539-struct outer_cache_fns outer_cache __read_mostly;
1540+struct outer_cache_fns outer_cache __read_only;
1541 EXPORT_SYMBOL(outer_cache);
1542 #endif
1543
1544diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
1545index 99a5727..a3d5bb1 100644
1546--- a/arch/arm/kernel/traps.c
1547+++ b/arch/arm/kernel/traps.c
1548@@ -259,6 +259,8 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt
1549
1550 static DEFINE_RAW_SPINLOCK(die_lock);
1551
1552+extern void gr_handle_kernel_exploit(void);
1553+
1554 /*
1555 * This function is protected against re-entrancy.
1556 */
1557@@ -288,6 +290,9 @@ void die(const char *str, struct pt_regs *regs, int err)
1558 panic("Fatal exception in interrupt");
1559 if (panic_on_oops)
1560 panic("Fatal exception");
1561+
1562+ gr_handle_kernel_exploit();
1563+
1564 if (ret != NOTIFY_STOP)
1565 do_exit(SIGSEGV);
1566 }
1567diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
1568index 66a477a..bee61d3 100644
1569--- a/arch/arm/lib/copy_from_user.S
1570+++ b/arch/arm/lib/copy_from_user.S
1571@@ -16,7 +16,7 @@
1572 /*
1573 * Prototype:
1574 *
1575- * size_t __copy_from_user(void *to, const void *from, size_t n)
1576+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
1577 *
1578 * Purpose:
1579 *
1580@@ -84,11 +84,11 @@
1581
1582 .text
1583
1584-ENTRY(__copy_from_user)
1585+ENTRY(___copy_from_user)
1586
1587 #include "copy_template.S"
1588
1589-ENDPROC(__copy_from_user)
1590+ENDPROC(___copy_from_user)
1591
1592 .pushsection .fixup,"ax"
1593 .align 0
1594diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
1595index 6ee2f67..d1cce76 100644
1596--- a/arch/arm/lib/copy_page.S
1597+++ b/arch/arm/lib/copy_page.S
1598@@ -10,6 +10,7 @@
1599 * ASM optimised string functions
1600 */
1601 #include <linux/linkage.h>
1602+#include <linux/const.h>
1603 #include <asm/assembler.h>
1604 #include <asm/asm-offsets.h>
1605 #include <asm/cache.h>
1606diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
1607index d066df6..df28194 100644
1608--- a/arch/arm/lib/copy_to_user.S
1609+++ b/arch/arm/lib/copy_to_user.S
1610@@ -16,7 +16,7 @@
1611 /*
1612 * Prototype:
1613 *
1614- * size_t __copy_to_user(void *to, const void *from, size_t n)
1615+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
1616 *
1617 * Purpose:
1618 *
1619@@ -88,11 +88,11 @@
1620 .text
1621
1622 ENTRY(__copy_to_user_std)
1623-WEAK(__copy_to_user)
1624+WEAK(___copy_to_user)
1625
1626 #include "copy_template.S"
1627
1628-ENDPROC(__copy_to_user)
1629+ENDPROC(___copy_to_user)
1630 ENDPROC(__copy_to_user_std)
1631
1632 .pushsection .fixup,"ax"
1633diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
1634index d0ece2a..5ae2f39 100644
1635--- a/arch/arm/lib/uaccess.S
1636+++ b/arch/arm/lib/uaccess.S
1637@@ -20,7 +20,7 @@
1638
1639 #define PAGE_SHIFT 12
1640
1641-/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
1642+/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n)
1643 * Purpose : copy a block to user memory from kernel memory
1644 * Params : to - user memory
1645 * : from - kernel memory
1646@@ -40,7 +40,7 @@ USER( T(strgtb) r3, [r0], #1) @ May fault
1647 sub r2, r2, ip
1648 b .Lc2u_dest_aligned
1649
1650-ENTRY(__copy_to_user)
1651+ENTRY(___copy_to_user)
1652 stmfd sp!, {r2, r4 - r7, lr}
1653 cmp r2, #4
1654 blt .Lc2u_not_enough
1655@@ -278,14 +278,14 @@ USER( T(strgeb) r3, [r0], #1) @ May fault
1656 ldrgtb r3, [r1], #0
1657 USER( T(strgtb) r3, [r0], #1) @ May fault
1658 b .Lc2u_finished
1659-ENDPROC(__copy_to_user)
1660+ENDPROC(___copy_to_user)
1661
1662 .pushsection .fixup,"ax"
1663 .align 0
1664 9001: ldmfd sp!, {r0, r4 - r7, pc}
1665 .popsection
1666
1667-/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
1668+/* Prototype: unsigned long ___copy_from_user(void *to,const void *from,unsigned long n);
1669 * Purpose : copy a block from user memory to kernel memory
1670 * Params : to - kernel memory
1671 * : from - user memory
1672@@ -304,7 +304,7 @@ USER( T(ldrgtb) r3, [r1], #1) @ May fault
1673 sub r2, r2, ip
1674 b .Lcfu_dest_aligned
1675
1676-ENTRY(__copy_from_user)
1677+ENTRY(___copy_from_user)
1678 stmfd sp!, {r0, r2, r4 - r7, lr}
1679 cmp r2, #4
1680 blt .Lcfu_not_enough
1681@@ -544,7 +544,7 @@ USER( T(ldrgeb) r3, [r1], #1) @ May fault
1682 USER( T(ldrgtb) r3, [r1], #1) @ May fault
1683 strgtb r3, [r0], #1
1684 b .Lcfu_finished
1685-ENDPROC(__copy_from_user)
1686+ENDPROC(___copy_from_user)
1687
1688 .pushsection .fixup,"ax"
1689 .align 0
1690diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
1691index 025f742..8432b08 100644
1692--- a/arch/arm/lib/uaccess_with_memcpy.c
1693+++ b/arch/arm/lib/uaccess_with_memcpy.c
1694@@ -104,7 +104,7 @@ out:
1695 }
1696
1697 unsigned long
1698-__copy_to_user(void __user *to, const void *from, unsigned long n)
1699+___copy_to_user(void __user *to, const void *from, unsigned long n)
1700 {
1701 /*
1702 * This test is stubbed out of the main function above to keep
1703diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
1704index e9d5f4a..f099699 100644
1705--- a/arch/arm/mach-omap2/board-n8x0.c
1706+++ b/arch/arm/mach-omap2/board-n8x0.c
1707@@ -593,7 +593,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
1708 }
1709 #endif
1710
1711-static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
1712+static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
1713 .late_init = n8x0_menelaus_late_init,
1714 };
1715
1716diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c
1717index 2b2d51c..0127490 100644
1718--- a/arch/arm/mach-ux500/mbox-db5500.c
1719+++ b/arch/arm/mach-ux500/mbox-db5500.c
1720@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct device *dev,
1721 return sprintf(buf, "0x%X\n", mbox_value);
1722 }
1723
1724-static DEVICE_ATTR(fifo, S_IWUGO | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
1725+static DEVICE_ATTR(fifo, S_IWUSR | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
1726
1727 static int mbox_show(struct seq_file *s, void *data)
1728 {
1729diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
1730index aa33949..d366075 100644
1731--- a/arch/arm/mm/fault.c
1732+++ b/arch/arm/mm/fault.c
1733@@ -183,6 +183,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
1734 }
1735 #endif
1736
1737+#ifdef CONFIG_PAX_PAGEEXEC
1738+ if (fsr & FSR_LNX_PF) {
1739+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
1740+ do_group_exit(SIGKILL);
1741+ }
1742+#endif
1743+
1744 tsk->thread.address = addr;
1745 tsk->thread.error_code = fsr;
1746 tsk->thread.trap_no = 14;
1747@@ -384,6 +391,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
1748 }
1749 #endif /* CONFIG_MMU */
1750
1751+#ifdef CONFIG_PAX_PAGEEXEC
1752+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1753+{
1754+ long i;
1755+
1756+ printk(KERN_ERR "PAX: bytes at PC: ");
1757+ for (i = 0; i < 20; i++) {
1758+ unsigned char c;
1759+ if (get_user(c, (__force unsigned char __user *)pc+i))
1760+ printk(KERN_CONT "?? ");
1761+ else
1762+ printk(KERN_CONT "%02x ", c);
1763+ }
1764+ printk("\n");
1765+
1766+ printk(KERN_ERR "PAX: bytes at SP-4: ");
1767+ for (i = -1; i < 20; i++) {
1768+ unsigned long c;
1769+ if (get_user(c, (__force unsigned long __user *)sp+i))
1770+ printk(KERN_CONT "???????? ");
1771+ else
1772+ printk(KERN_CONT "%08lx ", c);
1773+ }
1774+ printk("\n");
1775+}
1776+#endif
1777+
1778 /*
1779 * First Level Translation Fault Handler
1780 *
1781@@ -628,6 +662,20 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
1782 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
1783 struct siginfo info;
1784
1785+#ifdef CONFIG_PAX_REFCOUNT
1786+ if (fsr_fs(ifsr) == 2) {
1787+ unsigned int bkpt;
1788+
1789+ if (!probe_kernel_address((unsigned int *)addr, bkpt) && bkpt == 0xe12f1073) {
1790+ current->thread.error_code = ifsr;
1791+ current->thread.trap_no = 0;
1792+ pax_report_refcount_overflow(regs);
1793+ fixup_exception(regs);
1794+ return;
1795+ }
1796+ }
1797+#endif
1798+
1799 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
1800 return;
1801
1802diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
1803index 44b628e..623ee2a 100644
1804--- a/arch/arm/mm/mmap.c
1805+++ b/arch/arm/mm/mmap.c
1806@@ -54,6 +54,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1807 if (len > TASK_SIZE)
1808 return -ENOMEM;
1809
1810+#ifdef CONFIG_PAX_RANDMMAP
1811+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
1812+#endif
1813+
1814 if (addr) {
1815 if (do_align)
1816 addr = COLOUR_ALIGN(addr, pgoff);
1817@@ -61,15 +65,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1818 addr = PAGE_ALIGN(addr);
1819
1820 vma = find_vma(mm, addr);
1821- if (TASK_SIZE - len >= addr &&
1822- (!vma || addr + len <= vma->vm_start))
1823+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1824 return addr;
1825 }
1826 if (len > mm->cached_hole_size) {
1827- start_addr = addr = mm->free_area_cache;
1828+ start_addr = addr = mm->free_area_cache;
1829 } else {
1830- start_addr = addr = TASK_UNMAPPED_BASE;
1831- mm->cached_hole_size = 0;
1832+ start_addr = addr = mm->mmap_base;
1833+ mm->cached_hole_size = 0;
1834 }
1835 /* 8 bits of randomness in 20 address space bits */
1836 if ((current->flags & PF_RANDOMIZE) &&
1837@@ -89,14 +92,14 @@ full_search:
1838 * Start a new search - just in case we missed
1839 * some holes.
1840 */
1841- if (start_addr != TASK_UNMAPPED_BASE) {
1842- start_addr = addr = TASK_UNMAPPED_BASE;
1843+ if (start_addr != mm->mmap_base) {
1844+ start_addr = addr = mm->mmap_base;
1845 mm->cached_hole_size = 0;
1846 goto full_search;
1847 }
1848 return -ENOMEM;
1849 }
1850- if (!vma || addr + len <= vma->vm_start) {
1851+ if (check_heap_stack_gap(vma, addr, len)) {
1852 /*
1853 * Remember the place where we stopped the search:
1854 */
1855diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
1856index 4c1a363..df311d0 100644
1857--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
1858+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
1859@@ -41,7 +41,7 @@ struct samsung_dma_ops {
1860 int (*started)(unsigned ch);
1861 int (*flush)(unsigned ch);
1862 int (*stop)(unsigned ch);
1863-};
1864+} __no_const;
1865
1866 extern void *samsung_dmadev_get_ops(void);
1867 extern void *s3c_dma_get_ops(void);
1868diff --git a/arch/arm/plat-samsung/include/plat/ehci.h b/arch/arm/plat-samsung/include/plat/ehci.h
1869index 5f28cae..3d23723 100644
1870--- a/arch/arm/plat-samsung/include/plat/ehci.h
1871+++ b/arch/arm/plat-samsung/include/plat/ehci.h
1872@@ -14,7 +14,7 @@
1873 struct s5p_ehci_platdata {
1874 int (*phy_init)(struct platform_device *pdev, int type);
1875 int (*phy_exit)(struct platform_device *pdev, int type);
1876-};
1877+} __no_const;
1878
1879 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
1880
1881diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
1882index c3a58a1..78fbf54 100644
1883--- a/arch/avr32/include/asm/cache.h
1884+++ b/arch/avr32/include/asm/cache.h
1885@@ -1,8 +1,10 @@
1886 #ifndef __ASM_AVR32_CACHE_H
1887 #define __ASM_AVR32_CACHE_H
1888
1889+#include <linux/const.h>
1890+
1891 #define L1_CACHE_SHIFT 5
1892-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1893+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1894
1895 /*
1896 * Memory returned by kmalloc() may be used for DMA, so we must make
1897diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
1898index 3b3159b..425ea94 100644
1899--- a/arch/avr32/include/asm/elf.h
1900+++ b/arch/avr32/include/asm/elf.h
1901@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
1902 the loader. We need to make sure that it is out of the way of the program
1903 that it will "exec", and that there is sufficient room for the brk. */
1904
1905-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1906+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1907
1908+#ifdef CONFIG_PAX_ASLR
1909+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
1910+
1911+#define PAX_DELTA_MMAP_LEN 15
1912+#define PAX_DELTA_STACK_LEN 15
1913+#endif
1914
1915 /* This yields a mask that user programs can use to figure out what
1916 instruction set this CPU supports. This could be done in user space,
1917diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
1918index b7f5c68..556135c 100644
1919--- a/arch/avr32/include/asm/kmap_types.h
1920+++ b/arch/avr32/include/asm/kmap_types.h
1921@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
1922 D(11) KM_IRQ1,
1923 D(12) KM_SOFTIRQ0,
1924 D(13) KM_SOFTIRQ1,
1925-D(14) KM_TYPE_NR
1926+D(14) KM_CLEARPAGE,
1927+D(15) KM_TYPE_NR
1928 };
1929
1930 #undef D
1931diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
1932index f7040a1..db9f300 100644
1933--- a/arch/avr32/mm/fault.c
1934+++ b/arch/avr32/mm/fault.c
1935@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
1936
1937 int exception_trace = 1;
1938
1939+#ifdef CONFIG_PAX_PAGEEXEC
1940+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1941+{
1942+ unsigned long i;
1943+
1944+ printk(KERN_ERR "PAX: bytes at PC: ");
1945+ for (i = 0; i < 20; i++) {
1946+ unsigned char c;
1947+ if (get_user(c, (unsigned char *)pc+i))
1948+ printk(KERN_CONT "???????? ");
1949+ else
1950+ printk(KERN_CONT "%02x ", c);
1951+ }
1952+ printk("\n");
1953+}
1954+#endif
1955+
1956 /*
1957 * This routine handles page faults. It determines the address and the
1958 * problem, and then passes it off to one of the appropriate routines.
1959@@ -156,6 +173,16 @@ bad_area:
1960 up_read(&mm->mmap_sem);
1961
1962 if (user_mode(regs)) {
1963+
1964+#ifdef CONFIG_PAX_PAGEEXEC
1965+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
1966+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
1967+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
1968+ do_group_exit(SIGKILL);
1969+ }
1970+ }
1971+#endif
1972+
1973 if (exception_trace && printk_ratelimit())
1974 printk("%s%s[%d]: segfault at %08lx pc %08lx "
1975 "sp %08lx ecr %lu\n",
1976diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
1977index 568885a..f8008df 100644
1978--- a/arch/blackfin/include/asm/cache.h
1979+++ b/arch/blackfin/include/asm/cache.h
1980@@ -7,6 +7,7 @@
1981 #ifndef __ARCH_BLACKFIN_CACHE_H
1982 #define __ARCH_BLACKFIN_CACHE_H
1983
1984+#include <linux/const.h>
1985 #include <linux/linkage.h> /* for asmlinkage */
1986
1987 /*
1988@@ -14,7 +15,7 @@
1989 * Blackfin loads 32 bytes for cache
1990 */
1991 #define L1_CACHE_SHIFT 5
1992-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1993+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1994 #define SMP_CACHE_BYTES L1_CACHE_BYTES
1995
1996 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
1997diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
1998index aea2718..3639a60 100644
1999--- a/arch/cris/include/arch-v10/arch/cache.h
2000+++ b/arch/cris/include/arch-v10/arch/cache.h
2001@@ -1,8 +1,9 @@
2002 #ifndef _ASM_ARCH_CACHE_H
2003 #define _ASM_ARCH_CACHE_H
2004
2005+#include <linux/const.h>
2006 /* Etrax 100LX have 32-byte cache-lines. */
2007-#define L1_CACHE_BYTES 32
2008 #define L1_CACHE_SHIFT 5
2009+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2010
2011 #endif /* _ASM_ARCH_CACHE_H */
2012diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
2013index 1de779f..336fad3 100644
2014--- a/arch/cris/include/arch-v32/arch/cache.h
2015+++ b/arch/cris/include/arch-v32/arch/cache.h
2016@@ -1,11 +1,12 @@
2017 #ifndef _ASM_CRIS_ARCH_CACHE_H
2018 #define _ASM_CRIS_ARCH_CACHE_H
2019
2020+#include <linux/const.h>
2021 #include <arch/hwregs/dma.h>
2022
2023 /* A cache-line is 32 bytes. */
2024-#define L1_CACHE_BYTES 32
2025 #define L1_CACHE_SHIFT 5
2026+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2027
2028 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
2029
2030diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
2031index 0d8a7d6..d0c9ff5 100644
2032--- a/arch/frv/include/asm/atomic.h
2033+++ b/arch/frv/include/asm/atomic.h
2034@@ -241,6 +241,16 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v);
2035 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
2036 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
2037
2038+#define atomic64_read_unchecked(v) atomic64_read(v)
2039+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2040+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2041+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2042+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2043+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2044+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2045+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2046+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2047+
2048 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
2049 {
2050 int c, old;
2051diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
2052index 2797163..c2a401d 100644
2053--- a/arch/frv/include/asm/cache.h
2054+++ b/arch/frv/include/asm/cache.h
2055@@ -12,10 +12,11 @@
2056 #ifndef __ASM_CACHE_H
2057 #define __ASM_CACHE_H
2058
2059+#include <linux/const.h>
2060
2061 /* bytes per L1 cache line */
2062 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
2063-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2064+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2065
2066 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2067 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2068diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
2069index f8e16b2..c73ff79 100644
2070--- a/arch/frv/include/asm/kmap_types.h
2071+++ b/arch/frv/include/asm/kmap_types.h
2072@@ -23,6 +23,7 @@ enum km_type {
2073 KM_IRQ1,
2074 KM_SOFTIRQ0,
2075 KM_SOFTIRQ1,
2076+ KM_CLEARPAGE,
2077 KM_TYPE_NR
2078 };
2079
2080diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
2081index 385fd30..6c3d97e 100644
2082--- a/arch/frv/mm/elf-fdpic.c
2083+++ b/arch/frv/mm/elf-fdpic.c
2084@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2085 if (addr) {
2086 addr = PAGE_ALIGN(addr);
2087 vma = find_vma(current->mm, addr);
2088- if (TASK_SIZE - len >= addr &&
2089- (!vma || addr + len <= vma->vm_start))
2090+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
2091 goto success;
2092 }
2093
2094@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2095 for (; vma; vma = vma->vm_next) {
2096 if (addr > limit)
2097 break;
2098- if (addr + len <= vma->vm_start)
2099+ if (check_heap_stack_gap(vma, addr, len))
2100 goto success;
2101 addr = vma->vm_end;
2102 }
2103@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2104 for (; vma; vma = vma->vm_next) {
2105 if (addr > limit)
2106 break;
2107- if (addr + len <= vma->vm_start)
2108+ if (check_heap_stack_gap(vma, addr, len))
2109 goto success;
2110 addr = vma->vm_end;
2111 }
2112diff --git a/arch/h8300/include/asm/cache.h b/arch/h8300/include/asm/cache.h
2113index c635028..6d9445a 100644
2114--- a/arch/h8300/include/asm/cache.h
2115+++ b/arch/h8300/include/asm/cache.h
2116@@ -1,8 +1,10 @@
2117 #ifndef __ARCH_H8300_CACHE_H
2118 #define __ARCH_H8300_CACHE_H
2119
2120+#include <linux/const.h>
2121+
2122 /* bytes per L1 cache line */
2123-#define L1_CACHE_BYTES 4
2124+#define L1_CACHE_BYTES _AC(4,UL)
2125
2126 /* m68k-elf-gcc 2.95.2 doesn't like these */
2127
2128diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
2129index 0f01de2..d37d309 100644
2130--- a/arch/hexagon/include/asm/cache.h
2131+++ b/arch/hexagon/include/asm/cache.h
2132@@ -21,9 +21,11 @@
2133 #ifndef __ASM_CACHE_H
2134 #define __ASM_CACHE_H
2135
2136+#include <linux/const.h>
2137+
2138 /* Bytes per L1 cache line */
2139-#define L1_CACHE_SHIFT (5)
2140-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2141+#define L1_CACHE_SHIFT 5
2142+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2143
2144 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
2145 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
2146diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
2147index 3fad89e..3047da5 100644
2148--- a/arch/ia64/include/asm/atomic.h
2149+++ b/arch/ia64/include/asm/atomic.h
2150@@ -209,6 +209,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
2151 #define atomic64_inc(v) atomic64_add(1, (v))
2152 #define atomic64_dec(v) atomic64_sub(1, (v))
2153
2154+#define atomic64_read_unchecked(v) atomic64_read(v)
2155+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2156+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2157+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2158+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2159+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2160+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2161+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2162+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2163+
2164 /* Atomic operations are already serializing */
2165 #define smp_mb__before_atomic_dec() barrier()
2166 #define smp_mb__after_atomic_dec() barrier()
2167diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
2168index 988254a..e1ee885 100644
2169--- a/arch/ia64/include/asm/cache.h
2170+++ b/arch/ia64/include/asm/cache.h
2171@@ -1,6 +1,7 @@
2172 #ifndef _ASM_IA64_CACHE_H
2173 #define _ASM_IA64_CACHE_H
2174
2175+#include <linux/const.h>
2176
2177 /*
2178 * Copyright (C) 1998-2000 Hewlett-Packard Co
2179@@ -9,7 +10,7 @@
2180
2181 /* Bytes per L1 (data) cache line. */
2182 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
2183-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2184+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2185
2186 #ifdef CONFIG_SMP
2187 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2188diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
2189index b5298eb..67c6e62 100644
2190--- a/arch/ia64/include/asm/elf.h
2191+++ b/arch/ia64/include/asm/elf.h
2192@@ -42,6 +42,13 @@
2193 */
2194 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
2195
2196+#ifdef CONFIG_PAX_ASLR
2197+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
2198+
2199+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2200+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2201+#endif
2202+
2203 #define PT_IA_64_UNWIND 0x70000001
2204
2205 /* IA-64 relocations: */
2206diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
2207index 1a97af3..7529d31 100644
2208--- a/arch/ia64/include/asm/pgtable.h
2209+++ b/arch/ia64/include/asm/pgtable.h
2210@@ -12,7 +12,7 @@
2211 * David Mosberger-Tang <davidm@hpl.hp.com>
2212 */
2213
2214-
2215+#include <linux/const.h>
2216 #include <asm/mman.h>
2217 #include <asm/page.h>
2218 #include <asm/processor.h>
2219@@ -143,6 +143,17 @@
2220 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2221 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2222 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
2223+
2224+#ifdef CONFIG_PAX_PAGEEXEC
2225+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
2226+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2227+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2228+#else
2229+# define PAGE_SHARED_NOEXEC PAGE_SHARED
2230+# define PAGE_READONLY_NOEXEC PAGE_READONLY
2231+# define PAGE_COPY_NOEXEC PAGE_COPY
2232+#endif
2233+
2234 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
2235 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
2236 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
2237diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
2238index b77768d..e0795eb 100644
2239--- a/arch/ia64/include/asm/spinlock.h
2240+++ b/arch/ia64/include/asm/spinlock.h
2241@@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
2242 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
2243
2244 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
2245- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
2246+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
2247 }
2248
2249 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
2250diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
2251index 449c8c0..432a3d2 100644
2252--- a/arch/ia64/include/asm/uaccess.h
2253+++ b/arch/ia64/include/asm/uaccess.h
2254@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2255 const void *__cu_from = (from); \
2256 long __cu_len = (n); \
2257 \
2258- if (__access_ok(__cu_to, __cu_len, get_fs())) \
2259+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
2260 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
2261 __cu_len; \
2262 })
2263@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2264 long __cu_len = (n); \
2265 \
2266 __chk_user_ptr(__cu_from); \
2267- if (__access_ok(__cu_from, __cu_len, get_fs())) \
2268+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
2269 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
2270 __cu_len; \
2271 })
2272diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
2273index 24603be..948052d 100644
2274--- a/arch/ia64/kernel/module.c
2275+++ b/arch/ia64/kernel/module.c
2276@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
2277 void
2278 module_free (struct module *mod, void *module_region)
2279 {
2280- if (mod && mod->arch.init_unw_table &&
2281- module_region == mod->module_init) {
2282+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
2283 unw_remove_unwind_table(mod->arch.init_unw_table);
2284 mod->arch.init_unw_table = NULL;
2285 }
2286@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
2287 }
2288
2289 static inline int
2290+in_init_rx (const struct module *mod, uint64_t addr)
2291+{
2292+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
2293+}
2294+
2295+static inline int
2296+in_init_rw (const struct module *mod, uint64_t addr)
2297+{
2298+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
2299+}
2300+
2301+static inline int
2302 in_init (const struct module *mod, uint64_t addr)
2303 {
2304- return addr - (uint64_t) mod->module_init < mod->init_size;
2305+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
2306+}
2307+
2308+static inline int
2309+in_core_rx (const struct module *mod, uint64_t addr)
2310+{
2311+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
2312+}
2313+
2314+static inline int
2315+in_core_rw (const struct module *mod, uint64_t addr)
2316+{
2317+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
2318 }
2319
2320 static inline int
2321 in_core (const struct module *mod, uint64_t addr)
2322 {
2323- return addr - (uint64_t) mod->module_core < mod->core_size;
2324+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
2325 }
2326
2327 static inline int
2328@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
2329 break;
2330
2331 case RV_BDREL:
2332- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
2333+ if (in_init_rx(mod, val))
2334+ val -= (uint64_t) mod->module_init_rx;
2335+ else if (in_init_rw(mod, val))
2336+ val -= (uint64_t) mod->module_init_rw;
2337+ else if (in_core_rx(mod, val))
2338+ val -= (uint64_t) mod->module_core_rx;
2339+ else if (in_core_rw(mod, val))
2340+ val -= (uint64_t) mod->module_core_rw;
2341 break;
2342
2343 case RV_LTV:
2344@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
2345 * addresses have been selected...
2346 */
2347 uint64_t gp;
2348- if (mod->core_size > MAX_LTOFF)
2349+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
2350 /*
2351 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
2352 * at the end of the module.
2353 */
2354- gp = mod->core_size - MAX_LTOFF / 2;
2355+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
2356 else
2357- gp = mod->core_size / 2;
2358- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
2359+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
2360+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
2361 mod->arch.gp = gp;
2362 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
2363 }
2364diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
2365index 609d500..7dde2a8 100644
2366--- a/arch/ia64/kernel/sys_ia64.c
2367+++ b/arch/ia64/kernel/sys_ia64.c
2368@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2369 if (REGION_NUMBER(addr) == RGN_HPAGE)
2370 addr = 0;
2371 #endif
2372+
2373+#ifdef CONFIG_PAX_RANDMMAP
2374+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2375+ addr = mm->free_area_cache;
2376+ else
2377+#endif
2378+
2379 if (!addr)
2380 addr = mm->free_area_cache;
2381
2382@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2383 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
2384 /* At this point: (!vma || addr < vma->vm_end). */
2385 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
2386- if (start_addr != TASK_UNMAPPED_BASE) {
2387+ if (start_addr != mm->mmap_base) {
2388 /* Start a new search --- just in case we missed some holes. */
2389- addr = TASK_UNMAPPED_BASE;
2390+ addr = mm->mmap_base;
2391 goto full_search;
2392 }
2393 return -ENOMEM;
2394 }
2395- if (!vma || addr + len <= vma->vm_start) {
2396+ if (check_heap_stack_gap(vma, addr, len)) {
2397 /* Remember the address where we stopped this search: */
2398 mm->free_area_cache = addr + len;
2399 return addr;
2400diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
2401index 53c0ba0..2accdde 100644
2402--- a/arch/ia64/kernel/vmlinux.lds.S
2403+++ b/arch/ia64/kernel/vmlinux.lds.S
2404@@ -199,7 +199,7 @@ SECTIONS {
2405 /* Per-cpu data: */
2406 . = ALIGN(PERCPU_PAGE_SIZE);
2407 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
2408- __phys_per_cpu_start = __per_cpu_load;
2409+ __phys_per_cpu_start = per_cpu_load;
2410 /*
2411 * ensure percpu data fits
2412 * into percpu page size
2413diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
2414index 20b3593..1ce77f0 100644
2415--- a/arch/ia64/mm/fault.c
2416+++ b/arch/ia64/mm/fault.c
2417@@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned long address)
2418 return pte_present(pte);
2419 }
2420
2421+#ifdef CONFIG_PAX_PAGEEXEC
2422+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2423+{
2424+ unsigned long i;
2425+
2426+ printk(KERN_ERR "PAX: bytes at PC: ");
2427+ for (i = 0; i < 8; i++) {
2428+ unsigned int c;
2429+ if (get_user(c, (unsigned int *)pc+i))
2430+ printk(KERN_CONT "???????? ");
2431+ else
2432+ printk(KERN_CONT "%08x ", c);
2433+ }
2434+ printk("\n");
2435+}
2436+#endif
2437+
2438 void __kprobes
2439 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
2440 {
2441@@ -146,9 +163,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
2442 mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
2443 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
2444
2445- if ((vma->vm_flags & mask) != mask)
2446+ if ((vma->vm_flags & mask) != mask) {
2447+
2448+#ifdef CONFIG_PAX_PAGEEXEC
2449+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
2450+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
2451+ goto bad_area;
2452+
2453+ up_read(&mm->mmap_sem);
2454+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
2455+ do_group_exit(SIGKILL);
2456+ }
2457+#endif
2458+
2459 goto bad_area;
2460
2461+ }
2462+
2463 /*
2464 * If for any reason at all we couldn't handle the fault, make
2465 * sure we exit gracefully rather than endlessly redo the
2466diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
2467index 5ca674b..e0e1b70 100644
2468--- a/arch/ia64/mm/hugetlbpage.c
2469+++ b/arch/ia64/mm/hugetlbpage.c
2470@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
2471 /* At this point: (!vmm || addr < vmm->vm_end). */
2472 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
2473 return -ENOMEM;
2474- if (!vmm || (addr + len) <= vmm->vm_start)
2475+ if (check_heap_stack_gap(vmm, addr, len))
2476 return addr;
2477 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
2478 }
2479diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
2480index 00cb0e2..2ad8024 100644
2481--- a/arch/ia64/mm/init.c
2482+++ b/arch/ia64/mm/init.c
2483@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
2484 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
2485 vma->vm_end = vma->vm_start + PAGE_SIZE;
2486 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
2487+
2488+#ifdef CONFIG_PAX_PAGEEXEC
2489+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
2490+ vma->vm_flags &= ~VM_EXEC;
2491+
2492+#ifdef CONFIG_PAX_MPROTECT
2493+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
2494+ vma->vm_flags &= ~VM_MAYEXEC;
2495+#endif
2496+
2497+ }
2498+#endif
2499+
2500 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
2501 down_write(&current->mm->mmap_sem);
2502 if (insert_vm_struct(current->mm, vma)) {
2503diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
2504index 40b3ee9..8c2c112 100644
2505--- a/arch/m32r/include/asm/cache.h
2506+++ b/arch/m32r/include/asm/cache.h
2507@@ -1,8 +1,10 @@
2508 #ifndef _ASM_M32R_CACHE_H
2509 #define _ASM_M32R_CACHE_H
2510
2511+#include <linux/const.h>
2512+
2513 /* L1 cache line size */
2514 #define L1_CACHE_SHIFT 4
2515-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2516+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2517
2518 #endif /* _ASM_M32R_CACHE_H */
2519diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
2520index 82abd15..d95ae5d 100644
2521--- a/arch/m32r/lib/usercopy.c
2522+++ b/arch/m32r/lib/usercopy.c
2523@@ -14,6 +14,9 @@
2524 unsigned long
2525 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2526 {
2527+ if ((long)n < 0)
2528+ return n;
2529+
2530 prefetch(from);
2531 if (access_ok(VERIFY_WRITE, to, n))
2532 __copy_user(to,from,n);
2533@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2534 unsigned long
2535 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
2536 {
2537+ if ((long)n < 0)
2538+ return n;
2539+
2540 prefetchw(to);
2541 if (access_ok(VERIFY_READ, from, n))
2542 __copy_user_zeroing(to,from,n);
2543diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
2544index 0395c51..5f26031 100644
2545--- a/arch/m68k/include/asm/cache.h
2546+++ b/arch/m68k/include/asm/cache.h
2547@@ -4,9 +4,11 @@
2548 #ifndef __ARCH_M68K_CACHE_H
2549 #define __ARCH_M68K_CACHE_H
2550
2551+#include <linux/const.h>
2552+
2553 /* bytes per L1 cache line */
2554 #define L1_CACHE_SHIFT 4
2555-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
2556+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2557
2558 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2559
2560diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
2561index 4efe96a..60e8699 100644
2562--- a/arch/microblaze/include/asm/cache.h
2563+++ b/arch/microblaze/include/asm/cache.h
2564@@ -13,11 +13,12 @@
2565 #ifndef _ASM_MICROBLAZE_CACHE_H
2566 #define _ASM_MICROBLAZE_CACHE_H
2567
2568+#include <linux/const.h>
2569 #include <asm/registers.h>
2570
2571 #define L1_CACHE_SHIFT 5
2572 /* word-granular cache in microblaze */
2573-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2574+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2575
2576 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2577
2578diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
2579index 1d93f81..67794d0 100644
2580--- a/arch/mips/include/asm/atomic.h
2581+++ b/arch/mips/include/asm/atomic.h
2582@@ -21,6 +21,10 @@
2583 #include <asm/war.h>
2584 #include <asm/system.h>
2585
2586+#ifdef CONFIG_GENERIC_ATOMIC64
2587+#include <asm-generic/atomic64.h>
2588+#endif
2589+
2590 #define ATOMIC_INIT(i) { (i) }
2591
2592 /*
2593@@ -765,6 +769,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2594 */
2595 #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
2596
2597+#define atomic64_read_unchecked(v) atomic64_read(v)
2598+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2599+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2600+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2601+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2602+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2603+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2604+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2605+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2606+
2607 #endif /* CONFIG_64BIT */
2608
2609 /*
2610diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
2611index b4db69f..8f3b093 100644
2612--- a/arch/mips/include/asm/cache.h
2613+++ b/arch/mips/include/asm/cache.h
2614@@ -9,10 +9,11 @@
2615 #ifndef _ASM_CACHE_H
2616 #define _ASM_CACHE_H
2617
2618+#include <linux/const.h>
2619 #include <kmalloc.h>
2620
2621 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
2622-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2623+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2624
2625 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2626 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2627diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
2628index 455c0ac..ad65fbe 100644
2629--- a/arch/mips/include/asm/elf.h
2630+++ b/arch/mips/include/asm/elf.h
2631@@ -372,13 +372,16 @@ extern const char *__elf_platform;
2632 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
2633 #endif
2634
2635+#ifdef CONFIG_PAX_ASLR
2636+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2637+
2638+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2639+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2640+#endif
2641+
2642 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
2643 struct linux_binprm;
2644 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
2645 int uses_interp);
2646
2647-struct mm_struct;
2648-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2649-#define arch_randomize_brk arch_randomize_brk
2650-
2651 #endif /* _ASM_ELF_H */
2652diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
2653index e59cd1a..8e329d6 100644
2654--- a/arch/mips/include/asm/page.h
2655+++ b/arch/mips/include/asm/page.h
2656@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
2657 #ifdef CONFIG_CPU_MIPS32
2658 typedef struct { unsigned long pte_low, pte_high; } pte_t;
2659 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
2660- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
2661+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
2662 #else
2663 typedef struct { unsigned long long pte; } pte_t;
2664 #define pte_val(x) ((x).pte)
2665diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
2666index 6018c80..7c37203 100644
2667--- a/arch/mips/include/asm/system.h
2668+++ b/arch/mips/include/asm/system.h
2669@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
2670 */
2671 #define __ARCH_WANT_UNLOCKED_CTXSW
2672
2673-extern unsigned long arch_align_stack(unsigned long sp);
2674+#define arch_align_stack(x) ((x) & ~0xfUL)
2675
2676 #endif /* _ASM_SYSTEM_H */
2677diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
2678index 9fdd8bc..4bd7f1a 100644
2679--- a/arch/mips/kernel/binfmt_elfn32.c
2680+++ b/arch/mips/kernel/binfmt_elfn32.c
2681@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2682 #undef ELF_ET_DYN_BASE
2683 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2684
2685+#ifdef CONFIG_PAX_ASLR
2686+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2687+
2688+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2689+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2690+#endif
2691+
2692 #include <asm/processor.h>
2693 #include <linux/module.h>
2694 #include <linux/elfcore.h>
2695diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
2696index ff44823..97f8906 100644
2697--- a/arch/mips/kernel/binfmt_elfo32.c
2698+++ b/arch/mips/kernel/binfmt_elfo32.c
2699@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2700 #undef ELF_ET_DYN_BASE
2701 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2702
2703+#ifdef CONFIG_PAX_ASLR
2704+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2705+
2706+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2707+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2708+#endif
2709+
2710 #include <asm/processor.h>
2711
2712 /*
2713diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
2714index c47f96e..661d418 100644
2715--- a/arch/mips/kernel/process.c
2716+++ b/arch/mips/kernel/process.c
2717@@ -481,15 +481,3 @@ unsigned long get_wchan(struct task_struct *task)
2718 out:
2719 return pc;
2720 }
2721-
2722-/*
2723- * Don't forget that the stack pointer must be aligned on a 8 bytes
2724- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
2725- */
2726-unsigned long arch_align_stack(unsigned long sp)
2727-{
2728- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2729- sp -= get_random_int() & ~PAGE_MASK;
2730-
2731- return sp & ALMASK;
2732-}
2733diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
2734index 937cf33..adb39bb 100644
2735--- a/arch/mips/mm/fault.c
2736+++ b/arch/mips/mm/fault.c
2737@@ -28,6 +28,23 @@
2738 #include <asm/highmem.h> /* For VMALLOC_END */
2739 #include <linux/kdebug.h>
2740
2741+#ifdef CONFIG_PAX_PAGEEXEC
2742+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2743+{
2744+ unsigned long i;
2745+
2746+ printk(KERN_ERR "PAX: bytes at PC: ");
2747+ for (i = 0; i < 5; i++) {
2748+ unsigned int c;
2749+ if (get_user(c, (unsigned int *)pc+i))
2750+ printk(KERN_CONT "???????? ");
2751+ else
2752+ printk(KERN_CONT "%08x ", c);
2753+ }
2754+ printk("\n");
2755+}
2756+#endif
2757+
2758 /*
2759 * This routine handles page faults. It determines the address,
2760 * and the problem, and then passes it off to one of the appropriate
2761diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
2762index 302d779..7d35bf8 100644
2763--- a/arch/mips/mm/mmap.c
2764+++ b/arch/mips/mm/mmap.c
2765@@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2766 do_color_align = 1;
2767
2768 /* requesting a specific address */
2769+
2770+#ifdef CONFIG_PAX_RANDMMAP
2771+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
2772+#endif
2773+
2774 if (addr) {
2775 if (do_color_align)
2776 addr = COLOUR_ALIGN(addr, pgoff);
2777@@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2778 addr = PAGE_ALIGN(addr);
2779
2780 vma = find_vma(mm, addr);
2781- if (TASK_SIZE - len >= addr &&
2782- (!vma || addr + len <= vma->vm_start))
2783+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
2784 return addr;
2785 }
2786
2787@@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2788 /* At this point: (!vma || addr < vma->vm_end). */
2789 if (TASK_SIZE - len < addr)
2790 return -ENOMEM;
2791- if (!vma || addr + len <= vma->vm_start)
2792+ if (check_heap_stack_gap(vmm, addr, len))
2793 return addr;
2794 addr = vma->vm_end;
2795 if (do_color_align)
2796@@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2797 /* make sure it can fit in the remaining address space */
2798 if (likely(addr > len)) {
2799 vma = find_vma(mm, addr - len);
2800- if (!vma || addr <= vma->vm_start) {
2801+ if (check_heap_stack_gap(vmm, addr - len, len))
2802 /* cache the address as a hint for next time */
2803 return mm->free_area_cache = addr - len;
2804 }
2805@@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2806 * return with success:
2807 */
2808 vma = find_vma(mm, addr);
2809- if (likely(!vma || addr + len <= vma->vm_start)) {
2810+ if (check_heap_stack_gap(vmm, addr, len)) {
2811 /* cache the address as a hint for next time */
2812 return mm->free_area_cache = addr;
2813 }
2814@@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
2815 mm->unmap_area = arch_unmap_area_topdown;
2816 }
2817 }
2818-
2819-static inline unsigned long brk_rnd(void)
2820-{
2821- unsigned long rnd = get_random_int();
2822-
2823- rnd = rnd << PAGE_SHIFT;
2824- /* 8MB for 32bit, 256MB for 64bit */
2825- if (TASK_IS_32BIT_ADDR)
2826- rnd = rnd & 0x7ffffful;
2827- else
2828- rnd = rnd & 0xffffffful;
2829-
2830- return rnd;
2831-}
2832-
2833-unsigned long arch_randomize_brk(struct mm_struct *mm)
2834-{
2835- unsigned long base = mm->brk;
2836- unsigned long ret;
2837-
2838- ret = PAGE_ALIGN(base + brk_rnd());
2839-
2840- if (ret < mm->brk)
2841- return mm->brk;
2842-
2843- return ret;
2844-}
2845diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
2846index 967d144..db12197 100644
2847--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
2848+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
2849@@ -11,12 +11,14 @@
2850 #ifndef _ASM_PROC_CACHE_H
2851 #define _ASM_PROC_CACHE_H
2852
2853+#include <linux/const.h>
2854+
2855 /* L1 cache */
2856
2857 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
2858 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
2859-#define L1_CACHE_BYTES 16 /* bytes per entry */
2860 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
2861+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
2862 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
2863
2864 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
2865diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2866index bcb5df2..84fabd2 100644
2867--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2868+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2869@@ -16,13 +16,15 @@
2870 #ifndef _ASM_PROC_CACHE_H
2871 #define _ASM_PROC_CACHE_H
2872
2873+#include <linux/const.h>
2874+
2875 /*
2876 * L1 cache
2877 */
2878 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
2879 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
2880-#define L1_CACHE_BYTES 32 /* bytes per entry */
2881 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
2882+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
2883 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
2884
2885 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
2886diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
2887index 4ce7a01..449202a 100644
2888--- a/arch/openrisc/include/asm/cache.h
2889+++ b/arch/openrisc/include/asm/cache.h
2890@@ -19,11 +19,13 @@
2891 #ifndef __ASM_OPENRISC_CACHE_H
2892 #define __ASM_OPENRISC_CACHE_H
2893
2894+#include <linux/const.h>
2895+
2896 /* FIXME: How can we replace these with values from the CPU...
2897 * they shouldn't be hard-coded!
2898 */
2899
2900-#define L1_CACHE_BYTES 16
2901 #define L1_CACHE_SHIFT 4
2902+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2903
2904 #endif /* __ASM_OPENRISC_CACHE_H */
2905diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
2906index 4054b31..a10c105 100644
2907--- a/arch/parisc/include/asm/atomic.h
2908+++ b/arch/parisc/include/asm/atomic.h
2909@@ -335,6 +335,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2910
2911 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
2912
2913+#define atomic64_read_unchecked(v) atomic64_read(v)
2914+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2915+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2916+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2917+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2918+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2919+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2920+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2921+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2922+
2923 #endif /* !CONFIG_64BIT */
2924
2925
2926diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
2927index 47f11c7..3420df2 100644
2928--- a/arch/parisc/include/asm/cache.h
2929+++ b/arch/parisc/include/asm/cache.h
2930@@ -5,6 +5,7 @@
2931 #ifndef __ARCH_PARISC_CACHE_H
2932 #define __ARCH_PARISC_CACHE_H
2933
2934+#include <linux/const.h>
2935
2936 /*
2937 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
2938@@ -15,13 +16,13 @@
2939 * just ruin performance.
2940 */
2941 #ifdef CONFIG_PA20
2942-#define L1_CACHE_BYTES 64
2943 #define L1_CACHE_SHIFT 6
2944 #else
2945-#define L1_CACHE_BYTES 32
2946 #define L1_CACHE_SHIFT 5
2947 #endif
2948
2949+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2950+
2951 #ifndef __ASSEMBLY__
2952
2953 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2954diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
2955index 19f6cb1..6c78cf2 100644
2956--- a/arch/parisc/include/asm/elf.h
2957+++ b/arch/parisc/include/asm/elf.h
2958@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
2959
2960 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
2961
2962+#ifdef CONFIG_PAX_ASLR
2963+#define PAX_ELF_ET_DYN_BASE 0x10000UL
2964+
2965+#define PAX_DELTA_MMAP_LEN 16
2966+#define PAX_DELTA_STACK_LEN 16
2967+#endif
2968+
2969 /* This yields a mask that user programs can use to figure out what
2970 instruction set this CPU supports. This could be done in user space,
2971 but it's not easy, and we've already done it here. */
2972diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
2973index 22dadeb..f6c2be4 100644
2974--- a/arch/parisc/include/asm/pgtable.h
2975+++ b/arch/parisc/include/asm/pgtable.h
2976@@ -210,6 +210,17 @@ struct vm_area_struct;
2977 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
2978 #define PAGE_COPY PAGE_EXECREAD
2979 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
2980+
2981+#ifdef CONFIG_PAX_PAGEEXEC
2982+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
2983+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
2984+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
2985+#else
2986+# define PAGE_SHARED_NOEXEC PAGE_SHARED
2987+# define PAGE_COPY_NOEXEC PAGE_COPY
2988+# define PAGE_READONLY_NOEXEC PAGE_READONLY
2989+#endif
2990+
2991 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
2992 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
2993 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
2994diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
2995index 5e34ccf..672bc9c 100644
2996--- a/arch/parisc/kernel/module.c
2997+++ b/arch/parisc/kernel/module.c
2998@@ -98,16 +98,38 @@
2999
3000 /* three functions to determine where in the module core
3001 * or init pieces the location is */
3002+static inline int in_init_rx(struct module *me, void *loc)
3003+{
3004+ return (loc >= me->module_init_rx &&
3005+ loc < (me->module_init_rx + me->init_size_rx));
3006+}
3007+
3008+static inline int in_init_rw(struct module *me, void *loc)
3009+{
3010+ return (loc >= me->module_init_rw &&
3011+ loc < (me->module_init_rw + me->init_size_rw));
3012+}
3013+
3014 static inline int in_init(struct module *me, void *loc)
3015 {
3016- return (loc >= me->module_init &&
3017- loc <= (me->module_init + me->init_size));
3018+ return in_init_rx(me, loc) || in_init_rw(me, loc);
3019+}
3020+
3021+static inline int in_core_rx(struct module *me, void *loc)
3022+{
3023+ return (loc >= me->module_core_rx &&
3024+ loc < (me->module_core_rx + me->core_size_rx));
3025+}
3026+
3027+static inline int in_core_rw(struct module *me, void *loc)
3028+{
3029+ return (loc >= me->module_core_rw &&
3030+ loc < (me->module_core_rw + me->core_size_rw));
3031 }
3032
3033 static inline int in_core(struct module *me, void *loc)
3034 {
3035- return (loc >= me->module_core &&
3036- loc <= (me->module_core + me->core_size));
3037+ return in_core_rx(me, loc) || in_core_rw(me, loc);
3038 }
3039
3040 static inline int in_local(struct module *me, void *loc)
3041@@ -373,13 +395,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
3042 }
3043
3044 /* align things a bit */
3045- me->core_size = ALIGN(me->core_size, 16);
3046- me->arch.got_offset = me->core_size;
3047- me->core_size += gots * sizeof(struct got_entry);
3048+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
3049+ me->arch.got_offset = me->core_size_rw;
3050+ me->core_size_rw += gots * sizeof(struct got_entry);
3051
3052- me->core_size = ALIGN(me->core_size, 16);
3053- me->arch.fdesc_offset = me->core_size;
3054- me->core_size += fdescs * sizeof(Elf_Fdesc);
3055+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
3056+ me->arch.fdesc_offset = me->core_size_rw;
3057+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
3058
3059 me->arch.got_max = gots;
3060 me->arch.fdesc_max = fdescs;
3061@@ -397,7 +419,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3062
3063 BUG_ON(value == 0);
3064
3065- got = me->module_core + me->arch.got_offset;
3066+ got = me->module_core_rw + me->arch.got_offset;
3067 for (i = 0; got[i].addr; i++)
3068 if (got[i].addr == value)
3069 goto out;
3070@@ -415,7 +437,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3071 #ifdef CONFIG_64BIT
3072 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3073 {
3074- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
3075+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
3076
3077 if (!value) {
3078 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
3079@@ -433,7 +455,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3080
3081 /* Create new one */
3082 fdesc->addr = value;
3083- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3084+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3085 return (Elf_Addr)fdesc;
3086 }
3087 #endif /* CONFIG_64BIT */
3088@@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
3089
3090 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
3091 end = table + sechdrs[me->arch.unwind_section].sh_size;
3092- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3093+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3094
3095 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
3096 me->arch.unwind_section, table, end, gp);
3097diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
3098index c9b9322..02d8940 100644
3099--- a/arch/parisc/kernel/sys_parisc.c
3100+++ b/arch/parisc/kernel/sys_parisc.c
3101@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
3102 /* At this point: (!vma || addr < vma->vm_end). */
3103 if (TASK_SIZE - len < addr)
3104 return -ENOMEM;
3105- if (!vma || addr + len <= vma->vm_start)
3106+ if (check_heap_stack_gap(vma, addr, len))
3107 return addr;
3108 addr = vma->vm_end;
3109 }
3110@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
3111 /* At this point: (!vma || addr < vma->vm_end). */
3112 if (TASK_SIZE - len < addr)
3113 return -ENOMEM;
3114- if (!vma || addr + len <= vma->vm_start)
3115+ if (check_heap_stack_gap(vma, addr, len))
3116 return addr;
3117 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
3118 if (addr < vma->vm_end) /* handle wraparound */
3119@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
3120 if (flags & MAP_FIXED)
3121 return addr;
3122 if (!addr)
3123- addr = TASK_UNMAPPED_BASE;
3124+ addr = current->mm->mmap_base;
3125
3126 if (filp) {
3127 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
3128diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
3129index f19e660..414fe24 100644
3130--- a/arch/parisc/kernel/traps.c
3131+++ b/arch/parisc/kernel/traps.c
3132@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
3133
3134 down_read(&current->mm->mmap_sem);
3135 vma = find_vma(current->mm,regs->iaoq[0]);
3136- if (vma && (regs->iaoq[0] >= vma->vm_start)
3137- && (vma->vm_flags & VM_EXEC)) {
3138-
3139+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
3140 fault_address = regs->iaoq[0];
3141 fault_space = regs->iasq[0];
3142
3143diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
3144index 18162ce..94de376 100644
3145--- a/arch/parisc/mm/fault.c
3146+++ b/arch/parisc/mm/fault.c
3147@@ -15,6 +15,7 @@
3148 #include <linux/sched.h>
3149 #include <linux/interrupt.h>
3150 #include <linux/module.h>
3151+#include <linux/unistd.h>
3152
3153 #include <asm/uaccess.h>
3154 #include <asm/traps.h>
3155@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
3156 static unsigned long
3157 parisc_acctyp(unsigned long code, unsigned int inst)
3158 {
3159- if (code == 6 || code == 16)
3160+ if (code == 6 || code == 7 || code == 16)
3161 return VM_EXEC;
3162
3163 switch (inst & 0xf0000000) {
3164@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
3165 }
3166 #endif
3167
3168+#ifdef CONFIG_PAX_PAGEEXEC
3169+/*
3170+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
3171+ *
3172+ * returns 1 when task should be killed
3173+ * 2 when rt_sigreturn trampoline was detected
3174+ * 3 when unpatched PLT trampoline was detected
3175+ */
3176+static int pax_handle_fetch_fault(struct pt_regs *regs)
3177+{
3178+
3179+#ifdef CONFIG_PAX_EMUPLT
3180+ int err;
3181+
3182+ do { /* PaX: unpatched PLT emulation */
3183+ unsigned int bl, depwi;
3184+
3185+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
3186+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
3187+
3188+ if (err)
3189+ break;
3190+
3191+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
3192+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
3193+
3194+ err = get_user(ldw, (unsigned int *)addr);
3195+ err |= get_user(bv, (unsigned int *)(addr+4));
3196+ err |= get_user(ldw2, (unsigned int *)(addr+8));
3197+
3198+ if (err)
3199+ break;
3200+
3201+ if (ldw == 0x0E801096U &&
3202+ bv == 0xEAC0C000U &&
3203+ ldw2 == 0x0E881095U)
3204+ {
3205+ unsigned int resolver, map;
3206+
3207+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
3208+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
3209+ if (err)
3210+ break;
3211+
3212+ regs->gr[20] = instruction_pointer(regs)+8;
3213+ regs->gr[21] = map;
3214+ regs->gr[22] = resolver;
3215+ regs->iaoq[0] = resolver | 3UL;
3216+ regs->iaoq[1] = regs->iaoq[0] + 4;
3217+ return 3;
3218+ }
3219+ }
3220+ } while (0);
3221+#endif
3222+
3223+#ifdef CONFIG_PAX_EMUTRAMP
3224+
3225+#ifndef CONFIG_PAX_EMUSIGRT
3226+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
3227+ return 1;
3228+#endif
3229+
3230+ do { /* PaX: rt_sigreturn emulation */
3231+ unsigned int ldi1, ldi2, bel, nop;
3232+
3233+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
3234+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
3235+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
3236+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
3237+
3238+ if (err)
3239+ break;
3240+
3241+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
3242+ ldi2 == 0x3414015AU &&
3243+ bel == 0xE4008200U &&
3244+ nop == 0x08000240U)
3245+ {
3246+ regs->gr[25] = (ldi1 & 2) >> 1;
3247+ regs->gr[20] = __NR_rt_sigreturn;
3248+ regs->gr[31] = regs->iaoq[1] + 16;
3249+ regs->sr[0] = regs->iasq[1];
3250+ regs->iaoq[0] = 0x100UL;
3251+ regs->iaoq[1] = regs->iaoq[0] + 4;
3252+ regs->iasq[0] = regs->sr[2];
3253+ regs->iasq[1] = regs->sr[2];
3254+ return 2;
3255+ }
3256+ } while (0);
3257+#endif
3258+
3259+ return 1;
3260+}
3261+
3262+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3263+{
3264+ unsigned long i;
3265+
3266+ printk(KERN_ERR "PAX: bytes at PC: ");
3267+ for (i = 0; i < 5; i++) {
3268+ unsigned int c;
3269+ if (get_user(c, (unsigned int *)pc+i))
3270+ printk(KERN_CONT "???????? ");
3271+ else
3272+ printk(KERN_CONT "%08x ", c);
3273+ }
3274+ printk("\n");
3275+}
3276+#endif
3277+
3278 int fixup_exception(struct pt_regs *regs)
3279 {
3280 const struct exception_table_entry *fix;
3281@@ -192,8 +303,33 @@ good_area:
3282
3283 acc_type = parisc_acctyp(code,regs->iir);
3284
3285- if ((vma->vm_flags & acc_type) != acc_type)
3286+ if ((vma->vm_flags & acc_type) != acc_type) {
3287+
3288+#ifdef CONFIG_PAX_PAGEEXEC
3289+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
3290+ (address & ~3UL) == instruction_pointer(regs))
3291+ {
3292+ up_read(&mm->mmap_sem);
3293+ switch (pax_handle_fetch_fault(regs)) {
3294+
3295+#ifdef CONFIG_PAX_EMUPLT
3296+ case 3:
3297+ return;
3298+#endif
3299+
3300+#ifdef CONFIG_PAX_EMUTRAMP
3301+ case 2:
3302+ return;
3303+#endif
3304+
3305+ }
3306+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
3307+ do_group_exit(SIGKILL);
3308+ }
3309+#endif
3310+
3311 goto bad_area;
3312+ }
3313
3314 /*
3315 * If for any reason at all we couldn't handle the fault, make
3316diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
3317index 02e41b5..ec6e26c 100644
3318--- a/arch/powerpc/include/asm/atomic.h
3319+++ b/arch/powerpc/include/asm/atomic.h
3320@@ -469,6 +469,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
3321
3322 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3323
3324+#define atomic64_read_unchecked(v) atomic64_read(v)
3325+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
3326+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
3327+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
3328+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
3329+#define atomic64_inc_unchecked(v) atomic64_inc(v)
3330+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
3331+#define atomic64_dec_unchecked(v) atomic64_dec(v)
3332+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
3333+
3334 #endif /* __powerpc64__ */
3335
3336 #endif /* __KERNEL__ */
3337diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
3338index 4b50941..5605819 100644
3339--- a/arch/powerpc/include/asm/cache.h
3340+++ b/arch/powerpc/include/asm/cache.h
3341@@ -3,6 +3,7 @@
3342
3343 #ifdef __KERNEL__
3344
3345+#include <linux/const.h>
3346
3347 /* bytes per L1 cache line */
3348 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
3349@@ -22,7 +23,7 @@
3350 #define L1_CACHE_SHIFT 7
3351 #endif
3352
3353-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
3354+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3355
3356 #define SMP_CACHE_BYTES L1_CACHE_BYTES
3357
3358diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
3359index 3bf9cca..e7457d0 100644
3360--- a/arch/powerpc/include/asm/elf.h
3361+++ b/arch/powerpc/include/asm/elf.h
3362@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
3363 the loader. We need to make sure that it is out of the way of the program
3364 that it will "exec", and that there is sufficient room for the brk. */
3365
3366-extern unsigned long randomize_et_dyn(unsigned long base);
3367-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
3368+#define ELF_ET_DYN_BASE (0x20000000)
3369+
3370+#ifdef CONFIG_PAX_ASLR
3371+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
3372+
3373+#ifdef __powerpc64__
3374+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
3375+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
3376+#else
3377+#define PAX_DELTA_MMAP_LEN 15
3378+#define PAX_DELTA_STACK_LEN 15
3379+#endif
3380+#endif
3381
3382 /*
3383 * Our registers are always unsigned longs, whether we're a 32 bit
3384@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
3385 (0x7ff >> (PAGE_SHIFT - 12)) : \
3386 (0x3ffff >> (PAGE_SHIFT - 12)))
3387
3388-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
3389-#define arch_randomize_brk arch_randomize_brk
3390-
3391 #endif /* __KERNEL__ */
3392
3393 /*
3394diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
3395index bca8fdc..61e9580 100644
3396--- a/arch/powerpc/include/asm/kmap_types.h
3397+++ b/arch/powerpc/include/asm/kmap_types.h
3398@@ -27,6 +27,7 @@ enum km_type {
3399 KM_PPC_SYNC_PAGE,
3400 KM_PPC_SYNC_ICACHE,
3401 KM_KDB,
3402+ KM_CLEARPAGE,
3403 KM_TYPE_NR
3404 };
3405
3406diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
3407index d4a7f64..451de1c 100644
3408--- a/arch/powerpc/include/asm/mman.h
3409+++ b/arch/powerpc/include/asm/mman.h
3410@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
3411 }
3412 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
3413
3414-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
3415+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
3416 {
3417 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
3418 }
3419diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
3420index dd9c4fd..a2ced87 100644
3421--- a/arch/powerpc/include/asm/page.h
3422+++ b/arch/powerpc/include/asm/page.h
3423@@ -141,8 +141,9 @@ extern phys_addr_t kernstart_addr;
3424 * and needs to be executable. This means the whole heap ends
3425 * up being executable.
3426 */
3427-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3428- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3429+#define VM_DATA_DEFAULT_FLAGS32 \
3430+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3431+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3432
3433 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3434 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3435@@ -170,6 +171,9 @@ extern phys_addr_t kernstart_addr;
3436 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
3437 #endif
3438
3439+#define ktla_ktva(addr) (addr)
3440+#define ktva_ktla(addr) (addr)
3441+
3442 /*
3443 * Use the top bit of the higher-level page table entries to indicate whether
3444 * the entries we point to contain hugepages. This works because we know that
3445diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
3446index fb40ede..d3ce956 100644
3447--- a/arch/powerpc/include/asm/page_64.h
3448+++ b/arch/powerpc/include/asm/page_64.h
3449@@ -144,15 +144,18 @@ do { \
3450 * stack by default, so in the absence of a PT_GNU_STACK program header
3451 * we turn execute permission off.
3452 */
3453-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3454- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3455+#define VM_STACK_DEFAULT_FLAGS32 \
3456+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3457+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3458
3459 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3460 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3461
3462+#ifndef CONFIG_PAX_PAGEEXEC
3463 #define VM_STACK_DEFAULT_FLAGS \
3464 (is_32bit_task() ? \
3465 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
3466+#endif
3467
3468 #include <asm-generic/getorder.h>
3469
3470diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
3471index 88b0bd9..e32bc67 100644
3472--- a/arch/powerpc/include/asm/pgtable.h
3473+++ b/arch/powerpc/include/asm/pgtable.h
3474@@ -2,6 +2,7 @@
3475 #define _ASM_POWERPC_PGTABLE_H
3476 #ifdef __KERNEL__
3477
3478+#include <linux/const.h>
3479 #ifndef __ASSEMBLY__
3480 #include <asm/processor.h> /* For TASK_SIZE */
3481 #include <asm/mmu.h>
3482diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
3483index 4aad413..85d86bf 100644
3484--- a/arch/powerpc/include/asm/pte-hash32.h
3485+++ b/arch/powerpc/include/asm/pte-hash32.h
3486@@ -21,6 +21,7 @@
3487 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
3488 #define _PAGE_USER 0x004 /* usermode access allowed */
3489 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
3490+#define _PAGE_EXEC _PAGE_GUARDED
3491 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
3492 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
3493 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
3494diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
3495index 559da19..7e5835c 100644
3496--- a/arch/powerpc/include/asm/reg.h
3497+++ b/arch/powerpc/include/asm/reg.h
3498@@ -212,6 +212,7 @@
3499 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
3500 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
3501 #define DSISR_NOHPTE 0x40000000 /* no translation found */
3502+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
3503 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
3504 #define DSISR_ISSTORE 0x02000000 /* access was a store */
3505 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
3506diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
3507index e30a13d..2b7d994 100644
3508--- a/arch/powerpc/include/asm/system.h
3509+++ b/arch/powerpc/include/asm/system.h
3510@@ -530,7 +530,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
3511 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
3512 #endif
3513
3514-extern unsigned long arch_align_stack(unsigned long sp);
3515+#define arch_align_stack(x) ((x) & ~0xfUL)
3516
3517 /* Used in very early kernel initialization. */
3518 extern unsigned long reloc_offset(void);
3519diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
3520index bd0fb84..a42a14b 100644
3521--- a/arch/powerpc/include/asm/uaccess.h
3522+++ b/arch/powerpc/include/asm/uaccess.h
3523@@ -13,6 +13,8 @@
3524 #define VERIFY_READ 0
3525 #define VERIFY_WRITE 1
3526
3527+extern void check_object_size(const void *ptr, unsigned long n, bool to);
3528+
3529 /*
3530 * The fs value determines whether argument validity checking should be
3531 * performed or not. If get_fs() == USER_DS, checking is performed, with
3532@@ -327,52 +329,6 @@ do { \
3533 extern unsigned long __copy_tofrom_user(void __user *to,
3534 const void __user *from, unsigned long size);
3535
3536-#ifndef __powerpc64__
3537-
3538-static inline unsigned long copy_from_user(void *to,
3539- const void __user *from, unsigned long n)
3540-{
3541- unsigned long over;
3542-
3543- if (access_ok(VERIFY_READ, from, n))
3544- return __copy_tofrom_user((__force void __user *)to, from, n);
3545- if ((unsigned long)from < TASK_SIZE) {
3546- over = (unsigned long)from + n - TASK_SIZE;
3547- return __copy_tofrom_user((__force void __user *)to, from,
3548- n - over) + over;
3549- }
3550- return n;
3551-}
3552-
3553-static inline unsigned long copy_to_user(void __user *to,
3554- const void *from, unsigned long n)
3555-{
3556- unsigned long over;
3557-
3558- if (access_ok(VERIFY_WRITE, to, n))
3559- return __copy_tofrom_user(to, (__force void __user *)from, n);
3560- if ((unsigned long)to < TASK_SIZE) {
3561- over = (unsigned long)to + n - TASK_SIZE;
3562- return __copy_tofrom_user(to, (__force void __user *)from,
3563- n - over) + over;
3564- }
3565- return n;
3566-}
3567-
3568-#else /* __powerpc64__ */
3569-
3570-#define __copy_in_user(to, from, size) \
3571- __copy_tofrom_user((to), (from), (size))
3572-
3573-extern unsigned long copy_from_user(void *to, const void __user *from,
3574- unsigned long n);
3575-extern unsigned long copy_to_user(void __user *to, const void *from,
3576- unsigned long n);
3577-extern unsigned long copy_in_user(void __user *to, const void __user *from,
3578- unsigned long n);
3579-
3580-#endif /* __powerpc64__ */
3581-
3582 static inline unsigned long __copy_from_user_inatomic(void *to,
3583 const void __user *from, unsigned long n)
3584 {
3585@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
3586 if (ret == 0)
3587 return 0;
3588 }
3589+
3590+ if (!__builtin_constant_p(n))
3591+ check_object_size(to, n, false);
3592+
3593 return __copy_tofrom_user((__force void __user *)to, from, n);
3594 }
3595
3596@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
3597 if (ret == 0)
3598 return 0;
3599 }
3600+
3601+ if (!__builtin_constant_p(n))
3602+ check_object_size(from, n, true);
3603+
3604 return __copy_tofrom_user(to, (__force const void __user *)from, n);
3605 }
3606
3607@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to,
3608 return __copy_to_user_inatomic(to, from, size);
3609 }
3610
3611+#ifndef __powerpc64__
3612+
3613+static inline unsigned long __must_check copy_from_user(void *to,
3614+ const void __user *from, unsigned long n)
3615+{
3616+ unsigned long over;
3617+
3618+ if ((long)n < 0)
3619+ return n;
3620+
3621+ if (access_ok(VERIFY_READ, from, n)) {
3622+ if (!__builtin_constant_p(n))
3623+ check_object_size(to, n, false);
3624+ return __copy_tofrom_user((__force void __user *)to, from, n);
3625+ }
3626+ if ((unsigned long)from < TASK_SIZE) {
3627+ over = (unsigned long)from + n - TASK_SIZE;
3628+ if (!__builtin_constant_p(n - over))
3629+ check_object_size(to, n - over, false);
3630+ return __copy_tofrom_user((__force void __user *)to, from,
3631+ n - over) + over;
3632+ }
3633+ return n;
3634+}
3635+
3636+static inline unsigned long __must_check copy_to_user(void __user *to,
3637+ const void *from, unsigned long n)
3638+{
3639+ unsigned long over;
3640+
3641+ if ((long)n < 0)
3642+ return n;
3643+
3644+ if (access_ok(VERIFY_WRITE, to, n)) {
3645+ if (!__builtin_constant_p(n))
3646+ check_object_size(from, n, true);
3647+ return __copy_tofrom_user(to, (__force void __user *)from, n);
3648+ }
3649+ if ((unsigned long)to < TASK_SIZE) {
3650+ over = (unsigned long)to + n - TASK_SIZE;
3651+ if (!__builtin_constant_p(n))
3652+ check_object_size(from, n - over, true);
3653+ return __copy_tofrom_user(to, (__force void __user *)from,
3654+ n - over) + over;
3655+ }
3656+ return n;
3657+}
3658+
3659+#else /* __powerpc64__ */
3660+
3661+#define __copy_in_user(to, from, size) \
3662+ __copy_tofrom_user((to), (from), (size))
3663+
3664+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
3665+{
3666+ if ((long)n < 0 || n > INT_MAX)
3667+ return n;
3668+
3669+ if (!__builtin_constant_p(n))
3670+ check_object_size(to, n, false);
3671+
3672+ if (likely(access_ok(VERIFY_READ, from, n)))
3673+ n = __copy_from_user(to, from, n);
3674+ else
3675+ memset(to, 0, n);
3676+ return n;
3677+}
3678+
3679+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
3680+{
3681+ if ((long)n < 0 || n > INT_MAX)
3682+ return n;
3683+
3684+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
3685+ if (!__builtin_constant_p(n))
3686+ check_object_size(from, n, true);
3687+ n = __copy_to_user(to, from, n);
3688+ }
3689+ return n;
3690+}
3691+
3692+extern unsigned long copy_in_user(void __user *to, const void __user *from,
3693+ unsigned long n);
3694+
3695+#endif /* __powerpc64__ */
3696+
3697 extern unsigned long __clear_user(void __user *addr, unsigned long size);
3698
3699 static inline unsigned long clear_user(void __user *addr, unsigned long size)
3700diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
3701index 429983c..7af363b 100644
3702--- a/arch/powerpc/kernel/exceptions-64e.S
3703+++ b/arch/powerpc/kernel/exceptions-64e.S
3704@@ -587,6 +587,7 @@ storage_fault_common:
3705 std r14,_DAR(r1)
3706 std r15,_DSISR(r1)
3707 addi r3,r1,STACK_FRAME_OVERHEAD
3708+ bl .save_nvgprs
3709 mr r4,r14
3710 mr r5,r15
3711 ld r14,PACA_EXGEN+EX_R14(r13)
3712@@ -596,8 +597,7 @@ storage_fault_common:
3713 cmpdi r3,0
3714 bne- 1f
3715 b .ret_from_except_lite
3716-1: bl .save_nvgprs
3717- mr r5,r3
3718+1: mr r5,r3
3719 addi r3,r1,STACK_FRAME_OVERHEAD
3720 ld r4,_DAR(r1)
3721 bl .bad_page_fault
3722diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
3723index cf9c69b..ebc9640 100644
3724--- a/arch/powerpc/kernel/exceptions-64s.S
3725+++ b/arch/powerpc/kernel/exceptions-64s.S
3726@@ -1004,10 +1004,10 @@ handle_page_fault:
3727 11: ld r4,_DAR(r1)
3728 ld r5,_DSISR(r1)
3729 addi r3,r1,STACK_FRAME_OVERHEAD
3730+ bl .save_nvgprs
3731 bl .do_page_fault
3732 cmpdi r3,0
3733 beq+ 13f
3734- bl .save_nvgprs
3735 mr r5,r3
3736 addi r3,r1,STACK_FRAME_OVERHEAD
3737 lwz r4,_DAR(r1)
3738diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
3739index 745c1e7..59d97a6 100644
3740--- a/arch/powerpc/kernel/irq.c
3741+++ b/arch/powerpc/kernel/irq.c
3742@@ -547,9 +547,6 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
3743 host->ops = ops;
3744 host->of_node = of_node_get(of_node);
3745
3746- if (host->ops->match == NULL)
3747- host->ops->match = default_irq_host_match;
3748-
3749 raw_spin_lock_irqsave(&irq_big_lock, flags);
3750
3751 /* If it's a legacy controller, check for duplicates and
3752@@ -622,7 +619,12 @@ struct irq_host *irq_find_host(struct device_node *node)
3753 */
3754 raw_spin_lock_irqsave(&irq_big_lock, flags);
3755 list_for_each_entry(h, &irq_hosts, link)
3756- if (h->ops->match(h, node)) {
3757+ if (h->ops->match) {
3758+ if (h->ops->match(h, node)) {
3759+ found = h;
3760+ break;
3761+ }
3762+ } else if (default_irq_host_match(h, node)) {
3763 found = h;
3764 break;
3765 }
3766diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
3767index 0b6d796..d760ddb 100644
3768--- a/arch/powerpc/kernel/module_32.c
3769+++ b/arch/powerpc/kernel/module_32.c
3770@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
3771 me->arch.core_plt_section = i;
3772 }
3773 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
3774- printk("Module doesn't contain .plt or .init.plt sections.\n");
3775+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
3776 return -ENOEXEC;
3777 }
3778
3779@@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
3780
3781 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
3782 /* Init, or core PLT? */
3783- if (location >= mod->module_core
3784- && location < mod->module_core + mod->core_size)
3785+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
3786+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
3787 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
3788- else
3789+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
3790+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
3791 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
3792+ else {
3793+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
3794+ return ~0UL;
3795+ }
3796
3797 /* Find this entry, or if that fails, the next avail. entry */
3798 while (entry->jump[0]) {
3799diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
3800index 6457574..08b28d3 100644
3801--- a/arch/powerpc/kernel/process.c
3802+++ b/arch/powerpc/kernel/process.c
3803@@ -660,8 +660,8 @@ void show_regs(struct pt_regs * regs)
3804 * Lookup NIP late so we have the best change of getting the
3805 * above info out without failing
3806 */
3807- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
3808- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
3809+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
3810+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
3811 #endif
3812 show_stack(current, (unsigned long *) regs->gpr[1]);
3813 if (!user_mode(regs))
3814@@ -1165,10 +1165,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3815 newsp = stack[0];
3816 ip = stack[STACK_FRAME_LR_SAVE];
3817 if (!firstframe || ip != lr) {
3818- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
3819+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
3820 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
3821 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
3822- printk(" (%pS)",
3823+ printk(" (%pA)",
3824 (void *)current->ret_stack[curr_frame].ret);
3825 curr_frame--;
3826 }
3827@@ -1188,7 +1188,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3828 struct pt_regs *regs = (struct pt_regs *)
3829 (sp + STACK_FRAME_OVERHEAD);
3830 lr = regs->link;
3831- printk("--- Exception: %lx at %pS\n LR = %pS\n",
3832+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
3833 regs->trap, (void *)regs->nip, (void *)lr);
3834 firstframe = 1;
3835 }
3836@@ -1263,58 +1263,3 @@ void thread_info_cache_init(void)
3837 }
3838
3839 #endif /* THREAD_SHIFT < PAGE_SHIFT */
3840-
3841-unsigned long arch_align_stack(unsigned long sp)
3842-{
3843- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
3844- sp -= get_random_int() & ~PAGE_MASK;
3845- return sp & ~0xf;
3846-}
3847-
3848-static inline unsigned long brk_rnd(void)
3849-{
3850- unsigned long rnd = 0;
3851-
3852- /* 8MB for 32bit, 1GB for 64bit */
3853- if (is_32bit_task())
3854- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
3855- else
3856- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
3857-
3858- return rnd << PAGE_SHIFT;
3859-}
3860-
3861-unsigned long arch_randomize_brk(struct mm_struct *mm)
3862-{
3863- unsigned long base = mm->brk;
3864- unsigned long ret;
3865-
3866-#ifdef CONFIG_PPC_STD_MMU_64
3867- /*
3868- * If we are using 1TB segments and we are allowed to randomise
3869- * the heap, we can put it above 1TB so it is backed by a 1TB
3870- * segment. Otherwise the heap will be in the bottom 1TB
3871- * which always uses 256MB segments and this may result in a
3872- * performance penalty.
3873- */
3874- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
3875- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
3876-#endif
3877-
3878- ret = PAGE_ALIGN(base + brk_rnd());
3879-
3880- if (ret < mm->brk)
3881- return mm->brk;
3882-
3883- return ret;
3884-}
3885-
3886-unsigned long randomize_et_dyn(unsigned long base)
3887-{
3888- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
3889-
3890- if (ret < base)
3891- return base;
3892-
3893- return ret;
3894-}
3895diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
3896index 836a5a1..27289a3 100644
3897--- a/arch/powerpc/kernel/signal_32.c
3898+++ b/arch/powerpc/kernel/signal_32.c
3899@@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
3900 /* Save user registers on the stack */
3901 frame = &rt_sf->uc.uc_mcontext;
3902 addr = frame;
3903- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
3904+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3905 if (save_user_regs(regs, frame, 0, 1))
3906 goto badframe;
3907 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
3908diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
3909index a50b5ec..547078a 100644
3910--- a/arch/powerpc/kernel/signal_64.c
3911+++ b/arch/powerpc/kernel/signal_64.c
3912@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
3913 current->thread.fpscr.val = 0;
3914
3915 /* Set up to return from userspace. */
3916- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
3917+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3918 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
3919 } else {
3920 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
3921diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
3922index 5459d14..10f8070 100644
3923--- a/arch/powerpc/kernel/traps.c
3924+++ b/arch/powerpc/kernel/traps.c
3925@@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
3926 static inline void pmac_backlight_unblank(void) { }
3927 #endif
3928
3929+extern void gr_handle_kernel_exploit(void);
3930+
3931 int die(const char *str, struct pt_regs *regs, long err)
3932 {
3933 static struct {
3934@@ -171,6 +173,8 @@ int die(const char *str, struct pt_regs *regs, long err)
3935 if (panic_on_oops)
3936 panic("Fatal exception");
3937
3938+ gr_handle_kernel_exploit();
3939+
3940 oops_exit();
3941 do_exit(err);
3942
3943diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
3944index 7d14bb6..1305601 100644
3945--- a/arch/powerpc/kernel/vdso.c
3946+++ b/arch/powerpc/kernel/vdso.c
3947@@ -35,6 +35,7 @@
3948 #include <asm/firmware.h>
3949 #include <asm/vdso.h>
3950 #include <asm/vdso_datapage.h>
3951+#include <asm/mman.h>
3952
3953 #include "setup.h"
3954
3955@@ -219,7 +220,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3956 vdso_base = VDSO32_MBASE;
3957 #endif
3958
3959- current->mm->context.vdso_base = 0;
3960+ current->mm->context.vdso_base = ~0UL;
3961
3962 /* vDSO has a problem and was disabled, just don't "enable" it for the
3963 * process
3964@@ -239,7 +240,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3965 vdso_base = get_unmapped_area(NULL, vdso_base,
3966 (vdso_pages << PAGE_SHIFT) +
3967 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
3968- 0, 0);
3969+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
3970 if (IS_ERR_VALUE(vdso_base)) {
3971 rc = vdso_base;
3972 goto fail_mmapsem;
3973diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
3974index 5eea6f3..5d10396 100644
3975--- a/arch/powerpc/lib/usercopy_64.c
3976+++ b/arch/powerpc/lib/usercopy_64.c
3977@@ -9,22 +9,6 @@
3978 #include <linux/module.h>
3979 #include <asm/uaccess.h>
3980
3981-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
3982-{
3983- if (likely(access_ok(VERIFY_READ, from, n)))
3984- n = __copy_from_user(to, from, n);
3985- else
3986- memset(to, 0, n);
3987- return n;
3988-}
3989-
3990-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
3991-{
3992- if (likely(access_ok(VERIFY_WRITE, to, n)))
3993- n = __copy_to_user(to, from, n);
3994- return n;
3995-}
3996-
3997 unsigned long copy_in_user(void __user *to, const void __user *from,
3998 unsigned long n)
3999 {
4000@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
4001 return n;
4002 }
4003
4004-EXPORT_SYMBOL(copy_from_user);
4005-EXPORT_SYMBOL(copy_to_user);
4006 EXPORT_SYMBOL(copy_in_user);
4007
4008diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
4009index 5efe8c9..db9ceef 100644
4010--- a/arch/powerpc/mm/fault.c
4011+++ b/arch/powerpc/mm/fault.c
4012@@ -32,6 +32,10 @@
4013 #include <linux/perf_event.h>
4014 #include <linux/magic.h>
4015 #include <linux/ratelimit.h>
4016+#include <linux/slab.h>
4017+#include <linux/pagemap.h>
4018+#include <linux/compiler.h>
4019+#include <linux/unistd.h>
4020
4021 #include <asm/firmware.h>
4022 #include <asm/page.h>
4023@@ -43,6 +47,7 @@
4024 #include <asm/tlbflush.h>
4025 #include <asm/siginfo.h>
4026 #include <mm/mmu_decl.h>
4027+#include <asm/ptrace.h>
4028
4029 #ifdef CONFIG_KPROBES
4030 static inline int notify_page_fault(struct pt_regs *regs)
4031@@ -66,6 +71,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
4032 }
4033 #endif
4034
4035+#ifdef CONFIG_PAX_PAGEEXEC
4036+/*
4037+ * PaX: decide what to do with offenders (regs->nip = fault address)
4038+ *
4039+ * returns 1 when task should be killed
4040+ */
4041+static int pax_handle_fetch_fault(struct pt_regs *regs)
4042+{
4043+ return 1;
4044+}
4045+
4046+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4047+{
4048+ unsigned long i;
4049+
4050+ printk(KERN_ERR "PAX: bytes at PC: ");
4051+ for (i = 0; i < 5; i++) {
4052+ unsigned int c;
4053+ if (get_user(c, (unsigned int __user *)pc+i))
4054+ printk(KERN_CONT "???????? ");
4055+ else
4056+ printk(KERN_CONT "%08x ", c);
4057+ }
4058+ printk("\n");
4059+}
4060+#endif
4061+
4062 /*
4063 * Check whether the instruction at regs->nip is a store using
4064 * an update addressing form which will update r1.
4065@@ -136,7 +168,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
4066 * indicate errors in DSISR but can validly be set in SRR1.
4067 */
4068 if (trap == 0x400)
4069- error_code &= 0x48200000;
4070+ error_code &= 0x58200000;
4071 else
4072 is_write = error_code & DSISR_ISSTORE;
4073 #else
4074@@ -259,7 +291,7 @@ good_area:
4075 * "undefined". Of those that can be set, this is the only
4076 * one which seems bad.
4077 */
4078- if (error_code & 0x10000000)
4079+ if (error_code & DSISR_GUARDED)
4080 /* Guarded storage error. */
4081 goto bad_area;
4082 #endif /* CONFIG_8xx */
4083@@ -274,7 +306,7 @@ good_area:
4084 * processors use the same I/D cache coherency mechanism
4085 * as embedded.
4086 */
4087- if (error_code & DSISR_PROTFAULT)
4088+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
4089 goto bad_area;
4090 #endif /* CONFIG_PPC_STD_MMU */
4091
4092@@ -343,6 +375,23 @@ bad_area:
4093 bad_area_nosemaphore:
4094 /* User mode accesses cause a SIGSEGV */
4095 if (user_mode(regs)) {
4096+
4097+#ifdef CONFIG_PAX_PAGEEXEC
4098+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4099+#ifdef CONFIG_PPC_STD_MMU
4100+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
4101+#else
4102+ if (is_exec && regs->nip == address) {
4103+#endif
4104+ switch (pax_handle_fetch_fault(regs)) {
4105+ }
4106+
4107+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
4108+ do_group_exit(SIGKILL);
4109+ }
4110+ }
4111+#endif
4112+
4113 _exception(SIGSEGV, regs, code, address);
4114 return 0;
4115 }
4116diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
4117index 5a783d8..c23e14b 100644
4118--- a/arch/powerpc/mm/mmap_64.c
4119+++ b/arch/powerpc/mm/mmap_64.c
4120@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4121 */
4122 if (mmap_is_legacy()) {
4123 mm->mmap_base = TASK_UNMAPPED_BASE;
4124+
4125+#ifdef CONFIG_PAX_RANDMMAP
4126+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4127+ mm->mmap_base += mm->delta_mmap;
4128+#endif
4129+
4130 mm->get_unmapped_area = arch_get_unmapped_area;
4131 mm->unmap_area = arch_unmap_area;
4132 } else {
4133 mm->mmap_base = mmap_base();
4134+
4135+#ifdef CONFIG_PAX_RANDMMAP
4136+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4137+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4138+#endif
4139+
4140 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4141 mm->unmap_area = arch_unmap_area_topdown;
4142 }
4143diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
4144index 73709f7..6b90313 100644
4145--- a/arch/powerpc/mm/slice.c
4146+++ b/arch/powerpc/mm/slice.c
4147@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
4148 if ((mm->task_size - len) < addr)
4149 return 0;
4150 vma = find_vma(mm, addr);
4151- return (!vma || (addr + len) <= vma->vm_start);
4152+ return check_heap_stack_gap(vma, addr, len);
4153 }
4154
4155 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
4156@@ -256,7 +256,7 @@ full_search:
4157 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
4158 continue;
4159 }
4160- if (!vma || addr + len <= vma->vm_start) {
4161+ if (check_heap_stack_gap(vma, addr, len)) {
4162 /*
4163 * Remember the place where we stopped the search:
4164 */
4165@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4166 }
4167 }
4168
4169- addr = mm->mmap_base;
4170- while (addr > len) {
4171+ if (mm->mmap_base < len)
4172+ addr = -ENOMEM;
4173+ else
4174+ addr = mm->mmap_base - len;
4175+
4176+ while (!IS_ERR_VALUE(addr)) {
4177 /* Go down by chunk size */
4178- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
4179+ addr = _ALIGN_DOWN(addr, 1ul << pshift);
4180
4181 /* Check for hit with different page size */
4182 mask = slice_range_to_mask(addr, len);
4183@@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4184 * return with success:
4185 */
4186 vma = find_vma(mm, addr);
4187- if (!vma || (addr + len) <= vma->vm_start) {
4188+ if (check_heap_stack_gap(vma, addr, len)) {
4189 /* remember the address as a hint for next time */
4190 if (use_cache)
4191 mm->free_area_cache = addr;
4192@@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4193 mm->cached_hole_size = vma->vm_start - addr;
4194
4195 /* try just below the current vma->vm_start */
4196- addr = vma->vm_start;
4197+ addr = skip_heap_stack_gap(vma, len);
4198 }
4199
4200 /*
4201@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
4202 if (fixed && addr > (mm->task_size - len))
4203 return -EINVAL;
4204
4205+#ifdef CONFIG_PAX_RANDMMAP
4206+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
4207+ addr = 0;
4208+#endif
4209+
4210 /* If hint, make sure it matches our alignment restrictions */
4211 if (!fixed && addr) {
4212 addr = _ALIGN_UP(addr, 1ul << pshift);
4213diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
4214index 8517d2a..d2738d4 100644
4215--- a/arch/s390/include/asm/atomic.h
4216+++ b/arch/s390/include/asm/atomic.h
4217@@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
4218 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
4219 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4220
4221+#define atomic64_read_unchecked(v) atomic64_read(v)
4222+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4223+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4224+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4225+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4226+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4227+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4228+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4229+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4230+
4231 #define smp_mb__before_atomic_dec() smp_mb()
4232 #define smp_mb__after_atomic_dec() smp_mb()
4233 #define smp_mb__before_atomic_inc() smp_mb()
4234diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
4235index 2a30d5a..5e5586f 100644
4236--- a/arch/s390/include/asm/cache.h
4237+++ b/arch/s390/include/asm/cache.h
4238@@ -11,8 +11,10 @@
4239 #ifndef __ARCH_S390_CACHE_H
4240 #define __ARCH_S390_CACHE_H
4241
4242-#define L1_CACHE_BYTES 256
4243+#include <linux/const.h>
4244+
4245 #define L1_CACHE_SHIFT 8
4246+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4247 #define NET_SKB_PAD 32
4248
4249 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4250diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
4251index 547f1a6..0b22b53 100644
4252--- a/arch/s390/include/asm/elf.h
4253+++ b/arch/s390/include/asm/elf.h
4254@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
4255 the loader. We need to make sure that it is out of the way of the program
4256 that it will "exec", and that there is sufficient room for the brk. */
4257
4258-extern unsigned long randomize_et_dyn(unsigned long base);
4259-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
4260+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
4261+
4262+#ifdef CONFIG_PAX_ASLR
4263+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
4264+
4265+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4266+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4267+#endif
4268
4269 /* This yields a mask that user programs can use to figure out what
4270 instruction set this CPU supports. */
4271@@ -211,7 +217,4 @@ struct linux_binprm;
4272 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
4273 int arch_setup_additional_pages(struct linux_binprm *, int);
4274
4275-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
4276-#define arch_randomize_brk arch_randomize_brk
4277-
4278 #endif
4279diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
4280index ef573c1..75a1ce6 100644
4281--- a/arch/s390/include/asm/system.h
4282+++ b/arch/s390/include/asm/system.h
4283@@ -262,7 +262,7 @@ extern void (*_machine_restart)(char *command);
4284 extern void (*_machine_halt)(void);
4285 extern void (*_machine_power_off)(void);
4286
4287-extern unsigned long arch_align_stack(unsigned long sp);
4288+#define arch_align_stack(x) ((x) & ~0xfUL)
4289
4290 static inline int tprot(unsigned long addr)
4291 {
4292diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
4293index 2b23885..e136e31 100644
4294--- a/arch/s390/include/asm/uaccess.h
4295+++ b/arch/s390/include/asm/uaccess.h
4296@@ -235,6 +235,10 @@ static inline unsigned long __must_check
4297 copy_to_user(void __user *to, const void *from, unsigned long n)
4298 {
4299 might_fault();
4300+
4301+ if ((long)n < 0)
4302+ return n;
4303+
4304 if (access_ok(VERIFY_WRITE, to, n))
4305 n = __copy_to_user(to, from, n);
4306 return n;
4307@@ -260,6 +264,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
4308 static inline unsigned long __must_check
4309 __copy_from_user(void *to, const void __user *from, unsigned long n)
4310 {
4311+ if ((long)n < 0)
4312+ return n;
4313+
4314 if (__builtin_constant_p(n) && (n <= 256))
4315 return uaccess.copy_from_user_small(n, from, to);
4316 else
4317@@ -294,6 +301,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
4318 unsigned int sz = __compiletime_object_size(to);
4319
4320 might_fault();
4321+
4322+ if ((long)n < 0)
4323+ return n;
4324+
4325 if (unlikely(sz != -1 && sz < n)) {
4326 copy_from_user_overflow();
4327 return n;
4328diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
4329index dfcb343..eda788a 100644
4330--- a/arch/s390/kernel/module.c
4331+++ b/arch/s390/kernel/module.c
4332@@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
4333
4334 /* Increase core size by size of got & plt and set start
4335 offsets for got and plt. */
4336- me->core_size = ALIGN(me->core_size, 4);
4337- me->arch.got_offset = me->core_size;
4338- me->core_size += me->arch.got_size;
4339- me->arch.plt_offset = me->core_size;
4340- me->core_size += me->arch.plt_size;
4341+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
4342+ me->arch.got_offset = me->core_size_rw;
4343+ me->core_size_rw += me->arch.got_size;
4344+ me->arch.plt_offset = me->core_size_rx;
4345+ me->core_size_rx += me->arch.plt_size;
4346 return 0;
4347 }
4348
4349@@ -242,7 +242,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4350 if (info->got_initialized == 0) {
4351 Elf_Addr *gotent;
4352
4353- gotent = me->module_core + me->arch.got_offset +
4354+ gotent = me->module_core_rw + me->arch.got_offset +
4355 info->got_offset;
4356 *gotent = val;
4357 info->got_initialized = 1;
4358@@ -266,7 +266,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4359 else if (r_type == R_390_GOTENT ||
4360 r_type == R_390_GOTPLTENT)
4361 *(unsigned int *) loc =
4362- (val + (Elf_Addr) me->module_core - loc) >> 1;
4363+ (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
4364 else if (r_type == R_390_GOT64 ||
4365 r_type == R_390_GOTPLT64)
4366 *(unsigned long *) loc = val;
4367@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4368 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
4369 if (info->plt_initialized == 0) {
4370 unsigned int *ip;
4371- ip = me->module_core + me->arch.plt_offset +
4372+ ip = me->module_core_rx + me->arch.plt_offset +
4373 info->plt_offset;
4374 #ifndef CONFIG_64BIT
4375 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
4376@@ -305,7 +305,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4377 val - loc + 0xffffUL < 0x1ffffeUL) ||
4378 (r_type == R_390_PLT32DBL &&
4379 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
4380- val = (Elf_Addr) me->module_core +
4381+ val = (Elf_Addr) me->module_core_rx +
4382 me->arch.plt_offset +
4383 info->plt_offset;
4384 val += rela->r_addend - loc;
4385@@ -327,7 +327,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4386 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
4387 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
4388 val = val + rela->r_addend -
4389- ((Elf_Addr) me->module_core + me->arch.got_offset);
4390+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
4391 if (r_type == R_390_GOTOFF16)
4392 *(unsigned short *) loc = val;
4393 else if (r_type == R_390_GOTOFF32)
4394@@ -337,7 +337,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4395 break;
4396 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
4397 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
4398- val = (Elf_Addr) me->module_core + me->arch.got_offset +
4399+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
4400 rela->r_addend - loc;
4401 if (r_type == R_390_GOTPC)
4402 *(unsigned int *) loc = val;
4403diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
4404index 53088e2..9f44a36 100644
4405--- a/arch/s390/kernel/process.c
4406+++ b/arch/s390/kernel/process.c
4407@@ -320,39 +320,3 @@ unsigned long get_wchan(struct task_struct *p)
4408 }
4409 return 0;
4410 }
4411-
4412-unsigned long arch_align_stack(unsigned long sp)
4413-{
4414- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
4415- sp -= get_random_int() & ~PAGE_MASK;
4416- return sp & ~0xf;
4417-}
4418-
4419-static inline unsigned long brk_rnd(void)
4420-{
4421- /* 8MB for 32bit, 1GB for 64bit */
4422- if (is_32bit_task())
4423- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
4424- else
4425- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
4426-}
4427-
4428-unsigned long arch_randomize_brk(struct mm_struct *mm)
4429-{
4430- unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
4431-
4432- if (ret < mm->brk)
4433- return mm->brk;
4434- return ret;
4435-}
4436-
4437-unsigned long randomize_et_dyn(unsigned long base)
4438-{
4439- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
4440-
4441- if (!(current->flags & PF_RANDOMIZE))
4442- return base;
4443- if (ret < base)
4444- return base;
4445- return ret;
4446-}
4447diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
4448index a0155c0..34cc491 100644
4449--- a/arch/s390/mm/mmap.c
4450+++ b/arch/s390/mm/mmap.c
4451@@ -92,10 +92,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4452 */
4453 if (mmap_is_legacy()) {
4454 mm->mmap_base = TASK_UNMAPPED_BASE;
4455+
4456+#ifdef CONFIG_PAX_RANDMMAP
4457+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4458+ mm->mmap_base += mm->delta_mmap;
4459+#endif
4460+
4461 mm->get_unmapped_area = arch_get_unmapped_area;
4462 mm->unmap_area = arch_unmap_area;
4463 } else {
4464 mm->mmap_base = mmap_base();
4465+
4466+#ifdef CONFIG_PAX_RANDMMAP
4467+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4468+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4469+#endif
4470+
4471 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4472 mm->unmap_area = arch_unmap_area_topdown;
4473 }
4474@@ -167,10 +179,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4475 */
4476 if (mmap_is_legacy()) {
4477 mm->mmap_base = TASK_UNMAPPED_BASE;
4478+
4479+#ifdef CONFIG_PAX_RANDMMAP
4480+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4481+ mm->mmap_base += mm->delta_mmap;
4482+#endif
4483+
4484 mm->get_unmapped_area = s390_get_unmapped_area;
4485 mm->unmap_area = arch_unmap_area;
4486 } else {
4487 mm->mmap_base = mmap_base();
4488+
4489+#ifdef CONFIG_PAX_RANDMMAP
4490+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4491+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4492+#endif
4493+
4494 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
4495 mm->unmap_area = arch_unmap_area_topdown;
4496 }
4497diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
4498index ae3d59f..f65f075 100644
4499--- a/arch/score/include/asm/cache.h
4500+++ b/arch/score/include/asm/cache.h
4501@@ -1,7 +1,9 @@
4502 #ifndef _ASM_SCORE_CACHE_H
4503 #define _ASM_SCORE_CACHE_H
4504
4505+#include <linux/const.h>
4506+
4507 #define L1_CACHE_SHIFT 4
4508-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4509+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4510
4511 #endif /* _ASM_SCORE_CACHE_H */
4512diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
4513index 589d5c7..669e274 100644
4514--- a/arch/score/include/asm/system.h
4515+++ b/arch/score/include/asm/system.h
4516@@ -17,7 +17,7 @@ do { \
4517 #define finish_arch_switch(prev) do {} while (0)
4518
4519 typedef void (*vi_handler_t)(void);
4520-extern unsigned long arch_align_stack(unsigned long sp);
4521+#define arch_align_stack(x) (x)
4522
4523 #define mb() barrier()
4524 #define rmb() barrier()
4525diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
4526index 25d0803..d6c8e36 100644
4527--- a/arch/score/kernel/process.c
4528+++ b/arch/score/kernel/process.c
4529@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
4530
4531 return task_pt_regs(task)->cp0_epc;
4532 }
4533-
4534-unsigned long arch_align_stack(unsigned long sp)
4535-{
4536- return sp;
4537-}
4538diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
4539index ef9e555..331bd29 100644
4540--- a/arch/sh/include/asm/cache.h
4541+++ b/arch/sh/include/asm/cache.h
4542@@ -9,10 +9,11 @@
4543 #define __ASM_SH_CACHE_H
4544 #ifdef __KERNEL__
4545
4546+#include <linux/const.h>
4547 #include <linux/init.h>
4548 #include <cpu/cache.h>
4549
4550-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4551+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4552
4553 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4554
4555diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
4556index afeb710..d1d1289 100644
4557--- a/arch/sh/mm/mmap.c
4558+++ b/arch/sh/mm/mmap.c
4559@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
4560 addr = PAGE_ALIGN(addr);
4561
4562 vma = find_vma(mm, addr);
4563- if (TASK_SIZE - len >= addr &&
4564- (!vma || addr + len <= vma->vm_start))
4565+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4566 return addr;
4567 }
4568
4569@@ -106,7 +105,7 @@ full_search:
4570 }
4571 return -ENOMEM;
4572 }
4573- if (likely(!vma || addr + len <= vma->vm_start)) {
4574+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4575 /*
4576 * Remember the place where we stopped the search:
4577 */
4578@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4579 addr = PAGE_ALIGN(addr);
4580
4581 vma = find_vma(mm, addr);
4582- if (TASK_SIZE - len >= addr &&
4583- (!vma || addr + len <= vma->vm_start))
4584+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4585 return addr;
4586 }
4587
4588@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4589 /* make sure it can fit in the remaining address space */
4590 if (likely(addr > len)) {
4591 vma = find_vma(mm, addr-len);
4592- if (!vma || addr <= vma->vm_start) {
4593+ if (check_heap_stack_gap(vma, addr - len, len)) {
4594 /* remember the address as a hint for next time */
4595 return (mm->free_area_cache = addr-len);
4596 }
4597@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4598 if (unlikely(mm->mmap_base < len))
4599 goto bottomup;
4600
4601- addr = mm->mmap_base-len;
4602- if (do_colour_align)
4603- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4604+ addr = mm->mmap_base - len;
4605
4606 do {
4607+ if (do_colour_align)
4608+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4609 /*
4610 * Lookup failure means no vma is above this address,
4611 * else if new region fits below vma->vm_start,
4612 * return with success:
4613 */
4614 vma = find_vma(mm, addr);
4615- if (likely(!vma || addr+len <= vma->vm_start)) {
4616+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4617 /* remember the address as a hint for next time */
4618 return (mm->free_area_cache = addr);
4619 }
4620@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4621 mm->cached_hole_size = vma->vm_start - addr;
4622
4623 /* try just below the current vma->vm_start */
4624- addr = vma->vm_start-len;
4625- if (do_colour_align)
4626- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4627- } while (likely(len < vma->vm_start));
4628+ addr = skip_heap_stack_gap(vma, len);
4629+ } while (!IS_ERR_VALUE(addr));
4630
4631 bottomup:
4632 /*
4633diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
4634index f92602e..27060b2 100644
4635--- a/arch/sparc/Kconfig
4636+++ b/arch/sparc/Kconfig
4637@@ -31,6 +31,7 @@ config SPARC
4638
4639 config SPARC32
4640 def_bool !64BIT
4641+ select GENERIC_ATOMIC64
4642
4643 config SPARC64
4644 def_bool 64BIT
4645diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
4646index ad1fb5d..fc5315b 100644
4647--- a/arch/sparc/Makefile
4648+++ b/arch/sparc/Makefile
4649@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
4650 # Export what is needed by arch/sparc/boot/Makefile
4651 export VMLINUX_INIT VMLINUX_MAIN
4652 VMLINUX_INIT := $(head-y) $(init-y)
4653-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
4654+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
4655 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
4656 VMLINUX_MAIN += $(drivers-y) $(net-y)
4657
4658diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h
4659index 5c3c8b6..ba822fa 100644
4660--- a/arch/sparc/include/asm/atomic_32.h
4661+++ b/arch/sparc/include/asm/atomic_32.h
4662@@ -13,6 +13,8 @@
4663
4664 #include <linux/types.h>
4665
4666+#include <asm-generic/atomic64.h>
4667+
4668 #ifdef __KERNEL__
4669
4670 #include <asm/system.h>
4671diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
4672index 9f421df..b81fc12 100644
4673--- a/arch/sparc/include/asm/atomic_64.h
4674+++ b/arch/sparc/include/asm/atomic_64.h
4675@@ -14,18 +14,40 @@
4676 #define ATOMIC64_INIT(i) { (i) }
4677
4678 #define atomic_read(v) (*(volatile int *)&(v)->counter)
4679+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
4680+{
4681+ return v->counter;
4682+}
4683 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
4684+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
4685+{
4686+ return v->counter;
4687+}
4688
4689 #define atomic_set(v, i) (((v)->counter) = i)
4690+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
4691+{
4692+ v->counter = i;
4693+}
4694 #define atomic64_set(v, i) (((v)->counter) = i)
4695+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
4696+{
4697+ v->counter = i;
4698+}
4699
4700 extern void atomic_add(int, atomic_t *);
4701+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
4702 extern void atomic64_add(long, atomic64_t *);
4703+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
4704 extern void atomic_sub(int, atomic_t *);
4705+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
4706 extern void atomic64_sub(long, atomic64_t *);
4707+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
4708
4709 extern int atomic_add_ret(int, atomic_t *);
4710+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
4711 extern long atomic64_add_ret(long, atomic64_t *);
4712+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
4713 extern int atomic_sub_ret(int, atomic_t *);
4714 extern long atomic64_sub_ret(long, atomic64_t *);
4715
4716@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4717 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
4718
4719 #define atomic_inc_return(v) atomic_add_ret(1, v)
4720+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
4721+{
4722+ return atomic_add_ret_unchecked(1, v);
4723+}
4724 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
4725+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
4726+{
4727+ return atomic64_add_ret_unchecked(1, v);
4728+}
4729
4730 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
4731 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
4732
4733 #define atomic_add_return(i, v) atomic_add_ret(i, v)
4734+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
4735+{
4736+ return atomic_add_ret_unchecked(i, v);
4737+}
4738 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
4739+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
4740+{
4741+ return atomic64_add_ret_unchecked(i, v);
4742+}
4743
4744 /*
4745 * atomic_inc_and_test - increment and test
4746@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4747 * other cases.
4748 */
4749 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
4750+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
4751+{
4752+ return atomic_inc_return_unchecked(v) == 0;
4753+}
4754 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
4755
4756 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
4757@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4758 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
4759
4760 #define atomic_inc(v) atomic_add(1, v)
4761+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
4762+{
4763+ atomic_add_unchecked(1, v);
4764+}
4765 #define atomic64_inc(v) atomic64_add(1, v)
4766+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
4767+{
4768+ atomic64_add_unchecked(1, v);
4769+}
4770
4771 #define atomic_dec(v) atomic_sub(1, v)
4772+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
4773+{
4774+ atomic_sub_unchecked(1, v);
4775+}
4776 #define atomic64_dec(v) atomic64_sub(1, v)
4777+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
4778+{
4779+ atomic64_sub_unchecked(1, v);
4780+}
4781
4782 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
4783 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
4784
4785 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
4786+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
4787+{
4788+ return cmpxchg(&v->counter, old, new);
4789+}
4790 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
4791+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
4792+{
4793+ return xchg(&v->counter, new);
4794+}
4795
4796 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
4797 {
4798- int c, old;
4799+ int c, old, new;
4800 c = atomic_read(v);
4801 for (;;) {
4802- if (unlikely(c == (u)))
4803+ if (unlikely(c == u))
4804 break;
4805- old = atomic_cmpxchg((v), c, c + (a));
4806+
4807+ asm volatile("addcc %2, %0, %0\n"
4808+
4809+#ifdef CONFIG_PAX_REFCOUNT
4810+ "tvs %%icc, 6\n"
4811+#endif
4812+
4813+ : "=r" (new)
4814+ : "0" (c), "ir" (a)
4815+ : "cc");
4816+
4817+ old = atomic_cmpxchg(v, c, new);
4818 if (likely(old == c))
4819 break;
4820 c = old;
4821@@ -89,20 +166,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
4822 #define atomic64_cmpxchg(v, o, n) \
4823 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
4824 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
4825+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
4826+{
4827+ return xchg(&v->counter, new);
4828+}
4829
4830 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
4831 {
4832- long c, old;
4833+ long c, old, new;
4834 c = atomic64_read(v);
4835 for (;;) {
4836- if (unlikely(c == (u)))
4837+ if (unlikely(c == u))
4838 break;
4839- old = atomic64_cmpxchg((v), c, c + (a));
4840+
4841+ asm volatile("addcc %2, %0, %0\n"
4842+
4843+#ifdef CONFIG_PAX_REFCOUNT
4844+ "tvs %%xcc, 6\n"
4845+#endif
4846+
4847+ : "=r" (new)
4848+ : "0" (c), "ir" (a)
4849+ : "cc");
4850+
4851+ old = atomic64_cmpxchg(v, c, new);
4852 if (likely(old == c))
4853 break;
4854 c = old;
4855 }
4856- return c != (u);
4857+ return c != u;
4858 }
4859
4860 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4861diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
4862index 69358b5..9d0d492 100644
4863--- a/arch/sparc/include/asm/cache.h
4864+++ b/arch/sparc/include/asm/cache.h
4865@@ -7,10 +7,12 @@
4866 #ifndef _SPARC_CACHE_H
4867 #define _SPARC_CACHE_H
4868
4869+#include <linux/const.h>
4870+
4871 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
4872
4873 #define L1_CACHE_SHIFT 5
4874-#define L1_CACHE_BYTES 32
4875+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4876
4877 #ifdef CONFIG_SPARC32
4878 #define SMP_CACHE_BYTES_SHIFT 5
4879diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
4880index 4269ca6..e3da77f 100644
4881--- a/arch/sparc/include/asm/elf_32.h
4882+++ b/arch/sparc/include/asm/elf_32.h
4883@@ -114,6 +114,13 @@ typedef struct {
4884
4885 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
4886
4887+#ifdef CONFIG_PAX_ASLR
4888+#define PAX_ELF_ET_DYN_BASE 0x10000UL
4889+
4890+#define PAX_DELTA_MMAP_LEN 16
4891+#define PAX_DELTA_STACK_LEN 16
4892+#endif
4893+
4894 /* This yields a mask that user programs can use to figure out what
4895 instruction set this cpu supports. This can NOT be done in userspace
4896 on Sparc. */
4897diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
4898index 7df8b7f..4946269 100644
4899--- a/arch/sparc/include/asm/elf_64.h
4900+++ b/arch/sparc/include/asm/elf_64.h
4901@@ -180,6 +180,13 @@ typedef struct {
4902 #define ELF_ET_DYN_BASE 0x0000010000000000UL
4903 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
4904
4905+#ifdef CONFIG_PAX_ASLR
4906+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
4907+
4908+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
4909+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
4910+#endif
4911+
4912 extern unsigned long sparc64_elf_hwcap;
4913 #define ELF_HWCAP sparc64_elf_hwcap
4914
4915diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
4916index 156707b..aefa786 100644
4917--- a/arch/sparc/include/asm/page_32.h
4918+++ b/arch/sparc/include/asm/page_32.h
4919@@ -8,6 +8,8 @@
4920 #ifndef _SPARC_PAGE_H
4921 #define _SPARC_PAGE_H
4922
4923+#include <linux/const.h>
4924+
4925 #define PAGE_SHIFT 12
4926
4927 #ifndef __ASSEMBLY__
4928diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
4929index a790cc6..091ed94 100644
4930--- a/arch/sparc/include/asm/pgtable_32.h
4931+++ b/arch/sparc/include/asm/pgtable_32.h
4932@@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
4933 BTFIXUPDEF_INT(page_none)
4934 BTFIXUPDEF_INT(page_copy)
4935 BTFIXUPDEF_INT(page_readonly)
4936+
4937+#ifdef CONFIG_PAX_PAGEEXEC
4938+BTFIXUPDEF_INT(page_shared_noexec)
4939+BTFIXUPDEF_INT(page_copy_noexec)
4940+BTFIXUPDEF_INT(page_readonly_noexec)
4941+#endif
4942+
4943 BTFIXUPDEF_INT(page_kernel)
4944
4945 #define PMD_SHIFT SUN4C_PMD_SHIFT
4946@@ -66,6 +73,16 @@ extern pgprot_t PAGE_SHARED;
4947 #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy))
4948 #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly))
4949
4950+#ifdef CONFIG_PAX_PAGEEXEC
4951+extern pgprot_t PAGE_SHARED_NOEXEC;
4952+# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec))
4953+# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec))
4954+#else
4955+# define PAGE_SHARED_NOEXEC PAGE_SHARED
4956+# define PAGE_COPY_NOEXEC PAGE_COPY
4957+# define PAGE_READONLY_NOEXEC PAGE_READONLY
4958+#endif
4959+
4960 extern unsigned long page_kernel;
4961
4962 #ifdef MODULE
4963diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
4964index f6ae2b2..b03ffc7 100644
4965--- a/arch/sparc/include/asm/pgtsrmmu.h
4966+++ b/arch/sparc/include/asm/pgtsrmmu.h
4967@@ -115,6 +115,13 @@
4968 SRMMU_EXEC | SRMMU_REF)
4969 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
4970 SRMMU_EXEC | SRMMU_REF)
4971+
4972+#ifdef CONFIG_PAX_PAGEEXEC
4973+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
4974+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4975+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4976+#endif
4977+
4978 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
4979 SRMMU_DIRTY | SRMMU_REF)
4980
4981diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
4982index 9689176..63c18ea 100644
4983--- a/arch/sparc/include/asm/spinlock_64.h
4984+++ b/arch/sparc/include/asm/spinlock_64.h
4985@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
4986
4987 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
4988
4989-static void inline arch_read_lock(arch_rwlock_t *lock)
4990+static inline void arch_read_lock(arch_rwlock_t *lock)
4991 {
4992 unsigned long tmp1, tmp2;
4993
4994 __asm__ __volatile__ (
4995 "1: ldsw [%2], %0\n"
4996 " brlz,pn %0, 2f\n"
4997-"4: add %0, 1, %1\n"
4998+"4: addcc %0, 1, %1\n"
4999+
5000+#ifdef CONFIG_PAX_REFCOUNT
5001+" tvs %%icc, 6\n"
5002+#endif
5003+
5004 " cas [%2], %0, %1\n"
5005 " cmp %0, %1\n"
5006 " bne,pn %%icc, 1b\n"
5007@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
5008 " .previous"
5009 : "=&r" (tmp1), "=&r" (tmp2)
5010 : "r" (lock)
5011- : "memory");
5012+ : "memory", "cc");
5013 }
5014
5015-static int inline arch_read_trylock(arch_rwlock_t *lock)
5016+static inline int arch_read_trylock(arch_rwlock_t *lock)
5017 {
5018 int tmp1, tmp2;
5019
5020@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5021 "1: ldsw [%2], %0\n"
5022 " brlz,a,pn %0, 2f\n"
5023 " mov 0, %0\n"
5024-" add %0, 1, %1\n"
5025+" addcc %0, 1, %1\n"
5026+
5027+#ifdef CONFIG_PAX_REFCOUNT
5028+" tvs %%icc, 6\n"
5029+#endif
5030+
5031 " cas [%2], %0, %1\n"
5032 " cmp %0, %1\n"
5033 " bne,pn %%icc, 1b\n"
5034@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5035 return tmp1;
5036 }
5037
5038-static void inline arch_read_unlock(arch_rwlock_t *lock)
5039+static inline void arch_read_unlock(arch_rwlock_t *lock)
5040 {
5041 unsigned long tmp1, tmp2;
5042
5043 __asm__ __volatile__(
5044 "1: lduw [%2], %0\n"
5045-" sub %0, 1, %1\n"
5046+" subcc %0, 1, %1\n"
5047+
5048+#ifdef CONFIG_PAX_REFCOUNT
5049+" tvs %%icc, 6\n"
5050+#endif
5051+
5052 " cas [%2], %0, %1\n"
5053 " cmp %0, %1\n"
5054 " bne,pn %%xcc, 1b\n"
5055@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
5056 : "memory");
5057 }
5058
5059-static void inline arch_write_lock(arch_rwlock_t *lock)
5060+static inline void arch_write_lock(arch_rwlock_t *lock)
5061 {
5062 unsigned long mask, tmp1, tmp2;
5063
5064@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
5065 : "memory");
5066 }
5067
5068-static void inline arch_write_unlock(arch_rwlock_t *lock)
5069+static inline void arch_write_unlock(arch_rwlock_t *lock)
5070 {
5071 __asm__ __volatile__(
5072 " stw %%g0, [%0]"
5073@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
5074 : "memory");
5075 }
5076
5077-static int inline arch_write_trylock(arch_rwlock_t *lock)
5078+static inline int arch_write_trylock(arch_rwlock_t *lock)
5079 {
5080 unsigned long mask, tmp1, tmp2, result;
5081
5082diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
5083index fa57532..e1a4c53 100644
5084--- a/arch/sparc/include/asm/thread_info_32.h
5085+++ b/arch/sparc/include/asm/thread_info_32.h
5086@@ -50,6 +50,8 @@ struct thread_info {
5087 unsigned long w_saved;
5088
5089 struct restart_block restart_block;
5090+
5091+ unsigned long lowest_stack;
5092 };
5093
5094 /*
5095diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
5096index 60d86be..952dea1 100644
5097--- a/arch/sparc/include/asm/thread_info_64.h
5098+++ b/arch/sparc/include/asm/thread_info_64.h
5099@@ -63,6 +63,8 @@ struct thread_info {
5100 struct pt_regs *kern_una_regs;
5101 unsigned int kern_una_insn;
5102
5103+ unsigned long lowest_stack;
5104+
5105 unsigned long fpregs[0] __attribute__ ((aligned(64)));
5106 };
5107
5108diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
5109index e88fbe5..96b0ce5 100644
5110--- a/arch/sparc/include/asm/uaccess.h
5111+++ b/arch/sparc/include/asm/uaccess.h
5112@@ -1,5 +1,13 @@
5113 #ifndef ___ASM_SPARC_UACCESS_H
5114 #define ___ASM_SPARC_UACCESS_H
5115+
5116+#ifdef __KERNEL__
5117+#ifndef __ASSEMBLY__
5118+#include <linux/types.h>
5119+extern void check_object_size(const void *ptr, unsigned long n, bool to);
5120+#endif
5121+#endif
5122+
5123 #if defined(__sparc__) && defined(__arch64__)
5124 #include <asm/uaccess_64.h>
5125 #else
5126diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
5127index 8303ac4..07f333d 100644
5128--- a/arch/sparc/include/asm/uaccess_32.h
5129+++ b/arch/sparc/include/asm/uaccess_32.h
5130@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
5131
5132 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
5133 {
5134- if (n && __access_ok((unsigned long) to, n))
5135+ if ((long)n < 0)
5136+ return n;
5137+
5138+ if (n && __access_ok((unsigned long) to, n)) {
5139+ if (!__builtin_constant_p(n))
5140+ check_object_size(from, n, true);
5141 return __copy_user(to, (__force void __user *) from, n);
5142- else
5143+ } else
5144 return n;
5145 }
5146
5147 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
5148 {
5149+ if ((long)n < 0)
5150+ return n;
5151+
5152+ if (!__builtin_constant_p(n))
5153+ check_object_size(from, n, true);
5154+
5155 return __copy_user(to, (__force void __user *) from, n);
5156 }
5157
5158 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
5159 {
5160- if (n && __access_ok((unsigned long) from, n))
5161+ if ((long)n < 0)
5162+ return n;
5163+
5164+ if (n && __access_ok((unsigned long) from, n)) {
5165+ if (!__builtin_constant_p(n))
5166+ check_object_size(to, n, false);
5167 return __copy_user((__force void __user *) to, from, n);
5168- else
5169+ } else
5170 return n;
5171 }
5172
5173 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
5174 {
5175+ if ((long)n < 0)
5176+ return n;
5177+
5178 return __copy_user((__force void __user *) to, from, n);
5179 }
5180
5181diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
5182index 3e1449f..5293a0e 100644
5183--- a/arch/sparc/include/asm/uaccess_64.h
5184+++ b/arch/sparc/include/asm/uaccess_64.h
5185@@ -10,6 +10,7 @@
5186 #include <linux/compiler.h>
5187 #include <linux/string.h>
5188 #include <linux/thread_info.h>
5189+#include <linux/kernel.h>
5190 #include <asm/asi.h>
5191 #include <asm/system.h>
5192 #include <asm/spitfire.h>
5193@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
5194 static inline unsigned long __must_check
5195 copy_from_user(void *to, const void __user *from, unsigned long size)
5196 {
5197- unsigned long ret = ___copy_from_user(to, from, size);
5198+ unsigned long ret;
5199
5200+ if ((long)size < 0 || size > INT_MAX)
5201+ return size;
5202+
5203+ if (!__builtin_constant_p(size))
5204+ check_object_size(to, size, false);
5205+
5206+ ret = ___copy_from_user(to, from, size);
5207 if (unlikely(ret))
5208 ret = copy_from_user_fixup(to, from, size);
5209
5210@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
5211 static inline unsigned long __must_check
5212 copy_to_user(void __user *to, const void *from, unsigned long size)
5213 {
5214- unsigned long ret = ___copy_to_user(to, from, size);
5215+ unsigned long ret;
5216
5217+ if ((long)size < 0 || size > INT_MAX)
5218+ return size;
5219+
5220+ if (!__builtin_constant_p(size))
5221+ check_object_size(from, size, true);
5222+
5223+ ret = ___copy_to_user(to, from, size);
5224 if (unlikely(ret))
5225 ret = copy_to_user_fixup(to, from, size);
5226 return ret;
5227diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
5228index cb85458..e063f17 100644
5229--- a/arch/sparc/kernel/Makefile
5230+++ b/arch/sparc/kernel/Makefile
5231@@ -3,7 +3,7 @@
5232 #
5233
5234 asflags-y := -ansi
5235-ccflags-y := -Werror
5236+#ccflags-y := -Werror
5237
5238 extra-y := head_$(BITS).o
5239 extra-y += init_task.o
5240diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
5241index f793742..4d880af 100644
5242--- a/arch/sparc/kernel/process_32.c
5243+++ b/arch/sparc/kernel/process_32.c
5244@@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
5245 rw->ins[4], rw->ins[5],
5246 rw->ins[6],
5247 rw->ins[7]);
5248- printk("%pS\n", (void *) rw->ins[7]);
5249+ printk("%pA\n", (void *) rw->ins[7]);
5250 rw = (struct reg_window32 *) rw->ins[6];
5251 }
5252 spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
5253@@ -271,14 +271,14 @@ void show_regs(struct pt_regs *r)
5254
5255 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
5256 r->psr, r->pc, r->npc, r->y, print_tainted());
5257- printk("PC: <%pS>\n", (void *) r->pc);
5258+ printk("PC: <%pA>\n", (void *) r->pc);
5259 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5260 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
5261 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
5262 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5263 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
5264 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
5265- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
5266+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
5267
5268 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5269 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
5270@@ -313,7 +313,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5271 rw = (struct reg_window32 *) fp;
5272 pc = rw->ins[7];
5273 printk("[%08lx : ", pc);
5274- printk("%pS ] ", (void *) pc);
5275+ printk("%pA ] ", (void *) pc);
5276 fp = rw->ins[6];
5277 } while (++count < 16);
5278 printk("\n");
5279diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
5280index 3739a06..48b2ff0 100644
5281--- a/arch/sparc/kernel/process_64.c
5282+++ b/arch/sparc/kernel/process_64.c
5283@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_regs *regs)
5284 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
5285 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
5286 if (regs->tstate & TSTATE_PRIV)
5287- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
5288+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
5289 }
5290
5291 void show_regs(struct pt_regs *regs)
5292 {
5293 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
5294 regs->tpc, regs->tnpc, regs->y, print_tainted());
5295- printk("TPC: <%pS>\n", (void *) regs->tpc);
5296+ printk("TPC: <%pA>\n", (void *) regs->tpc);
5297 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
5298 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
5299 regs->u_regs[3]);
5300@@ -200,7 +200,7 @@ void show_regs(struct pt_regs *regs)
5301 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
5302 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
5303 regs->u_regs[15]);
5304- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
5305+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
5306 show_regwindow(regs);
5307 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
5308 }
5309@@ -285,7 +285,7 @@ void arch_trigger_all_cpu_backtrace(void)
5310 ((tp && tp->task) ? tp->task->pid : -1));
5311
5312 if (gp->tstate & TSTATE_PRIV) {
5313- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
5314+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
5315 (void *) gp->tpc,
5316 (void *) gp->o7,
5317 (void *) gp->i7,
5318diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
5319index 42b282f..28ce9f2 100644
5320--- a/arch/sparc/kernel/sys_sparc_32.c
5321+++ b/arch/sparc/kernel/sys_sparc_32.c
5322@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5323 if (ARCH_SUN4C && len > 0x20000000)
5324 return -ENOMEM;
5325 if (!addr)
5326- addr = TASK_UNMAPPED_BASE;
5327+ addr = current->mm->mmap_base;
5328
5329 if (flags & MAP_SHARED)
5330 addr = COLOUR_ALIGN(addr);
5331@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5332 }
5333 if (TASK_SIZE - PAGE_SIZE - len < addr)
5334 return -ENOMEM;
5335- if (!vmm || addr + len <= vmm->vm_start)
5336+ if (check_heap_stack_gap(vmm, addr, len))
5337 return addr;
5338 addr = vmm->vm_end;
5339 if (flags & MAP_SHARED)
5340diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
5341index 441521a..b767073 100644
5342--- a/arch/sparc/kernel/sys_sparc_64.c
5343+++ b/arch/sparc/kernel/sys_sparc_64.c
5344@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5345 /* We do not accept a shared mapping if it would violate
5346 * cache aliasing constraints.
5347 */
5348- if ((flags & MAP_SHARED) &&
5349+ if ((filp || (flags & MAP_SHARED)) &&
5350 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5351 return -EINVAL;
5352 return addr;
5353@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5354 if (filp || (flags & MAP_SHARED))
5355 do_color_align = 1;
5356
5357+#ifdef CONFIG_PAX_RANDMMAP
5358+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
5359+#endif
5360+
5361 if (addr) {
5362 if (do_color_align)
5363 addr = COLOUR_ALIGN(addr, pgoff);
5364@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5365 addr = PAGE_ALIGN(addr);
5366
5367 vma = find_vma(mm, addr);
5368- if (task_size - len >= addr &&
5369- (!vma || addr + len <= vma->vm_start))
5370+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5371 return addr;
5372 }
5373
5374 if (len > mm->cached_hole_size) {
5375- start_addr = addr = mm->free_area_cache;
5376+ start_addr = addr = mm->free_area_cache;
5377 } else {
5378- start_addr = addr = TASK_UNMAPPED_BASE;
5379+ start_addr = addr = mm->mmap_base;
5380 mm->cached_hole_size = 0;
5381 }
5382
5383@@ -174,14 +177,14 @@ full_search:
5384 vma = find_vma(mm, VA_EXCLUDE_END);
5385 }
5386 if (unlikely(task_size < addr)) {
5387- if (start_addr != TASK_UNMAPPED_BASE) {
5388- start_addr = addr = TASK_UNMAPPED_BASE;
5389+ if (start_addr != mm->mmap_base) {
5390+ start_addr = addr = mm->mmap_base;
5391 mm->cached_hole_size = 0;
5392 goto full_search;
5393 }
5394 return -ENOMEM;
5395 }
5396- if (likely(!vma || addr + len <= vma->vm_start)) {
5397+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5398 /*
5399 * Remember the place where we stopped the search:
5400 */
5401@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5402 /* We do not accept a shared mapping if it would violate
5403 * cache aliasing constraints.
5404 */
5405- if ((flags & MAP_SHARED) &&
5406+ if ((filp || (flags & MAP_SHARED)) &&
5407 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5408 return -EINVAL;
5409 return addr;
5410@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5411 addr = PAGE_ALIGN(addr);
5412
5413 vma = find_vma(mm, addr);
5414- if (task_size - len >= addr &&
5415- (!vma || addr + len <= vma->vm_start))
5416+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5417 return addr;
5418 }
5419
5420@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5421 /* make sure it can fit in the remaining address space */
5422 if (likely(addr > len)) {
5423 vma = find_vma(mm, addr-len);
5424- if (!vma || addr <= vma->vm_start) {
5425+ if (check_heap_stack_gap(vma, addr - len, len)) {
5426 /* remember the address as a hint for next time */
5427 return (mm->free_area_cache = addr-len);
5428 }
5429@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5430 if (unlikely(mm->mmap_base < len))
5431 goto bottomup;
5432
5433- addr = mm->mmap_base-len;
5434- if (do_color_align)
5435- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5436+ addr = mm->mmap_base - len;
5437
5438 do {
5439+ if (do_color_align)
5440+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5441 /*
5442 * Lookup failure means no vma is above this address,
5443 * else if new region fits below vma->vm_start,
5444 * return with success:
5445 */
5446 vma = find_vma(mm, addr);
5447- if (likely(!vma || addr+len <= vma->vm_start)) {
5448+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5449 /* remember the address as a hint for next time */
5450 return (mm->free_area_cache = addr);
5451 }
5452@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5453 mm->cached_hole_size = vma->vm_start - addr;
5454
5455 /* try just below the current vma->vm_start */
5456- addr = vma->vm_start-len;
5457- if (do_color_align)
5458- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5459- } while (likely(len < vma->vm_start));
5460+ addr = skip_heap_stack_gap(vma, len);
5461+ } while (!IS_ERR_VALUE(addr));
5462
5463 bottomup:
5464 /*
5465@@ -390,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5466 gap == RLIM_INFINITY ||
5467 sysctl_legacy_va_layout) {
5468 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
5469+
5470+#ifdef CONFIG_PAX_RANDMMAP
5471+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5472+ mm->mmap_base += mm->delta_mmap;
5473+#endif
5474+
5475 mm->get_unmapped_area = arch_get_unmapped_area;
5476 mm->unmap_area = arch_unmap_area;
5477 } else {
5478@@ -402,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5479 gap = (task_size / 6 * 5);
5480
5481 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
5482+
5483+#ifdef CONFIG_PAX_RANDMMAP
5484+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5485+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
5486+#endif
5487+
5488 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
5489 mm->unmap_area = arch_unmap_area_topdown;
5490 }
5491diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
5492index 591f20c..0f1b925 100644
5493--- a/arch/sparc/kernel/traps_32.c
5494+++ b/arch/sparc/kernel/traps_32.c
5495@@ -45,6 +45,8 @@ static void instruction_dump(unsigned long *pc)
5496 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
5497 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
5498
5499+extern void gr_handle_kernel_exploit(void);
5500+
5501 void die_if_kernel(char *str, struct pt_regs *regs)
5502 {
5503 static int die_counter;
5504@@ -77,15 +79,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5505 count++ < 30 &&
5506 (((unsigned long) rw) >= PAGE_OFFSET) &&
5507 !(((unsigned long) rw) & 0x7)) {
5508- printk("Caller[%08lx]: %pS\n", rw->ins[7],
5509+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
5510 (void *) rw->ins[7]);
5511 rw = (struct reg_window32 *)rw->ins[6];
5512 }
5513 }
5514 printk("Instruction DUMP:");
5515 instruction_dump ((unsigned long *) regs->pc);
5516- if(regs->psr & PSR_PS)
5517+ if(regs->psr & PSR_PS) {
5518+ gr_handle_kernel_exploit();
5519 do_exit(SIGKILL);
5520+ }
5521 do_exit(SIGSEGV);
5522 }
5523
5524diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
5525index 0cbdaa4..438e4c9 100644
5526--- a/arch/sparc/kernel/traps_64.c
5527+++ b/arch/sparc/kernel/traps_64.c
5528@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
5529 i + 1,
5530 p->trapstack[i].tstate, p->trapstack[i].tpc,
5531 p->trapstack[i].tnpc, p->trapstack[i].tt);
5532- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
5533+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
5534 }
5535 }
5536
5537@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
5538
5539 lvl -= 0x100;
5540 if (regs->tstate & TSTATE_PRIV) {
5541+
5542+#ifdef CONFIG_PAX_REFCOUNT
5543+ if (lvl == 6)
5544+ pax_report_refcount_overflow(regs);
5545+#endif
5546+
5547 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
5548 die_if_kernel(buffer, regs);
5549 }
5550@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
5551 void bad_trap_tl1(struct pt_regs *regs, long lvl)
5552 {
5553 char buffer[32];
5554-
5555+
5556 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
5557 0, lvl, SIGTRAP) == NOTIFY_STOP)
5558 return;
5559
5560+#ifdef CONFIG_PAX_REFCOUNT
5561+ if (lvl == 6)
5562+ pax_report_refcount_overflow(regs);
5563+#endif
5564+
5565 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
5566
5567 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
5568@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
5569 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
5570 printk("%s" "ERROR(%d): ",
5571 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
5572- printk("TPC<%pS>\n", (void *) regs->tpc);
5573+ printk("TPC<%pA>\n", (void *) regs->tpc);
5574 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
5575 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
5576 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
5577@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5578 smp_processor_id(),
5579 (type & 0x1) ? 'I' : 'D',
5580 regs->tpc);
5581- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
5582+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
5583 panic("Irrecoverable Cheetah+ parity error.");
5584 }
5585
5586@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5587 smp_processor_id(),
5588 (type & 0x1) ? 'I' : 'D',
5589 regs->tpc);
5590- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
5591+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
5592 }
5593
5594 struct sun4v_error_entry {
5595@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
5596
5597 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
5598 regs->tpc, tl);
5599- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
5600+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
5601 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5602- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
5603+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
5604 (void *) regs->u_regs[UREG_I7]);
5605 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
5606 "pte[%lx] error[%lx]\n",
5607@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
5608
5609 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
5610 regs->tpc, tl);
5611- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
5612+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
5613 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5614- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
5615+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
5616 (void *) regs->u_regs[UREG_I7]);
5617 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
5618 "pte[%lx] error[%lx]\n",
5619@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5620 fp = (unsigned long)sf->fp + STACK_BIAS;
5621 }
5622
5623- printk(" [%016lx] %pS\n", pc, (void *) pc);
5624+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5625 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
5626 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
5627 int index = tsk->curr_ret_stack;
5628 if (tsk->ret_stack && index >= graph) {
5629 pc = tsk->ret_stack[index - graph].ret;
5630- printk(" [%016lx] %pS\n", pc, (void *) pc);
5631+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5632 graph++;
5633 }
5634 }
5635@@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
5636 return (struct reg_window *) (fp + STACK_BIAS);
5637 }
5638
5639+extern void gr_handle_kernel_exploit(void);
5640+
5641 void die_if_kernel(char *str, struct pt_regs *regs)
5642 {
5643 static int die_counter;
5644@@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5645 while (rw &&
5646 count++ < 30 &&
5647 kstack_valid(tp, (unsigned long) rw)) {
5648- printk("Caller[%016lx]: %pS\n", rw->ins[7],
5649+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
5650 (void *) rw->ins[7]);
5651
5652 rw = kernel_stack_up(rw);
5653@@ -2267,8 +2280,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5654 }
5655 user_instruction_dump ((unsigned int __user *) regs->tpc);
5656 }
5657- if (regs->tstate & TSTATE_PRIV)
5658+ if (regs->tstate & TSTATE_PRIV) {
5659+ gr_handle_kernel_exploit();
5660 do_exit(SIGKILL);
5661+ }
5662 do_exit(SIGSEGV);
5663 }
5664 EXPORT_SYMBOL(die_if_kernel);
5665diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
5666index 76e4ac1..78f8bb1 100644
5667--- a/arch/sparc/kernel/unaligned_64.c
5668+++ b/arch/sparc/kernel/unaligned_64.c
5669@@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs *regs)
5670 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
5671
5672 if (__ratelimit(&ratelimit)) {
5673- printk("Kernel unaligned access at TPC[%lx] %pS\n",
5674+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
5675 regs->tpc, (void *) regs->tpc);
5676 }
5677 }
5678diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
5679index a3fc437..fea9957 100644
5680--- a/arch/sparc/lib/Makefile
5681+++ b/arch/sparc/lib/Makefile
5682@@ -2,7 +2,7 @@
5683 #
5684
5685 asflags-y := -ansi -DST_DIV0=0x02
5686-ccflags-y := -Werror
5687+#ccflags-y := -Werror
5688
5689 lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
5690 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
5691diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
5692index 59186e0..f747d7a 100644
5693--- a/arch/sparc/lib/atomic_64.S
5694+++ b/arch/sparc/lib/atomic_64.S
5695@@ -18,7 +18,12 @@
5696 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5697 BACKOFF_SETUP(%o2)
5698 1: lduw [%o1], %g1
5699- add %g1, %o0, %g7
5700+ addcc %g1, %o0, %g7
5701+
5702+#ifdef CONFIG_PAX_REFCOUNT
5703+ tvs %icc, 6
5704+#endif
5705+
5706 cas [%o1], %g1, %g7
5707 cmp %g1, %g7
5708 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5709@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5710 2: BACKOFF_SPIN(%o2, %o3, 1b)
5711 .size atomic_add, .-atomic_add
5712
5713+ .globl atomic_add_unchecked
5714+ .type atomic_add_unchecked,#function
5715+atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5716+ BACKOFF_SETUP(%o2)
5717+1: lduw [%o1], %g1
5718+ add %g1, %o0, %g7
5719+ cas [%o1], %g1, %g7
5720+ cmp %g1, %g7
5721+ bne,pn %icc, 2f
5722+ nop
5723+ retl
5724+ nop
5725+2: BACKOFF_SPIN(%o2, %o3, 1b)
5726+ .size atomic_add_unchecked, .-atomic_add_unchecked
5727+
5728 .globl atomic_sub
5729 .type atomic_sub,#function
5730 atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5731 BACKOFF_SETUP(%o2)
5732 1: lduw [%o1], %g1
5733- sub %g1, %o0, %g7
5734+ subcc %g1, %o0, %g7
5735+
5736+#ifdef CONFIG_PAX_REFCOUNT
5737+ tvs %icc, 6
5738+#endif
5739+
5740 cas [%o1], %g1, %g7
5741 cmp %g1, %g7
5742 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5743@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5744 2: BACKOFF_SPIN(%o2, %o3, 1b)
5745 .size atomic_sub, .-atomic_sub
5746
5747+ .globl atomic_sub_unchecked
5748+ .type atomic_sub_unchecked,#function
5749+atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5750+ BACKOFF_SETUP(%o2)
5751+1: lduw [%o1], %g1
5752+ sub %g1, %o0, %g7
5753+ cas [%o1], %g1, %g7
5754+ cmp %g1, %g7
5755+ bne,pn %icc, 2f
5756+ nop
5757+ retl
5758+ nop
5759+2: BACKOFF_SPIN(%o2, %o3, 1b)
5760+ .size atomic_sub_unchecked, .-atomic_sub_unchecked
5761+
5762 .globl atomic_add_ret
5763 .type atomic_add_ret,#function
5764 atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5765 BACKOFF_SETUP(%o2)
5766 1: lduw [%o1], %g1
5767- add %g1, %o0, %g7
5768+ addcc %g1, %o0, %g7
5769+
5770+#ifdef CONFIG_PAX_REFCOUNT
5771+ tvs %icc, 6
5772+#endif
5773+
5774 cas [%o1], %g1, %g7
5775 cmp %g1, %g7
5776 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5777@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5778 2: BACKOFF_SPIN(%o2, %o3, 1b)
5779 .size atomic_add_ret, .-atomic_add_ret
5780
5781+ .globl atomic_add_ret_unchecked
5782+ .type atomic_add_ret_unchecked,#function
5783+atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5784+ BACKOFF_SETUP(%o2)
5785+1: lduw [%o1], %g1
5786+ addcc %g1, %o0, %g7
5787+ cas [%o1], %g1, %g7
5788+ cmp %g1, %g7
5789+ bne,pn %icc, 2f
5790+ add %g7, %o0, %g7
5791+ sra %g7, 0, %o0
5792+ retl
5793+ nop
5794+2: BACKOFF_SPIN(%o2, %o3, 1b)
5795+ .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
5796+
5797 .globl atomic_sub_ret
5798 .type atomic_sub_ret,#function
5799 atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5800 BACKOFF_SETUP(%o2)
5801 1: lduw [%o1], %g1
5802- sub %g1, %o0, %g7
5803+ subcc %g1, %o0, %g7
5804+
5805+#ifdef CONFIG_PAX_REFCOUNT
5806+ tvs %icc, 6
5807+#endif
5808+
5809 cas [%o1], %g1, %g7
5810 cmp %g1, %g7
5811 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5812@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5813 atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5814 BACKOFF_SETUP(%o2)
5815 1: ldx [%o1], %g1
5816- add %g1, %o0, %g7
5817+ addcc %g1, %o0, %g7
5818+
5819+#ifdef CONFIG_PAX_REFCOUNT
5820+ tvs %xcc, 6
5821+#endif
5822+
5823 casx [%o1], %g1, %g7
5824 cmp %g1, %g7
5825 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5826@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5827 2: BACKOFF_SPIN(%o2, %o3, 1b)
5828 .size atomic64_add, .-atomic64_add
5829
5830+ .globl atomic64_add_unchecked
5831+ .type atomic64_add_unchecked,#function
5832+atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5833+ BACKOFF_SETUP(%o2)
5834+1: ldx [%o1], %g1
5835+ addcc %g1, %o0, %g7
5836+ casx [%o1], %g1, %g7
5837+ cmp %g1, %g7
5838+ bne,pn %xcc, 2f
5839+ nop
5840+ retl
5841+ nop
5842+2: BACKOFF_SPIN(%o2, %o3, 1b)
5843+ .size atomic64_add_unchecked, .-atomic64_add_unchecked
5844+
5845 .globl atomic64_sub
5846 .type atomic64_sub,#function
5847 atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5848 BACKOFF_SETUP(%o2)
5849 1: ldx [%o1], %g1
5850- sub %g1, %o0, %g7
5851+ subcc %g1, %o0, %g7
5852+
5853+#ifdef CONFIG_PAX_REFCOUNT
5854+ tvs %xcc, 6
5855+#endif
5856+
5857 casx [%o1], %g1, %g7
5858 cmp %g1, %g7
5859 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5860@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5861 2: BACKOFF_SPIN(%o2, %o3, 1b)
5862 .size atomic64_sub, .-atomic64_sub
5863
5864+ .globl atomic64_sub_unchecked
5865+ .type atomic64_sub_unchecked,#function
5866+atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5867+ BACKOFF_SETUP(%o2)
5868+1: ldx [%o1], %g1
5869+ subcc %g1, %o0, %g7
5870+ casx [%o1], %g1, %g7
5871+ cmp %g1, %g7
5872+ bne,pn %xcc, 2f
5873+ nop
5874+ retl
5875+ nop
5876+2: BACKOFF_SPIN(%o2, %o3, 1b)
5877+ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked
5878+
5879 .globl atomic64_add_ret
5880 .type atomic64_add_ret,#function
5881 atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5882 BACKOFF_SETUP(%o2)
5883 1: ldx [%o1], %g1
5884- add %g1, %o0, %g7
5885+ addcc %g1, %o0, %g7
5886+
5887+#ifdef CONFIG_PAX_REFCOUNT
5888+ tvs %xcc, 6
5889+#endif
5890+
5891 casx [%o1], %g1, %g7
5892 cmp %g1, %g7
5893 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5894@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5895 2: BACKOFF_SPIN(%o2, %o3, 1b)
5896 .size atomic64_add_ret, .-atomic64_add_ret
5897
5898+ .globl atomic64_add_ret_unchecked
5899+ .type atomic64_add_ret_unchecked,#function
5900+atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5901+ BACKOFF_SETUP(%o2)
5902+1: ldx [%o1], %g1
5903+ addcc %g1, %o0, %g7
5904+ casx [%o1], %g1, %g7
5905+ cmp %g1, %g7
5906+ bne,pn %xcc, 2f
5907+ add %g7, %o0, %g7
5908+ mov %g7, %o0
5909+ retl
5910+ nop
5911+2: BACKOFF_SPIN(%o2, %o3, 1b)
5912+ .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked
5913+
5914 .globl atomic64_sub_ret
5915 .type atomic64_sub_ret,#function
5916 atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5917 BACKOFF_SETUP(%o2)
5918 1: ldx [%o1], %g1
5919- sub %g1, %o0, %g7
5920+ subcc %g1, %o0, %g7
5921+
5922+#ifdef CONFIG_PAX_REFCOUNT
5923+ tvs %xcc, 6
5924+#endif
5925+
5926 casx [%o1], %g1, %g7
5927 cmp %g1, %g7
5928 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5929diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
5930index 1b30bb3..b4a16c7 100644
5931--- a/arch/sparc/lib/ksyms.c
5932+++ b/arch/sparc/lib/ksyms.c
5933@@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
5934
5935 /* Atomic counter implementation. */
5936 EXPORT_SYMBOL(atomic_add);
5937+EXPORT_SYMBOL(atomic_add_unchecked);
5938 EXPORT_SYMBOL(atomic_add_ret);
5939+EXPORT_SYMBOL(atomic_add_ret_unchecked);
5940 EXPORT_SYMBOL(atomic_sub);
5941+EXPORT_SYMBOL(atomic_sub_unchecked);
5942 EXPORT_SYMBOL(atomic_sub_ret);
5943 EXPORT_SYMBOL(atomic64_add);
5944+EXPORT_SYMBOL(atomic64_add_unchecked);
5945 EXPORT_SYMBOL(atomic64_add_ret);
5946+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
5947 EXPORT_SYMBOL(atomic64_sub);
5948+EXPORT_SYMBOL(atomic64_sub_unchecked);
5949 EXPORT_SYMBOL(atomic64_sub_ret);
5950
5951 /* Atomic bit operations. */
5952diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
5953index 301421c..e2535d1 100644
5954--- a/arch/sparc/mm/Makefile
5955+++ b/arch/sparc/mm/Makefile
5956@@ -2,7 +2,7 @@
5957 #
5958
5959 asflags-y := -ansi
5960-ccflags-y := -Werror
5961+#ccflags-y := -Werror
5962
5963 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
5964 obj-y += fault_$(BITS).o
5965diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
5966index 8023fd7..c8e89e9 100644
5967--- a/arch/sparc/mm/fault_32.c
5968+++ b/arch/sparc/mm/fault_32.c
5969@@ -21,6 +21,9 @@
5970 #include <linux/perf_event.h>
5971 #include <linux/interrupt.h>
5972 #include <linux/kdebug.h>
5973+#include <linux/slab.h>
5974+#include <linux/pagemap.h>
5975+#include <linux/compiler.h>
5976
5977 #include <asm/system.h>
5978 #include <asm/page.h>
5979@@ -208,6 +211,268 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
5980 return safe_compute_effective_address(regs, insn);
5981 }
5982
5983+#ifdef CONFIG_PAX_PAGEEXEC
5984+#ifdef CONFIG_PAX_DLRESOLVE
5985+static void pax_emuplt_close(struct vm_area_struct *vma)
5986+{
5987+ vma->vm_mm->call_dl_resolve = 0UL;
5988+}
5989+
5990+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
5991+{
5992+ unsigned int *kaddr;
5993+
5994+ vmf->page = alloc_page(GFP_HIGHUSER);
5995+ if (!vmf->page)
5996+ return VM_FAULT_OOM;
5997+
5998+ kaddr = kmap(vmf->page);
5999+ memset(kaddr, 0, PAGE_SIZE);
6000+ kaddr[0] = 0x9DE3BFA8U; /* save */
6001+ flush_dcache_page(vmf->page);
6002+ kunmap(vmf->page);
6003+ return VM_FAULT_MAJOR;
6004+}
6005+
6006+static const struct vm_operations_struct pax_vm_ops = {
6007+ .close = pax_emuplt_close,
6008+ .fault = pax_emuplt_fault
6009+};
6010+
6011+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6012+{
6013+ int ret;
6014+
6015+ INIT_LIST_HEAD(&vma->anon_vma_chain);
6016+ vma->vm_mm = current->mm;
6017+ vma->vm_start = addr;
6018+ vma->vm_end = addr + PAGE_SIZE;
6019+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6020+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6021+ vma->vm_ops = &pax_vm_ops;
6022+
6023+ ret = insert_vm_struct(current->mm, vma);
6024+ if (ret)
6025+ return ret;
6026+
6027+ ++current->mm->total_vm;
6028+ return 0;
6029+}
6030+#endif
6031+
6032+/*
6033+ * PaX: decide what to do with offenders (regs->pc = fault address)
6034+ *
6035+ * returns 1 when task should be killed
6036+ * 2 when patched PLT trampoline was detected
6037+ * 3 when unpatched PLT trampoline was detected
6038+ */
6039+static int pax_handle_fetch_fault(struct pt_regs *regs)
6040+{
6041+
6042+#ifdef CONFIG_PAX_EMUPLT
6043+ int err;
6044+
6045+ do { /* PaX: patched PLT emulation #1 */
6046+ unsigned int sethi1, sethi2, jmpl;
6047+
6048+ err = get_user(sethi1, (unsigned int *)regs->pc);
6049+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
6050+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
6051+
6052+ if (err)
6053+ break;
6054+
6055+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6056+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6057+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6058+ {
6059+ unsigned int addr;
6060+
6061+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6062+ addr = regs->u_regs[UREG_G1];
6063+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6064+ regs->pc = addr;
6065+ regs->npc = addr+4;
6066+ return 2;
6067+ }
6068+ } while (0);
6069+
6070+ { /* PaX: patched PLT emulation #2 */
6071+ unsigned int ba;
6072+
6073+ err = get_user(ba, (unsigned int *)regs->pc);
6074+
6075+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6076+ unsigned int addr;
6077+
6078+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6079+ regs->pc = addr;
6080+ regs->npc = addr+4;
6081+ return 2;
6082+ }
6083+ }
6084+
6085+ do { /* PaX: patched PLT emulation #3 */
6086+ unsigned int sethi, jmpl, nop;
6087+
6088+ err = get_user(sethi, (unsigned int *)regs->pc);
6089+ err |= get_user(jmpl, (unsigned int *)(regs->pc+4));
6090+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
6091+
6092+ if (err)
6093+ break;
6094+
6095+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6096+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6097+ nop == 0x01000000U)
6098+ {
6099+ unsigned int addr;
6100+
6101+ addr = (sethi & 0x003FFFFFU) << 10;
6102+ regs->u_regs[UREG_G1] = addr;
6103+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6104+ regs->pc = addr;
6105+ regs->npc = addr+4;
6106+ return 2;
6107+ }
6108+ } while (0);
6109+
6110+ do { /* PaX: unpatched PLT emulation step 1 */
6111+ unsigned int sethi, ba, nop;
6112+
6113+ err = get_user(sethi, (unsigned int *)regs->pc);
6114+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
6115+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
6116+
6117+ if (err)
6118+ break;
6119+
6120+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6121+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6122+ nop == 0x01000000U)
6123+ {
6124+ unsigned int addr, save, call;
6125+
6126+ if ((ba & 0xFFC00000U) == 0x30800000U)
6127+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6128+ else
6129+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6130+
6131+ err = get_user(save, (unsigned int *)addr);
6132+ err |= get_user(call, (unsigned int *)(addr+4));
6133+ err |= get_user(nop, (unsigned int *)(addr+8));
6134+ if (err)
6135+ break;
6136+
6137+#ifdef CONFIG_PAX_DLRESOLVE
6138+ if (save == 0x9DE3BFA8U &&
6139+ (call & 0xC0000000U) == 0x40000000U &&
6140+ nop == 0x01000000U)
6141+ {
6142+ struct vm_area_struct *vma;
6143+ unsigned long call_dl_resolve;
6144+
6145+ down_read(&current->mm->mmap_sem);
6146+ call_dl_resolve = current->mm->call_dl_resolve;
6147+ up_read(&current->mm->mmap_sem);
6148+ if (likely(call_dl_resolve))
6149+ goto emulate;
6150+
6151+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6152+
6153+ down_write(&current->mm->mmap_sem);
6154+ if (current->mm->call_dl_resolve) {
6155+ call_dl_resolve = current->mm->call_dl_resolve;
6156+ up_write(&current->mm->mmap_sem);
6157+ if (vma)
6158+ kmem_cache_free(vm_area_cachep, vma);
6159+ goto emulate;
6160+ }
6161+
6162+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6163+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6164+ up_write(&current->mm->mmap_sem);
6165+ if (vma)
6166+ kmem_cache_free(vm_area_cachep, vma);
6167+ return 1;
6168+ }
6169+
6170+ if (pax_insert_vma(vma, call_dl_resolve)) {
6171+ up_write(&current->mm->mmap_sem);
6172+ kmem_cache_free(vm_area_cachep, vma);
6173+ return 1;
6174+ }
6175+
6176+ current->mm->call_dl_resolve = call_dl_resolve;
6177+ up_write(&current->mm->mmap_sem);
6178+
6179+emulate:
6180+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6181+ regs->pc = call_dl_resolve;
6182+ regs->npc = addr+4;
6183+ return 3;
6184+ }
6185+#endif
6186+
6187+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6188+ if ((save & 0xFFC00000U) == 0x05000000U &&
6189+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6190+ nop == 0x01000000U)
6191+ {
6192+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6193+ regs->u_regs[UREG_G2] = addr + 4;
6194+ addr = (save & 0x003FFFFFU) << 10;
6195+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6196+ regs->pc = addr;
6197+ regs->npc = addr+4;
6198+ return 3;
6199+ }
6200+ }
6201+ } while (0);
6202+
6203+ do { /* PaX: unpatched PLT emulation step 2 */
6204+ unsigned int save, call, nop;
6205+
6206+ err = get_user(save, (unsigned int *)(regs->pc-4));
6207+ err |= get_user(call, (unsigned int *)regs->pc);
6208+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
6209+ if (err)
6210+ break;
6211+
6212+ if (save == 0x9DE3BFA8U &&
6213+ (call & 0xC0000000U) == 0x40000000U &&
6214+ nop == 0x01000000U)
6215+ {
6216+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
6217+
6218+ regs->u_regs[UREG_RETPC] = regs->pc;
6219+ regs->pc = dl_resolve;
6220+ regs->npc = dl_resolve+4;
6221+ return 3;
6222+ }
6223+ } while (0);
6224+#endif
6225+
6226+ return 1;
6227+}
6228+
6229+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6230+{
6231+ unsigned long i;
6232+
6233+ printk(KERN_ERR "PAX: bytes at PC: ");
6234+ for (i = 0; i < 8; i++) {
6235+ unsigned int c;
6236+ if (get_user(c, (unsigned int *)pc+i))
6237+ printk(KERN_CONT "???????? ");
6238+ else
6239+ printk(KERN_CONT "%08x ", c);
6240+ }
6241+ printk("\n");
6242+}
6243+#endif
6244+
6245 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
6246 int text_fault)
6247 {
6248@@ -280,6 +545,24 @@ good_area:
6249 if(!(vma->vm_flags & VM_WRITE))
6250 goto bad_area;
6251 } else {
6252+
6253+#ifdef CONFIG_PAX_PAGEEXEC
6254+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
6255+ up_read(&mm->mmap_sem);
6256+ switch (pax_handle_fetch_fault(regs)) {
6257+
6258+#ifdef CONFIG_PAX_EMUPLT
6259+ case 2:
6260+ case 3:
6261+ return;
6262+#endif
6263+
6264+ }
6265+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
6266+ do_group_exit(SIGKILL);
6267+ }
6268+#endif
6269+
6270 /* Allow reads even for write-only mappings */
6271 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
6272 goto bad_area;
6273diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
6274index 504c062..6fcb9c6 100644
6275--- a/arch/sparc/mm/fault_64.c
6276+++ b/arch/sparc/mm/fault_64.c
6277@@ -21,6 +21,9 @@
6278 #include <linux/kprobes.h>
6279 #include <linux/kdebug.h>
6280 #include <linux/percpu.h>
6281+#include <linux/slab.h>
6282+#include <linux/pagemap.h>
6283+#include <linux/compiler.h>
6284
6285 #include <asm/page.h>
6286 #include <asm/pgtable.h>
6287@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
6288 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
6289 regs->tpc);
6290 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
6291- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
6292+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
6293 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
6294 dump_stack();
6295 unhandled_fault(regs->tpc, current, regs);
6296@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
6297 show_regs(regs);
6298 }
6299
6300+#ifdef CONFIG_PAX_PAGEEXEC
6301+#ifdef CONFIG_PAX_DLRESOLVE
6302+static void pax_emuplt_close(struct vm_area_struct *vma)
6303+{
6304+ vma->vm_mm->call_dl_resolve = 0UL;
6305+}
6306+
6307+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6308+{
6309+ unsigned int *kaddr;
6310+
6311+ vmf->page = alloc_page(GFP_HIGHUSER);
6312+ if (!vmf->page)
6313+ return VM_FAULT_OOM;
6314+
6315+ kaddr = kmap(vmf->page);
6316+ memset(kaddr, 0, PAGE_SIZE);
6317+ kaddr[0] = 0x9DE3BFA8U; /* save */
6318+ flush_dcache_page(vmf->page);
6319+ kunmap(vmf->page);
6320+ return VM_FAULT_MAJOR;
6321+}
6322+
6323+static const struct vm_operations_struct pax_vm_ops = {
6324+ .close = pax_emuplt_close,
6325+ .fault = pax_emuplt_fault
6326+};
6327+
6328+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6329+{
6330+ int ret;
6331+
6332+ INIT_LIST_HEAD(&vma->anon_vma_chain);
6333+ vma->vm_mm = current->mm;
6334+ vma->vm_start = addr;
6335+ vma->vm_end = addr + PAGE_SIZE;
6336+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6337+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6338+ vma->vm_ops = &pax_vm_ops;
6339+
6340+ ret = insert_vm_struct(current->mm, vma);
6341+ if (ret)
6342+ return ret;
6343+
6344+ ++current->mm->total_vm;
6345+ return 0;
6346+}
6347+#endif
6348+
6349+/*
6350+ * PaX: decide what to do with offenders (regs->tpc = fault address)
6351+ *
6352+ * returns 1 when task should be killed
6353+ * 2 when patched PLT trampoline was detected
6354+ * 3 when unpatched PLT trampoline was detected
6355+ */
6356+static int pax_handle_fetch_fault(struct pt_regs *regs)
6357+{
6358+
6359+#ifdef CONFIG_PAX_EMUPLT
6360+ int err;
6361+
6362+ do { /* PaX: patched PLT emulation #1 */
6363+ unsigned int sethi1, sethi2, jmpl;
6364+
6365+ err = get_user(sethi1, (unsigned int *)regs->tpc);
6366+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
6367+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
6368+
6369+ if (err)
6370+ break;
6371+
6372+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6373+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6374+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6375+ {
6376+ unsigned long addr;
6377+
6378+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6379+ addr = regs->u_regs[UREG_G1];
6380+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6381+
6382+ if (test_thread_flag(TIF_32BIT))
6383+ addr &= 0xFFFFFFFFUL;
6384+
6385+ regs->tpc = addr;
6386+ regs->tnpc = addr+4;
6387+ return 2;
6388+ }
6389+ } while (0);
6390+
6391+ { /* PaX: patched PLT emulation #2 */
6392+ unsigned int ba;
6393+
6394+ err = get_user(ba, (unsigned int *)regs->tpc);
6395+
6396+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6397+ unsigned long addr;
6398+
6399+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6400+
6401+ if (test_thread_flag(TIF_32BIT))
6402+ addr &= 0xFFFFFFFFUL;
6403+
6404+ regs->tpc = addr;
6405+ regs->tnpc = addr+4;
6406+ return 2;
6407+ }
6408+ }
6409+
6410+ do { /* PaX: patched PLT emulation #3 */
6411+ unsigned int sethi, jmpl, nop;
6412+
6413+ err = get_user(sethi, (unsigned int *)regs->tpc);
6414+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+4));
6415+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6416+
6417+ if (err)
6418+ break;
6419+
6420+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6421+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6422+ nop == 0x01000000U)
6423+ {
6424+ unsigned long addr;
6425+
6426+ addr = (sethi & 0x003FFFFFU) << 10;
6427+ regs->u_regs[UREG_G1] = addr;
6428+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6429+
6430+ if (test_thread_flag(TIF_32BIT))
6431+ addr &= 0xFFFFFFFFUL;
6432+
6433+ regs->tpc = addr;
6434+ regs->tnpc = addr+4;
6435+ return 2;
6436+ }
6437+ } while (0);
6438+
6439+ do { /* PaX: patched PLT emulation #4 */
6440+ unsigned int sethi, mov1, call, mov2;
6441+
6442+ err = get_user(sethi, (unsigned int *)regs->tpc);
6443+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
6444+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
6445+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
6446+
6447+ if (err)
6448+ break;
6449+
6450+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6451+ mov1 == 0x8210000FU &&
6452+ (call & 0xC0000000U) == 0x40000000U &&
6453+ mov2 == 0x9E100001U)
6454+ {
6455+ unsigned long addr;
6456+
6457+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
6458+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6459+
6460+ if (test_thread_flag(TIF_32BIT))
6461+ addr &= 0xFFFFFFFFUL;
6462+
6463+ regs->tpc = addr;
6464+ regs->tnpc = addr+4;
6465+ return 2;
6466+ }
6467+ } while (0);
6468+
6469+ do { /* PaX: patched PLT emulation #5 */
6470+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
6471+
6472+ err = get_user(sethi, (unsigned int *)regs->tpc);
6473+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6474+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6475+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
6476+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
6477+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
6478+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
6479+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
6480+
6481+ if (err)
6482+ break;
6483+
6484+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6485+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6486+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6487+ (or1 & 0xFFFFE000U) == 0x82106000U &&
6488+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6489+ sllx == 0x83287020U &&
6490+ jmpl == 0x81C04005U &&
6491+ nop == 0x01000000U)
6492+ {
6493+ unsigned long addr;
6494+
6495+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6496+ regs->u_regs[UREG_G1] <<= 32;
6497+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6498+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6499+ regs->tpc = addr;
6500+ regs->tnpc = addr+4;
6501+ return 2;
6502+ }
6503+ } while (0);
6504+
6505+ do { /* PaX: patched PLT emulation #6 */
6506+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
6507+
6508+ err = get_user(sethi, (unsigned int *)regs->tpc);
6509+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6510+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6511+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
6512+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
6513+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
6514+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
6515+
6516+ if (err)
6517+ break;
6518+
6519+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6520+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6521+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6522+ sllx == 0x83287020U &&
6523+ (or & 0xFFFFE000U) == 0x8A116000U &&
6524+ jmpl == 0x81C04005U &&
6525+ nop == 0x01000000U)
6526+ {
6527+ unsigned long addr;
6528+
6529+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
6530+ regs->u_regs[UREG_G1] <<= 32;
6531+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
6532+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6533+ regs->tpc = addr;
6534+ regs->tnpc = addr+4;
6535+ return 2;
6536+ }
6537+ } while (0);
6538+
6539+ do { /* PaX: unpatched PLT emulation step 1 */
6540+ unsigned int sethi, ba, nop;
6541+
6542+ err = get_user(sethi, (unsigned int *)regs->tpc);
6543+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6544+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6545+
6546+ if (err)
6547+ break;
6548+
6549+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6550+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6551+ nop == 0x01000000U)
6552+ {
6553+ unsigned long addr;
6554+ unsigned int save, call;
6555+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
6556+
6557+ if ((ba & 0xFFC00000U) == 0x30800000U)
6558+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6559+ else
6560+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6561+
6562+ if (test_thread_flag(TIF_32BIT))
6563+ addr &= 0xFFFFFFFFUL;
6564+
6565+ err = get_user(save, (unsigned int *)addr);
6566+ err |= get_user(call, (unsigned int *)(addr+4));
6567+ err |= get_user(nop, (unsigned int *)(addr+8));
6568+ if (err)
6569+ break;
6570+
6571+#ifdef CONFIG_PAX_DLRESOLVE
6572+ if (save == 0x9DE3BFA8U &&
6573+ (call & 0xC0000000U) == 0x40000000U &&
6574+ nop == 0x01000000U)
6575+ {
6576+ struct vm_area_struct *vma;
6577+ unsigned long call_dl_resolve;
6578+
6579+ down_read(&current->mm->mmap_sem);
6580+ call_dl_resolve = current->mm->call_dl_resolve;
6581+ up_read(&current->mm->mmap_sem);
6582+ if (likely(call_dl_resolve))
6583+ goto emulate;
6584+
6585+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6586+
6587+ down_write(&current->mm->mmap_sem);
6588+ if (current->mm->call_dl_resolve) {
6589+ call_dl_resolve = current->mm->call_dl_resolve;
6590+ up_write(&current->mm->mmap_sem);
6591+ if (vma)
6592+ kmem_cache_free(vm_area_cachep, vma);
6593+ goto emulate;
6594+ }
6595+
6596+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6597+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6598+ up_write(&current->mm->mmap_sem);
6599+ if (vma)
6600+ kmem_cache_free(vm_area_cachep, vma);
6601+ return 1;
6602+ }
6603+
6604+ if (pax_insert_vma(vma, call_dl_resolve)) {
6605+ up_write(&current->mm->mmap_sem);
6606+ kmem_cache_free(vm_area_cachep, vma);
6607+ return 1;
6608+ }
6609+
6610+ current->mm->call_dl_resolve = call_dl_resolve;
6611+ up_write(&current->mm->mmap_sem);
6612+
6613+emulate:
6614+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6615+ regs->tpc = call_dl_resolve;
6616+ regs->tnpc = addr+4;
6617+ return 3;
6618+ }
6619+#endif
6620+
6621+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6622+ if ((save & 0xFFC00000U) == 0x05000000U &&
6623+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6624+ nop == 0x01000000U)
6625+ {
6626+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6627+ regs->u_regs[UREG_G2] = addr + 4;
6628+ addr = (save & 0x003FFFFFU) << 10;
6629+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6630+
6631+ if (test_thread_flag(TIF_32BIT))
6632+ addr &= 0xFFFFFFFFUL;
6633+
6634+ regs->tpc = addr;
6635+ regs->tnpc = addr+4;
6636+ return 3;
6637+ }
6638+
6639+ /* PaX: 64-bit PLT stub */
6640+ err = get_user(sethi1, (unsigned int *)addr);
6641+ err |= get_user(sethi2, (unsigned int *)(addr+4));
6642+ err |= get_user(or1, (unsigned int *)(addr+8));
6643+ err |= get_user(or2, (unsigned int *)(addr+12));
6644+ err |= get_user(sllx, (unsigned int *)(addr+16));
6645+ err |= get_user(add, (unsigned int *)(addr+20));
6646+ err |= get_user(jmpl, (unsigned int *)(addr+24));
6647+ err |= get_user(nop, (unsigned int *)(addr+28));
6648+ if (err)
6649+ break;
6650+
6651+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
6652+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6653+ (or1 & 0xFFFFE000U) == 0x88112000U &&
6654+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6655+ sllx == 0x89293020U &&
6656+ add == 0x8A010005U &&
6657+ jmpl == 0x89C14000U &&
6658+ nop == 0x01000000U)
6659+ {
6660+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6661+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6662+ regs->u_regs[UREG_G4] <<= 32;
6663+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6664+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
6665+ regs->u_regs[UREG_G4] = addr + 24;
6666+ addr = regs->u_regs[UREG_G5];
6667+ regs->tpc = addr;
6668+ regs->tnpc = addr+4;
6669+ return 3;
6670+ }
6671+ }
6672+ } while (0);
6673+
6674+#ifdef CONFIG_PAX_DLRESOLVE
6675+ do { /* PaX: unpatched PLT emulation step 2 */
6676+ unsigned int save, call, nop;
6677+
6678+ err = get_user(save, (unsigned int *)(regs->tpc-4));
6679+ err |= get_user(call, (unsigned int *)regs->tpc);
6680+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
6681+ if (err)
6682+ break;
6683+
6684+ if (save == 0x9DE3BFA8U &&
6685+ (call & 0xC0000000U) == 0x40000000U &&
6686+ nop == 0x01000000U)
6687+ {
6688+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6689+
6690+ if (test_thread_flag(TIF_32BIT))
6691+ dl_resolve &= 0xFFFFFFFFUL;
6692+
6693+ regs->u_regs[UREG_RETPC] = regs->tpc;
6694+ regs->tpc = dl_resolve;
6695+ regs->tnpc = dl_resolve+4;
6696+ return 3;
6697+ }
6698+ } while (0);
6699+#endif
6700+
6701+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
6702+ unsigned int sethi, ba, nop;
6703+
6704+ err = get_user(sethi, (unsigned int *)regs->tpc);
6705+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6706+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6707+
6708+ if (err)
6709+ break;
6710+
6711+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6712+ (ba & 0xFFF00000U) == 0x30600000U &&
6713+ nop == 0x01000000U)
6714+ {
6715+ unsigned long addr;
6716+
6717+ addr = (sethi & 0x003FFFFFU) << 10;
6718+ regs->u_regs[UREG_G1] = addr;
6719+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6720+
6721+ if (test_thread_flag(TIF_32BIT))
6722+ addr &= 0xFFFFFFFFUL;
6723+
6724+ regs->tpc = addr;
6725+ regs->tnpc = addr+4;
6726+ return 2;
6727+ }
6728+ } while (0);
6729+
6730+#endif
6731+
6732+ return 1;
6733+}
6734+
6735+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6736+{
6737+ unsigned long i;
6738+
6739+ printk(KERN_ERR "PAX: bytes at PC: ");
6740+ for (i = 0; i < 8; i++) {
6741+ unsigned int c;
6742+ if (get_user(c, (unsigned int *)pc+i))
6743+ printk(KERN_CONT "???????? ");
6744+ else
6745+ printk(KERN_CONT "%08x ", c);
6746+ }
6747+ printk("\n");
6748+}
6749+#endif
6750+
6751 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6752 {
6753 struct mm_struct *mm = current->mm;
6754@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6755 if (!vma)
6756 goto bad_area;
6757
6758+#ifdef CONFIG_PAX_PAGEEXEC
6759+ /* PaX: detect ITLB misses on non-exec pages */
6760+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
6761+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
6762+ {
6763+ if (address != regs->tpc)
6764+ goto good_area;
6765+
6766+ up_read(&mm->mmap_sem);
6767+ switch (pax_handle_fetch_fault(regs)) {
6768+
6769+#ifdef CONFIG_PAX_EMUPLT
6770+ case 2:
6771+ case 3:
6772+ return;
6773+#endif
6774+
6775+ }
6776+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
6777+ do_group_exit(SIGKILL);
6778+ }
6779+#endif
6780+
6781 /* Pure DTLB misses do not tell us whether the fault causing
6782 * load/store/atomic was a write or not, it only says that there
6783 * was no match. So in such a case we (carefully) read the
6784diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
6785index 07e1453..0a7d9e9 100644
6786--- a/arch/sparc/mm/hugetlbpage.c
6787+++ b/arch/sparc/mm/hugetlbpage.c
6788@@ -67,7 +67,7 @@ full_search:
6789 }
6790 return -ENOMEM;
6791 }
6792- if (likely(!vma || addr + len <= vma->vm_start)) {
6793+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6794 /*
6795 * Remember the place where we stopped the search:
6796 */
6797@@ -106,7 +106,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6798 /* make sure it can fit in the remaining address space */
6799 if (likely(addr > len)) {
6800 vma = find_vma(mm, addr-len);
6801- if (!vma || addr <= vma->vm_start) {
6802+ if (check_heap_stack_gap(vma, addr - len, len)) {
6803 /* remember the address as a hint for next time */
6804 return (mm->free_area_cache = addr-len);
6805 }
6806@@ -115,16 +115,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6807 if (unlikely(mm->mmap_base < len))
6808 goto bottomup;
6809
6810- addr = (mm->mmap_base-len) & HPAGE_MASK;
6811+ addr = mm->mmap_base - len;
6812
6813 do {
6814+ addr &= HPAGE_MASK;
6815 /*
6816 * Lookup failure means no vma is above this address,
6817 * else if new region fits below vma->vm_start,
6818 * return with success:
6819 */
6820 vma = find_vma(mm, addr);
6821- if (likely(!vma || addr+len <= vma->vm_start)) {
6822+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6823 /* remember the address as a hint for next time */
6824 return (mm->free_area_cache = addr);
6825 }
6826@@ -134,8 +135,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6827 mm->cached_hole_size = vma->vm_start - addr;
6828
6829 /* try just below the current vma->vm_start */
6830- addr = (vma->vm_start-len) & HPAGE_MASK;
6831- } while (likely(len < vma->vm_start));
6832+ addr = skip_heap_stack_gap(vma, len);
6833+ } while (!IS_ERR_VALUE(addr));
6834
6835 bottomup:
6836 /*
6837@@ -181,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
6838 if (addr) {
6839 addr = ALIGN(addr, HPAGE_SIZE);
6840 vma = find_vma(mm, addr);
6841- if (task_size - len >= addr &&
6842- (!vma || addr + len <= vma->vm_start))
6843+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
6844 return addr;
6845 }
6846 if (mm->get_unmapped_area == arch_get_unmapped_area)
6847diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
6848index 7b00de6..78239f4 100644
6849--- a/arch/sparc/mm/init_32.c
6850+++ b/arch/sparc/mm/init_32.c
6851@@ -316,6 +316,9 @@ extern void device_scan(void);
6852 pgprot_t PAGE_SHARED __read_mostly;
6853 EXPORT_SYMBOL(PAGE_SHARED);
6854
6855+pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
6856+EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
6857+
6858 void __init paging_init(void)
6859 {
6860 switch(sparc_cpu_model) {
6861@@ -344,17 +347,17 @@ void __init paging_init(void)
6862
6863 /* Initialize the protection map with non-constant, MMU dependent values. */
6864 protection_map[0] = PAGE_NONE;
6865- protection_map[1] = PAGE_READONLY;
6866- protection_map[2] = PAGE_COPY;
6867- protection_map[3] = PAGE_COPY;
6868+ protection_map[1] = PAGE_READONLY_NOEXEC;
6869+ protection_map[2] = PAGE_COPY_NOEXEC;
6870+ protection_map[3] = PAGE_COPY_NOEXEC;
6871 protection_map[4] = PAGE_READONLY;
6872 protection_map[5] = PAGE_READONLY;
6873 protection_map[6] = PAGE_COPY;
6874 protection_map[7] = PAGE_COPY;
6875 protection_map[8] = PAGE_NONE;
6876- protection_map[9] = PAGE_READONLY;
6877- protection_map[10] = PAGE_SHARED;
6878- protection_map[11] = PAGE_SHARED;
6879+ protection_map[9] = PAGE_READONLY_NOEXEC;
6880+ protection_map[10] = PAGE_SHARED_NOEXEC;
6881+ protection_map[11] = PAGE_SHARED_NOEXEC;
6882 protection_map[12] = PAGE_READONLY;
6883 protection_map[13] = PAGE_READONLY;
6884 protection_map[14] = PAGE_SHARED;
6885diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
6886index cbef74e..c38fead 100644
6887--- a/arch/sparc/mm/srmmu.c
6888+++ b/arch/sparc/mm/srmmu.c
6889@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
6890 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
6891 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
6892 BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
6893+
6894+#ifdef CONFIG_PAX_PAGEEXEC
6895+ PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC);
6896+ BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC));
6897+ BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC));
6898+#endif
6899+
6900 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
6901 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
6902
6903diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
6904index 27fe667..36d474c 100644
6905--- a/arch/tile/include/asm/atomic_64.h
6906+++ b/arch/tile/include/asm/atomic_64.h
6907@@ -142,6 +142,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
6908
6909 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
6910
6911+#define atomic64_read_unchecked(v) atomic64_read(v)
6912+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
6913+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
6914+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
6915+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
6916+#define atomic64_inc_unchecked(v) atomic64_inc(v)
6917+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
6918+#define atomic64_dec_unchecked(v) atomic64_dec(v)
6919+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
6920+
6921 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
6922 #define smp_mb__before_atomic_dec() smp_mb()
6923 #define smp_mb__after_atomic_dec() smp_mb()
6924diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
6925index 392e533..536b092 100644
6926--- a/arch/tile/include/asm/cache.h
6927+++ b/arch/tile/include/asm/cache.h
6928@@ -15,11 +15,12 @@
6929 #ifndef _ASM_TILE_CACHE_H
6930 #define _ASM_TILE_CACHE_H
6931
6932+#include <linux/const.h>
6933 #include <arch/chip.h>
6934
6935 /* bytes per L1 data cache line */
6936 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
6937-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6938+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6939
6940 /* bytes per L2 cache line */
6941 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
6942diff --git a/arch/um/Makefile b/arch/um/Makefile
6943index 7730af6..cce5b19 100644
6944--- a/arch/um/Makefile
6945+++ b/arch/um/Makefile
6946@@ -61,6 +61,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
6947 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
6948 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
6949
6950+ifdef CONSTIFY_PLUGIN
6951+USER_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
6952+endif
6953+
6954 #This will adjust *FLAGS accordingly to the platform.
6955 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
6956
6957diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
6958index 19e1bdd..3665b77 100644
6959--- a/arch/um/include/asm/cache.h
6960+++ b/arch/um/include/asm/cache.h
6961@@ -1,6 +1,7 @@
6962 #ifndef __UM_CACHE_H
6963 #define __UM_CACHE_H
6964
6965+#include <linux/const.h>
6966
6967 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
6968 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
6969@@ -12,6 +13,6 @@
6970 # define L1_CACHE_SHIFT 5
6971 #endif
6972
6973-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6974+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6975
6976 #endif
6977diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
6978index 6c03acd..a5e0215 100644
6979--- a/arch/um/include/asm/kmap_types.h
6980+++ b/arch/um/include/asm/kmap_types.h
6981@@ -23,6 +23,7 @@ enum km_type {
6982 KM_IRQ1,
6983 KM_SOFTIRQ0,
6984 KM_SOFTIRQ1,
6985+ KM_CLEARPAGE,
6986 KM_TYPE_NR
6987 };
6988
6989diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
6990index 7cfc3ce..cbd1a58 100644
6991--- a/arch/um/include/asm/page.h
6992+++ b/arch/um/include/asm/page.h
6993@@ -14,6 +14,9 @@
6994 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
6995 #define PAGE_MASK (~(PAGE_SIZE-1))
6996
6997+#define ktla_ktva(addr) (addr)
6998+#define ktva_ktla(addr) (addr)
6999+
7000 #ifndef __ASSEMBLY__
7001
7002 struct page;
7003diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
7004index c533835..84db18e 100644
7005--- a/arch/um/kernel/process.c
7006+++ b/arch/um/kernel/process.c
7007@@ -406,22 +406,6 @@ int singlestepping(void * t)
7008 return 2;
7009 }
7010
7011-/*
7012- * Only x86 and x86_64 have an arch_align_stack().
7013- * All other arches have "#define arch_align_stack(x) (x)"
7014- * in their asm/system.h
7015- * As this is included in UML from asm-um/system-generic.h,
7016- * we can use it to behave as the subarch does.
7017- */
7018-#ifndef arch_align_stack
7019-unsigned long arch_align_stack(unsigned long sp)
7020-{
7021- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
7022- sp -= get_random_int() % 8192;
7023- return sp & ~0xf;
7024-}
7025-#endif
7026-
7027 unsigned long get_wchan(struct task_struct *p)
7028 {
7029 unsigned long stack_page, sp, ip;
7030diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
7031index ad8f795..2c7eec6 100644
7032--- a/arch/unicore32/include/asm/cache.h
7033+++ b/arch/unicore32/include/asm/cache.h
7034@@ -12,8 +12,10 @@
7035 #ifndef __UNICORE_CACHE_H__
7036 #define __UNICORE_CACHE_H__
7037
7038-#define L1_CACHE_SHIFT (5)
7039-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7040+#include <linux/const.h>
7041+
7042+#define L1_CACHE_SHIFT 5
7043+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7044
7045 /*
7046 * Memory returned by kmalloc() may be used for DMA, so we must make
7047diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
7048index efb4294..61bc18c 100644
7049--- a/arch/x86/Kconfig
7050+++ b/arch/x86/Kconfig
7051@@ -235,7 +235,7 @@ config X86_HT
7052
7053 config X86_32_LAZY_GS
7054 def_bool y
7055- depends on X86_32 && !CC_STACKPROTECTOR
7056+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
7057
7058 config ARCH_HWEIGHT_CFLAGS
7059 string
7060@@ -1022,7 +1022,7 @@ choice
7061
7062 config NOHIGHMEM
7063 bool "off"
7064- depends on !X86_NUMAQ
7065+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7066 ---help---
7067 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
7068 However, the address space of 32-bit x86 processors is only 4
7069@@ -1059,7 +1059,7 @@ config NOHIGHMEM
7070
7071 config HIGHMEM4G
7072 bool "4GB"
7073- depends on !X86_NUMAQ
7074+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7075 ---help---
7076 Select this if you have a 32-bit processor and between 1 and 4
7077 gigabytes of physical RAM.
7078@@ -1113,7 +1113,7 @@ config PAGE_OFFSET
7079 hex
7080 default 0xB0000000 if VMSPLIT_3G_OPT
7081 default 0x80000000 if VMSPLIT_2G
7082- default 0x78000000 if VMSPLIT_2G_OPT
7083+ default 0x70000000 if VMSPLIT_2G_OPT
7084 default 0x40000000 if VMSPLIT_1G
7085 default 0xC0000000
7086 depends on X86_32
7087@@ -1496,6 +1496,7 @@ config SECCOMP
7088
7089 config CC_STACKPROTECTOR
7090 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
7091+ depends on X86_64 || !PAX_MEMORY_UDEREF
7092 ---help---
7093 This option turns on the -fstack-protector GCC feature. This
7094 feature puts, at the beginning of functions, a canary value on
7095@@ -1553,6 +1554,7 @@ config KEXEC_JUMP
7096 config PHYSICAL_START
7097 hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
7098 default "0x1000000"
7099+ range 0x400000 0x40000000
7100 ---help---
7101 This gives the physical address where the kernel is loaded.
7102
7103@@ -1616,6 +1618,7 @@ config X86_NEED_RELOCS
7104 config PHYSICAL_ALIGN
7105 hex "Alignment value to which kernel should be aligned" if X86_32
7106 default "0x1000000"
7107+ range 0x400000 0x1000000 if PAX_KERNEXEC
7108 range 0x2000 0x1000000
7109 ---help---
7110 This value puts the alignment restrictions on physical address
7111@@ -1647,9 +1650,10 @@ config HOTPLUG_CPU
7112 Say N if you want to disable CPU hotplug.
7113
7114 config COMPAT_VDSO
7115- def_bool y
7116+ def_bool n
7117 prompt "Compat VDSO support"
7118 depends on X86_32 || IA32_EMULATION
7119+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
7120 ---help---
7121 Map the 32-bit VDSO to the predictable old-style address too.
7122
7123diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
7124index e3ca7e0..b30b28a 100644
7125--- a/arch/x86/Kconfig.cpu
7126+++ b/arch/x86/Kconfig.cpu
7127@@ -341,7 +341,7 @@ config X86_PPRO_FENCE
7128
7129 config X86_F00F_BUG
7130 def_bool y
7131- depends on M586MMX || M586TSC || M586 || M486 || M386
7132+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
7133
7134 config X86_INVD_BUG
7135 def_bool y
7136@@ -365,7 +365,7 @@ config X86_POPAD_OK
7137
7138 config X86_ALIGNMENT_16
7139 def_bool y
7140- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7141+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7142
7143 config X86_INTEL_USERCOPY
7144 def_bool y
7145@@ -411,7 +411,7 @@ config X86_CMPXCHG64
7146 # generates cmov.
7147 config X86_CMOV
7148 def_bool y
7149- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7150+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7151
7152 config X86_MINIMUM_CPU_FAMILY
7153 int
7154diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
7155index bf56e17..05f9891 100644
7156--- a/arch/x86/Kconfig.debug
7157+++ b/arch/x86/Kconfig.debug
7158@@ -81,7 +81,7 @@ config X86_PTDUMP
7159 config DEBUG_RODATA
7160 bool "Write protect kernel read-only data structures"
7161 default y
7162- depends on DEBUG_KERNEL
7163+ depends on DEBUG_KERNEL && BROKEN
7164 ---help---
7165 Mark the kernel read-only data as write-protected in the pagetables,
7166 in order to catch accidental (and incorrect) writes to such const
7167@@ -99,7 +99,7 @@ config DEBUG_RODATA_TEST
7168
7169 config DEBUG_SET_MODULE_RONX
7170 bool "Set loadable kernel module data as NX and text as RO"
7171- depends on MODULES
7172+ depends on MODULES && BROKEN
7173 ---help---
7174 This option helps catch unintended modifications to loadable
7175 kernel module's text and read-only data. It also prevents execution
7176diff --git a/arch/x86/Makefile b/arch/x86/Makefile
7177index b02e509..2631e48 100644
7178--- a/arch/x86/Makefile
7179+++ b/arch/x86/Makefile
7180@@ -46,6 +46,7 @@ else
7181 UTS_MACHINE := x86_64
7182 CHECKFLAGS += -D__x86_64__ -m64
7183
7184+ biarch := $(call cc-option,-m64)
7185 KBUILD_AFLAGS += -m64
7186 KBUILD_CFLAGS += -m64
7187
7188@@ -195,3 +196,12 @@ define archhelp
7189 echo ' FDARGS="..." arguments for the booted kernel'
7190 echo ' FDINITRD=file initrd for the booted kernel'
7191 endef
7192+
7193+define OLD_LD
7194+
7195+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
7196+*** Please upgrade your binutils to 2.18 or newer
7197+endef
7198+
7199+archprepare:
7200+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
7201diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
7202index 95365a8..52f857b 100644
7203--- a/arch/x86/boot/Makefile
7204+++ b/arch/x86/boot/Makefile
7205@@ -63,6 +63,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
7206 $(call cc-option, -fno-stack-protector) \
7207 $(call cc-option, -mpreferred-stack-boundary=2)
7208 KBUILD_CFLAGS += $(call cc-option, -m32)
7209+ifdef CONSTIFY_PLUGIN
7210+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7211+endif
7212 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7213 GCOV_PROFILE := n
7214
7215diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
7216index 878e4b9..20537ab 100644
7217--- a/arch/x86/boot/bitops.h
7218+++ b/arch/x86/boot/bitops.h
7219@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7220 u8 v;
7221 const u32 *p = (const u32 *)addr;
7222
7223- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7224+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7225 return v;
7226 }
7227
7228@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7229
7230 static inline void set_bit(int nr, void *addr)
7231 {
7232- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7233+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7234 }
7235
7236 #endif /* BOOT_BITOPS_H */
7237diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
7238index c7093bd..d4247ffe0 100644
7239--- a/arch/x86/boot/boot.h
7240+++ b/arch/x86/boot/boot.h
7241@@ -85,7 +85,7 @@ static inline void io_delay(void)
7242 static inline u16 ds(void)
7243 {
7244 u16 seg;
7245- asm("movw %%ds,%0" : "=rm" (seg));
7246+ asm volatile("movw %%ds,%0" : "=rm" (seg));
7247 return seg;
7248 }
7249
7250@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
7251 static inline int memcmp(const void *s1, const void *s2, size_t len)
7252 {
7253 u8 diff;
7254- asm("repe; cmpsb; setnz %0"
7255+ asm volatile("repe; cmpsb; setnz %0"
7256 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
7257 return diff;
7258 }
7259diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
7260index 09664ef..edc5d03 100644
7261--- a/arch/x86/boot/compressed/Makefile
7262+++ b/arch/x86/boot/compressed/Makefile
7263@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
7264 KBUILD_CFLAGS += $(cflags-y)
7265 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
7266 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
7267+ifdef CONSTIFY_PLUGIN
7268+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7269+endif
7270
7271 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7272 GCOV_PROFILE := n
7273diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
7274index 67a655a..b924059 100644
7275--- a/arch/x86/boot/compressed/head_32.S
7276+++ b/arch/x86/boot/compressed/head_32.S
7277@@ -76,7 +76,7 @@ ENTRY(startup_32)
7278 notl %eax
7279 andl %eax, %ebx
7280 #else
7281- movl $LOAD_PHYSICAL_ADDR, %ebx
7282+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7283 #endif
7284
7285 /* Target address to relocate to for decompression */
7286@@ -162,7 +162,7 @@ relocated:
7287 * and where it was actually loaded.
7288 */
7289 movl %ebp, %ebx
7290- subl $LOAD_PHYSICAL_ADDR, %ebx
7291+ subl $____LOAD_PHYSICAL_ADDR, %ebx
7292 jz 2f /* Nothing to be done if loaded at compiled addr. */
7293 /*
7294 * Process relocations.
7295@@ -170,8 +170,7 @@ relocated:
7296
7297 1: subl $4, %edi
7298 movl (%edi), %ecx
7299- testl %ecx, %ecx
7300- jz 2f
7301+ jecxz 2f
7302 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
7303 jmp 1b
7304 2:
7305diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
7306index 35af09d..99c9676 100644
7307--- a/arch/x86/boot/compressed/head_64.S
7308+++ b/arch/x86/boot/compressed/head_64.S
7309@@ -91,7 +91,7 @@ ENTRY(startup_32)
7310 notl %eax
7311 andl %eax, %ebx
7312 #else
7313- movl $LOAD_PHYSICAL_ADDR, %ebx
7314+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7315 #endif
7316
7317 /* Target address to relocate to for decompression */
7318@@ -233,7 +233,7 @@ ENTRY(startup_64)
7319 notq %rax
7320 andq %rax, %rbp
7321 #else
7322- movq $LOAD_PHYSICAL_ADDR, %rbp
7323+ movq $____LOAD_PHYSICAL_ADDR, %rbp
7324 #endif
7325
7326 /* Target address to relocate to for decompression */
7327diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
7328index 3a19d04..7c1d55a 100644
7329--- a/arch/x86/boot/compressed/misc.c
7330+++ b/arch/x86/boot/compressed/misc.c
7331@@ -310,7 +310,7 @@ static void parse_elf(void *output)
7332 case PT_LOAD:
7333 #ifdef CONFIG_RELOCATABLE
7334 dest = output;
7335- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
7336+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
7337 #else
7338 dest = (void *)(phdr->p_paddr);
7339 #endif
7340@@ -363,7 +363,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
7341 error("Destination address too large");
7342 #endif
7343 #ifndef CONFIG_RELOCATABLE
7344- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
7345+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
7346 error("Wrong destination address");
7347 #endif
7348
7349diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
7350index 89bbf4e..869908e 100644
7351--- a/arch/x86/boot/compressed/relocs.c
7352+++ b/arch/x86/boot/compressed/relocs.c
7353@@ -13,8 +13,11 @@
7354
7355 static void die(char *fmt, ...);
7356
7357+#include "../../../../include/generated/autoconf.h"
7358+
7359 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
7360 static Elf32_Ehdr ehdr;
7361+static Elf32_Phdr *phdr;
7362 static unsigned long reloc_count, reloc_idx;
7363 static unsigned long *relocs;
7364
7365@@ -270,9 +273,39 @@ static void read_ehdr(FILE *fp)
7366 }
7367 }
7368
7369+static void read_phdrs(FILE *fp)
7370+{
7371+ unsigned int i;
7372+
7373+ phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
7374+ if (!phdr) {
7375+ die("Unable to allocate %d program headers\n",
7376+ ehdr.e_phnum);
7377+ }
7378+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
7379+ die("Seek to %d failed: %s\n",
7380+ ehdr.e_phoff, strerror(errno));
7381+ }
7382+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
7383+ die("Cannot read ELF program headers: %s\n",
7384+ strerror(errno));
7385+ }
7386+ for(i = 0; i < ehdr.e_phnum; i++) {
7387+ phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
7388+ phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
7389+ phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
7390+ phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
7391+ phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
7392+ phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
7393+ phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
7394+ phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
7395+ }
7396+
7397+}
7398+
7399 static void read_shdrs(FILE *fp)
7400 {
7401- int i;
7402+ unsigned int i;
7403 Elf32_Shdr shdr;
7404
7405 secs = calloc(ehdr.e_shnum, sizeof(struct section));
7406@@ -307,7 +340,7 @@ static void read_shdrs(FILE *fp)
7407
7408 static void read_strtabs(FILE *fp)
7409 {
7410- int i;
7411+ unsigned int i;
7412 for (i = 0; i < ehdr.e_shnum; i++) {
7413 struct section *sec = &secs[i];
7414 if (sec->shdr.sh_type != SHT_STRTAB) {
7415@@ -332,7 +365,7 @@ static void read_strtabs(FILE *fp)
7416
7417 static void read_symtabs(FILE *fp)
7418 {
7419- int i,j;
7420+ unsigned int i,j;
7421 for (i = 0; i < ehdr.e_shnum; i++) {
7422 struct section *sec = &secs[i];
7423 if (sec->shdr.sh_type != SHT_SYMTAB) {
7424@@ -365,7 +398,9 @@ static void read_symtabs(FILE *fp)
7425
7426 static void read_relocs(FILE *fp)
7427 {
7428- int i,j;
7429+ unsigned int i,j;
7430+ uint32_t base;
7431+
7432 for (i = 0; i < ehdr.e_shnum; i++) {
7433 struct section *sec = &secs[i];
7434 if (sec->shdr.sh_type != SHT_REL) {
7435@@ -385,9 +420,18 @@ static void read_relocs(FILE *fp)
7436 die("Cannot read symbol table: %s\n",
7437 strerror(errno));
7438 }
7439+ base = 0;
7440+ for (j = 0; j < ehdr.e_phnum; j++) {
7441+ if (phdr[j].p_type != PT_LOAD )
7442+ continue;
7443+ if (secs[sec->shdr.sh_info].shdr.sh_offset < phdr[j].p_offset || secs[sec->shdr.sh_info].shdr.sh_offset >= phdr[j].p_offset + phdr[j].p_filesz)
7444+ continue;
7445+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
7446+ break;
7447+ }
7448 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
7449 Elf32_Rel *rel = &sec->reltab[j];
7450- rel->r_offset = elf32_to_cpu(rel->r_offset);
7451+ rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
7452 rel->r_info = elf32_to_cpu(rel->r_info);
7453 }
7454 }
7455@@ -396,14 +440,14 @@ static void read_relocs(FILE *fp)
7456
7457 static void print_absolute_symbols(void)
7458 {
7459- int i;
7460+ unsigned int i;
7461 printf("Absolute symbols\n");
7462 printf(" Num: Value Size Type Bind Visibility Name\n");
7463 for (i = 0; i < ehdr.e_shnum; i++) {
7464 struct section *sec = &secs[i];
7465 char *sym_strtab;
7466 Elf32_Sym *sh_symtab;
7467- int j;
7468+ unsigned int j;
7469
7470 if (sec->shdr.sh_type != SHT_SYMTAB) {
7471 continue;
7472@@ -431,14 +475,14 @@ static void print_absolute_symbols(void)
7473
7474 static void print_absolute_relocs(void)
7475 {
7476- int i, printed = 0;
7477+ unsigned int i, printed = 0;
7478
7479 for (i = 0; i < ehdr.e_shnum; i++) {
7480 struct section *sec = &secs[i];
7481 struct section *sec_applies, *sec_symtab;
7482 char *sym_strtab;
7483 Elf32_Sym *sh_symtab;
7484- int j;
7485+ unsigned int j;
7486 if (sec->shdr.sh_type != SHT_REL) {
7487 continue;
7488 }
7489@@ -499,13 +543,13 @@ static void print_absolute_relocs(void)
7490
7491 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7492 {
7493- int i;
7494+ unsigned int i;
7495 /* Walk through the relocations */
7496 for (i = 0; i < ehdr.e_shnum; i++) {
7497 char *sym_strtab;
7498 Elf32_Sym *sh_symtab;
7499 struct section *sec_applies, *sec_symtab;
7500- int j;
7501+ unsigned int j;
7502 struct section *sec = &secs[i];
7503
7504 if (sec->shdr.sh_type != SHT_REL) {
7505@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7506 !is_rel_reloc(sym_name(sym_strtab, sym))) {
7507 continue;
7508 }
7509+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
7510+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
7511+ continue;
7512+
7513+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
7514+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
7515+ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
7516+ continue;
7517+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
7518+ continue;
7519+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
7520+ continue;
7521+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
7522+ continue;
7523+#endif
7524+
7525 switch (r_type) {
7526 case R_386_NONE:
7527 case R_386_PC32:
7528@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, const void *vb)
7529
7530 static void emit_relocs(int as_text)
7531 {
7532- int i;
7533+ unsigned int i;
7534 /* Count how many relocations I have and allocate space for them. */
7535 reloc_count = 0;
7536 walk_relocs(count_reloc);
7537@@ -665,6 +725,7 @@ int main(int argc, char **argv)
7538 fname, strerror(errno));
7539 }
7540 read_ehdr(fp);
7541+ read_phdrs(fp);
7542 read_shdrs(fp);
7543 read_strtabs(fp);
7544 read_symtabs(fp);
7545diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
7546index 4d3ff03..e4972ff 100644
7547--- a/arch/x86/boot/cpucheck.c
7548+++ b/arch/x86/boot/cpucheck.c
7549@@ -74,7 +74,7 @@ static int has_fpu(void)
7550 u16 fcw = -1, fsw = -1;
7551 u32 cr0;
7552
7553- asm("movl %%cr0,%0" : "=r" (cr0));
7554+ asm volatile("movl %%cr0,%0" : "=r" (cr0));
7555 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
7556 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
7557 asm volatile("movl %0,%%cr0" : : "r" (cr0));
7558@@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
7559 {
7560 u32 f0, f1;
7561
7562- asm("pushfl ; "
7563+ asm volatile("pushfl ; "
7564 "pushfl ; "
7565 "popl %0 ; "
7566 "movl %0,%1 ; "
7567@@ -115,7 +115,7 @@ static void get_flags(void)
7568 set_bit(X86_FEATURE_FPU, cpu.flags);
7569
7570 if (has_eflag(X86_EFLAGS_ID)) {
7571- asm("cpuid"
7572+ asm volatile("cpuid"
7573 : "=a" (max_intel_level),
7574 "=b" (cpu_vendor[0]),
7575 "=d" (cpu_vendor[1]),
7576@@ -124,7 +124,7 @@ static void get_flags(void)
7577
7578 if (max_intel_level >= 0x00000001 &&
7579 max_intel_level <= 0x0000ffff) {
7580- asm("cpuid"
7581+ asm volatile("cpuid"
7582 : "=a" (tfms),
7583 "=c" (cpu.flags[4]),
7584 "=d" (cpu.flags[0])
7585@@ -136,7 +136,7 @@ static void get_flags(void)
7586 cpu.model += ((tfms >> 16) & 0xf) << 4;
7587 }
7588
7589- asm("cpuid"
7590+ asm volatile("cpuid"
7591 : "=a" (max_amd_level)
7592 : "a" (0x80000000)
7593 : "ebx", "ecx", "edx");
7594@@ -144,7 +144,7 @@ static void get_flags(void)
7595 if (max_amd_level >= 0x80000001 &&
7596 max_amd_level <= 0x8000ffff) {
7597 u32 eax = 0x80000001;
7598- asm("cpuid"
7599+ asm volatile("cpuid"
7600 : "+a" (eax),
7601 "=c" (cpu.flags[6]),
7602 "=d" (cpu.flags[1])
7603@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7604 u32 ecx = MSR_K7_HWCR;
7605 u32 eax, edx;
7606
7607- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7608+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7609 eax &= ~(1 << 15);
7610- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7611+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7612
7613 get_flags(); /* Make sure it really did something */
7614 err = check_flags();
7615@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7616 u32 ecx = MSR_VIA_FCR;
7617 u32 eax, edx;
7618
7619- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7620+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7621 eax |= (1<<1)|(1<<7);
7622- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7623+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7624
7625 set_bit(X86_FEATURE_CX8, cpu.flags);
7626 err = check_flags();
7627@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7628 u32 eax, edx;
7629 u32 level = 1;
7630
7631- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7632- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7633- asm("cpuid"
7634+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7635+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7636+ asm volatile("cpuid"
7637 : "+a" (level), "=d" (cpu.flags[0])
7638 : : "ecx", "ebx");
7639- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7640+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7641
7642 err = check_flags();
7643 }
7644diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
7645index bdb4d45..0476680 100644
7646--- a/arch/x86/boot/header.S
7647+++ b/arch/x86/boot/header.S
7648@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical pointer to
7649 # single linked list of
7650 # struct setup_data
7651
7652-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
7653+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
7654
7655 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
7656 #define VO_INIT_SIZE (VO__end - VO__text)
7657diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
7658index db75d07..8e6d0af 100644
7659--- a/arch/x86/boot/memory.c
7660+++ b/arch/x86/boot/memory.c
7661@@ -19,7 +19,7 @@
7662
7663 static int detect_memory_e820(void)
7664 {
7665- int count = 0;
7666+ unsigned int count = 0;
7667 struct biosregs ireg, oreg;
7668 struct e820entry *desc = boot_params.e820_map;
7669 static struct e820entry buf; /* static so it is zeroed */
7670diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
7671index 11e8c6e..fdbb1ed 100644
7672--- a/arch/x86/boot/video-vesa.c
7673+++ b/arch/x86/boot/video-vesa.c
7674@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
7675
7676 boot_params.screen_info.vesapm_seg = oreg.es;
7677 boot_params.screen_info.vesapm_off = oreg.di;
7678+ boot_params.screen_info.vesapm_size = oreg.cx;
7679 }
7680
7681 /*
7682diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
7683index 43eda28..5ab5fdb 100644
7684--- a/arch/x86/boot/video.c
7685+++ b/arch/x86/boot/video.c
7686@@ -96,7 +96,7 @@ static void store_mode_params(void)
7687 static unsigned int get_entry(void)
7688 {
7689 char entry_buf[4];
7690- int i, len = 0;
7691+ unsigned int i, len = 0;
7692 int key;
7693 unsigned int v;
7694
7695diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
7696index 5b577d5..3c1fed4 100644
7697--- a/arch/x86/crypto/aes-x86_64-asm_64.S
7698+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
7699@@ -8,6 +8,8 @@
7700 * including this sentence is retained in full.
7701 */
7702
7703+#include <asm/alternative-asm.h>
7704+
7705 .extern crypto_ft_tab
7706 .extern crypto_it_tab
7707 .extern crypto_fl_tab
7708@@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
7709 je B192; \
7710 leaq 32(r9),r9;
7711
7712+#define ret pax_force_retaddr 0, 1; ret
7713+
7714 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
7715 movq r1,r2; \
7716 movq r3,r4; \
7717diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
7718index be6d9e3..21fbbca 100644
7719--- a/arch/x86/crypto/aesni-intel_asm.S
7720+++ b/arch/x86/crypto/aesni-intel_asm.S
7721@@ -31,6 +31,7 @@
7722
7723 #include <linux/linkage.h>
7724 #include <asm/inst.h>
7725+#include <asm/alternative-asm.h>
7726
7727 #ifdef __x86_64__
7728 .data
7729@@ -1436,7 +1437,9 @@ _return_T_done_decrypt:
7730 pop %r14
7731 pop %r13
7732 pop %r12
7733+ pax_force_retaddr 0, 1
7734 ret
7735+ENDPROC(aesni_gcm_dec)
7736
7737
7738 /*****************************************************************************
7739@@ -1699,7 +1702,9 @@ _return_T_done_encrypt:
7740 pop %r14
7741 pop %r13
7742 pop %r12
7743+ pax_force_retaddr 0, 1
7744 ret
7745+ENDPROC(aesni_gcm_enc)
7746
7747 #endif
7748
7749@@ -1714,6 +1719,7 @@ _key_expansion_256a:
7750 pxor %xmm1, %xmm0
7751 movaps %xmm0, (TKEYP)
7752 add $0x10, TKEYP
7753+ pax_force_retaddr_bts
7754 ret
7755
7756 .align 4
7757@@ -1738,6 +1744,7 @@ _key_expansion_192a:
7758 shufps $0b01001110, %xmm2, %xmm1
7759 movaps %xmm1, 0x10(TKEYP)
7760 add $0x20, TKEYP
7761+ pax_force_retaddr_bts
7762 ret
7763
7764 .align 4
7765@@ -1757,6 +1764,7 @@ _key_expansion_192b:
7766
7767 movaps %xmm0, (TKEYP)
7768 add $0x10, TKEYP
7769+ pax_force_retaddr_bts
7770 ret
7771
7772 .align 4
7773@@ -1769,6 +1777,7 @@ _key_expansion_256b:
7774 pxor %xmm1, %xmm2
7775 movaps %xmm2, (TKEYP)
7776 add $0x10, TKEYP
7777+ pax_force_retaddr_bts
7778 ret
7779
7780 /*
7781@@ -1881,7 +1890,9 @@ ENTRY(aesni_set_key)
7782 #ifndef __x86_64__
7783 popl KEYP
7784 #endif
7785+ pax_force_retaddr 0, 1
7786 ret
7787+ENDPROC(aesni_set_key)
7788
7789 /*
7790 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
7791@@ -1902,7 +1913,9 @@ ENTRY(aesni_enc)
7792 popl KLEN
7793 popl KEYP
7794 #endif
7795+ pax_force_retaddr 0, 1
7796 ret
7797+ENDPROC(aesni_enc)
7798
7799 /*
7800 * _aesni_enc1: internal ABI
7801@@ -1959,6 +1972,7 @@ _aesni_enc1:
7802 AESENC KEY STATE
7803 movaps 0x70(TKEYP), KEY
7804 AESENCLAST KEY STATE
7805+ pax_force_retaddr_bts
7806 ret
7807
7808 /*
7809@@ -2067,6 +2081,7 @@ _aesni_enc4:
7810 AESENCLAST KEY STATE2
7811 AESENCLAST KEY STATE3
7812 AESENCLAST KEY STATE4
7813+ pax_force_retaddr_bts
7814 ret
7815
7816 /*
7817@@ -2089,7 +2104,9 @@ ENTRY(aesni_dec)
7818 popl KLEN
7819 popl KEYP
7820 #endif
7821+ pax_force_retaddr 0, 1
7822 ret
7823+ENDPROC(aesni_dec)
7824
7825 /*
7826 * _aesni_dec1: internal ABI
7827@@ -2146,6 +2163,7 @@ _aesni_dec1:
7828 AESDEC KEY STATE
7829 movaps 0x70(TKEYP), KEY
7830 AESDECLAST KEY STATE
7831+ pax_force_retaddr_bts
7832 ret
7833
7834 /*
7835@@ -2254,6 +2272,7 @@ _aesni_dec4:
7836 AESDECLAST KEY STATE2
7837 AESDECLAST KEY STATE3
7838 AESDECLAST KEY STATE4
7839+ pax_force_retaddr_bts
7840 ret
7841
7842 /*
7843@@ -2311,7 +2330,9 @@ ENTRY(aesni_ecb_enc)
7844 popl KEYP
7845 popl LEN
7846 #endif
7847+ pax_force_retaddr 0, 1
7848 ret
7849+ENDPROC(aesni_ecb_enc)
7850
7851 /*
7852 * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7853@@ -2369,7 +2390,9 @@ ENTRY(aesni_ecb_dec)
7854 popl KEYP
7855 popl LEN
7856 #endif
7857+ pax_force_retaddr 0, 1
7858 ret
7859+ENDPROC(aesni_ecb_dec)
7860
7861 /*
7862 * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7863@@ -2410,7 +2433,9 @@ ENTRY(aesni_cbc_enc)
7864 popl LEN
7865 popl IVP
7866 #endif
7867+ pax_force_retaddr 0, 1
7868 ret
7869+ENDPROC(aesni_cbc_enc)
7870
7871 /*
7872 * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7873@@ -2498,7 +2523,9 @@ ENTRY(aesni_cbc_dec)
7874 popl LEN
7875 popl IVP
7876 #endif
7877+ pax_force_retaddr 0, 1
7878 ret
7879+ENDPROC(aesni_cbc_dec)
7880
7881 #ifdef __x86_64__
7882 .align 16
7883@@ -2524,6 +2551,7 @@ _aesni_inc_init:
7884 mov $1, TCTR_LOW
7885 MOVQ_R64_XMM TCTR_LOW INC
7886 MOVQ_R64_XMM CTR TCTR_LOW
7887+ pax_force_retaddr_bts
7888 ret
7889
7890 /*
7891@@ -2552,6 +2580,7 @@ _aesni_inc:
7892 .Linc_low:
7893 movaps CTR, IV
7894 PSHUFB_XMM BSWAP_MASK IV
7895+ pax_force_retaddr_bts
7896 ret
7897
7898 /*
7899@@ -2612,5 +2641,7 @@ ENTRY(aesni_ctr_enc)
7900 .Lctr_enc_ret:
7901 movups IV, (IVP)
7902 .Lctr_enc_just_ret:
7903+ pax_force_retaddr 0, 1
7904 ret
7905+ENDPROC(aesni_ctr_enc)
7906 #endif
7907diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
7908index 391d245..67f35c2 100644
7909--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
7910+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
7911@@ -20,6 +20,8 @@
7912 *
7913 */
7914
7915+#include <asm/alternative-asm.h>
7916+
7917 .file "blowfish-x86_64-asm.S"
7918 .text
7919
7920@@ -151,9 +153,11 @@ __blowfish_enc_blk:
7921 jnz __enc_xor;
7922
7923 write_block();
7924+ pax_force_retaddr 0, 1
7925 ret;
7926 __enc_xor:
7927 xor_block();
7928+ pax_force_retaddr 0, 1
7929 ret;
7930
7931 .align 8
7932@@ -188,6 +192,7 @@ blowfish_dec_blk:
7933
7934 movq %r11, %rbp;
7935
7936+ pax_force_retaddr 0, 1
7937 ret;
7938
7939 /**********************************************************************
7940@@ -342,6 +347,7 @@ __blowfish_enc_blk_4way:
7941
7942 popq %rbx;
7943 popq %rbp;
7944+ pax_force_retaddr 0, 1
7945 ret;
7946
7947 __enc_xor4:
7948@@ -349,6 +355,7 @@ __enc_xor4:
7949
7950 popq %rbx;
7951 popq %rbp;
7952+ pax_force_retaddr 0, 1
7953 ret;
7954
7955 .align 8
7956@@ -386,5 +393,6 @@ blowfish_dec_blk_4way:
7957 popq %rbx;
7958 popq %rbp;
7959
7960+ pax_force_retaddr 0, 1
7961 ret;
7962
7963diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7964index 6214a9b..1f4fc9a 100644
7965--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
7966+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7967@@ -1,3 +1,5 @@
7968+#include <asm/alternative-asm.h>
7969+
7970 # enter ECRYPT_encrypt_bytes
7971 .text
7972 .p2align 5
7973@@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
7974 add %r11,%rsp
7975 mov %rdi,%rax
7976 mov %rsi,%rdx
7977+ pax_force_retaddr 0, 1
7978 ret
7979 # bytesatleast65:
7980 ._bytesatleast65:
7981@@ -891,6 +894,7 @@ ECRYPT_keysetup:
7982 add %r11,%rsp
7983 mov %rdi,%rax
7984 mov %rsi,%rdx
7985+ pax_force_retaddr
7986 ret
7987 # enter ECRYPT_ivsetup
7988 .text
7989@@ -917,4 +921,5 @@ ECRYPT_ivsetup:
7990 add %r11,%rsp
7991 mov %rdi,%rax
7992 mov %rsi,%rdx
7993+ pax_force_retaddr
7994 ret
7995diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
7996index b2c2f57..8470cab 100644
7997--- a/arch/x86/crypto/sha1_ssse3_asm.S
7998+++ b/arch/x86/crypto/sha1_ssse3_asm.S
7999@@ -28,6 +28,8 @@
8000 * (at your option) any later version.
8001 */
8002
8003+#include <asm/alternative-asm.h>
8004+
8005 #define CTX %rdi // arg1
8006 #define BUF %rsi // arg2
8007 #define CNT %rdx // arg3
8008@@ -104,6 +106,7 @@
8009 pop %r12
8010 pop %rbp
8011 pop %rbx
8012+ pax_force_retaddr 0, 1
8013 ret
8014
8015 .size \name, .-\name
8016diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8017index 5b012a2..36d5364 100644
8018--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8019+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8020@@ -20,6 +20,8 @@
8021 *
8022 */
8023
8024+#include <asm/alternative-asm.h>
8025+
8026 .file "twofish-x86_64-asm-3way.S"
8027 .text
8028
8029@@ -260,6 +262,7 @@ __twofish_enc_blk_3way:
8030 popq %r13;
8031 popq %r14;
8032 popq %r15;
8033+ pax_force_retaddr 0, 1
8034 ret;
8035
8036 __enc_xor3:
8037@@ -271,6 +274,7 @@ __enc_xor3:
8038 popq %r13;
8039 popq %r14;
8040 popq %r15;
8041+ pax_force_retaddr 0, 1
8042 ret;
8043
8044 .global twofish_dec_blk_3way
8045@@ -312,5 +316,6 @@ twofish_dec_blk_3way:
8046 popq %r13;
8047 popq %r14;
8048 popq %r15;
8049+ pax_force_retaddr 0, 1
8050 ret;
8051
8052diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
8053index 7bcf3fc..f53832f 100644
8054--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
8055+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
8056@@ -21,6 +21,7 @@
8057 .text
8058
8059 #include <asm/asm-offsets.h>
8060+#include <asm/alternative-asm.h>
8061
8062 #define a_offset 0
8063 #define b_offset 4
8064@@ -268,6 +269,7 @@ twofish_enc_blk:
8065
8066 popq R1
8067 movq $1,%rax
8068+ pax_force_retaddr 0, 1
8069 ret
8070
8071 twofish_dec_blk:
8072@@ -319,4 +321,5 @@ twofish_dec_blk:
8073
8074 popq R1
8075 movq $1,%rax
8076+ pax_force_retaddr 0, 1
8077 ret
8078diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
8079index fd84387..887aa7e 100644
8080--- a/arch/x86/ia32/ia32_aout.c
8081+++ b/arch/x86/ia32/ia32_aout.c
8082@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
8083 unsigned long dump_start, dump_size;
8084 struct user32 dump;
8085
8086+ memset(&dump, 0, sizeof(dump));
8087+
8088 fs = get_fs();
8089 set_fs(KERNEL_DS);
8090 has_dumped = 1;
8091@@ -315,6 +317,13 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs)
8092 current->mm->free_area_cache = TASK_UNMAPPED_BASE;
8093 current->mm->cached_hole_size = 0;
8094
8095+ retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT);
8096+ if (retval < 0) {
8097+ /* Someone check-me: is this error path enough? */
8098+ send_sig(SIGKILL, current, 0);
8099+ return retval;
8100+ }
8101+
8102 install_exec_creds(bprm);
8103 current->flags &= ~PF_FORKNOEXEC;
8104
8105@@ -410,13 +419,6 @@ beyond_if:
8106
8107 set_brk(current->mm->start_brk, current->mm->brk);
8108
8109- retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT);
8110- if (retval < 0) {
8111- /* Someone check-me: is this error path enough? */
8112- send_sig(SIGKILL, current, 0);
8113- return retval;
8114- }
8115-
8116 current->mm->start_stack =
8117 (unsigned long)create_aout_tables((char __user *)bprm->p, bprm);
8118 /* start thread */
8119diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
8120index 6557769..ef6ae89 100644
8121--- a/arch/x86/ia32/ia32_signal.c
8122+++ b/arch/x86/ia32/ia32_signal.c
8123@@ -169,7 +169,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
8124 }
8125 seg = get_fs();
8126 set_fs(KERNEL_DS);
8127- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
8128+ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
8129 set_fs(seg);
8130 if (ret >= 0 && uoss_ptr) {
8131 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
8132@@ -370,7 +370,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
8133 */
8134 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8135 size_t frame_size,
8136- void **fpstate)
8137+ void __user **fpstate)
8138 {
8139 unsigned long sp;
8140
8141@@ -391,7 +391,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8142
8143 if (used_math()) {
8144 sp = sp - sig_xstate_ia32_size;
8145- *fpstate = (struct _fpstate_ia32 *) sp;
8146+ *fpstate = (struct _fpstate_ia32 __user *) sp;
8147 if (save_i387_xstate_ia32(*fpstate) < 0)
8148 return (void __user *) -1L;
8149 }
8150@@ -399,7 +399,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8151 sp -= frame_size;
8152 /* Align the stack pointer according to the i386 ABI,
8153 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
8154- sp = ((sp + 4) & -16ul) - 4;
8155+ sp = ((sp - 12) & -16ul) - 4;
8156 return (void __user *) sp;
8157 }
8158
8159@@ -457,7 +457,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
8160 * These are actually not used anymore, but left because some
8161 * gdb versions depend on them as a marker.
8162 */
8163- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8164+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8165 } put_user_catch(err);
8166
8167 if (err)
8168@@ -499,7 +499,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8169 0xb8,
8170 __NR_ia32_rt_sigreturn,
8171 0x80cd,
8172- 0,
8173+ 0
8174 };
8175
8176 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
8177@@ -529,16 +529,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8178
8179 if (ka->sa.sa_flags & SA_RESTORER)
8180 restorer = ka->sa.sa_restorer;
8181+ else if (current->mm->context.vdso)
8182+ /* Return stub is in 32bit vsyscall page */
8183+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
8184 else
8185- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
8186- rt_sigreturn);
8187+ restorer = &frame->retcode;
8188 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
8189
8190 /*
8191 * Not actually used anymore, but left because some gdb
8192 * versions need it.
8193 */
8194- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8195+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8196 } put_user_catch(err);
8197
8198 if (err)
8199diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
8200index a6253ec..4ad2120 100644
8201--- a/arch/x86/ia32/ia32entry.S
8202+++ b/arch/x86/ia32/ia32entry.S
8203@@ -13,7 +13,9 @@
8204 #include <asm/thread_info.h>
8205 #include <asm/segment.h>
8206 #include <asm/irqflags.h>
8207+#include <asm/pgtable.h>
8208 #include <linux/linkage.h>
8209+#include <asm/alternative-asm.h>
8210
8211 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
8212 #include <linux/elf-em.h>
8213@@ -95,6 +97,32 @@ ENTRY(native_irq_enable_sysexit)
8214 ENDPROC(native_irq_enable_sysexit)
8215 #endif
8216
8217+ .macro pax_enter_kernel_user
8218+ pax_set_fptr_mask
8219+#ifdef CONFIG_PAX_MEMORY_UDEREF
8220+ call pax_enter_kernel_user
8221+#endif
8222+ .endm
8223+
8224+ .macro pax_exit_kernel_user
8225+#ifdef CONFIG_PAX_MEMORY_UDEREF
8226+ call pax_exit_kernel_user
8227+#endif
8228+#ifdef CONFIG_PAX_RANDKSTACK
8229+ pushq %rax
8230+ pushq %r11
8231+ call pax_randomize_kstack
8232+ popq %r11
8233+ popq %rax
8234+#endif
8235+ .endm
8236+
8237+.macro pax_erase_kstack
8238+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
8239+ call pax_erase_kstack
8240+#endif
8241+.endm
8242+
8243 /*
8244 * 32bit SYSENTER instruction entry.
8245 *
8246@@ -121,12 +149,6 @@ ENTRY(ia32_sysenter_target)
8247 CFI_REGISTER rsp,rbp
8248 SWAPGS_UNSAFE_STACK
8249 movq PER_CPU_VAR(kernel_stack), %rsp
8250- addq $(KERNEL_STACK_OFFSET),%rsp
8251- /*
8252- * No need to follow this irqs on/off section: the syscall
8253- * disabled irqs, here we enable it straight after entry:
8254- */
8255- ENABLE_INTERRUPTS(CLBR_NONE)
8256 movl %ebp,%ebp /* zero extension */
8257 pushq_cfi $__USER32_DS
8258 /*CFI_REL_OFFSET ss,0*/
8259@@ -134,25 +156,39 @@ ENTRY(ia32_sysenter_target)
8260 CFI_REL_OFFSET rsp,0
8261 pushfq_cfi
8262 /*CFI_REL_OFFSET rflags,0*/
8263- movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d
8264- CFI_REGISTER rip,r10
8265+ orl $X86_EFLAGS_IF,(%rsp)
8266+ GET_THREAD_INFO(%r11)
8267+ movl TI_sysenter_return(%r11), %r11d
8268+ CFI_REGISTER rip,r11
8269 pushq_cfi $__USER32_CS
8270 /*CFI_REL_OFFSET cs,0*/
8271 movl %eax, %eax
8272- pushq_cfi %r10
8273+ pushq_cfi %r11
8274 CFI_REL_OFFSET rip,0
8275 pushq_cfi %rax
8276 cld
8277 SAVE_ARGS 0,1,0
8278+ pax_enter_kernel_user
8279+ /*
8280+ * No need to follow this irqs on/off section: the syscall
8281+ * disabled irqs, here we enable it straight after entry:
8282+ */
8283+ ENABLE_INTERRUPTS(CLBR_NONE)
8284 /* no need to do an access_ok check here because rbp has been
8285 32bit zero extended */
8286+
8287+#ifdef CONFIG_PAX_MEMORY_UDEREF
8288+ mov $PAX_USER_SHADOW_BASE,%r11
8289+ add %r11,%rbp
8290+#endif
8291+
8292 1: movl (%rbp),%ebp
8293 .section __ex_table,"a"
8294 .quad 1b,ia32_badarg
8295 .previous
8296- GET_THREAD_INFO(%r10)
8297- orl $TS_COMPAT,TI_status(%r10)
8298- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8299+ GET_THREAD_INFO(%r11)
8300+ orl $TS_COMPAT,TI_status(%r11)
8301+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8302 CFI_REMEMBER_STATE
8303 jnz sysenter_tracesys
8304 cmpq $(IA32_NR_syscalls-1),%rax
8305@@ -162,13 +198,15 @@ sysenter_do_call:
8306 sysenter_dispatch:
8307 call *ia32_sys_call_table(,%rax,8)
8308 movq %rax,RAX-ARGOFFSET(%rsp)
8309- GET_THREAD_INFO(%r10)
8310+ GET_THREAD_INFO(%r11)
8311 DISABLE_INTERRUPTS(CLBR_NONE)
8312 TRACE_IRQS_OFF
8313- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
8314+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8315 jnz sysexit_audit
8316 sysexit_from_sys_call:
8317- andl $~TS_COMPAT,TI_status(%r10)
8318+ pax_exit_kernel_user
8319+ pax_erase_kstack
8320+ andl $~TS_COMPAT,TI_status(%r11)
8321 /* clear IF, that popfq doesn't enable interrupts early */
8322 andl $~0x200,EFLAGS-R11(%rsp)
8323 movl RIP-R11(%rsp),%edx /* User %eip */
8324@@ -194,6 +232,9 @@ sysexit_from_sys_call:
8325 movl %eax,%esi /* 2nd arg: syscall number */
8326 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
8327 call audit_syscall_entry
8328+
8329+ pax_erase_kstack
8330+
8331 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
8332 cmpq $(IA32_NR_syscalls-1),%rax
8333 ja ia32_badsys
8334@@ -205,7 +246,7 @@ sysexit_from_sys_call:
8335 .endm
8336
8337 .macro auditsys_exit exit
8338- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8339+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8340 jnz ia32_ret_from_sys_call
8341 TRACE_IRQS_ON
8342 sti
8343@@ -215,12 +256,12 @@ sysexit_from_sys_call:
8344 movzbl %al,%edi /* zero-extend that into %edi */
8345 inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */
8346 call audit_syscall_exit
8347- GET_THREAD_INFO(%r10)
8348+ GET_THREAD_INFO(%r11)
8349 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall return value */
8350 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
8351 cli
8352 TRACE_IRQS_OFF
8353- testl %edi,TI_flags(%r10)
8354+ testl %edi,TI_flags(%r11)
8355 jz \exit
8356 CLEAR_RREGS -ARGOFFSET
8357 jmp int_with_check
8358@@ -238,7 +279,7 @@ sysexit_audit:
8359
8360 sysenter_tracesys:
8361 #ifdef CONFIG_AUDITSYSCALL
8362- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8363+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8364 jz sysenter_auditsys
8365 #endif
8366 SAVE_REST
8367@@ -246,6 +287,9 @@ sysenter_tracesys:
8368 movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
8369 movq %rsp,%rdi /* &pt_regs -> arg1 */
8370 call syscall_trace_enter
8371+
8372+ pax_erase_kstack
8373+
8374 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8375 RESTORE_REST
8376 cmpq $(IA32_NR_syscalls-1),%rax
8377@@ -277,19 +321,20 @@ ENDPROC(ia32_sysenter_target)
8378 ENTRY(ia32_cstar_target)
8379 CFI_STARTPROC32 simple
8380 CFI_SIGNAL_FRAME
8381- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
8382+ CFI_DEF_CFA rsp,0
8383 CFI_REGISTER rip,rcx
8384 /*CFI_REGISTER rflags,r11*/
8385 SWAPGS_UNSAFE_STACK
8386 movl %esp,%r8d
8387 CFI_REGISTER rsp,r8
8388 movq PER_CPU_VAR(kernel_stack),%rsp
8389+ SAVE_ARGS 8*6,0,0
8390+ pax_enter_kernel_user
8391 /*
8392 * No need to follow this irqs on/off section: the syscall
8393 * disabled irqs and here we enable it straight after entry:
8394 */
8395 ENABLE_INTERRUPTS(CLBR_NONE)
8396- SAVE_ARGS 8,0,0
8397 movl %eax,%eax /* zero extension */
8398 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
8399 movq %rcx,RIP-ARGOFFSET(%rsp)
8400@@ -305,13 +350,19 @@ ENTRY(ia32_cstar_target)
8401 /* no need to do an access_ok check here because r8 has been
8402 32bit zero extended */
8403 /* hardware stack frame is complete now */
8404+
8405+#ifdef CONFIG_PAX_MEMORY_UDEREF
8406+ mov $PAX_USER_SHADOW_BASE,%r11
8407+ add %r11,%r8
8408+#endif
8409+
8410 1: movl (%r8),%r9d
8411 .section __ex_table,"a"
8412 .quad 1b,ia32_badarg
8413 .previous
8414- GET_THREAD_INFO(%r10)
8415- orl $TS_COMPAT,TI_status(%r10)
8416- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8417+ GET_THREAD_INFO(%r11)
8418+ orl $TS_COMPAT,TI_status(%r11)
8419+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8420 CFI_REMEMBER_STATE
8421 jnz cstar_tracesys
8422 cmpq $IA32_NR_syscalls-1,%rax
8423@@ -321,13 +372,15 @@ cstar_do_call:
8424 cstar_dispatch:
8425 call *ia32_sys_call_table(,%rax,8)
8426 movq %rax,RAX-ARGOFFSET(%rsp)
8427- GET_THREAD_INFO(%r10)
8428+ GET_THREAD_INFO(%r11)
8429 DISABLE_INTERRUPTS(CLBR_NONE)
8430 TRACE_IRQS_OFF
8431- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
8432+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8433 jnz sysretl_audit
8434 sysretl_from_sys_call:
8435- andl $~TS_COMPAT,TI_status(%r10)
8436+ pax_exit_kernel_user
8437+ pax_erase_kstack
8438+ andl $~TS_COMPAT,TI_status(%r11)
8439 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
8440 movl RIP-ARGOFFSET(%rsp),%ecx
8441 CFI_REGISTER rip,rcx
8442@@ -355,7 +408,7 @@ sysretl_audit:
8443
8444 cstar_tracesys:
8445 #ifdef CONFIG_AUDITSYSCALL
8446- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8447+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8448 jz cstar_auditsys
8449 #endif
8450 xchgl %r9d,%ebp
8451@@ -364,6 +417,9 @@ cstar_tracesys:
8452 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8453 movq %rsp,%rdi /* &pt_regs -> arg1 */
8454 call syscall_trace_enter
8455+
8456+ pax_erase_kstack
8457+
8458 LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
8459 RESTORE_REST
8460 xchgl %ebp,%r9d
8461@@ -409,20 +465,21 @@ ENTRY(ia32_syscall)
8462 CFI_REL_OFFSET rip,RIP-RIP
8463 PARAVIRT_ADJUST_EXCEPTION_FRAME
8464 SWAPGS
8465- /*
8466- * No need to follow this irqs on/off section: the syscall
8467- * disabled irqs and here we enable it straight after entry:
8468- */
8469- ENABLE_INTERRUPTS(CLBR_NONE)
8470 movl %eax,%eax
8471 pushq_cfi %rax
8472 cld
8473 /* note the registers are not zero extended to the sf.
8474 this could be a problem. */
8475 SAVE_ARGS 0,1,0
8476- GET_THREAD_INFO(%r10)
8477- orl $TS_COMPAT,TI_status(%r10)
8478- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8479+ pax_enter_kernel_user
8480+ /*
8481+ * No need to follow this irqs on/off section: the syscall
8482+ * disabled irqs and here we enable it straight after entry:
8483+ */
8484+ ENABLE_INTERRUPTS(CLBR_NONE)
8485+ GET_THREAD_INFO(%r11)
8486+ orl $TS_COMPAT,TI_status(%r11)
8487+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8488 jnz ia32_tracesys
8489 cmpq $(IA32_NR_syscalls-1),%rax
8490 ja ia32_badsys
8491@@ -441,6 +498,9 @@ ia32_tracesys:
8492 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8493 movq %rsp,%rdi /* &pt_regs -> arg1 */
8494 call syscall_trace_enter
8495+
8496+ pax_erase_kstack
8497+
8498 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8499 RESTORE_REST
8500 cmpq $(IA32_NR_syscalls-1),%rax
8501@@ -455,6 +515,7 @@ ia32_badsys:
8502
8503 quiet_ni_syscall:
8504 movq $-ENOSYS,%rax
8505+ pax_force_retaddr
8506 ret
8507 CFI_ENDPROC
8508
8509diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
8510index f6f5c53..b358b28 100644
8511--- a/arch/x86/ia32/sys_ia32.c
8512+++ b/arch/x86/ia32/sys_ia32.c
8513@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
8514 */
8515 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
8516 {
8517- typeof(ubuf->st_uid) uid = 0;
8518- typeof(ubuf->st_gid) gid = 0;
8519+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
8520+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
8521 SET_UID(uid, stat->uid);
8522 SET_GID(gid, stat->gid);
8523 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
8524@@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
8525 }
8526 set_fs(KERNEL_DS);
8527 ret = sys_rt_sigprocmask(how,
8528- set ? (sigset_t __user *)&s : NULL,
8529- oset ? (sigset_t __user *)&s : NULL,
8530+ set ? (sigset_t __force_user *)&s : NULL,
8531+ oset ? (sigset_t __force_user *)&s : NULL,
8532 sigsetsize);
8533 set_fs(old_fs);
8534 if (ret)
8535@@ -332,7 +332,7 @@ asmlinkage long sys32_alarm(unsigned int seconds)
8536 return alarm_setitimer(seconds);
8537 }
8538
8539-asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
8540+asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
8541 int options)
8542 {
8543 return compat_sys_wait4(pid, stat_addr, options, NULL);
8544@@ -353,7 +353,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
8545 mm_segment_t old_fs = get_fs();
8546
8547 set_fs(KERNEL_DS);
8548- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
8549+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
8550 set_fs(old_fs);
8551 if (put_compat_timespec(&t, interval))
8552 return -EFAULT;
8553@@ -369,7 +369,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
8554 mm_segment_t old_fs = get_fs();
8555
8556 set_fs(KERNEL_DS);
8557- ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
8558+ ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
8559 set_fs(old_fs);
8560 if (!ret) {
8561 switch (_NSIG_WORDS) {
8562@@ -394,7 +394,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
8563 if (copy_siginfo_from_user32(&info, uinfo))
8564 return -EFAULT;
8565 set_fs(KERNEL_DS);
8566- ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
8567+ ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
8568 set_fs(old_fs);
8569 return ret;
8570 }
8571@@ -439,7 +439,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
8572 return -EFAULT;
8573
8574 set_fs(KERNEL_DS);
8575- ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
8576+ ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
8577 count);
8578 set_fs(old_fs);
8579
8580diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
8581index 091508b..7692c6f 100644
8582--- a/arch/x86/include/asm/alternative-asm.h
8583+++ b/arch/x86/include/asm/alternative-asm.h
8584@@ -4,10 +4,10 @@
8585
8586 #ifdef CONFIG_SMP
8587 .macro LOCK_PREFIX
8588-1: lock
8589+672: lock
8590 .section .smp_locks,"a"
8591 .balign 4
8592- .long 1b - .
8593+ .long 672b - .
8594 .previous
8595 .endm
8596 #else
8597@@ -15,6 +15,45 @@
8598 .endm
8599 #endif
8600
8601+#ifdef KERNEXEC_PLUGIN
8602+ .macro pax_force_retaddr_bts rip=0
8603+ btsq $63,\rip(%rsp)
8604+ .endm
8605+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
8606+ .macro pax_force_retaddr rip=0, reload=0
8607+ btsq $63,\rip(%rsp)
8608+ .endm
8609+ .macro pax_force_fptr ptr
8610+ btsq $63,\ptr
8611+ .endm
8612+ .macro pax_set_fptr_mask
8613+ .endm
8614+#endif
8615+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
8616+ .macro pax_force_retaddr rip=0, reload=0
8617+ .if \reload
8618+ pax_set_fptr_mask
8619+ .endif
8620+ orq %r10,\rip(%rsp)
8621+ .endm
8622+ .macro pax_force_fptr ptr
8623+ orq %r10,\ptr
8624+ .endm
8625+ .macro pax_set_fptr_mask
8626+ movabs $0x8000000000000000,%r10
8627+ .endm
8628+#endif
8629+#else
8630+ .macro pax_force_retaddr rip=0, reload=0
8631+ .endm
8632+ .macro pax_force_fptr ptr
8633+ .endm
8634+ .macro pax_force_retaddr_bts rip=0
8635+ .endm
8636+ .macro pax_set_fptr_mask
8637+ .endm
8638+#endif
8639+
8640 .macro altinstruction_entry orig alt feature orig_len alt_len
8641 .long \orig - .
8642 .long \alt - .
8643diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
8644index 37ad100..7d47faa 100644
8645--- a/arch/x86/include/asm/alternative.h
8646+++ b/arch/x86/include/asm/alternative.h
8647@@ -89,7 +89,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
8648 ".section .discard,\"aw\",@progbits\n" \
8649 " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
8650 ".previous\n" \
8651- ".section .altinstr_replacement, \"ax\"\n" \
8652+ ".section .altinstr_replacement, \"a\"\n" \
8653 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
8654 ".previous"
8655
8656diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
8657index 1a6c09a..fec2432 100644
8658--- a/arch/x86/include/asm/apic.h
8659+++ b/arch/x86/include/asm/apic.h
8660@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
8661
8662 #ifdef CONFIG_X86_LOCAL_APIC
8663
8664-extern unsigned int apic_verbosity;
8665+extern int apic_verbosity;
8666 extern int local_apic_timer_c2_ok;
8667
8668 extern int disable_apic;
8669diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
8670index 20370c6..a2eb9b0 100644
8671--- a/arch/x86/include/asm/apm.h
8672+++ b/arch/x86/include/asm/apm.h
8673@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
8674 __asm__ __volatile__(APM_DO_ZERO_SEGS
8675 "pushl %%edi\n\t"
8676 "pushl %%ebp\n\t"
8677- "lcall *%%cs:apm_bios_entry\n\t"
8678+ "lcall *%%ss:apm_bios_entry\n\t"
8679 "setc %%al\n\t"
8680 "popl %%ebp\n\t"
8681 "popl %%edi\n\t"
8682@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
8683 __asm__ __volatile__(APM_DO_ZERO_SEGS
8684 "pushl %%edi\n\t"
8685 "pushl %%ebp\n\t"
8686- "lcall *%%cs:apm_bios_entry\n\t"
8687+ "lcall *%%ss:apm_bios_entry\n\t"
8688 "setc %%bl\n\t"
8689 "popl %%ebp\n\t"
8690 "popl %%edi\n\t"
8691diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
8692index 58cb6d4..ca9010d 100644
8693--- a/arch/x86/include/asm/atomic.h
8694+++ b/arch/x86/include/asm/atomic.h
8695@@ -22,7 +22,18 @@
8696 */
8697 static inline int atomic_read(const atomic_t *v)
8698 {
8699- return (*(volatile int *)&(v)->counter);
8700+ return (*(volatile const int *)&(v)->counter);
8701+}
8702+
8703+/**
8704+ * atomic_read_unchecked - read atomic variable
8705+ * @v: pointer of type atomic_unchecked_t
8706+ *
8707+ * Atomically reads the value of @v.
8708+ */
8709+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8710+{
8711+ return (*(volatile const int *)&(v)->counter);
8712 }
8713
8714 /**
8715@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
8716 }
8717
8718 /**
8719+ * atomic_set_unchecked - set atomic variable
8720+ * @v: pointer of type atomic_unchecked_t
8721+ * @i: required value
8722+ *
8723+ * Atomically sets the value of @v to @i.
8724+ */
8725+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8726+{
8727+ v->counter = i;
8728+}
8729+
8730+/**
8731 * atomic_add - add integer to atomic variable
8732 * @i: integer value to add
8733 * @v: pointer of type atomic_t
8734@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
8735 */
8736 static inline void atomic_add(int i, atomic_t *v)
8737 {
8738- asm volatile(LOCK_PREFIX "addl %1,%0"
8739+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8740+
8741+#ifdef CONFIG_PAX_REFCOUNT
8742+ "jno 0f\n"
8743+ LOCK_PREFIX "subl %1,%0\n"
8744+ "int $4\n0:\n"
8745+ _ASM_EXTABLE(0b, 0b)
8746+#endif
8747+
8748+ : "+m" (v->counter)
8749+ : "ir" (i));
8750+}
8751+
8752+/**
8753+ * atomic_add_unchecked - add integer to atomic variable
8754+ * @i: integer value to add
8755+ * @v: pointer of type atomic_unchecked_t
8756+ *
8757+ * Atomically adds @i to @v.
8758+ */
8759+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
8760+{
8761+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8762 : "+m" (v->counter)
8763 : "ir" (i));
8764 }
8765@@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
8766 */
8767 static inline void atomic_sub(int i, atomic_t *v)
8768 {
8769- asm volatile(LOCK_PREFIX "subl %1,%0"
8770+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8771+
8772+#ifdef CONFIG_PAX_REFCOUNT
8773+ "jno 0f\n"
8774+ LOCK_PREFIX "addl %1,%0\n"
8775+ "int $4\n0:\n"
8776+ _ASM_EXTABLE(0b, 0b)
8777+#endif
8778+
8779+ : "+m" (v->counter)
8780+ : "ir" (i));
8781+}
8782+
8783+/**
8784+ * atomic_sub_unchecked - subtract integer from atomic variable
8785+ * @i: integer value to subtract
8786+ * @v: pointer of type atomic_unchecked_t
8787+ *
8788+ * Atomically subtracts @i from @v.
8789+ */
8790+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
8791+{
8792+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8793 : "+m" (v->counter)
8794 : "ir" (i));
8795 }
8796@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8797 {
8798 unsigned char c;
8799
8800- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
8801+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
8802+
8803+#ifdef CONFIG_PAX_REFCOUNT
8804+ "jno 0f\n"
8805+ LOCK_PREFIX "addl %2,%0\n"
8806+ "int $4\n0:\n"
8807+ _ASM_EXTABLE(0b, 0b)
8808+#endif
8809+
8810+ "sete %1\n"
8811 : "+m" (v->counter), "=qm" (c)
8812 : "ir" (i) : "memory");
8813 return c;
8814@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8815 */
8816 static inline void atomic_inc(atomic_t *v)
8817 {
8818- asm volatile(LOCK_PREFIX "incl %0"
8819+ asm volatile(LOCK_PREFIX "incl %0\n"
8820+
8821+#ifdef CONFIG_PAX_REFCOUNT
8822+ "jno 0f\n"
8823+ LOCK_PREFIX "decl %0\n"
8824+ "int $4\n0:\n"
8825+ _ASM_EXTABLE(0b, 0b)
8826+#endif
8827+
8828+ : "+m" (v->counter));
8829+}
8830+
8831+/**
8832+ * atomic_inc_unchecked - increment atomic variable
8833+ * @v: pointer of type atomic_unchecked_t
8834+ *
8835+ * Atomically increments @v by 1.
8836+ */
8837+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
8838+{
8839+ asm volatile(LOCK_PREFIX "incl %0\n"
8840 : "+m" (v->counter));
8841 }
8842
8843@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
8844 */
8845 static inline void atomic_dec(atomic_t *v)
8846 {
8847- asm volatile(LOCK_PREFIX "decl %0"
8848+ asm volatile(LOCK_PREFIX "decl %0\n"
8849+
8850+#ifdef CONFIG_PAX_REFCOUNT
8851+ "jno 0f\n"
8852+ LOCK_PREFIX "incl %0\n"
8853+ "int $4\n0:\n"
8854+ _ASM_EXTABLE(0b, 0b)
8855+#endif
8856+
8857+ : "+m" (v->counter));
8858+}
8859+
8860+/**
8861+ * atomic_dec_unchecked - decrement atomic variable
8862+ * @v: pointer of type atomic_unchecked_t
8863+ *
8864+ * Atomically decrements @v by 1.
8865+ */
8866+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
8867+{
8868+ asm volatile(LOCK_PREFIX "decl %0\n"
8869 : "+m" (v->counter));
8870 }
8871
8872@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
8873 {
8874 unsigned char c;
8875
8876- asm volatile(LOCK_PREFIX "decl %0; sete %1"
8877+ asm volatile(LOCK_PREFIX "decl %0\n"
8878+
8879+#ifdef CONFIG_PAX_REFCOUNT
8880+ "jno 0f\n"
8881+ LOCK_PREFIX "incl %0\n"
8882+ "int $4\n0:\n"
8883+ _ASM_EXTABLE(0b, 0b)
8884+#endif
8885+
8886+ "sete %1\n"
8887 : "+m" (v->counter), "=qm" (c)
8888 : : "memory");
8889 return c != 0;
8890@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
8891 {
8892 unsigned char c;
8893
8894- asm volatile(LOCK_PREFIX "incl %0; sete %1"
8895+ asm volatile(LOCK_PREFIX "incl %0\n"
8896+
8897+#ifdef CONFIG_PAX_REFCOUNT
8898+ "jno 0f\n"
8899+ LOCK_PREFIX "decl %0\n"
8900+ "int $4\n0:\n"
8901+ _ASM_EXTABLE(0b, 0b)
8902+#endif
8903+
8904+ "sete %1\n"
8905+ : "+m" (v->counter), "=qm" (c)
8906+ : : "memory");
8907+ return c != 0;
8908+}
8909+
8910+/**
8911+ * atomic_inc_and_test_unchecked - increment and test
8912+ * @v: pointer of type atomic_unchecked_t
8913+ *
8914+ * Atomically increments @v by 1
8915+ * and returns true if the result is zero, or false for all
8916+ * other cases.
8917+ */
8918+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
8919+{
8920+ unsigned char c;
8921+
8922+ asm volatile(LOCK_PREFIX "incl %0\n"
8923+ "sete %1\n"
8924 : "+m" (v->counter), "=qm" (c)
8925 : : "memory");
8926 return c != 0;
8927@@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
8928 {
8929 unsigned char c;
8930
8931- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
8932+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
8933+
8934+#ifdef CONFIG_PAX_REFCOUNT
8935+ "jno 0f\n"
8936+ LOCK_PREFIX "subl %2,%0\n"
8937+ "int $4\n0:\n"
8938+ _ASM_EXTABLE(0b, 0b)
8939+#endif
8940+
8941+ "sets %1\n"
8942 : "+m" (v->counter), "=qm" (c)
8943 : "ir" (i) : "memory");
8944 return c;
8945@@ -179,7 +341,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
8946 goto no_xadd;
8947 #endif
8948 /* Modern 486+ processor */
8949- return i + xadd(&v->counter, i);
8950+ return i + xadd_check_overflow(&v->counter, i);
8951
8952 #ifdef CONFIG_M386
8953 no_xadd: /* Legacy 386 processor */
8954@@ -192,6 +354,34 @@ no_xadd: /* Legacy 386 processor */
8955 }
8956
8957 /**
8958+ * atomic_add_return_unchecked - add integer and return
8959+ * @i: integer value to add
8960+ * @v: pointer of type atomic_unchecked_t
8961+ *
8962+ * Atomically adds @i to @v and returns @i + @v
8963+ */
8964+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
8965+{
8966+#ifdef CONFIG_M386
8967+ int __i;
8968+ unsigned long flags;
8969+ if (unlikely(boot_cpu_data.x86 <= 3))
8970+ goto no_xadd;
8971+#endif
8972+ /* Modern 486+ processor */
8973+ return i + xadd(&v->counter, i);
8974+
8975+#ifdef CONFIG_M386
8976+no_xadd: /* Legacy 386 processor */
8977+ raw_local_irq_save(flags);
8978+ __i = atomic_read_unchecked(v);
8979+ atomic_set_unchecked(v, i + __i);
8980+ raw_local_irq_restore(flags);
8981+ return i + __i;
8982+#endif
8983+}
8984+
8985+/**
8986 * atomic_sub_return - subtract integer and return
8987 * @v: pointer of type atomic_t
8988 * @i: integer value to subtract
8989@@ -204,6 +394,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
8990 }
8991
8992 #define atomic_inc_return(v) (atomic_add_return(1, v))
8993+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
8994+{
8995+ return atomic_add_return_unchecked(1, v);
8996+}
8997 #define atomic_dec_return(v) (atomic_sub_return(1, v))
8998
8999 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9000@@ -211,11 +405,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9001 return cmpxchg(&v->counter, old, new);
9002 }
9003
9004+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9005+{
9006+ return cmpxchg(&v->counter, old, new);
9007+}
9008+
9009 static inline int atomic_xchg(atomic_t *v, int new)
9010 {
9011 return xchg(&v->counter, new);
9012 }
9013
9014+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9015+{
9016+ return xchg(&v->counter, new);
9017+}
9018+
9019 /**
9020 * __atomic_add_unless - add unless the number is already a given value
9021 * @v: pointer of type atomic_t
9022@@ -227,12 +431,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
9023 */
9024 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9025 {
9026- int c, old;
9027+ int c, old, new;
9028 c = atomic_read(v);
9029 for (;;) {
9030- if (unlikely(c == (u)))
9031+ if (unlikely(c == u))
9032 break;
9033- old = atomic_cmpxchg((v), c, c + (a));
9034+
9035+ asm volatile("addl %2,%0\n"
9036+
9037+#ifdef CONFIG_PAX_REFCOUNT
9038+ "jno 0f\n"
9039+ "subl %2,%0\n"
9040+ "int $4\n0:\n"
9041+ _ASM_EXTABLE(0b, 0b)
9042+#endif
9043+
9044+ : "=r" (new)
9045+ : "0" (c), "ir" (a));
9046+
9047+ old = atomic_cmpxchg(v, c, new);
9048 if (likely(old == c))
9049 break;
9050 c = old;
9051@@ -240,6 +457,48 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9052 return c;
9053 }
9054
9055+/**
9056+ * atomic_inc_not_zero_hint - increment if not null
9057+ * @v: pointer of type atomic_t
9058+ * @hint: probable value of the atomic before the increment
9059+ *
9060+ * This version of atomic_inc_not_zero() gives a hint of probable
9061+ * value of the atomic. This helps processor to not read the memory
9062+ * before doing the atomic read/modify/write cycle, lowering
9063+ * number of bus transactions on some arches.
9064+ *
9065+ * Returns: 0 if increment was not done, 1 otherwise.
9066+ */
9067+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
9068+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
9069+{
9070+ int val, c = hint, new;
9071+
9072+ /* sanity test, should be removed by compiler if hint is a constant */
9073+ if (!hint)
9074+ return __atomic_add_unless(v, 1, 0);
9075+
9076+ do {
9077+ asm volatile("incl %0\n"
9078+
9079+#ifdef CONFIG_PAX_REFCOUNT
9080+ "jno 0f\n"
9081+ "decl %0\n"
9082+ "int $4\n0:\n"
9083+ _ASM_EXTABLE(0b, 0b)
9084+#endif
9085+
9086+ : "=r" (new)
9087+ : "0" (c));
9088+
9089+ val = atomic_cmpxchg(v, c, new);
9090+ if (val == c)
9091+ return 1;
9092+ c = val;
9093+ } while (c);
9094+
9095+ return 0;
9096+}
9097
9098 /*
9099 * atomic_dec_if_positive - decrement by 1 if old value positive
9100diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
9101index 24098aa..1e37723 100644
9102--- a/arch/x86/include/asm/atomic64_32.h
9103+++ b/arch/x86/include/asm/atomic64_32.h
9104@@ -12,6 +12,14 @@ typedef struct {
9105 u64 __aligned(8) counter;
9106 } atomic64_t;
9107
9108+#ifdef CONFIG_PAX_REFCOUNT
9109+typedef struct {
9110+ u64 __aligned(8) counter;
9111+} atomic64_unchecked_t;
9112+#else
9113+typedef atomic64_t atomic64_unchecked_t;
9114+#endif
9115+
9116 #define ATOMIC64_INIT(val) { (val) }
9117
9118 #ifdef CONFIG_X86_CMPXCHG64
9119@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
9120 }
9121
9122 /**
9123+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
9124+ * @p: pointer to type atomic64_unchecked_t
9125+ * @o: expected value
9126+ * @n: new value
9127+ *
9128+ * Atomically sets @v to @n if it was equal to @o and returns
9129+ * the old value.
9130+ */
9131+
9132+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
9133+{
9134+ return cmpxchg64(&v->counter, o, n);
9135+}
9136+
9137+/**
9138 * atomic64_xchg - xchg atomic64 variable
9139 * @v: pointer to type atomic64_t
9140 * @n: value to assign
9141@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64_t *v, long long i)
9142 }
9143
9144 /**
9145+ * atomic64_set_unchecked - set atomic64 variable
9146+ * @v: pointer to type atomic64_unchecked_t
9147+ * @n: value to assign
9148+ *
9149+ * Atomically sets the value of @v to @n.
9150+ */
9151+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
9152+{
9153+ unsigned high = (unsigned)(i >> 32);
9154+ unsigned low = (unsigned)i;
9155+ asm volatile(ATOMIC64_ALTERNATIVE(set)
9156+ : "+b" (low), "+c" (high)
9157+ : "S" (v)
9158+ : "eax", "edx", "memory"
9159+ );
9160+}
9161+
9162+/**
9163 * atomic64_read - read atomic64 variable
9164 * @v: pointer to type atomic64_t
9165 *
9166@@ -93,6 +134,22 @@ static inline long long atomic64_read(atomic64_t *v)
9167 }
9168
9169 /**
9170+ * atomic64_read_unchecked - read atomic64 variable
9171+ * @v: pointer to type atomic64_unchecked_t
9172+ *
9173+ * Atomically reads the value of @v and returns it.
9174+ */
9175+static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v)
9176+{
9177+ long long r;
9178+ asm volatile(ATOMIC64_ALTERNATIVE(read_unchecked)
9179+ : "=A" (r), "+c" (v)
9180+ : : "memory"
9181+ );
9182+ return r;
9183+ }
9184+
9185+/**
9186 * atomic64_add_return - add and return
9187 * @i: integer value to add
9188 * @v: pointer to type atomic64_t
9189@@ -108,6 +165,22 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
9190 return i;
9191 }
9192
9193+/**
9194+ * atomic64_add_return_unchecked - add and return
9195+ * @i: integer value to add
9196+ * @v: pointer to type atomic64_unchecked_t
9197+ *
9198+ * Atomically adds @i to @v and returns @i + *@v
9199+ */
9200+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
9201+{
9202+ asm volatile(ATOMIC64_ALTERNATIVE(add_return_unchecked)
9203+ : "+A" (i), "+c" (v)
9204+ : : "memory"
9205+ );
9206+ return i;
9207+}
9208+
9209 /*
9210 * Other variants with different arithmetic operators:
9211 */
9212@@ -131,6 +204,17 @@ static inline long long atomic64_inc_return(atomic64_t *v)
9213 return a;
9214 }
9215
9216+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9217+{
9218+ long long a;
9219+ asm volatile(ATOMIC64_ALTERNATIVE(inc_return_unchecked)
9220+ : "=A" (a)
9221+ : "S" (v)
9222+ : "memory", "ecx"
9223+ );
9224+ return a;
9225+}
9226+
9227 static inline long long atomic64_dec_return(atomic64_t *v)
9228 {
9229 long long a;
9230@@ -159,6 +243,22 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
9231 }
9232
9233 /**
9234+ * atomic64_add_unchecked - add integer to atomic64 variable
9235+ * @i: integer value to add
9236+ * @v: pointer to type atomic64_unchecked_t
9237+ *
9238+ * Atomically adds @i to @v.
9239+ */
9240+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
9241+{
9242+ asm volatile(ATOMIC64_ALTERNATIVE_(add_unchecked, add_return_unchecked)
9243+ : "+A" (i), "+c" (v)
9244+ : : "memory"
9245+ );
9246+ return i;
9247+}
9248+
9249+/**
9250 * atomic64_sub - subtract the atomic64 variable
9251 * @i: integer value to subtract
9252 * @v: pointer to type atomic64_t
9253diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
9254index 0e1cbfc..5623683 100644
9255--- a/arch/x86/include/asm/atomic64_64.h
9256+++ b/arch/x86/include/asm/atomic64_64.h
9257@@ -18,7 +18,19 @@
9258 */
9259 static inline long atomic64_read(const atomic64_t *v)
9260 {
9261- return (*(volatile long *)&(v)->counter);
9262+ return (*(volatile const long *)&(v)->counter);
9263+}
9264+
9265+/**
9266+ * atomic64_read_unchecked - read atomic64 variable
9267+ * @v: pointer of type atomic64_unchecked_t
9268+ *
9269+ * Atomically reads the value of @v.
9270+ * Doesn't imply a read memory barrier.
9271+ */
9272+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9273+{
9274+ return (*(volatile const long *)&(v)->counter);
9275 }
9276
9277 /**
9278@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
9279 }
9280
9281 /**
9282+ * atomic64_set_unchecked - set atomic64 variable
9283+ * @v: pointer to type atomic64_unchecked_t
9284+ * @i: required value
9285+ *
9286+ * Atomically sets the value of @v to @i.
9287+ */
9288+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9289+{
9290+ v->counter = i;
9291+}
9292+
9293+/**
9294 * atomic64_add - add integer to atomic64 variable
9295 * @i: integer value to add
9296 * @v: pointer to type atomic64_t
9297@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
9298 */
9299 static inline void atomic64_add(long i, atomic64_t *v)
9300 {
9301+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
9302+
9303+#ifdef CONFIG_PAX_REFCOUNT
9304+ "jno 0f\n"
9305+ LOCK_PREFIX "subq %1,%0\n"
9306+ "int $4\n0:\n"
9307+ _ASM_EXTABLE(0b, 0b)
9308+#endif
9309+
9310+ : "=m" (v->counter)
9311+ : "er" (i), "m" (v->counter));
9312+}
9313+
9314+/**
9315+ * atomic64_add_unchecked - add integer to atomic64 variable
9316+ * @i: integer value to add
9317+ * @v: pointer to type atomic64_unchecked_t
9318+ *
9319+ * Atomically adds @i to @v.
9320+ */
9321+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
9322+{
9323 asm volatile(LOCK_PREFIX "addq %1,%0"
9324 : "=m" (v->counter)
9325 : "er" (i), "m" (v->counter));
9326@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
9327 */
9328 static inline void atomic64_sub(long i, atomic64_t *v)
9329 {
9330- asm volatile(LOCK_PREFIX "subq %1,%0"
9331+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9332+
9333+#ifdef CONFIG_PAX_REFCOUNT
9334+ "jno 0f\n"
9335+ LOCK_PREFIX "addq %1,%0\n"
9336+ "int $4\n0:\n"
9337+ _ASM_EXTABLE(0b, 0b)
9338+#endif
9339+
9340+ : "=m" (v->counter)
9341+ : "er" (i), "m" (v->counter));
9342+}
9343+
9344+/**
9345+ * atomic64_sub_unchecked - subtract the atomic64 variable
9346+ * @i: integer value to subtract
9347+ * @v: pointer to type atomic64_unchecked_t
9348+ *
9349+ * Atomically subtracts @i from @v.
9350+ */
9351+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
9352+{
9353+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9354 : "=m" (v->counter)
9355 : "er" (i), "m" (v->counter));
9356 }
9357@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9358 {
9359 unsigned char c;
9360
9361- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
9362+ asm volatile(LOCK_PREFIX "subq %2,%0\n"
9363+
9364+#ifdef CONFIG_PAX_REFCOUNT
9365+ "jno 0f\n"
9366+ LOCK_PREFIX "addq %2,%0\n"
9367+ "int $4\n0:\n"
9368+ _ASM_EXTABLE(0b, 0b)
9369+#endif
9370+
9371+ "sete %1\n"
9372 : "=m" (v->counter), "=qm" (c)
9373 : "er" (i), "m" (v->counter) : "memory");
9374 return c;
9375@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9376 */
9377 static inline void atomic64_inc(atomic64_t *v)
9378 {
9379+ asm volatile(LOCK_PREFIX "incq %0\n"
9380+
9381+#ifdef CONFIG_PAX_REFCOUNT
9382+ "jno 0f\n"
9383+ LOCK_PREFIX "decq %0\n"
9384+ "int $4\n0:\n"
9385+ _ASM_EXTABLE(0b, 0b)
9386+#endif
9387+
9388+ : "=m" (v->counter)
9389+ : "m" (v->counter));
9390+}
9391+
9392+/**
9393+ * atomic64_inc_unchecked - increment atomic64 variable
9394+ * @v: pointer to type atomic64_unchecked_t
9395+ *
9396+ * Atomically increments @v by 1.
9397+ */
9398+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9399+{
9400 asm volatile(LOCK_PREFIX "incq %0"
9401 : "=m" (v->counter)
9402 : "m" (v->counter));
9403@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
9404 */
9405 static inline void atomic64_dec(atomic64_t *v)
9406 {
9407- asm volatile(LOCK_PREFIX "decq %0"
9408+ asm volatile(LOCK_PREFIX "decq %0\n"
9409+
9410+#ifdef CONFIG_PAX_REFCOUNT
9411+ "jno 0f\n"
9412+ LOCK_PREFIX "incq %0\n"
9413+ "int $4\n0:\n"
9414+ _ASM_EXTABLE(0b, 0b)
9415+#endif
9416+
9417+ : "=m" (v->counter)
9418+ : "m" (v->counter));
9419+}
9420+
9421+/**
9422+ * atomic64_dec_unchecked - decrement atomic64 variable
9423+ * @v: pointer to type atomic64_t
9424+ *
9425+ * Atomically decrements @v by 1.
9426+ */
9427+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9428+{
9429+ asm volatile(LOCK_PREFIX "decq %0\n"
9430 : "=m" (v->counter)
9431 : "m" (v->counter));
9432 }
9433@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
9434 {
9435 unsigned char c;
9436
9437- asm volatile(LOCK_PREFIX "decq %0; sete %1"
9438+ asm volatile(LOCK_PREFIX "decq %0\n"
9439+
9440+#ifdef CONFIG_PAX_REFCOUNT
9441+ "jno 0f\n"
9442+ LOCK_PREFIX "incq %0\n"
9443+ "int $4\n0:\n"
9444+ _ASM_EXTABLE(0b, 0b)
9445+#endif
9446+
9447+ "sete %1\n"
9448 : "=m" (v->counter), "=qm" (c)
9449 : "m" (v->counter) : "memory");
9450 return c != 0;
9451@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
9452 {
9453 unsigned char c;
9454
9455- asm volatile(LOCK_PREFIX "incq %0; sete %1"
9456+ asm volatile(LOCK_PREFIX "incq %0\n"
9457+
9458+#ifdef CONFIG_PAX_REFCOUNT
9459+ "jno 0f\n"
9460+ LOCK_PREFIX "decq %0\n"
9461+ "int $4\n0:\n"
9462+ _ASM_EXTABLE(0b, 0b)
9463+#endif
9464+
9465+ "sete %1\n"
9466 : "=m" (v->counter), "=qm" (c)
9467 : "m" (v->counter) : "memory");
9468 return c != 0;
9469@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9470 {
9471 unsigned char c;
9472
9473- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
9474+ asm volatile(LOCK_PREFIX "addq %2,%0\n"
9475+
9476+#ifdef CONFIG_PAX_REFCOUNT
9477+ "jno 0f\n"
9478+ LOCK_PREFIX "subq %2,%0\n"
9479+ "int $4\n0:\n"
9480+ _ASM_EXTABLE(0b, 0b)
9481+#endif
9482+
9483+ "sets %1\n"
9484 : "=m" (v->counter), "=qm" (c)
9485 : "er" (i), "m" (v->counter) : "memory");
9486 return c;
9487@@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9488 */
9489 static inline long atomic64_add_return(long i, atomic64_t *v)
9490 {
9491+ return i + xadd_check_overflow(&v->counter, i);
9492+}
9493+
9494+/**
9495+ * atomic64_add_return_unchecked - add and return
9496+ * @i: integer value to add
9497+ * @v: pointer to type atomic64_unchecked_t
9498+ *
9499+ * Atomically adds @i to @v and returns @i + @v
9500+ */
9501+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9502+{
9503 return i + xadd(&v->counter, i);
9504 }
9505
9506@@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
9507 }
9508
9509 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
9510+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9511+{
9512+ return atomic64_add_return_unchecked(1, v);
9513+}
9514 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
9515
9516 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9517@@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9518 return cmpxchg(&v->counter, old, new);
9519 }
9520
9521+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
9522+{
9523+ return cmpxchg(&v->counter, old, new);
9524+}
9525+
9526 static inline long atomic64_xchg(atomic64_t *v, long new)
9527 {
9528 return xchg(&v->counter, new);
9529@@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
9530 */
9531 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
9532 {
9533- long c, old;
9534+ long c, old, new;
9535 c = atomic64_read(v);
9536 for (;;) {
9537- if (unlikely(c == (u)))
9538+ if (unlikely(c == u))
9539 break;
9540- old = atomic64_cmpxchg((v), c, c + (a));
9541+
9542+ asm volatile("add %2,%0\n"
9543+
9544+#ifdef CONFIG_PAX_REFCOUNT
9545+ "jno 0f\n"
9546+ "sub %2,%0\n"
9547+ "int $4\n0:\n"
9548+ _ASM_EXTABLE(0b, 0b)
9549+#endif
9550+
9551+ : "=r" (new)
9552+ : "0" (c), "ir" (a));
9553+
9554+ old = atomic64_cmpxchg(v, c, new);
9555 if (likely(old == c))
9556 break;
9557 c = old;
9558 }
9559- return c != (u);
9560+ return c != u;
9561 }
9562
9563 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9564diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
9565index 1775d6e..b65017f 100644
9566--- a/arch/x86/include/asm/bitops.h
9567+++ b/arch/x86/include/asm/bitops.h
9568@@ -38,7 +38,7 @@
9569 * a mask operation on a byte.
9570 */
9571 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
9572-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
9573+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
9574 #define CONST_MASK(nr) (1 << ((nr) & 7))
9575
9576 /**
9577diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
9578index 5e1a2ee..c9f9533 100644
9579--- a/arch/x86/include/asm/boot.h
9580+++ b/arch/x86/include/asm/boot.h
9581@@ -11,10 +11,15 @@
9582 #include <asm/pgtable_types.h>
9583
9584 /* Physical address where kernel should be loaded. */
9585-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9586+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9587 + (CONFIG_PHYSICAL_ALIGN - 1)) \
9588 & ~(CONFIG_PHYSICAL_ALIGN - 1))
9589
9590+#ifndef __ASSEMBLY__
9591+extern unsigned char __LOAD_PHYSICAL_ADDR[];
9592+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
9593+#endif
9594+
9595 /* Minimum kernel alignment, as a power of two */
9596 #ifdef CONFIG_X86_64
9597 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
9598diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
9599index 48f99f1..d78ebf9 100644
9600--- a/arch/x86/include/asm/cache.h
9601+++ b/arch/x86/include/asm/cache.h
9602@@ -5,12 +5,13 @@
9603
9604 /* L1 cache line size */
9605 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
9606-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9607+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9608
9609 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9610+#define __read_only __attribute__((__section__(".data..read_only")))
9611
9612 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
9613-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
9614+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
9615
9616 #ifdef CONFIG_X86_VSMP
9617 #ifdef CONFIG_SMP
9618diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
9619index 4e12668..501d239 100644
9620--- a/arch/x86/include/asm/cacheflush.h
9621+++ b/arch/x86/include/asm/cacheflush.h
9622@@ -26,7 +26,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
9623 unsigned long pg_flags = pg->flags & _PGMT_MASK;
9624
9625 if (pg_flags == _PGMT_DEFAULT)
9626- return -1;
9627+ return ~0UL;
9628 else if (pg_flags == _PGMT_WC)
9629 return _PAGE_CACHE_WC;
9630 else if (pg_flags == _PGMT_UC_MINUS)
9631diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
9632index 46fc474..b02b0f9 100644
9633--- a/arch/x86/include/asm/checksum_32.h
9634+++ b/arch/x86/include/asm/checksum_32.h
9635@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
9636 int len, __wsum sum,
9637 int *src_err_ptr, int *dst_err_ptr);
9638
9639+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
9640+ int len, __wsum sum,
9641+ int *src_err_ptr, int *dst_err_ptr);
9642+
9643+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
9644+ int len, __wsum sum,
9645+ int *src_err_ptr, int *dst_err_ptr);
9646+
9647 /*
9648 * Note: when you get a NULL pointer exception here this means someone
9649 * passed in an incorrect kernel address to one of these functions.
9650@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
9651 int *err_ptr)
9652 {
9653 might_sleep();
9654- return csum_partial_copy_generic((__force void *)src, dst,
9655+ return csum_partial_copy_generic_from_user((__force void *)src, dst,
9656 len, sum, err_ptr, NULL);
9657 }
9658
9659@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
9660 {
9661 might_sleep();
9662 if (access_ok(VERIFY_WRITE, dst, len))
9663- return csum_partial_copy_generic(src, (__force void *)dst,
9664+ return csum_partial_copy_generic_to_user(src, (__force void *)dst,
9665 len, sum, NULL, err_ptr);
9666
9667 if (len)
9668diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
9669index 5d3acdf..6447a02 100644
9670--- a/arch/x86/include/asm/cmpxchg.h
9671+++ b/arch/x86/include/asm/cmpxchg.h
9672@@ -14,6 +14,8 @@ extern void __cmpxchg_wrong_size(void)
9673 __compiletime_error("Bad argument size for cmpxchg");
9674 extern void __xadd_wrong_size(void)
9675 __compiletime_error("Bad argument size for xadd");
9676+extern void __xadd_check_overflow_wrong_size(void)
9677+ __compiletime_error("Bad argument size for xadd_check_overflow");
9678
9679 /*
9680 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
9681@@ -195,6 +197,34 @@ extern void __xadd_wrong_size(void)
9682 __ret; \
9683 })
9684
9685+#define __xadd_check_overflow(ptr, inc, lock) \
9686+ ({ \
9687+ __typeof__ (*(ptr)) __ret = (inc); \
9688+ switch (sizeof(*(ptr))) { \
9689+ case __X86_CASE_L: \
9690+ asm volatile (lock "xaddl %0, %1\n" \
9691+ "jno 0f\n" \
9692+ "mov %0,%1\n" \
9693+ "int $4\n0:\n" \
9694+ _ASM_EXTABLE(0b, 0b) \
9695+ : "+r" (__ret), "+m" (*(ptr)) \
9696+ : : "memory", "cc"); \
9697+ break; \
9698+ case __X86_CASE_Q: \
9699+ asm volatile (lock "xaddq %q0, %1\n" \
9700+ "jno 0f\n" \
9701+ "mov %0,%1\n" \
9702+ "int $4\n0:\n" \
9703+ _ASM_EXTABLE(0b, 0b) \
9704+ : "+r" (__ret), "+m" (*(ptr)) \
9705+ : : "memory", "cc"); \
9706+ break; \
9707+ default: \
9708+ __xadd_check_overflow_wrong_size(); \
9709+ } \
9710+ __ret; \
9711+ })
9712+
9713 /*
9714 * xadd() adds "inc" to "*ptr" and atomically returns the previous
9715 * value of "*ptr".
9716@@ -207,4 +237,6 @@ extern void __xadd_wrong_size(void)
9717 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
9718 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
9719
9720+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
9721+
9722 #endif /* ASM_X86_CMPXCHG_H */
9723diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
9724index f3444f7..051a196 100644
9725--- a/arch/x86/include/asm/cpufeature.h
9726+++ b/arch/x86/include/asm/cpufeature.h
9727@@ -363,7 +363,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
9728 ".section .discard,\"aw\",@progbits\n"
9729 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
9730 ".previous\n"
9731- ".section .altinstr_replacement,\"ax\"\n"
9732+ ".section .altinstr_replacement,\"a\"\n"
9733 "3: movb $1,%0\n"
9734 "4:\n"
9735 ".previous\n"
9736diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
9737index 41935fa..3b40db8 100644
9738--- a/arch/x86/include/asm/desc.h
9739+++ b/arch/x86/include/asm/desc.h
9740@@ -4,6 +4,7 @@
9741 #include <asm/desc_defs.h>
9742 #include <asm/ldt.h>
9743 #include <asm/mmu.h>
9744+#include <asm/pgtable.h>
9745
9746 #include <linux/smp.h>
9747
9748@@ -16,6 +17,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
9749
9750 desc->type = (info->read_exec_only ^ 1) << 1;
9751 desc->type |= info->contents << 2;
9752+ desc->type |= info->seg_not_present ^ 1;
9753
9754 desc->s = 1;
9755 desc->dpl = 0x3;
9756@@ -34,17 +36,12 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
9757 }
9758
9759 extern struct desc_ptr idt_descr;
9760-extern gate_desc idt_table[];
9761-
9762-struct gdt_page {
9763- struct desc_struct gdt[GDT_ENTRIES];
9764-} __attribute__((aligned(PAGE_SIZE)));
9765-
9766-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
9767+extern gate_desc idt_table[256];
9768
9769+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
9770 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
9771 {
9772- return per_cpu(gdt_page, cpu).gdt;
9773+ return cpu_gdt_table[cpu];
9774 }
9775
9776 #ifdef CONFIG_X86_64
9777@@ -69,8 +66,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
9778 unsigned long base, unsigned dpl, unsigned flags,
9779 unsigned short seg)
9780 {
9781- gate->a = (seg << 16) | (base & 0xffff);
9782- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
9783+ gate->gate.offset_low = base;
9784+ gate->gate.seg = seg;
9785+ gate->gate.reserved = 0;
9786+ gate->gate.type = type;
9787+ gate->gate.s = 0;
9788+ gate->gate.dpl = dpl;
9789+ gate->gate.p = 1;
9790+ gate->gate.offset_high = base >> 16;
9791 }
9792
9793 #endif
9794@@ -115,12 +118,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
9795
9796 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
9797 {
9798+ pax_open_kernel();
9799 memcpy(&idt[entry], gate, sizeof(*gate));
9800+ pax_close_kernel();
9801 }
9802
9803 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
9804 {
9805+ pax_open_kernel();
9806 memcpy(&ldt[entry], desc, 8);
9807+ pax_close_kernel();
9808 }
9809
9810 static inline void
9811@@ -134,7 +141,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
9812 default: size = sizeof(*gdt); break;
9813 }
9814
9815+ pax_open_kernel();
9816 memcpy(&gdt[entry], desc, size);
9817+ pax_close_kernel();
9818 }
9819
9820 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
9821@@ -207,7 +216,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
9822
9823 static inline void native_load_tr_desc(void)
9824 {
9825+ pax_open_kernel();
9826 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
9827+ pax_close_kernel();
9828 }
9829
9830 static inline void native_load_gdt(const struct desc_ptr *dtr)
9831@@ -244,8 +255,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
9832 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
9833 unsigned int i;
9834
9835+ pax_open_kernel();
9836 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
9837 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
9838+ pax_close_kernel();
9839 }
9840
9841 #define _LDT_empty(info) \
9842@@ -307,7 +320,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
9843 desc->limit = (limit >> 16) & 0xf;
9844 }
9845
9846-static inline void _set_gate(int gate, unsigned type, void *addr,
9847+static inline void _set_gate(int gate, unsigned type, const void *addr,
9848 unsigned dpl, unsigned ist, unsigned seg)
9849 {
9850 gate_desc s;
9851@@ -326,7 +339,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
9852 * Pentium F0 0F bugfix can have resulted in the mapped
9853 * IDT being write-protected.
9854 */
9855-static inline void set_intr_gate(unsigned int n, void *addr)
9856+static inline void set_intr_gate(unsigned int n, const void *addr)
9857 {
9858 BUG_ON((unsigned)n > 0xFF);
9859 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
9860@@ -356,19 +369,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
9861 /*
9862 * This routine sets up an interrupt gate at directory privilege level 3.
9863 */
9864-static inline void set_system_intr_gate(unsigned int n, void *addr)
9865+static inline void set_system_intr_gate(unsigned int n, const void *addr)
9866 {
9867 BUG_ON((unsigned)n > 0xFF);
9868 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
9869 }
9870
9871-static inline void set_system_trap_gate(unsigned int n, void *addr)
9872+static inline void set_system_trap_gate(unsigned int n, const void *addr)
9873 {
9874 BUG_ON((unsigned)n > 0xFF);
9875 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
9876 }
9877
9878-static inline void set_trap_gate(unsigned int n, void *addr)
9879+static inline void set_trap_gate(unsigned int n, const void *addr)
9880 {
9881 BUG_ON((unsigned)n > 0xFF);
9882 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
9883@@ -377,19 +390,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
9884 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
9885 {
9886 BUG_ON((unsigned)n > 0xFF);
9887- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
9888+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
9889 }
9890
9891-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
9892+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
9893 {
9894 BUG_ON((unsigned)n > 0xFF);
9895 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
9896 }
9897
9898-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
9899+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
9900 {
9901 BUG_ON((unsigned)n > 0xFF);
9902 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
9903 }
9904
9905+#ifdef CONFIG_X86_32
9906+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
9907+{
9908+ struct desc_struct d;
9909+
9910+ if (likely(limit))
9911+ limit = (limit - 1UL) >> PAGE_SHIFT;
9912+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
9913+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
9914+}
9915+#endif
9916+
9917 #endif /* _ASM_X86_DESC_H */
9918diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
9919index 278441f..b95a174 100644
9920--- a/arch/x86/include/asm/desc_defs.h
9921+++ b/arch/x86/include/asm/desc_defs.h
9922@@ -31,6 +31,12 @@ struct desc_struct {
9923 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
9924 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
9925 };
9926+ struct {
9927+ u16 offset_low;
9928+ u16 seg;
9929+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
9930+ unsigned offset_high: 16;
9931+ } gate;
9932 };
9933 } __attribute__((packed));
9934
9935diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
9936index 908b969..a1f4eb4 100644
9937--- a/arch/x86/include/asm/e820.h
9938+++ b/arch/x86/include/asm/e820.h
9939@@ -69,7 +69,7 @@ struct e820map {
9940 #define ISA_START_ADDRESS 0xa0000
9941 #define ISA_END_ADDRESS 0x100000
9942
9943-#define BIOS_BEGIN 0x000a0000
9944+#define BIOS_BEGIN 0x000c0000
9945 #define BIOS_END 0x00100000
9946
9947 #define BIOS_ROM_BASE 0xffe00000
9948diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
9949index 5f962df..7289f09 100644
9950--- a/arch/x86/include/asm/elf.h
9951+++ b/arch/x86/include/asm/elf.h
9952@@ -238,7 +238,25 @@ extern int force_personality32;
9953 the loader. We need to make sure that it is out of the way of the program
9954 that it will "exec", and that there is sufficient room for the brk. */
9955
9956+#ifdef CONFIG_PAX_SEGMEXEC
9957+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
9958+#else
9959 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
9960+#endif
9961+
9962+#ifdef CONFIG_PAX_ASLR
9963+#ifdef CONFIG_X86_32
9964+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
9965+
9966+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9967+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9968+#else
9969+#define PAX_ELF_ET_DYN_BASE 0x400000UL
9970+
9971+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9972+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9973+#endif
9974+#endif
9975
9976 /* This yields a mask that user programs can use to figure out what
9977 instruction set this CPU supports. This could be done in user space,
9978@@ -291,9 +309,7 @@ do { \
9979
9980 #define ARCH_DLINFO \
9981 do { \
9982- if (vdso_enabled) \
9983- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
9984- (unsigned long)current->mm->context.vdso); \
9985+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
9986 } while (0)
9987
9988 #define AT_SYSINFO 32
9989@@ -304,7 +320,7 @@ do { \
9990
9991 #endif /* !CONFIG_X86_32 */
9992
9993-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
9994+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
9995
9996 #define VDSO_ENTRY \
9997 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
9998@@ -318,9 +334,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
9999 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
10000 #define compat_arch_setup_additional_pages syscall32_setup_pages
10001
10002-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
10003-#define arch_randomize_brk arch_randomize_brk
10004-
10005 /*
10006 * True on X86_32 or when emulating IA32 on X86_64
10007 */
10008diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
10009index cc70c1c..d96d011 100644
10010--- a/arch/x86/include/asm/emergency-restart.h
10011+++ b/arch/x86/include/asm/emergency-restart.h
10012@@ -15,6 +15,6 @@ enum reboot_type {
10013
10014 extern enum reboot_type reboot_type;
10015
10016-extern void machine_emergency_restart(void);
10017+extern void machine_emergency_restart(void) __noreturn;
10018
10019 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
10020diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
10021index dbe82a5..c6d8a00 100644
10022--- a/arch/x86/include/asm/floppy.h
10023+++ b/arch/x86/include/asm/floppy.h
10024@@ -157,6 +157,7 @@ static unsigned long dma_mem_alloc(unsigned long size)
10025 }
10026
10027
10028+static unsigned long vdma_mem_alloc(unsigned long size) __size_overflow(1);
10029 static unsigned long vdma_mem_alloc(unsigned long size)
10030 {
10031 return (unsigned long)vmalloc(size);
10032diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
10033index d09bb03..4ea4194 100644
10034--- a/arch/x86/include/asm/futex.h
10035+++ b/arch/x86/include/asm/futex.h
10036@@ -12,16 +12,18 @@
10037 #include <asm/system.h>
10038
10039 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
10040+ typecheck(u32 __user *, uaddr); \
10041 asm volatile("1:\t" insn "\n" \
10042 "2:\t.section .fixup,\"ax\"\n" \
10043 "3:\tmov\t%3, %1\n" \
10044 "\tjmp\t2b\n" \
10045 "\t.previous\n" \
10046 _ASM_EXTABLE(1b, 3b) \
10047- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
10048+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
10049 : "i" (-EFAULT), "0" (oparg), "1" (0))
10050
10051 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
10052+ typecheck(u32 __user *, uaddr); \
10053 asm volatile("1:\tmovl %2, %0\n" \
10054 "\tmovl\t%0, %3\n" \
10055 "\t" insn "\n" \
10056@@ -34,7 +36,7 @@
10057 _ASM_EXTABLE(1b, 4b) \
10058 _ASM_EXTABLE(2b, 4b) \
10059 : "=&a" (oldval), "=&r" (ret), \
10060- "+m" (*uaddr), "=&r" (tem) \
10061+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
10062 : "r" (oparg), "i" (-EFAULT), "1" (0))
10063
10064 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10065@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10066
10067 switch (op) {
10068 case FUTEX_OP_SET:
10069- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
10070+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
10071 break;
10072 case FUTEX_OP_ADD:
10073- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
10074+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
10075 uaddr, oparg);
10076 break;
10077 case FUTEX_OP_OR:
10078@@ -123,13 +125,13 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
10079 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
10080 return -EFAULT;
10081
10082- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
10083+ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
10084 "2:\t.section .fixup, \"ax\"\n"
10085 "3:\tmov %3, %0\n"
10086 "\tjmp 2b\n"
10087 "\t.previous\n"
10088 _ASM_EXTABLE(1b, 3b)
10089- : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
10090+ : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
10091 : "i" (-EFAULT), "r" (newval), "1" (oldval)
10092 : "memory"
10093 );
10094diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
10095index eb92a6e..b98b2f4 100644
10096--- a/arch/x86/include/asm/hw_irq.h
10097+++ b/arch/x86/include/asm/hw_irq.h
10098@@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
10099 extern void enable_IO_APIC(void);
10100
10101 /* Statistics */
10102-extern atomic_t irq_err_count;
10103-extern atomic_t irq_mis_count;
10104+extern atomic_unchecked_t irq_err_count;
10105+extern atomic_unchecked_t irq_mis_count;
10106
10107 /* EISA */
10108 extern void eisa_set_level_irq(unsigned int irq);
10109diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
10110index a850b4d..bae26dc 100644
10111--- a/arch/x86/include/asm/i387.h
10112+++ b/arch/x86/include/asm/i387.h
10113@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10114 {
10115 int err;
10116
10117+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10118+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10119+ fx = (struct i387_fxsave_struct __user *)((void *)fx + PAX_USER_SHADOW_BASE);
10120+#endif
10121+
10122 /* See comment in fxsave() below. */
10123 #ifdef CONFIG_AS_FXSAVEQ
10124 asm volatile("1: fxrstorq %[fx]\n\t"
10125@@ -121,6 +126,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
10126 {
10127 int err;
10128
10129+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10130+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10131+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
10132+#endif
10133+
10134 /*
10135 * Clear the bytes not touched by the fxsave and reserved
10136 * for the SW usage.
10137@@ -424,7 +434,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
10138 static inline bool interrupted_user_mode(void)
10139 {
10140 struct pt_regs *regs = get_irq_regs();
10141- return regs && user_mode_vm(regs);
10142+ return regs && user_mode(regs);
10143 }
10144
10145 /*
10146diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
10147index d8e8eef..99f81ae 100644
10148--- a/arch/x86/include/asm/io.h
10149+++ b/arch/x86/include/asm/io.h
10150@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
10151
10152 #include <linux/vmalloc.h>
10153
10154+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10155+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10156+{
10157+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10158+}
10159+
10160+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10161+{
10162+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10163+}
10164+
10165 /*
10166 * Convert a virtual cached pointer to an uncached pointer
10167 */
10168diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
10169index bba3cf8..06bc8da 100644
10170--- a/arch/x86/include/asm/irqflags.h
10171+++ b/arch/x86/include/asm/irqflags.h
10172@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
10173 sti; \
10174 sysexit
10175
10176+#define GET_CR0_INTO_RDI mov %cr0, %rdi
10177+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
10178+#define GET_CR3_INTO_RDI mov %cr3, %rdi
10179+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
10180+
10181 #else
10182 #define INTERRUPT_RETURN iret
10183 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
10184diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
10185index 5478825..839e88c 100644
10186--- a/arch/x86/include/asm/kprobes.h
10187+++ b/arch/x86/include/asm/kprobes.h
10188@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
10189 #define RELATIVEJUMP_SIZE 5
10190 #define RELATIVECALL_OPCODE 0xe8
10191 #define RELATIVE_ADDR_SIZE 4
10192-#define MAX_STACK_SIZE 64
10193-#define MIN_STACK_SIZE(ADDR) \
10194- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
10195- THREAD_SIZE - (unsigned long)(ADDR))) \
10196- ? (MAX_STACK_SIZE) \
10197- : (((unsigned long)current_thread_info()) + \
10198- THREAD_SIZE - (unsigned long)(ADDR)))
10199+#define MAX_STACK_SIZE 64UL
10200+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
10201
10202 #define flush_insn_slot(p) do { } while (0)
10203
10204diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
10205index b4973f4..a42170a 100644
10206--- a/arch/x86/include/asm/kvm_host.h
10207+++ b/arch/x86/include/asm/kvm_host.h
10208@@ -459,7 +459,7 @@ struct kvm_arch {
10209 unsigned int n_requested_mmu_pages;
10210 unsigned int n_max_mmu_pages;
10211 unsigned int indirect_shadow_pages;
10212- atomic_t invlpg_counter;
10213+ atomic_unchecked_t invlpg_counter;
10214 struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
10215 /*
10216 * Hash table of struct kvm_mmu_page.
10217@@ -638,7 +638,7 @@ struct kvm_x86_ops {
10218 int (*check_intercept)(struct kvm_vcpu *vcpu,
10219 struct x86_instruction_info *info,
10220 enum x86_intercept_stage stage);
10221-};
10222+} __do_const;
10223
10224 struct kvm_arch_async_pf {
10225 u32 token;
10226@@ -667,9 +667,9 @@ void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages);
10227 int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3);
10228
10229 int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,
10230- const void *val, int bytes);
10231+ const void *val, int bytes) __size_overflow(2);
10232 int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes,
10233- gpa_t addr, unsigned long *ret);
10234+ gpa_t addr, unsigned long *ret) __size_overflow(2,3);
10235 u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);
10236
10237 extern bool tdp_enabled;
10238@@ -730,7 +730,7 @@ void kvm_get_cs_db_l_bits(struct kvm_vcpu *vcpu, int *db, int *l);
10239 int kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr);
10240
10241 int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata);
10242-int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data);
10243+int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data) __size_overflow(3);
10244
10245 unsigned long kvm_get_rflags(struct kvm_vcpu *vcpu);
10246 void kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags);
10247@@ -755,7 +755,7 @@ int fx_init(struct kvm_vcpu *vcpu);
10248 void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu);
10249 void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
10250 const u8 *new, int bytes,
10251- bool guest_initiated);
10252+ bool guest_initiated) __size_overflow(2);
10253 int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva);
10254 void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
10255 int kvm_mmu_load(struct kvm_vcpu *vcpu);
10256diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
10257index 9cdae5d..300d20f 100644
10258--- a/arch/x86/include/asm/local.h
10259+++ b/arch/x86/include/asm/local.h
10260@@ -18,26 +18,58 @@ typedef struct {
10261
10262 static inline void local_inc(local_t *l)
10263 {
10264- asm volatile(_ASM_INC "%0"
10265+ asm volatile(_ASM_INC "%0\n"
10266+
10267+#ifdef CONFIG_PAX_REFCOUNT
10268+ "jno 0f\n"
10269+ _ASM_DEC "%0\n"
10270+ "int $4\n0:\n"
10271+ _ASM_EXTABLE(0b, 0b)
10272+#endif
10273+
10274 : "+m" (l->a.counter));
10275 }
10276
10277 static inline void local_dec(local_t *l)
10278 {
10279- asm volatile(_ASM_DEC "%0"
10280+ asm volatile(_ASM_DEC "%0\n"
10281+
10282+#ifdef CONFIG_PAX_REFCOUNT
10283+ "jno 0f\n"
10284+ _ASM_INC "%0\n"
10285+ "int $4\n0:\n"
10286+ _ASM_EXTABLE(0b, 0b)
10287+#endif
10288+
10289 : "+m" (l->a.counter));
10290 }
10291
10292 static inline void local_add(long i, local_t *l)
10293 {
10294- asm volatile(_ASM_ADD "%1,%0"
10295+ asm volatile(_ASM_ADD "%1,%0\n"
10296+
10297+#ifdef CONFIG_PAX_REFCOUNT
10298+ "jno 0f\n"
10299+ _ASM_SUB "%1,%0\n"
10300+ "int $4\n0:\n"
10301+ _ASM_EXTABLE(0b, 0b)
10302+#endif
10303+
10304 : "+m" (l->a.counter)
10305 : "ir" (i));
10306 }
10307
10308 static inline void local_sub(long i, local_t *l)
10309 {
10310- asm volatile(_ASM_SUB "%1,%0"
10311+ asm volatile(_ASM_SUB "%1,%0\n"
10312+
10313+#ifdef CONFIG_PAX_REFCOUNT
10314+ "jno 0f\n"
10315+ _ASM_ADD "%1,%0\n"
10316+ "int $4\n0:\n"
10317+ _ASM_EXTABLE(0b, 0b)
10318+#endif
10319+
10320 : "+m" (l->a.counter)
10321 : "ir" (i));
10322 }
10323@@ -55,7 +87,16 @@ static inline int local_sub_and_test(long i, local_t *l)
10324 {
10325 unsigned char c;
10326
10327- asm volatile(_ASM_SUB "%2,%0; sete %1"
10328+ asm volatile(_ASM_SUB "%2,%0\n"
10329+
10330+#ifdef CONFIG_PAX_REFCOUNT
10331+ "jno 0f\n"
10332+ _ASM_ADD "%2,%0\n"
10333+ "int $4\n0:\n"
10334+ _ASM_EXTABLE(0b, 0b)
10335+#endif
10336+
10337+ "sete %1\n"
10338 : "+m" (l->a.counter), "=qm" (c)
10339 : "ir" (i) : "memory");
10340 return c;
10341@@ -73,7 +114,16 @@ static inline int local_dec_and_test(local_t *l)
10342 {
10343 unsigned char c;
10344
10345- asm volatile(_ASM_DEC "%0; sete %1"
10346+ asm volatile(_ASM_DEC "%0\n"
10347+
10348+#ifdef CONFIG_PAX_REFCOUNT
10349+ "jno 0f\n"
10350+ _ASM_INC "%0\n"
10351+ "int $4\n0:\n"
10352+ _ASM_EXTABLE(0b, 0b)
10353+#endif
10354+
10355+ "sete %1\n"
10356 : "+m" (l->a.counter), "=qm" (c)
10357 : : "memory");
10358 return c != 0;
10359@@ -91,7 +141,16 @@ static inline int local_inc_and_test(local_t *l)
10360 {
10361 unsigned char c;
10362
10363- asm volatile(_ASM_INC "%0; sete %1"
10364+ asm volatile(_ASM_INC "%0\n"
10365+
10366+#ifdef CONFIG_PAX_REFCOUNT
10367+ "jno 0f\n"
10368+ _ASM_DEC "%0\n"
10369+ "int $4\n0:\n"
10370+ _ASM_EXTABLE(0b, 0b)
10371+#endif
10372+
10373+ "sete %1\n"
10374 : "+m" (l->a.counter), "=qm" (c)
10375 : : "memory");
10376 return c != 0;
10377@@ -110,7 +169,16 @@ static inline int local_add_negative(long i, local_t *l)
10378 {
10379 unsigned char c;
10380
10381- asm volatile(_ASM_ADD "%2,%0; sets %1"
10382+ asm volatile(_ASM_ADD "%2,%0\n"
10383+
10384+#ifdef CONFIG_PAX_REFCOUNT
10385+ "jno 0f\n"
10386+ _ASM_SUB "%2,%0\n"
10387+ "int $4\n0:\n"
10388+ _ASM_EXTABLE(0b, 0b)
10389+#endif
10390+
10391+ "sets %1\n"
10392 : "+m" (l->a.counter), "=qm" (c)
10393 : "ir" (i) : "memory");
10394 return c;
10395@@ -133,7 +201,15 @@ static inline long local_add_return(long i, local_t *l)
10396 #endif
10397 /* Modern 486+ processor */
10398 __i = i;
10399- asm volatile(_ASM_XADD "%0, %1;"
10400+ asm volatile(_ASM_XADD "%0, %1\n"
10401+
10402+#ifdef CONFIG_PAX_REFCOUNT
10403+ "jno 0f\n"
10404+ _ASM_MOV "%0,%1\n"
10405+ "int $4\n0:\n"
10406+ _ASM_EXTABLE(0b, 0b)
10407+#endif
10408+
10409 : "+r" (i), "+m" (l->a.counter)
10410 : : "memory");
10411 return i + __i;
10412diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
10413index 593e51d..fa69c9a 100644
10414--- a/arch/x86/include/asm/mman.h
10415+++ b/arch/x86/include/asm/mman.h
10416@@ -5,4 +5,14 @@
10417
10418 #include <asm-generic/mman.h>
10419
10420+#ifdef __KERNEL__
10421+#ifndef __ASSEMBLY__
10422+#ifdef CONFIG_X86_32
10423+#define arch_mmap_check i386_mmap_check
10424+int i386_mmap_check(unsigned long addr, unsigned long len,
10425+ unsigned long flags);
10426+#endif
10427+#endif
10428+#endif
10429+
10430 #endif /* _ASM_X86_MMAN_H */
10431diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
10432index 5f55e69..e20bfb1 100644
10433--- a/arch/x86/include/asm/mmu.h
10434+++ b/arch/x86/include/asm/mmu.h
10435@@ -9,7 +9,7 @@
10436 * we put the segment information here.
10437 */
10438 typedef struct {
10439- void *ldt;
10440+ struct desc_struct *ldt;
10441 int size;
10442
10443 #ifdef CONFIG_X86_64
10444@@ -18,7 +18,19 @@ typedef struct {
10445 #endif
10446
10447 struct mutex lock;
10448- void *vdso;
10449+ unsigned long vdso;
10450+
10451+#ifdef CONFIG_X86_32
10452+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
10453+ unsigned long user_cs_base;
10454+ unsigned long user_cs_limit;
10455+
10456+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10457+ cpumask_t cpu_user_cs_mask;
10458+#endif
10459+
10460+#endif
10461+#endif
10462 } mm_context_t;
10463
10464 #ifdef CONFIG_SMP
10465diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
10466index 6902152..399f3a2 100644
10467--- a/arch/x86/include/asm/mmu_context.h
10468+++ b/arch/x86/include/asm/mmu_context.h
10469@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
10470
10471 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
10472 {
10473+
10474+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10475+ unsigned int i;
10476+ pgd_t *pgd;
10477+
10478+ pax_open_kernel();
10479+ pgd = get_cpu_pgd(smp_processor_id());
10480+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
10481+ set_pgd_batched(pgd+i, native_make_pgd(0));
10482+ pax_close_kernel();
10483+#endif
10484+
10485 #ifdef CONFIG_SMP
10486 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
10487 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
10488@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10489 struct task_struct *tsk)
10490 {
10491 unsigned cpu = smp_processor_id();
10492+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10493+ int tlbstate = TLBSTATE_OK;
10494+#endif
10495
10496 if (likely(prev != next)) {
10497 #ifdef CONFIG_SMP
10498+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10499+ tlbstate = percpu_read(cpu_tlbstate.state);
10500+#endif
10501 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10502 percpu_write(cpu_tlbstate.active_mm, next);
10503 #endif
10504 cpumask_set_cpu(cpu, mm_cpumask(next));
10505
10506 /* Re-load page tables */
10507+#ifdef CONFIG_PAX_PER_CPU_PGD
10508+ pax_open_kernel();
10509+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10510+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10511+ pax_close_kernel();
10512+ load_cr3(get_cpu_pgd(cpu));
10513+#else
10514 load_cr3(next->pgd);
10515+#endif
10516
10517 /* stop flush ipis for the previous mm */
10518 cpumask_clear_cpu(cpu, mm_cpumask(prev));
10519@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10520 */
10521 if (unlikely(prev->context.ldt != next->context.ldt))
10522 load_LDT_nolock(&next->context);
10523- }
10524+
10525+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10526+ if (!(__supported_pte_mask & _PAGE_NX)) {
10527+ smp_mb__before_clear_bit();
10528+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
10529+ smp_mb__after_clear_bit();
10530+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10531+ }
10532+#endif
10533+
10534+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10535+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
10536+ prev->context.user_cs_limit != next->context.user_cs_limit))
10537+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10538 #ifdef CONFIG_SMP
10539+ else if (unlikely(tlbstate != TLBSTATE_OK))
10540+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10541+#endif
10542+#endif
10543+
10544+ }
10545 else {
10546+
10547+#ifdef CONFIG_PAX_PER_CPU_PGD
10548+ pax_open_kernel();
10549+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10550+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10551+ pax_close_kernel();
10552+ load_cr3(get_cpu_pgd(cpu));
10553+#endif
10554+
10555+#ifdef CONFIG_SMP
10556 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10557 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
10558
10559@@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10560 * tlb flush IPI delivery. We must reload CR3
10561 * to make sure to use no freed page tables.
10562 */
10563+
10564+#ifndef CONFIG_PAX_PER_CPU_PGD
10565 load_cr3(next->pgd);
10566+#endif
10567+
10568 load_LDT_nolock(&next->context);
10569+
10570+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
10571+ if (!(__supported_pte_mask & _PAGE_NX))
10572+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10573+#endif
10574+
10575+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10576+#ifdef CONFIG_PAX_PAGEEXEC
10577+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
10578+#endif
10579+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10580+#endif
10581+
10582 }
10583+#endif
10584 }
10585-#endif
10586 }
10587
10588 #define activate_mm(prev, next) \
10589diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
10590index 9eae775..c914fea 100644
10591--- a/arch/x86/include/asm/module.h
10592+++ b/arch/x86/include/asm/module.h
10593@@ -5,6 +5,7 @@
10594
10595 #ifdef CONFIG_X86_64
10596 /* X86_64 does not define MODULE_PROC_FAMILY */
10597+#define MODULE_PROC_FAMILY ""
10598 #elif defined CONFIG_M386
10599 #define MODULE_PROC_FAMILY "386 "
10600 #elif defined CONFIG_M486
10601@@ -59,8 +60,20 @@
10602 #error unknown processor family
10603 #endif
10604
10605-#ifdef CONFIG_X86_32
10606-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
10607+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
10608+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
10609+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
10610+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
10611+#else
10612+#define MODULE_PAX_KERNEXEC ""
10613 #endif
10614
10615+#ifdef CONFIG_PAX_MEMORY_UDEREF
10616+#define MODULE_PAX_UDEREF "UDEREF "
10617+#else
10618+#define MODULE_PAX_UDEREF ""
10619+#endif
10620+
10621+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
10622+
10623 #endif /* _ASM_X86_MODULE_H */
10624diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
10625index 7639dbf..e08a58c 100644
10626--- a/arch/x86/include/asm/page_64_types.h
10627+++ b/arch/x86/include/asm/page_64_types.h
10628@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
10629
10630 /* duplicated to the one in bootmem.h */
10631 extern unsigned long max_pfn;
10632-extern unsigned long phys_base;
10633+extern const unsigned long phys_base;
10634
10635 extern unsigned long __phys_addr(unsigned long);
10636 #define __phys_reloc_hide(x) (x)
10637diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
10638index a7d2db9..edb023e 100644
10639--- a/arch/x86/include/asm/paravirt.h
10640+++ b/arch/x86/include/asm/paravirt.h
10641@@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
10642 val);
10643 }
10644
10645+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
10646+{
10647+ pgdval_t val = native_pgd_val(pgd);
10648+
10649+ if (sizeof(pgdval_t) > sizeof(long))
10650+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
10651+ val, (u64)val >> 32);
10652+ else
10653+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
10654+ val);
10655+}
10656+
10657 static inline void pgd_clear(pgd_t *pgdp)
10658 {
10659 set_pgd(pgdp, __pgd(0));
10660@@ -748,6 +760,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
10661 pv_mmu_ops.set_fixmap(idx, phys, flags);
10662 }
10663
10664+#ifdef CONFIG_PAX_KERNEXEC
10665+static inline unsigned long pax_open_kernel(void)
10666+{
10667+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
10668+}
10669+
10670+static inline unsigned long pax_close_kernel(void)
10671+{
10672+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
10673+}
10674+#else
10675+static inline unsigned long pax_open_kernel(void) { return 0; }
10676+static inline unsigned long pax_close_kernel(void) { return 0; }
10677+#endif
10678+
10679 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
10680
10681 static inline int arch_spin_is_locked(struct arch_spinlock *lock)
10682@@ -964,7 +991,7 @@ extern void default_banner(void);
10683
10684 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
10685 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
10686-#define PARA_INDIRECT(addr) *%cs:addr
10687+#define PARA_INDIRECT(addr) *%ss:addr
10688 #endif
10689
10690 #define INTERRUPT_RETURN \
10691@@ -1041,6 +1068,21 @@ extern void default_banner(void);
10692 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
10693 CLBR_NONE, \
10694 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
10695+
10696+#define GET_CR0_INTO_RDI \
10697+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
10698+ mov %rax,%rdi
10699+
10700+#define SET_RDI_INTO_CR0 \
10701+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10702+
10703+#define GET_CR3_INTO_RDI \
10704+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
10705+ mov %rax,%rdi
10706+
10707+#define SET_RDI_INTO_CR3 \
10708+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
10709+
10710 #endif /* CONFIG_X86_32 */
10711
10712 #endif /* __ASSEMBLY__ */
10713diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
10714index 8e8b9a4..f07d725 100644
10715--- a/arch/x86/include/asm/paravirt_types.h
10716+++ b/arch/x86/include/asm/paravirt_types.h
10717@@ -84,20 +84,20 @@ struct pv_init_ops {
10718 */
10719 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
10720 unsigned long addr, unsigned len);
10721-};
10722+} __no_const;
10723
10724
10725 struct pv_lazy_ops {
10726 /* Set deferred update mode, used for batching operations. */
10727 void (*enter)(void);
10728 void (*leave)(void);
10729-};
10730+} __no_const;
10731
10732 struct pv_time_ops {
10733 unsigned long long (*sched_clock)(void);
10734 unsigned long long (*steal_clock)(int cpu);
10735 unsigned long (*get_tsc_khz)(void);
10736-};
10737+} __no_const;
10738
10739 struct pv_cpu_ops {
10740 /* hooks for various privileged instructions */
10741@@ -193,7 +193,7 @@ struct pv_cpu_ops {
10742
10743 void (*start_context_switch)(struct task_struct *prev);
10744 void (*end_context_switch)(struct task_struct *next);
10745-};
10746+} __no_const;
10747
10748 struct pv_irq_ops {
10749 /*
10750@@ -224,7 +224,7 @@ struct pv_apic_ops {
10751 unsigned long start_eip,
10752 unsigned long start_esp);
10753 #endif
10754-};
10755+} __no_const;
10756
10757 struct pv_mmu_ops {
10758 unsigned long (*read_cr2)(void);
10759@@ -313,6 +313,7 @@ struct pv_mmu_ops {
10760 struct paravirt_callee_save make_pud;
10761
10762 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
10763+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
10764 #endif /* PAGETABLE_LEVELS == 4 */
10765 #endif /* PAGETABLE_LEVELS >= 3 */
10766
10767@@ -324,6 +325,12 @@ struct pv_mmu_ops {
10768 an mfn. We can tell which is which from the index. */
10769 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
10770 phys_addr_t phys, pgprot_t flags);
10771+
10772+#ifdef CONFIG_PAX_KERNEXEC
10773+ unsigned long (*pax_open_kernel)(void);
10774+ unsigned long (*pax_close_kernel)(void);
10775+#endif
10776+
10777 };
10778
10779 struct arch_spinlock;
10780@@ -334,7 +341,7 @@ struct pv_lock_ops {
10781 void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
10782 int (*spin_trylock)(struct arch_spinlock *lock);
10783 void (*spin_unlock)(struct arch_spinlock *lock);
10784-};
10785+} __no_const;
10786
10787 /* This contains all the paravirt structures: we get a convenient
10788 * number for each function using the offset which we use to indicate
10789diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
10790index b4389a4..b7ff22c 100644
10791--- a/arch/x86/include/asm/pgalloc.h
10792+++ b/arch/x86/include/asm/pgalloc.h
10793@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
10794 pmd_t *pmd, pte_t *pte)
10795 {
10796 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10797+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
10798+}
10799+
10800+static inline void pmd_populate_user(struct mm_struct *mm,
10801+ pmd_t *pmd, pte_t *pte)
10802+{
10803+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10804 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
10805 }
10806
10807diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
10808index 98391db..8f6984e 100644
10809--- a/arch/x86/include/asm/pgtable-2level.h
10810+++ b/arch/x86/include/asm/pgtable-2level.h
10811@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
10812
10813 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10814 {
10815+ pax_open_kernel();
10816 *pmdp = pmd;
10817+ pax_close_kernel();
10818 }
10819
10820 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10821diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
10822index effff47..f9e4035 100644
10823--- a/arch/x86/include/asm/pgtable-3level.h
10824+++ b/arch/x86/include/asm/pgtable-3level.h
10825@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10826
10827 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10828 {
10829+ pax_open_kernel();
10830 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
10831+ pax_close_kernel();
10832 }
10833
10834 static inline void native_set_pud(pud_t *pudp, pud_t pud)
10835 {
10836+ pax_open_kernel();
10837 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
10838+ pax_close_kernel();
10839 }
10840
10841 /*
10842diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
10843index 18601c8..3d716d1 100644
10844--- a/arch/x86/include/asm/pgtable.h
10845+++ b/arch/x86/include/asm/pgtable.h
10846@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
10847
10848 #ifndef __PAGETABLE_PUD_FOLDED
10849 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
10850+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
10851 #define pgd_clear(pgd) native_pgd_clear(pgd)
10852 #endif
10853
10854@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
10855
10856 #define arch_end_context_switch(prev) do {} while(0)
10857
10858+#define pax_open_kernel() native_pax_open_kernel()
10859+#define pax_close_kernel() native_pax_close_kernel()
10860 #endif /* CONFIG_PARAVIRT */
10861
10862+#define __HAVE_ARCH_PAX_OPEN_KERNEL
10863+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
10864+
10865+#ifdef CONFIG_PAX_KERNEXEC
10866+static inline unsigned long native_pax_open_kernel(void)
10867+{
10868+ unsigned long cr0;
10869+
10870+ preempt_disable();
10871+ barrier();
10872+ cr0 = read_cr0() ^ X86_CR0_WP;
10873+ BUG_ON(unlikely(cr0 & X86_CR0_WP));
10874+ write_cr0(cr0);
10875+ return cr0 ^ X86_CR0_WP;
10876+}
10877+
10878+static inline unsigned long native_pax_close_kernel(void)
10879+{
10880+ unsigned long cr0;
10881+
10882+ cr0 = read_cr0() ^ X86_CR0_WP;
10883+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
10884+ write_cr0(cr0);
10885+ barrier();
10886+ preempt_enable_no_resched();
10887+ return cr0 ^ X86_CR0_WP;
10888+}
10889+#else
10890+static inline unsigned long native_pax_open_kernel(void) { return 0; }
10891+static inline unsigned long native_pax_close_kernel(void) { return 0; }
10892+#endif
10893+
10894 /*
10895 * The following only work if pte_present() is true.
10896 * Undefined behaviour if not..
10897 */
10898+static inline int pte_user(pte_t pte)
10899+{
10900+ return pte_val(pte) & _PAGE_USER;
10901+}
10902+
10903 static inline int pte_dirty(pte_t pte)
10904 {
10905 return pte_flags(pte) & _PAGE_DIRTY;
10906@@ -196,9 +236,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
10907 return pte_clear_flags(pte, _PAGE_RW);
10908 }
10909
10910+static inline pte_t pte_mkread(pte_t pte)
10911+{
10912+ return __pte(pte_val(pte) | _PAGE_USER);
10913+}
10914+
10915 static inline pte_t pte_mkexec(pte_t pte)
10916 {
10917- return pte_clear_flags(pte, _PAGE_NX);
10918+#ifdef CONFIG_X86_PAE
10919+ if (__supported_pte_mask & _PAGE_NX)
10920+ return pte_clear_flags(pte, _PAGE_NX);
10921+ else
10922+#endif
10923+ return pte_set_flags(pte, _PAGE_USER);
10924+}
10925+
10926+static inline pte_t pte_exprotect(pte_t pte)
10927+{
10928+#ifdef CONFIG_X86_PAE
10929+ if (__supported_pte_mask & _PAGE_NX)
10930+ return pte_set_flags(pte, _PAGE_NX);
10931+ else
10932+#endif
10933+ return pte_clear_flags(pte, _PAGE_USER);
10934 }
10935
10936 static inline pte_t pte_mkdirty(pte_t pte)
10937@@ -390,6 +450,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
10938 #endif
10939
10940 #ifndef __ASSEMBLY__
10941+
10942+#ifdef CONFIG_PAX_PER_CPU_PGD
10943+extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
10944+static inline pgd_t *get_cpu_pgd(unsigned int cpu)
10945+{
10946+ return cpu_pgd[cpu];
10947+}
10948+#endif
10949+
10950 #include <linux/mm_types.h>
10951
10952 static inline int pte_none(pte_t pte)
10953@@ -560,7 +629,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
10954
10955 static inline int pgd_bad(pgd_t pgd)
10956 {
10957- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
10958+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
10959 }
10960
10961 static inline int pgd_none(pgd_t pgd)
10962@@ -583,7 +652,12 @@ static inline int pgd_none(pgd_t pgd)
10963 * pgd_offset() returns a (pgd_t *)
10964 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
10965 */
10966-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
10967+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
10968+
10969+#ifdef CONFIG_PAX_PER_CPU_PGD
10970+#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
10971+#endif
10972+
10973 /*
10974 * a shortcut which implies the use of the kernel's pgd, instead
10975 * of a process's
10976@@ -594,6 +668,20 @@ static inline int pgd_none(pgd_t pgd)
10977 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
10978 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
10979
10980+#ifdef CONFIG_X86_32
10981+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
10982+#else
10983+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
10984+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
10985+
10986+#ifdef CONFIG_PAX_MEMORY_UDEREF
10987+#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
10988+#else
10989+#define PAX_USER_SHADOW_BASE (_AC(0,UL))
10990+#endif
10991+
10992+#endif
10993+
10994 #ifndef __ASSEMBLY__
10995
10996 extern int direct_gbpages;
10997@@ -758,11 +846,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
10998 * dst and src can be on the same page, but the range must not overlap,
10999 * and must not cross a page boundary.
11000 */
11001-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
11002+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
11003 {
11004- memcpy(dst, src, count * sizeof(pgd_t));
11005+ pax_open_kernel();
11006+ while (count--)
11007+ *dst++ = *src++;
11008+ pax_close_kernel();
11009 }
11010
11011+#ifdef CONFIG_PAX_PER_CPU_PGD
11012+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11013+#endif
11014+
11015+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11016+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11017+#else
11018+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
11019+#endif
11020
11021 #include <asm-generic/pgtable.h>
11022 #endif /* __ASSEMBLY__ */
11023diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
11024index 0c92113..34a77c6 100644
11025--- a/arch/x86/include/asm/pgtable_32.h
11026+++ b/arch/x86/include/asm/pgtable_32.h
11027@@ -25,9 +25,6 @@
11028 struct mm_struct;
11029 struct vm_area_struct;
11030
11031-extern pgd_t swapper_pg_dir[1024];
11032-extern pgd_t initial_page_table[1024];
11033-
11034 static inline void pgtable_cache_init(void) { }
11035 static inline void check_pgt_cache(void) { }
11036 void paging_init(void);
11037@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11038 # include <asm/pgtable-2level.h>
11039 #endif
11040
11041+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
11042+extern pgd_t initial_page_table[PTRS_PER_PGD];
11043+#ifdef CONFIG_X86_PAE
11044+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
11045+#endif
11046+
11047 #if defined(CONFIG_HIGHPTE)
11048 #define pte_offset_map(dir, address) \
11049 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
11050@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11051 /* Clear a kernel PTE and flush it from the TLB */
11052 #define kpte_clear_flush(ptep, vaddr) \
11053 do { \
11054+ pax_open_kernel(); \
11055 pte_clear(&init_mm, (vaddr), (ptep)); \
11056+ pax_close_kernel(); \
11057 __flush_tlb_one((vaddr)); \
11058 } while (0)
11059
11060@@ -74,6 +79,9 @@ do { \
11061
11062 #endif /* !__ASSEMBLY__ */
11063
11064+#define HAVE_ARCH_UNMAPPED_AREA
11065+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
11066+
11067 /*
11068 * kern_addr_valid() is (1) for FLATMEM and (0) for
11069 * SPARSEMEM and DISCONTIGMEM
11070diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
11071index ed5903b..c7fe163 100644
11072--- a/arch/x86/include/asm/pgtable_32_types.h
11073+++ b/arch/x86/include/asm/pgtable_32_types.h
11074@@ -8,7 +8,7 @@
11075 */
11076 #ifdef CONFIG_X86_PAE
11077 # include <asm/pgtable-3level_types.h>
11078-# define PMD_SIZE (1UL << PMD_SHIFT)
11079+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
11080 # define PMD_MASK (~(PMD_SIZE - 1))
11081 #else
11082 # include <asm/pgtable-2level_types.h>
11083@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
11084 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
11085 #endif
11086
11087+#ifdef CONFIG_PAX_KERNEXEC
11088+#ifndef __ASSEMBLY__
11089+extern unsigned char MODULES_EXEC_VADDR[];
11090+extern unsigned char MODULES_EXEC_END[];
11091+#endif
11092+#include <asm/boot.h>
11093+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
11094+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
11095+#else
11096+#define ktla_ktva(addr) (addr)
11097+#define ktva_ktla(addr) (addr)
11098+#endif
11099+
11100 #define MODULES_VADDR VMALLOC_START
11101 #define MODULES_END VMALLOC_END
11102 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
11103diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
11104index 975f709..107976d 100644
11105--- a/arch/x86/include/asm/pgtable_64.h
11106+++ b/arch/x86/include/asm/pgtable_64.h
11107@@ -16,10 +16,14 @@
11108
11109 extern pud_t level3_kernel_pgt[512];
11110 extern pud_t level3_ident_pgt[512];
11111+extern pud_t level3_vmalloc_start_pgt[512];
11112+extern pud_t level3_vmalloc_end_pgt[512];
11113+extern pud_t level3_vmemmap_pgt[512];
11114+extern pud_t level2_vmemmap_pgt[512];
11115 extern pmd_t level2_kernel_pgt[512];
11116 extern pmd_t level2_fixmap_pgt[512];
11117-extern pmd_t level2_ident_pgt[512];
11118-extern pgd_t init_level4_pgt[];
11119+extern pmd_t level2_ident_pgt[512*2];
11120+extern pgd_t init_level4_pgt[512];
11121
11122 #define swapper_pg_dir init_level4_pgt
11123
11124@@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11125
11126 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11127 {
11128+ pax_open_kernel();
11129 *pmdp = pmd;
11130+ pax_close_kernel();
11131 }
11132
11133 static inline void native_pmd_clear(pmd_t *pmd)
11134@@ -107,6 +113,13 @@ static inline void native_pud_clear(pud_t *pud)
11135
11136 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
11137 {
11138+ pax_open_kernel();
11139+ *pgdp = pgd;
11140+ pax_close_kernel();
11141+}
11142+
11143+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11144+{
11145 *pgdp = pgd;
11146 }
11147
11148diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
11149index 766ea16..5b96cb3 100644
11150--- a/arch/x86/include/asm/pgtable_64_types.h
11151+++ b/arch/x86/include/asm/pgtable_64_types.h
11152@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
11153 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
11154 #define MODULES_END _AC(0xffffffffff000000, UL)
11155 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
11156+#define MODULES_EXEC_VADDR MODULES_VADDR
11157+#define MODULES_EXEC_END MODULES_END
11158+
11159+#define ktla_ktva(addr) (addr)
11160+#define ktva_ktla(addr) (addr)
11161
11162 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
11163diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
11164index 013286a..8b42f4f 100644
11165--- a/arch/x86/include/asm/pgtable_types.h
11166+++ b/arch/x86/include/asm/pgtable_types.h
11167@@ -16,13 +16,12 @@
11168 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
11169 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
11170 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
11171-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
11172+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
11173 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
11174 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
11175 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
11176-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
11177-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
11178-#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
11179+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
11180+#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
11181 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
11182
11183 /* If _PAGE_BIT_PRESENT is clear, we use these: */
11184@@ -40,7 +39,6 @@
11185 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
11186 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
11187 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
11188-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
11189 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
11190 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
11191 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
11192@@ -57,8 +55,10 @@
11193
11194 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
11195 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
11196-#else
11197+#elif defined(CONFIG_KMEMCHECK)
11198 #define _PAGE_NX (_AT(pteval_t, 0))
11199+#else
11200+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
11201 #endif
11202
11203 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
11204@@ -96,6 +96,9 @@
11205 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
11206 _PAGE_ACCESSED)
11207
11208+#define PAGE_READONLY_NOEXEC PAGE_READONLY
11209+#define PAGE_SHARED_NOEXEC PAGE_SHARED
11210+
11211 #define __PAGE_KERNEL_EXEC \
11212 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
11213 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
11214@@ -106,7 +109,7 @@
11215 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
11216 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
11217 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
11218-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
11219+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
11220 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
11221 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
11222 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
11223@@ -168,8 +171,8 @@
11224 * bits are combined, this will alow user to access the high address mapped
11225 * VDSO in the presence of CONFIG_COMPAT_VDSO
11226 */
11227-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
11228-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
11229+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11230+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11231 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
11232 #endif
11233
11234@@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
11235 {
11236 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
11237 }
11238+#endif
11239
11240+#if PAGETABLE_LEVELS == 3
11241+#include <asm-generic/pgtable-nopud.h>
11242+#endif
11243+
11244+#if PAGETABLE_LEVELS == 2
11245+#include <asm-generic/pgtable-nopmd.h>
11246+#endif
11247+
11248+#ifndef __ASSEMBLY__
11249 #if PAGETABLE_LEVELS > 3
11250 typedef struct { pudval_t pud; } pud_t;
11251
11252@@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pud_t pud)
11253 return pud.pud;
11254 }
11255 #else
11256-#include <asm-generic/pgtable-nopud.h>
11257-
11258 static inline pudval_t native_pud_val(pud_t pud)
11259 {
11260 return native_pgd_val(pud.pgd);
11261@@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
11262 return pmd.pmd;
11263 }
11264 #else
11265-#include <asm-generic/pgtable-nopmd.h>
11266-
11267 static inline pmdval_t native_pmd_val(pmd_t pmd)
11268 {
11269 return native_pgd_val(pmd.pud.pgd);
11270@@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
11271
11272 extern pteval_t __supported_pte_mask;
11273 extern void set_nx(void);
11274-extern int nx_enabled;
11275
11276 #define pgprot_writecombine pgprot_writecombine
11277 extern pgprot_t pgprot_writecombine(pgprot_t prot);
11278diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
11279index bb3ee36..781a6b8 100644
11280--- a/arch/x86/include/asm/processor.h
11281+++ b/arch/x86/include/asm/processor.h
11282@@ -268,7 +268,7 @@ struct tss_struct {
11283
11284 } ____cacheline_aligned;
11285
11286-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
11287+extern struct tss_struct init_tss[NR_CPUS];
11288
11289 /*
11290 * Save the original ist values for checking stack pointers during debugging
11291@@ -861,11 +861,18 @@ static inline void spin_lock_prefetch(const void *x)
11292 */
11293 #define TASK_SIZE PAGE_OFFSET
11294 #define TASK_SIZE_MAX TASK_SIZE
11295+
11296+#ifdef CONFIG_PAX_SEGMEXEC
11297+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
11298+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
11299+#else
11300 #define STACK_TOP TASK_SIZE
11301-#define STACK_TOP_MAX STACK_TOP
11302+#endif
11303+
11304+#define STACK_TOP_MAX TASK_SIZE
11305
11306 #define INIT_THREAD { \
11307- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11308+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11309 .vm86_info = NULL, \
11310 .sysenter_cs = __KERNEL_CS, \
11311 .io_bitmap_ptr = NULL, \
11312@@ -879,7 +886,7 @@ static inline void spin_lock_prefetch(const void *x)
11313 */
11314 #define INIT_TSS { \
11315 .x86_tss = { \
11316- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11317+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11318 .ss0 = __KERNEL_DS, \
11319 .ss1 = __KERNEL_CS, \
11320 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
11321@@ -890,11 +897,7 @@ static inline void spin_lock_prefetch(const void *x)
11322 extern unsigned long thread_saved_pc(struct task_struct *tsk);
11323
11324 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
11325-#define KSTK_TOP(info) \
11326-({ \
11327- unsigned long *__ptr = (unsigned long *)(info); \
11328- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
11329-})
11330+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
11331
11332 /*
11333 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
11334@@ -909,7 +912,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11335 #define task_pt_regs(task) \
11336 ({ \
11337 struct pt_regs *__regs__; \
11338- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
11339+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
11340 __regs__ - 1; \
11341 })
11342
11343@@ -919,13 +922,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11344 /*
11345 * User space process size. 47bits minus one guard page.
11346 */
11347-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
11348+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
11349
11350 /* This decides where the kernel will search for a free chunk of vm
11351 * space during mmap's.
11352 */
11353 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
11354- 0xc0000000 : 0xFFFFe000)
11355+ 0xc0000000 : 0xFFFFf000)
11356
11357 #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
11358 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
11359@@ -936,11 +939,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11360 #define STACK_TOP_MAX TASK_SIZE_MAX
11361
11362 #define INIT_THREAD { \
11363- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11364+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11365 }
11366
11367 #define INIT_TSS { \
11368- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11369+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11370 }
11371
11372 /*
11373@@ -962,6 +965,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
11374 */
11375 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
11376
11377+#ifdef CONFIG_PAX_SEGMEXEC
11378+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
11379+#endif
11380+
11381 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
11382
11383 /* Get/set a process' ability to use the timestamp counter instruction */
11384diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
11385index 3566454..4bdfb8c 100644
11386--- a/arch/x86/include/asm/ptrace.h
11387+++ b/arch/x86/include/asm/ptrace.h
11388@@ -156,28 +156,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
11389 }
11390
11391 /*
11392- * user_mode_vm(regs) determines whether a register set came from user mode.
11393+ * user_mode(regs) determines whether a register set came from user mode.
11394 * This is true if V8086 mode was enabled OR if the register set was from
11395 * protected mode with RPL-3 CS value. This tricky test checks that with
11396 * one comparison. Many places in the kernel can bypass this full check
11397- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
11398+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
11399+ * be used.
11400 */
11401-static inline int user_mode(struct pt_regs *regs)
11402+static inline int user_mode_novm(struct pt_regs *regs)
11403 {
11404 #ifdef CONFIG_X86_32
11405 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
11406 #else
11407- return !!(regs->cs & 3);
11408+ return !!(regs->cs & SEGMENT_RPL_MASK);
11409 #endif
11410 }
11411
11412-static inline int user_mode_vm(struct pt_regs *regs)
11413+static inline int user_mode(struct pt_regs *regs)
11414 {
11415 #ifdef CONFIG_X86_32
11416 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
11417 USER_RPL;
11418 #else
11419- return user_mode(regs);
11420+ return user_mode_novm(regs);
11421 #endif
11422 }
11423
11424@@ -193,15 +194,16 @@ static inline int v8086_mode(struct pt_regs *regs)
11425 #ifdef CONFIG_X86_64
11426 static inline bool user_64bit_mode(struct pt_regs *regs)
11427 {
11428+ unsigned long cs = regs->cs & 0xffff;
11429 #ifndef CONFIG_PARAVIRT
11430 /*
11431 * On non-paravirt systems, this is the only long mode CPL 3
11432 * selector. We do not allow long mode selectors in the LDT.
11433 */
11434- return regs->cs == __USER_CS;
11435+ return cs == __USER_CS;
11436 #else
11437 /* Headers are too twisted for this to go in paravirt.h. */
11438- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
11439+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
11440 #endif
11441 }
11442 #endif
11443diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
11444index 92f29706..a79cbbb 100644
11445--- a/arch/x86/include/asm/reboot.h
11446+++ b/arch/x86/include/asm/reboot.h
11447@@ -6,19 +6,19 @@
11448 struct pt_regs;
11449
11450 struct machine_ops {
11451- void (*restart)(char *cmd);
11452- void (*halt)(void);
11453- void (*power_off)(void);
11454+ void (* __noreturn restart)(char *cmd);
11455+ void (* __noreturn halt)(void);
11456+ void (* __noreturn power_off)(void);
11457 void (*shutdown)(void);
11458 void (*crash_shutdown)(struct pt_regs *);
11459- void (*emergency_restart)(void);
11460-};
11461+ void (* __noreturn emergency_restart)(void);
11462+} __no_const;
11463
11464 extern struct machine_ops machine_ops;
11465
11466 void native_machine_crash_shutdown(struct pt_regs *regs);
11467 void native_machine_shutdown(void);
11468-void machine_real_restart(unsigned int type);
11469+void machine_real_restart(unsigned int type) __noreturn;
11470 /* These must match dispatch_table in reboot_32.S */
11471 #define MRR_BIOS 0
11472 #define MRR_APM 1
11473diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
11474index 2dbe4a7..ce1db00 100644
11475--- a/arch/x86/include/asm/rwsem.h
11476+++ b/arch/x86/include/asm/rwsem.h
11477@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
11478 {
11479 asm volatile("# beginning down_read\n\t"
11480 LOCK_PREFIX _ASM_INC "(%1)\n\t"
11481+
11482+#ifdef CONFIG_PAX_REFCOUNT
11483+ "jno 0f\n"
11484+ LOCK_PREFIX _ASM_DEC "(%1)\n"
11485+ "int $4\n0:\n"
11486+ _ASM_EXTABLE(0b, 0b)
11487+#endif
11488+
11489 /* adds 0x00000001 */
11490 " jns 1f\n"
11491 " call call_rwsem_down_read_failed\n"
11492@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
11493 "1:\n\t"
11494 " mov %1,%2\n\t"
11495 " add %3,%2\n\t"
11496+
11497+#ifdef CONFIG_PAX_REFCOUNT
11498+ "jno 0f\n"
11499+ "sub %3,%2\n"
11500+ "int $4\n0:\n"
11501+ _ASM_EXTABLE(0b, 0b)
11502+#endif
11503+
11504 " jle 2f\n\t"
11505 LOCK_PREFIX " cmpxchg %2,%0\n\t"
11506 " jnz 1b\n\t"
11507@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
11508 long tmp;
11509 asm volatile("# beginning down_write\n\t"
11510 LOCK_PREFIX " xadd %1,(%2)\n\t"
11511+
11512+#ifdef CONFIG_PAX_REFCOUNT
11513+ "jno 0f\n"
11514+ "mov %1,(%2)\n"
11515+ "int $4\n0:\n"
11516+ _ASM_EXTABLE(0b, 0b)
11517+#endif
11518+
11519 /* adds 0xffff0001, returns the old value */
11520 " test %1,%1\n\t"
11521 /* was the count 0 before? */
11522@@ -141,6 +165,14 @@ static inline void __up_read(struct rw_semaphore *sem)
11523 long tmp;
11524 asm volatile("# beginning __up_read\n\t"
11525 LOCK_PREFIX " xadd %1,(%2)\n\t"
11526+
11527+#ifdef CONFIG_PAX_REFCOUNT
11528+ "jno 0f\n"
11529+ "mov %1,(%2)\n"
11530+ "int $4\n0:\n"
11531+ _ASM_EXTABLE(0b, 0b)
11532+#endif
11533+
11534 /* subtracts 1, returns the old value */
11535 " jns 1f\n\t"
11536 " call call_rwsem_wake\n" /* expects old value in %edx */
11537@@ -159,6 +191,14 @@ static inline void __up_write(struct rw_semaphore *sem)
11538 long tmp;
11539 asm volatile("# beginning __up_write\n\t"
11540 LOCK_PREFIX " xadd %1,(%2)\n\t"
11541+
11542+#ifdef CONFIG_PAX_REFCOUNT
11543+ "jno 0f\n"
11544+ "mov %1,(%2)\n"
11545+ "int $4\n0:\n"
11546+ _ASM_EXTABLE(0b, 0b)
11547+#endif
11548+
11549 /* subtracts 0xffff0001, returns the old value */
11550 " jns 1f\n\t"
11551 " call call_rwsem_wake\n" /* expects old value in %edx */
11552@@ -176,6 +216,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11553 {
11554 asm volatile("# beginning __downgrade_write\n\t"
11555 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
11556+
11557+#ifdef CONFIG_PAX_REFCOUNT
11558+ "jno 0f\n"
11559+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
11560+ "int $4\n0:\n"
11561+ _ASM_EXTABLE(0b, 0b)
11562+#endif
11563+
11564 /*
11565 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
11566 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
11567@@ -194,7 +242,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11568 */
11569 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
11570 {
11571- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
11572+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
11573+
11574+#ifdef CONFIG_PAX_REFCOUNT
11575+ "jno 0f\n"
11576+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
11577+ "int $4\n0:\n"
11578+ _ASM_EXTABLE(0b, 0b)
11579+#endif
11580+
11581 : "+m" (sem->count)
11582 : "er" (delta));
11583 }
11584@@ -204,7 +260,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
11585 */
11586 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
11587 {
11588- return delta + xadd(&sem->count, delta);
11589+ return delta + xadd_check_overflow(&sem->count, delta);
11590 }
11591
11592 #endif /* __KERNEL__ */
11593diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
11594index 5e64171..f58957e 100644
11595--- a/arch/x86/include/asm/segment.h
11596+++ b/arch/x86/include/asm/segment.h
11597@@ -64,10 +64,15 @@
11598 * 26 - ESPFIX small SS
11599 * 27 - per-cpu [ offset to per-cpu data area ]
11600 * 28 - stack_canary-20 [ for stack protector ]
11601- * 29 - unused
11602- * 30 - unused
11603+ * 29 - PCI BIOS CS
11604+ * 30 - PCI BIOS DS
11605 * 31 - TSS for double fault handler
11606 */
11607+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
11608+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
11609+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
11610+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
11611+
11612 #define GDT_ENTRY_TLS_MIN 6
11613 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
11614
11615@@ -79,6 +84,8 @@
11616
11617 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
11618
11619+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
11620+
11621 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
11622
11623 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
11624@@ -104,6 +111,12 @@
11625 #define __KERNEL_STACK_CANARY 0
11626 #endif
11627
11628+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
11629+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
11630+
11631+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
11632+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
11633+
11634 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
11635
11636 /*
11637@@ -141,7 +154,7 @@
11638 */
11639
11640 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
11641-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
11642+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
11643
11644
11645 #else
11646@@ -165,6 +178,8 @@
11647 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
11648 #define __USER32_DS __USER_DS
11649
11650+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
11651+
11652 #define GDT_ENTRY_TSS 8 /* needs two entries */
11653 #define GDT_ENTRY_LDT 10 /* needs two entries */
11654 #define GDT_ENTRY_TLS_MIN 12
11655@@ -185,6 +200,7 @@
11656 #endif
11657
11658 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
11659+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
11660 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
11661 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
11662 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
11663diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
11664index 73b11bc..d4a3b63 100644
11665--- a/arch/x86/include/asm/smp.h
11666+++ b/arch/x86/include/asm/smp.h
11667@@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
11668 /* cpus sharing the last level cache: */
11669 DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
11670 DECLARE_PER_CPU(u16, cpu_llc_id);
11671-DECLARE_PER_CPU(int, cpu_number);
11672+DECLARE_PER_CPU(unsigned int, cpu_number);
11673
11674 static inline struct cpumask *cpu_sibling_mask(int cpu)
11675 {
11676@@ -77,7 +77,7 @@ struct smp_ops {
11677
11678 void (*send_call_func_ipi)(const struct cpumask *mask);
11679 void (*send_call_func_single_ipi)(int cpu);
11680-};
11681+} __no_const;
11682
11683 /* Globals due to paravirt */
11684 extern void set_cpu_sibling_map(int cpu);
11685@@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitdata;
11686 extern int safe_smp_processor_id(void);
11687
11688 #elif defined(CONFIG_X86_64_SMP)
11689-#define raw_smp_processor_id() (percpu_read(cpu_number))
11690-
11691-#define stack_smp_processor_id() \
11692-({ \
11693- struct thread_info *ti; \
11694- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
11695- ti->cpu; \
11696-})
11697+#define raw_smp_processor_id() (percpu_read(cpu_number))
11698+#define stack_smp_processor_id() raw_smp_processor_id()
11699 #define safe_smp_processor_id() smp_processor_id()
11700
11701 #endif
11702diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
11703index 972c260..43ab1fd 100644
11704--- a/arch/x86/include/asm/spinlock.h
11705+++ b/arch/x86/include/asm/spinlock.h
11706@@ -188,6 +188,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
11707 static inline void arch_read_lock(arch_rwlock_t *rw)
11708 {
11709 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
11710+
11711+#ifdef CONFIG_PAX_REFCOUNT
11712+ "jno 0f\n"
11713+ LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
11714+ "int $4\n0:\n"
11715+ _ASM_EXTABLE(0b, 0b)
11716+#endif
11717+
11718 "jns 1f\n"
11719 "call __read_lock_failed\n\t"
11720 "1:\n"
11721@@ -197,6 +205,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
11722 static inline void arch_write_lock(arch_rwlock_t *rw)
11723 {
11724 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
11725+
11726+#ifdef CONFIG_PAX_REFCOUNT
11727+ "jno 0f\n"
11728+ LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
11729+ "int $4\n0:\n"
11730+ _ASM_EXTABLE(0b, 0b)
11731+#endif
11732+
11733 "jz 1f\n"
11734 "call __write_lock_failed\n\t"
11735 "1:\n"
11736@@ -226,13 +242,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
11737
11738 static inline void arch_read_unlock(arch_rwlock_t *rw)
11739 {
11740- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
11741+ asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
11742+
11743+#ifdef CONFIG_PAX_REFCOUNT
11744+ "jno 0f\n"
11745+ LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
11746+ "int $4\n0:\n"
11747+ _ASM_EXTABLE(0b, 0b)
11748+#endif
11749+
11750 :"+m" (rw->lock) : : "memory");
11751 }
11752
11753 static inline void arch_write_unlock(arch_rwlock_t *rw)
11754 {
11755- asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
11756+ asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
11757+
11758+#ifdef CONFIG_PAX_REFCOUNT
11759+ "jno 0f\n"
11760+ LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
11761+ "int $4\n0:\n"
11762+ _ASM_EXTABLE(0b, 0b)
11763+#endif
11764+
11765 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
11766 }
11767
11768diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
11769index 1575177..cb23f52 100644
11770--- a/arch/x86/include/asm/stackprotector.h
11771+++ b/arch/x86/include/asm/stackprotector.h
11772@@ -48,7 +48,7 @@
11773 * head_32 for boot CPU and setup_per_cpu_areas() for others.
11774 */
11775 #define GDT_STACK_CANARY_INIT \
11776- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
11777+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
11778
11779 /*
11780 * Initialize the stackprotector canary value.
11781@@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu)
11782
11783 static inline void load_stack_canary_segment(void)
11784 {
11785-#ifdef CONFIG_X86_32
11786+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
11787 asm volatile ("mov %0, %%gs" : : "r" (0));
11788 #endif
11789 }
11790diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
11791index 70bbe39..4ae2bd4 100644
11792--- a/arch/x86/include/asm/stacktrace.h
11793+++ b/arch/x86/include/asm/stacktrace.h
11794@@ -11,28 +11,20 @@
11795
11796 extern int kstack_depth_to_print;
11797
11798-struct thread_info;
11799+struct task_struct;
11800 struct stacktrace_ops;
11801
11802-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
11803- unsigned long *stack,
11804- unsigned long bp,
11805- const struct stacktrace_ops *ops,
11806- void *data,
11807- unsigned long *end,
11808- int *graph);
11809+typedef unsigned long walk_stack_t(struct task_struct *task,
11810+ void *stack_start,
11811+ unsigned long *stack,
11812+ unsigned long bp,
11813+ const struct stacktrace_ops *ops,
11814+ void *data,
11815+ unsigned long *end,
11816+ int *graph);
11817
11818-extern unsigned long
11819-print_context_stack(struct thread_info *tinfo,
11820- unsigned long *stack, unsigned long bp,
11821- const struct stacktrace_ops *ops, void *data,
11822- unsigned long *end, int *graph);
11823-
11824-extern unsigned long
11825-print_context_stack_bp(struct thread_info *tinfo,
11826- unsigned long *stack, unsigned long bp,
11827- const struct stacktrace_ops *ops, void *data,
11828- unsigned long *end, int *graph);
11829+extern walk_stack_t print_context_stack;
11830+extern walk_stack_t print_context_stack_bp;
11831
11832 /* Generic stack tracer with callbacks */
11833
11834@@ -40,7 +32,7 @@ struct stacktrace_ops {
11835 void (*address)(void *data, unsigned long address, int reliable);
11836 /* On negative return stop dumping */
11837 int (*stack)(void *data, char *name);
11838- walk_stack_t walk_stack;
11839+ walk_stack_t *walk_stack;
11840 };
11841
11842 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
11843diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
11844index cb23852..2dde194 100644
11845--- a/arch/x86/include/asm/sys_ia32.h
11846+++ b/arch/x86/include/asm/sys_ia32.h
11847@@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int, compat_sigset_t __user *,
11848 compat_sigset_t __user *, unsigned int);
11849 asmlinkage long sys32_alarm(unsigned int);
11850
11851-asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
11852+asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
11853 asmlinkage long sys32_sysfs(int, u32, u32);
11854
11855 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
11856diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
11857index f1d8b44..a4de8b7 100644
11858--- a/arch/x86/include/asm/syscalls.h
11859+++ b/arch/x86/include/asm/syscalls.h
11860@@ -30,7 +30,7 @@ long sys_clone(unsigned long, unsigned long, void __user *,
11861 void __user *, struct pt_regs *);
11862
11863 /* kernel/ldt.c */
11864-asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);
11865+asmlinkage int sys_modify_ldt(int, void __user *, unsigned long) __size_overflow(3);
11866
11867 /* kernel/signal.c */
11868 long sys_rt_sigreturn(struct pt_regs *);
11869diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
11870index 2d2f01c..f985723 100644
11871--- a/arch/x86/include/asm/system.h
11872+++ b/arch/x86/include/asm/system.h
11873@@ -129,7 +129,7 @@ do { \
11874 "call __switch_to\n\t" \
11875 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
11876 __switch_canary \
11877- "movq %P[thread_info](%%rsi),%%r8\n\t" \
11878+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
11879 "movq %%rax,%%rdi\n\t" \
11880 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
11881 "jnz ret_from_fork\n\t" \
11882@@ -140,7 +140,7 @@ do { \
11883 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
11884 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
11885 [_tif_fork] "i" (_TIF_FORK), \
11886- [thread_info] "i" (offsetof(struct task_struct, stack)), \
11887+ [thread_info] "m" (current_tinfo), \
11888 [current_task] "m" (current_task) \
11889 __switch_canary_iparam \
11890 : "memory", "cc" __EXTRA_CLOBBER)
11891@@ -200,7 +200,7 @@ static inline unsigned long get_limit(unsigned long segment)
11892 {
11893 unsigned long __limit;
11894 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
11895- return __limit + 1;
11896+ return __limit;
11897 }
11898
11899 static inline void native_clts(void)
11900@@ -397,13 +397,13 @@ void enable_hlt(void);
11901
11902 void cpu_idle_wait(void);
11903
11904-extern unsigned long arch_align_stack(unsigned long sp);
11905+#define arch_align_stack(x) ((x) & ~0xfUL)
11906 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
11907
11908 void default_idle(void);
11909 bool set_pm_idle_to_default(void);
11910
11911-void stop_this_cpu(void *dummy);
11912+void stop_this_cpu(void *dummy) __noreturn;
11913
11914 /*
11915 * Force strict CPU ordering.
11916diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
11917index d7ef849..6af292e 100644
11918--- a/arch/x86/include/asm/thread_info.h
11919+++ b/arch/x86/include/asm/thread_info.h
11920@@ -10,6 +10,7 @@
11921 #include <linux/compiler.h>
11922 #include <asm/page.h>
11923 #include <asm/types.h>
11924+#include <asm/percpu.h>
11925
11926 /*
11927 * low level task data that entry.S needs immediate access to
11928@@ -24,7 +25,6 @@ struct exec_domain;
11929 #include <linux/atomic.h>
11930
11931 struct thread_info {
11932- struct task_struct *task; /* main task structure */
11933 struct exec_domain *exec_domain; /* execution domain */
11934 __u32 flags; /* low level flags */
11935 __u32 status; /* thread synchronous flags */
11936@@ -34,18 +34,12 @@ struct thread_info {
11937 mm_segment_t addr_limit;
11938 struct restart_block restart_block;
11939 void __user *sysenter_return;
11940-#ifdef CONFIG_X86_32
11941- unsigned long previous_esp; /* ESP of the previous stack in
11942- case of nested (IRQ) stacks
11943- */
11944- __u8 supervisor_stack[0];
11945-#endif
11946+ unsigned long lowest_stack;
11947 int uaccess_err;
11948 };
11949
11950-#define INIT_THREAD_INFO(tsk) \
11951+#define INIT_THREAD_INFO \
11952 { \
11953- .task = &tsk, \
11954 .exec_domain = &default_exec_domain, \
11955 .flags = 0, \
11956 .cpu = 0, \
11957@@ -56,7 +50,7 @@ struct thread_info {
11958 }, \
11959 }
11960
11961-#define init_thread_info (init_thread_union.thread_info)
11962+#define init_thread_info (init_thread_union.stack)
11963 #define init_stack (init_thread_union.stack)
11964
11965 #else /* !__ASSEMBLY__ */
11966@@ -170,45 +164,40 @@ struct thread_info {
11967 ret; \
11968 })
11969
11970-#ifdef CONFIG_X86_32
11971-
11972-#define STACK_WARN (THREAD_SIZE/8)
11973-/*
11974- * macros/functions for gaining access to the thread information structure
11975- *
11976- * preempt_count needs to be 1 initially, until the scheduler is functional.
11977- */
11978-#ifndef __ASSEMBLY__
11979-
11980-
11981-/* how to get the current stack pointer from C */
11982-register unsigned long current_stack_pointer asm("esp") __used;
11983-
11984-/* how to get the thread information struct from C */
11985-static inline struct thread_info *current_thread_info(void)
11986-{
11987- return (struct thread_info *)
11988- (current_stack_pointer & ~(THREAD_SIZE - 1));
11989-}
11990-
11991-#else /* !__ASSEMBLY__ */
11992-
11993+#ifdef __ASSEMBLY__
11994 /* how to get the thread information struct from ASM */
11995 #define GET_THREAD_INFO(reg) \
11996- movl $-THREAD_SIZE, reg; \
11997- andl %esp, reg
11998+ mov PER_CPU_VAR(current_tinfo), reg
11999
12000 /* use this one if reg already contains %esp */
12001-#define GET_THREAD_INFO_WITH_ESP(reg) \
12002- andl $-THREAD_SIZE, reg
12003+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
12004+#else
12005+/* how to get the thread information struct from C */
12006+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
12007+
12008+static __always_inline struct thread_info *current_thread_info(void)
12009+{
12010+ return percpu_read_stable(current_tinfo);
12011+}
12012+#endif
12013+
12014+#ifdef CONFIG_X86_32
12015+
12016+#define STACK_WARN (THREAD_SIZE/8)
12017+/*
12018+ * macros/functions for gaining access to the thread information structure
12019+ *
12020+ * preempt_count needs to be 1 initially, until the scheduler is functional.
12021+ */
12022+#ifndef __ASSEMBLY__
12023+
12024+/* how to get the current stack pointer from C */
12025+register unsigned long current_stack_pointer asm("esp") __used;
12026
12027 #endif
12028
12029 #else /* X86_32 */
12030
12031-#include <asm/percpu.h>
12032-#define KERNEL_STACK_OFFSET (5*8)
12033-
12034 /*
12035 * macros/functions for gaining access to the thread information structure
12036 * preempt_count needs to be 1 initially, until the scheduler is functional.
12037@@ -216,21 +205,8 @@ static inline struct thread_info *current_thread_info(void)
12038 #ifndef __ASSEMBLY__
12039 DECLARE_PER_CPU(unsigned long, kernel_stack);
12040
12041-static inline struct thread_info *current_thread_info(void)
12042-{
12043- struct thread_info *ti;
12044- ti = (void *)(percpu_read_stable(kernel_stack) +
12045- KERNEL_STACK_OFFSET - THREAD_SIZE);
12046- return ti;
12047-}
12048-
12049-#else /* !__ASSEMBLY__ */
12050-
12051-/* how to get the thread information struct from ASM */
12052-#define GET_THREAD_INFO(reg) \
12053- movq PER_CPU_VAR(kernel_stack),reg ; \
12054- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
12055-
12056+/* how to get the current stack pointer from C */
12057+register unsigned long current_stack_pointer asm("rsp") __used;
12058 #endif
12059
12060 #endif /* !X86_32 */
12061@@ -264,5 +240,16 @@ extern void arch_task_cache_init(void);
12062 extern void free_thread_info(struct thread_info *ti);
12063 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
12064 #define arch_task_cache_init arch_task_cache_init
12065+
12066+#define __HAVE_THREAD_FUNCTIONS
12067+#define task_thread_info(task) (&(task)->tinfo)
12068+#define task_stack_page(task) ((task)->stack)
12069+#define setup_thread_stack(p, org) do {} while (0)
12070+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
12071+
12072+#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
12073+extern struct task_struct *alloc_task_struct_node(int node);
12074+extern void free_task_struct(struct task_struct *);
12075+
12076 #endif
12077 #endif /* _ASM_X86_THREAD_INFO_H */
12078diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
12079index 36361bf..324f262 100644
12080--- a/arch/x86/include/asm/uaccess.h
12081+++ b/arch/x86/include/asm/uaccess.h
12082@@ -7,12 +7,15 @@
12083 #include <linux/compiler.h>
12084 #include <linux/thread_info.h>
12085 #include <linux/string.h>
12086+#include <linux/sched.h>
12087 #include <asm/asm.h>
12088 #include <asm/page.h>
12089
12090 #define VERIFY_READ 0
12091 #define VERIFY_WRITE 1
12092
12093+extern void check_object_size(const void *ptr, unsigned long n, bool to);
12094+
12095 /*
12096 * The fs value determines whether argument validity checking should be
12097 * performed or not. If get_fs() == USER_DS, checking is performed, with
12098@@ -28,7 +31,12 @@
12099
12100 #define get_ds() (KERNEL_DS)
12101 #define get_fs() (current_thread_info()->addr_limit)
12102+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12103+void __set_fs(mm_segment_t x);
12104+void set_fs(mm_segment_t x);
12105+#else
12106 #define set_fs(x) (current_thread_info()->addr_limit = (x))
12107+#endif
12108
12109 #define segment_eq(a, b) ((a).seg == (b).seg)
12110
12111@@ -76,7 +84,33 @@
12112 * checks that the pointer is in the user space range - after calling
12113 * this function, memory access functions may still return -EFAULT.
12114 */
12115-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12116+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12117+#define access_ok(type, addr, size) \
12118+({ \
12119+ long __size = size; \
12120+ unsigned long __addr = (unsigned long)addr; \
12121+ unsigned long __addr_ao = __addr & PAGE_MASK; \
12122+ unsigned long __end_ao = __addr + __size - 1; \
12123+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
12124+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
12125+ while(__addr_ao <= __end_ao) { \
12126+ char __c_ao; \
12127+ __addr_ao += PAGE_SIZE; \
12128+ if (__size > PAGE_SIZE) \
12129+ cond_resched(); \
12130+ if (__get_user(__c_ao, (char __user *)__addr)) \
12131+ break; \
12132+ if (type != VERIFY_WRITE) { \
12133+ __addr = __addr_ao; \
12134+ continue; \
12135+ } \
12136+ if (__put_user(__c_ao, (char __user *)__addr)) \
12137+ break; \
12138+ __addr = __addr_ao; \
12139+ } \
12140+ } \
12141+ __ret_ao; \
12142+})
12143
12144 /*
12145 * The exception table consists of pairs of addresses: the first is the
12146@@ -182,12 +216,20 @@ extern int __get_user_bad(void);
12147 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
12148 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
12149
12150-
12151+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12152+#define __copyuser_seg "gs;"
12153+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
12154+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
12155+#else
12156+#define __copyuser_seg
12157+#define __COPYUSER_SET_ES
12158+#define __COPYUSER_RESTORE_ES
12159+#endif
12160
12161 #ifdef CONFIG_X86_32
12162 #define __put_user_asm_u64(x, addr, err, errret) \
12163- asm volatile("1: movl %%eax,0(%2)\n" \
12164- "2: movl %%edx,4(%2)\n" \
12165+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
12166+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
12167 "3:\n" \
12168 ".section .fixup,\"ax\"\n" \
12169 "4: movl %3,%0\n" \
12170@@ -199,8 +241,8 @@ extern int __get_user_bad(void);
12171 : "A" (x), "r" (addr), "i" (errret), "0" (err))
12172
12173 #define __put_user_asm_ex_u64(x, addr) \
12174- asm volatile("1: movl %%eax,0(%1)\n" \
12175- "2: movl %%edx,4(%1)\n" \
12176+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
12177+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
12178 "3:\n" \
12179 _ASM_EXTABLE(1b, 2b - 1b) \
12180 _ASM_EXTABLE(2b, 3b - 2b) \
12181@@ -252,7 +294,7 @@ extern void __put_user_8(void);
12182 __typeof__(*(ptr)) __pu_val; \
12183 __chk_user_ptr(ptr); \
12184 might_fault(); \
12185- __pu_val = x; \
12186+ __pu_val = (x); \
12187 switch (sizeof(*(ptr))) { \
12188 case 1: \
12189 __put_user_x(1, __pu_val, ptr, __ret_pu); \
12190@@ -373,7 +415,7 @@ do { \
12191 } while (0)
12192
12193 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12194- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
12195+ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
12196 "2:\n" \
12197 ".section .fixup,\"ax\"\n" \
12198 "3: mov %3,%0\n" \
12199@@ -381,7 +423,7 @@ do { \
12200 " jmp 2b\n" \
12201 ".previous\n" \
12202 _ASM_EXTABLE(1b, 3b) \
12203- : "=r" (err), ltype(x) \
12204+ : "=r" (err), ltype (x) \
12205 : "m" (__m(addr)), "i" (errret), "0" (err))
12206
12207 #define __get_user_size_ex(x, ptr, size) \
12208@@ -406,7 +448,7 @@ do { \
12209 } while (0)
12210
12211 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
12212- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
12213+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
12214 "2:\n" \
12215 _ASM_EXTABLE(1b, 2b - 1b) \
12216 : ltype(x) : "m" (__m(addr)))
12217@@ -423,13 +465,24 @@ do { \
12218 int __gu_err; \
12219 unsigned long __gu_val; \
12220 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
12221- (x) = (__force __typeof__(*(ptr)))__gu_val; \
12222+ (x) = (__typeof__(*(ptr)))__gu_val; \
12223 __gu_err; \
12224 })
12225
12226 /* FIXME: this hack is definitely wrong -AK */
12227 struct __large_struct { unsigned long buf[100]; };
12228-#define __m(x) (*(struct __large_struct __user *)(x))
12229+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12230+#define ____m(x) \
12231+({ \
12232+ unsigned long ____x = (unsigned long)(x); \
12233+ if (____x < PAX_USER_SHADOW_BASE) \
12234+ ____x += PAX_USER_SHADOW_BASE; \
12235+ (void __user *)____x; \
12236+})
12237+#else
12238+#define ____m(x) (x)
12239+#endif
12240+#define __m(x) (*(struct __large_struct __user *)____m(x))
12241
12242 /*
12243 * Tell gcc we read from memory instead of writing: this is because
12244@@ -437,7 +490,7 @@ struct __large_struct { unsigned long buf[100]; };
12245 * aliasing issues.
12246 */
12247 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12248- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
12249+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
12250 "2:\n" \
12251 ".section .fixup,\"ax\"\n" \
12252 "3: mov %3,%0\n" \
12253@@ -445,10 +498,10 @@ struct __large_struct { unsigned long buf[100]; };
12254 ".previous\n" \
12255 _ASM_EXTABLE(1b, 3b) \
12256 : "=r"(err) \
12257- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
12258+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
12259
12260 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
12261- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
12262+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
12263 "2:\n" \
12264 _ASM_EXTABLE(1b, 2b - 1b) \
12265 : : ltype(x), "m" (__m(addr)))
12266@@ -487,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
12267 * On error, the variable @x is set to zero.
12268 */
12269
12270+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12271+#define __get_user(x, ptr) get_user((x), (ptr))
12272+#else
12273 #define __get_user(x, ptr) \
12274 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
12275+#endif
12276
12277 /**
12278 * __put_user: - Write a simple value into user space, with less checking.
12279@@ -510,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
12280 * Returns zero on success, or -EFAULT on error.
12281 */
12282
12283+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12284+#define __put_user(x, ptr) put_user((x), (ptr))
12285+#else
12286 #define __put_user(x, ptr) \
12287 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
12288+#endif
12289
12290 #define __get_user_unaligned __get_user
12291 #define __put_user_unaligned __put_user
12292@@ -529,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
12293 #define get_user_ex(x, ptr) do { \
12294 unsigned long __gue_val; \
12295 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
12296- (x) = (__force __typeof__(*(ptr)))__gue_val; \
12297+ (x) = (__typeof__(*(ptr)))__gue_val; \
12298 } while (0)
12299
12300 #ifdef CONFIG_X86_WP_WORKS_OK
12301diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
12302index 566e803..4414921 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,24 +235,72 @@ 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 long __must_check strncpy_from_user(char *dst, const char __user *src,
12517- long count);
12518+ unsigned long count) __size_overflow(3);
12519 long __must_check __strncpy_from_user(char *dst,
12520- const char __user *src, long count);
12521+ const char __user *src, unsigned long count) __size_overflow(3);
12522
12523 /**
12524 * strlen_user: - Get the size of a string in user space.
12525@@ -234,8 +318,8 @@ long __must_check __strncpy_from_user(char *dst,
12526 */
12527 #define strlen_user(str) strnlen_user(str, LONG_MAX)
12528
12529-long strnlen_user(const char __user *str, long n);
12530-unsigned long __must_check clear_user(void __user *mem, unsigned long len);
12531-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
12532+long strnlen_user(const char __user *str, unsigned long n);
12533+unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12534+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12535
12536 #endif /* _ASM_X86_UACCESS_32_H */
12537diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
12538index 1c66d30..2582764 100644
12539--- a/arch/x86/include/asm/uaccess_64.h
12540+++ b/arch/x86/include/asm/uaccess_64.h
12541@@ -10,6 +10,9 @@
12542 #include <asm/alternative.h>
12543 #include <asm/cpufeature.h>
12544 #include <asm/page.h>
12545+#include <asm/pgtable.h>
12546+
12547+#define set_fs(x) (current_thread_info()->addr_limit = (x))
12548
12549 /*
12550 * Copy To/From Userspace
12551@@ -17,12 +20,14 @@
12552
12553 /* Handles exceptions in both to and from, but doesn't do access_ok */
12554 __must_check unsigned long
12555-copy_user_generic_string(void *to, const void *from, unsigned len);
12556+copy_user_generic_string(void *to, const void *from, unsigned long len) __size_overflow(3);
12557 __must_check unsigned long
12558-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
12559+copy_user_generic_unrolled(void *to, const void *from, unsigned long len) __size_overflow(3);
12560
12561 static __always_inline __must_check unsigned long
12562-copy_user_generic(void *to, const void *from, unsigned len)
12563+copy_user_generic(void *to, const void *from, unsigned long len) __size_overflow(3);
12564+static __always_inline __must_check unsigned long
12565+copy_user_generic(void *to, const void *from, unsigned long len)
12566 {
12567 unsigned ret;
12568
12569@@ -32,142 +37,237 @@ copy_user_generic(void *to, const void *from, unsigned len)
12570 ASM_OUTPUT2("=a" (ret), "=D" (to), "=S" (from),
12571 "=d" (len)),
12572 "1" (to), "2" (from), "3" (len)
12573- : "memory", "rcx", "r8", "r9", "r10", "r11");
12574+ : "memory", "rcx", "r8", "r9", "r11");
12575 return ret;
12576 }
12577
12578+static __always_inline __must_check unsigned long
12579+__copy_to_user(void __user *to, const void *from, unsigned long len) __size_overflow(3);
12580+static __always_inline __must_check unsigned long
12581+__copy_from_user(void *to, const void __user *from, unsigned long len) __size_overflow(3);
12582 __must_check unsigned long
12583-_copy_to_user(void __user *to, const void *from, unsigned len);
12584-__must_check unsigned long
12585-_copy_from_user(void *to, const void __user *from, unsigned len);
12586-__must_check unsigned long
12587-copy_in_user(void __user *to, const void __user *from, unsigned len);
12588+copy_in_user(void __user *to, const void __user *from, unsigned long len) __size_overflow(3);
12589
12590 static inline unsigned long __must_check copy_from_user(void *to,
12591 const void __user *from,
12592+ unsigned long n) __size_overflow(3);
12593+static inline unsigned long __must_check copy_from_user(void *to,
12594+ const void __user *from,
12595 unsigned long n)
12596 {
12597- int sz = __compiletime_object_size(to);
12598-
12599 might_fault();
12600- if (likely(sz == -1 || sz >= n))
12601- n = _copy_from_user(to, from, n);
12602-#ifdef CONFIG_DEBUG_VM
12603- else
12604- WARN(1, "Buffer overflow detected!\n");
12605-#endif
12606+
12607+ if (access_ok(VERIFY_READ, from, n))
12608+ n = __copy_from_user(to, from, n);
12609+ else if (n < INT_MAX) {
12610+ if (!__builtin_constant_p(n))
12611+ check_object_size(to, n, false);
12612+ memset(to, 0, n);
12613+ }
12614 return n;
12615 }
12616
12617 static __always_inline __must_check
12618-int copy_to_user(void __user *dst, const void *src, unsigned size)
12619+int copy_to_user(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12620+static __always_inline __must_check
12621+int copy_to_user(void __user *dst, const void *src, unsigned long size)
12622 {
12623 might_fault();
12624
12625- return _copy_to_user(dst, src, size);
12626+ if (access_ok(VERIFY_WRITE, dst, size))
12627+ size = __copy_to_user(dst, src, size);
12628+ return size;
12629 }
12630
12631 static __always_inline __must_check
12632-int __copy_from_user(void *dst, const void __user *src, unsigned size)
12633+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12634+static __always_inline __must_check
12635+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
12636 {
12637- int ret = 0;
12638+ int sz = __compiletime_object_size(dst);
12639+ unsigned ret = 0;
12640
12641 might_fault();
12642- if (!__builtin_constant_p(size))
12643- return copy_user_generic(dst, (__force void *)src, size);
12644+
12645+ if (size > INT_MAX)
12646+ return size;
12647+
12648+#ifdef CONFIG_PAX_MEMORY_UDEREF
12649+ if (!__access_ok(VERIFY_READ, src, size))
12650+ return size;
12651+#endif
12652+
12653+ if (unlikely(sz != -1 && sz < size)) {
12654+#ifdef CONFIG_DEBUG_VM
12655+ WARN(1, "Buffer overflow detected!\n");
12656+#endif
12657+ return size;
12658+ }
12659+
12660+ if (!__builtin_constant_p(size)) {
12661+ check_object_size(dst, size, false);
12662+
12663+#ifdef CONFIG_PAX_MEMORY_UDEREF
12664+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12665+ src += PAX_USER_SHADOW_BASE;
12666+#endif
12667+
12668+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12669+ }
12670 switch (size) {
12671- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
12672+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
12673 ret, "b", "b", "=q", 1);
12674 return ret;
12675- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
12676+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
12677 ret, "w", "w", "=r", 2);
12678 return ret;
12679- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
12680+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
12681 ret, "l", "k", "=r", 4);
12682 return ret;
12683- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
12684+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12685 ret, "q", "", "=r", 8);
12686 return ret;
12687 case 10:
12688- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12689+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12690 ret, "q", "", "=r", 10);
12691 if (unlikely(ret))
12692 return ret;
12693 __get_user_asm(*(u16 *)(8 + (char *)dst),
12694- (u16 __user *)(8 + (char __user *)src),
12695+ (const u16 __user *)(8 + (const char __user *)src),
12696 ret, "w", "w", "=r", 2);
12697 return ret;
12698 case 16:
12699- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12700+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12701 ret, "q", "", "=r", 16);
12702 if (unlikely(ret))
12703 return ret;
12704 __get_user_asm(*(u64 *)(8 + (char *)dst),
12705- (u64 __user *)(8 + (char __user *)src),
12706+ (const u64 __user *)(8 + (const char __user *)src),
12707 ret, "q", "", "=r", 8);
12708 return ret;
12709 default:
12710- return copy_user_generic(dst, (__force void *)src, size);
12711+
12712+#ifdef CONFIG_PAX_MEMORY_UDEREF
12713+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12714+ src += PAX_USER_SHADOW_BASE;
12715+#endif
12716+
12717+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12718 }
12719 }
12720
12721 static __always_inline __must_check
12722-int __copy_to_user(void __user *dst, const void *src, unsigned size)
12723+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12724+static __always_inline __must_check
12725+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
12726 {
12727- int ret = 0;
12728+ int sz = __compiletime_object_size(src);
12729+ unsigned ret = 0;
12730
12731 might_fault();
12732- if (!__builtin_constant_p(size))
12733- return copy_user_generic((__force void *)dst, src, size);
12734+
12735+ if (size > INT_MAX)
12736+ return size;
12737+
12738+#ifdef CONFIG_PAX_MEMORY_UDEREF
12739+ if (!__access_ok(VERIFY_WRITE, dst, size))
12740+ return size;
12741+#endif
12742+
12743+ if (unlikely(sz != -1 && sz < size)) {
12744+#ifdef CONFIG_DEBUG_VM
12745+ WARN(1, "Buffer overflow detected!\n");
12746+#endif
12747+ return size;
12748+ }
12749+
12750+ if (!__builtin_constant_p(size)) {
12751+ check_object_size(src, size, true);
12752+
12753+#ifdef CONFIG_PAX_MEMORY_UDEREF
12754+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12755+ dst += PAX_USER_SHADOW_BASE;
12756+#endif
12757+
12758+ return copy_user_generic((__force_kernel void *)dst, src, size);
12759+ }
12760 switch (size) {
12761- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
12762+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
12763 ret, "b", "b", "iq", 1);
12764 return ret;
12765- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
12766+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
12767 ret, "w", "w", "ir", 2);
12768 return ret;
12769- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
12770+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
12771 ret, "l", "k", "ir", 4);
12772 return ret;
12773- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
12774+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12775 ret, "q", "", "er", 8);
12776 return ret;
12777 case 10:
12778- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12779+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12780 ret, "q", "", "er", 10);
12781 if (unlikely(ret))
12782 return ret;
12783 asm("":::"memory");
12784- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
12785+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
12786 ret, "w", "w", "ir", 2);
12787 return ret;
12788 case 16:
12789- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12790+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12791 ret, "q", "", "er", 16);
12792 if (unlikely(ret))
12793 return ret;
12794 asm("":::"memory");
12795- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
12796+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
12797 ret, "q", "", "er", 8);
12798 return ret;
12799 default:
12800- return copy_user_generic((__force void *)dst, src, size);
12801+
12802+#ifdef CONFIG_PAX_MEMORY_UDEREF
12803+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12804+ dst += PAX_USER_SHADOW_BASE;
12805+#endif
12806+
12807+ return copy_user_generic((__force_kernel void *)dst, src, size);
12808 }
12809 }
12810
12811 static __always_inline __must_check
12812-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12813+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size) __size_overflow(3);
12814+static __always_inline __must_check
12815+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
12816 {
12817- int ret = 0;
12818+ unsigned ret = 0;
12819
12820 might_fault();
12821- if (!__builtin_constant_p(size))
12822- return copy_user_generic((__force void *)dst,
12823- (__force void *)src, size);
12824+
12825+ if (size > INT_MAX)
12826+ return size;
12827+
12828+#ifdef CONFIG_PAX_MEMORY_UDEREF
12829+ if (!__access_ok(VERIFY_READ, src, size))
12830+ return size;
12831+ if (!__access_ok(VERIFY_WRITE, dst, size))
12832+ return size;
12833+#endif
12834+
12835+ if (!__builtin_constant_p(size)) {
12836+
12837+#ifdef CONFIG_PAX_MEMORY_UDEREF
12838+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12839+ src += PAX_USER_SHADOW_BASE;
12840+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12841+ dst += PAX_USER_SHADOW_BASE;
12842+#endif
12843+
12844+ return copy_user_generic((__force_kernel void *)dst,
12845+ (__force_kernel const void *)src, size);
12846+ }
12847 switch (size) {
12848 case 1: {
12849 u8 tmp;
12850- __get_user_asm(tmp, (u8 __user *)src,
12851+ __get_user_asm(tmp, (const u8 __user *)src,
12852 ret, "b", "b", "=q", 1);
12853 if (likely(!ret))
12854 __put_user_asm(tmp, (u8 __user *)dst,
12855@@ -176,7 +276,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12856 }
12857 case 2: {
12858 u16 tmp;
12859- __get_user_asm(tmp, (u16 __user *)src,
12860+ __get_user_asm(tmp, (const u16 __user *)src,
12861 ret, "w", "w", "=r", 2);
12862 if (likely(!ret))
12863 __put_user_asm(tmp, (u16 __user *)dst,
12864@@ -186,7 +286,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12865
12866 case 4: {
12867 u32 tmp;
12868- __get_user_asm(tmp, (u32 __user *)src,
12869+ __get_user_asm(tmp, (const u32 __user *)src,
12870 ret, "l", "k", "=r", 4);
12871 if (likely(!ret))
12872 __put_user_asm(tmp, (u32 __user *)dst,
12873@@ -195,7 +295,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12874 }
12875 case 8: {
12876 u64 tmp;
12877- __get_user_asm(tmp, (u64 __user *)src,
12878+ __get_user_asm(tmp, (const u64 __user *)src,
12879 ret, "q", "", "=r", 8);
12880 if (likely(!ret))
12881 __put_user_asm(tmp, (u64 __user *)dst,
12882@@ -203,51 +303,103 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12883 return ret;
12884 }
12885 default:
12886- return copy_user_generic((__force void *)dst,
12887- (__force void *)src, size);
12888+
12889+#ifdef CONFIG_PAX_MEMORY_UDEREF
12890+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12891+ src += PAX_USER_SHADOW_BASE;
12892+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12893+ dst += PAX_USER_SHADOW_BASE;
12894+#endif
12895+
12896+ return copy_user_generic((__force_kernel void *)dst,
12897+ (__force_kernel const void *)src, size);
12898 }
12899 }
12900
12901 __must_check long
12902-strncpy_from_user(char *dst, const char __user *src, long count);
12903+strncpy_from_user(char *dst, const char __user *src, unsigned long count) __size_overflow(3);
12904 __must_check long
12905-__strncpy_from_user(char *dst, const char __user *src, long count);
12906-__must_check long strnlen_user(const char __user *str, long n);
12907-__must_check long __strnlen_user(const char __user *str, long n);
12908+__strncpy_from_user(char *dst, const char __user *src, unsigned long count) __size_overflow(3);
12909+__must_check long strnlen_user(const char __user *str, unsigned long n);
12910+__must_check long __strnlen_user(const char __user *str, unsigned long n);
12911 __must_check long strlen_user(const char __user *str);
12912-__must_check unsigned long clear_user(void __user *mem, unsigned long len);
12913-__must_check unsigned long __clear_user(void __user *mem, unsigned long len);
12914+__must_check unsigned long clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12915+__must_check unsigned long __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12916
12917 static __must_check __always_inline int
12918-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
12919+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12920+static __must_check __always_inline int
12921+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
12922 {
12923- return copy_user_generic(dst, (__force const void *)src, size);
12924+ if (size > INT_MAX)
12925+ return size;
12926+
12927+#ifdef CONFIG_PAX_MEMORY_UDEREF
12928+ if (!__access_ok(VERIFY_READ, src, size))
12929+ return size;
12930+
12931+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12932+ src += PAX_USER_SHADOW_BASE;
12933+#endif
12934+
12935+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12936 }
12937
12938-static __must_check __always_inline int
12939-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
12940+static __must_check __always_inline unsigned long
12941+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12942+static __must_check __always_inline unsigned long
12943+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
12944 {
12945- return copy_user_generic((__force void *)dst, src, size);
12946+ if (size > INT_MAX)
12947+ return size;
12948+
12949+#ifdef CONFIG_PAX_MEMORY_UDEREF
12950+ if (!__access_ok(VERIFY_WRITE, dst, size))
12951+ return size;
12952+
12953+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12954+ dst += PAX_USER_SHADOW_BASE;
12955+#endif
12956+
12957+ return copy_user_generic((__force_kernel void *)dst, src, size);
12958 }
12959
12960-extern long __copy_user_nocache(void *dst, const void __user *src,
12961- unsigned size, int zerorest);
12962+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
12963+ unsigned long size, int zerorest) __size_overflow(3);
12964
12965-static inline int
12966-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
12967+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12968+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
12969 {
12970 might_sleep();
12971+
12972+ if (size > INT_MAX)
12973+ return size;
12974+
12975+#ifdef CONFIG_PAX_MEMORY_UDEREF
12976+ if (!__access_ok(VERIFY_READ, src, size))
12977+ return size;
12978+#endif
12979+
12980 return __copy_user_nocache(dst, src, size, 1);
12981 }
12982
12983-static inline int
12984-__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12985- unsigned size)
12986+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12987+ unsigned long size) __size_overflow(3);
12988+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12989+ unsigned long size)
12990 {
12991+ if (size > INT_MAX)
12992+ return size;
12993+
12994+#ifdef CONFIG_PAX_MEMORY_UDEREF
12995+ if (!__access_ok(VERIFY_READ, src, size))
12996+ return size;
12997+#endif
12998+
12999 return __copy_user_nocache(dst, src, size, 0);
13000 }
13001
13002-unsigned long
13003-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
13004+extern unsigned long
13005+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
13006
13007 #endif /* _ASM_X86_UACCESS_64_H */
13008diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
13009index bb05228..d763d5b 100644
13010--- a/arch/x86/include/asm/vdso.h
13011+++ b/arch/x86/include/asm/vdso.h
13012@@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
13013 #define VDSO32_SYMBOL(base, name) \
13014 ({ \
13015 extern const char VDSO32_##name[]; \
13016- (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13017+ (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13018 })
13019 #endif
13020
13021diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
13022index 1971e65..1e3559b 100644
13023--- a/arch/x86/include/asm/x86_init.h
13024+++ b/arch/x86/include/asm/x86_init.h
13025@@ -28,7 +28,7 @@ struct x86_init_mpparse {
13026 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
13027 void (*find_smp_config)(void);
13028 void (*get_smp_config)(unsigned int early);
13029-};
13030+} __no_const;
13031
13032 /**
13033 * struct x86_init_resources - platform specific resource related ops
13034@@ -42,7 +42,7 @@ struct x86_init_resources {
13035 void (*probe_roms)(void);
13036 void (*reserve_resources)(void);
13037 char *(*memory_setup)(void);
13038-};
13039+} __no_const;
13040
13041 /**
13042 * struct x86_init_irqs - platform specific interrupt setup
13043@@ -55,7 +55,7 @@ struct x86_init_irqs {
13044 void (*pre_vector_init)(void);
13045 void (*intr_init)(void);
13046 void (*trap_init)(void);
13047-};
13048+} __no_const;
13049
13050 /**
13051 * struct x86_init_oem - oem platform specific customizing functions
13052@@ -65,7 +65,7 @@ struct x86_init_irqs {
13053 struct x86_init_oem {
13054 void (*arch_setup)(void);
13055 void (*banner)(void);
13056-};
13057+} __no_const;
13058
13059 /**
13060 * struct x86_init_mapping - platform specific initial kernel pagetable setup
13061@@ -76,7 +76,7 @@ struct x86_init_oem {
13062 */
13063 struct x86_init_mapping {
13064 void (*pagetable_reserve)(u64 start, u64 end);
13065-};
13066+} __no_const;
13067
13068 /**
13069 * struct x86_init_paging - platform specific paging functions
13070@@ -86,7 +86,7 @@ struct x86_init_mapping {
13071 struct x86_init_paging {
13072 void (*pagetable_setup_start)(pgd_t *base);
13073 void (*pagetable_setup_done)(pgd_t *base);
13074-};
13075+} __no_const;
13076
13077 /**
13078 * struct x86_init_timers - platform specific timer setup
13079@@ -101,7 +101,7 @@ struct x86_init_timers {
13080 void (*tsc_pre_init)(void);
13081 void (*timer_init)(void);
13082 void (*wallclock_init)(void);
13083-};
13084+} __no_const;
13085
13086 /**
13087 * struct x86_init_iommu - platform specific iommu setup
13088@@ -109,7 +109,7 @@ struct x86_init_timers {
13089 */
13090 struct x86_init_iommu {
13091 int (*iommu_init)(void);
13092-};
13093+} __no_const;
13094
13095 /**
13096 * struct x86_init_pci - platform specific pci init functions
13097@@ -123,7 +123,7 @@ struct x86_init_pci {
13098 int (*init)(void);
13099 void (*init_irq)(void);
13100 void (*fixup_irqs)(void);
13101-};
13102+} __no_const;
13103
13104 /**
13105 * struct x86_init_ops - functions for platform specific setup
13106@@ -139,7 +139,7 @@ struct x86_init_ops {
13107 struct x86_init_timers timers;
13108 struct x86_init_iommu iommu;
13109 struct x86_init_pci pci;
13110-};
13111+} __no_const;
13112
13113 /**
13114 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
13115@@ -147,7 +147,7 @@ struct x86_init_ops {
13116 */
13117 struct x86_cpuinit_ops {
13118 void (*setup_percpu_clockev)(void);
13119-};
13120+} __no_const;
13121
13122 /**
13123 * struct x86_platform_ops - platform specific runtime functions
13124@@ -169,7 +169,7 @@ struct x86_platform_ops {
13125 void (*nmi_init)(void);
13126 unsigned char (*get_nmi_reason)(void);
13127 int (*i8042_detect)(void);
13128-};
13129+} __no_const;
13130
13131 struct pci_dev;
13132
13133@@ -177,7 +177,7 @@ struct x86_msi_ops {
13134 int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
13135 void (*teardown_msi_irq)(unsigned int irq);
13136 void (*teardown_msi_irqs)(struct pci_dev *dev);
13137-};
13138+} __no_const;
13139
13140 extern struct x86_init_ops x86_init;
13141 extern struct x86_cpuinit_ops x86_cpuinit;
13142diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
13143index c6ce245..ffbdab7 100644
13144--- a/arch/x86/include/asm/xsave.h
13145+++ b/arch/x86/include/asm/xsave.h
13146@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13147 {
13148 int err;
13149
13150+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13151+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
13152+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
13153+#endif
13154+
13155 /*
13156 * Clear the xsave header first, so that reserved fields are
13157 * initialized to zero.
13158@@ -96,10 +101,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13159 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
13160 {
13161 int err;
13162- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
13163+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
13164 u32 lmask = mask;
13165 u32 hmask = mask >> 32;
13166
13167+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13168+ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
13169+ xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
13170+#endif
13171+
13172 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
13173 "2:\n"
13174 ".section .fixup,\"ax\"\n"
13175diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
13176index 6a564ac..9b1340c 100644
13177--- a/arch/x86/kernel/acpi/realmode/Makefile
13178+++ b/arch/x86/kernel/acpi/realmode/Makefile
13179@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D_WAKEUP -D__KERNEL__ \
13180 $(call cc-option, -fno-stack-protector) \
13181 $(call cc-option, -mpreferred-stack-boundary=2)
13182 KBUILD_CFLAGS += $(call cc-option, -m32)
13183+ifdef CONSTIFY_PLUGIN
13184+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
13185+endif
13186 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
13187 GCOV_PROFILE := n
13188
13189diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S
13190index b4fd836..4358fe3 100644
13191--- a/arch/x86/kernel/acpi/realmode/wakeup.S
13192+++ b/arch/x86/kernel/acpi/realmode/wakeup.S
13193@@ -108,6 +108,9 @@ wakeup_code:
13194 /* Do any other stuff... */
13195
13196 #ifndef CONFIG_64BIT
13197+ /* Recheck NX bit overrides (64bit path does this in trampoline */
13198+ call verify_cpu
13199+
13200 /* This could also be done in C code... */
13201 movl pmode_cr3, %eax
13202 movl %eax, %cr3
13203@@ -131,6 +134,7 @@ wakeup_code:
13204 movl pmode_cr0, %eax
13205 movl %eax, %cr0
13206 jmp pmode_return
13207+# include "../../verify_cpu.S"
13208 #else
13209 pushw $0
13210 pushw trampoline_segment
13211diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
13212index 103b6ab..2004d0a 100644
13213--- a/arch/x86/kernel/acpi/sleep.c
13214+++ b/arch/x86/kernel/acpi/sleep.c
13215@@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
13216 header->trampoline_segment = trampoline_address() >> 4;
13217 #ifdef CONFIG_SMP
13218 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
13219+
13220+ pax_open_kernel();
13221 early_gdt_descr.address =
13222 (unsigned long)get_cpu_gdt_table(smp_processor_id());
13223+ pax_close_kernel();
13224+
13225 initial_gs = per_cpu_offset(smp_processor_id());
13226 #endif
13227 initial_code = (unsigned long)wakeup_long64;
13228diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
13229index 13ab720..95d5442 100644
13230--- a/arch/x86/kernel/acpi/wakeup_32.S
13231+++ b/arch/x86/kernel/acpi/wakeup_32.S
13232@@ -30,13 +30,11 @@ wakeup_pmode_return:
13233 # and restore the stack ... but you need gdt for this to work
13234 movl saved_context_esp, %esp
13235
13236- movl %cs:saved_magic, %eax
13237- cmpl $0x12345678, %eax
13238+ cmpl $0x12345678, saved_magic
13239 jne bogus_magic
13240
13241 # jump to place where we left off
13242- movl saved_eip, %eax
13243- jmp *%eax
13244+ jmp *(saved_eip)
13245
13246 bogus_magic:
13247 jmp bogus_magic
13248diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
13249index 1f84794..e23f862 100644
13250--- a/arch/x86/kernel/alternative.c
13251+++ b/arch/x86/kernel/alternative.c
13252@@ -276,6 +276,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
13253 */
13254 for (a = start; a < end; a++) {
13255 instr = (u8 *)&a->instr_offset + a->instr_offset;
13256+
13257+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13258+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13259+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
13260+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13261+#endif
13262+
13263 replacement = (u8 *)&a->repl_offset + a->repl_offset;
13264 BUG_ON(a->replacementlen > a->instrlen);
13265 BUG_ON(a->instrlen > sizeof(insnbuf));
13266@@ -307,10 +314,16 @@ static void alternatives_smp_lock(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 DS segment override prefix into lock prefix */
13279- if (*ptr == 0x3e)
13280+ if (*ktla_ktva(ptr) == 0x3e)
13281 text_poke(ptr, ((unsigned char []){0xf0}), 1);
13282 };
13283 mutex_unlock(&text_mutex);
13284@@ -328,10 +341,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
13285 for (poff = start; poff < end; poff++) {
13286 u8 *ptr = (u8 *)poff + *poff;
13287
13288+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13289+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13290+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13291+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13292+#endif
13293+
13294 if (!*poff || ptr < text || ptr >= text_end)
13295 continue;
13296 /* turn lock prefix into DS segment override prefix */
13297- if (*ptr == 0xf0)
13298+ if (*ktla_ktva(ptr) == 0xf0)
13299 text_poke(ptr, ((unsigned char []){0x3E}), 1);
13300 };
13301 mutex_unlock(&text_mutex);
13302@@ -500,7 +519,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
13303
13304 BUG_ON(p->len > MAX_PATCH_LEN);
13305 /* prep the buffer with the original instructions */
13306- memcpy(insnbuf, p->instr, p->len);
13307+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
13308 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
13309 (unsigned long)p->instr, p->len);
13310
13311@@ -568,7 +587,7 @@ void __init alternative_instructions(void)
13312 if (smp_alt_once)
13313 free_init_pages("SMP alternatives",
13314 (unsigned long)__smp_locks,
13315- (unsigned long)__smp_locks_end);
13316+ PAGE_ALIGN((unsigned long)__smp_locks_end));
13317
13318 restart_nmi();
13319 }
13320@@ -585,13 +604,17 @@ void __init alternative_instructions(void)
13321 * instructions. And on the local CPU you need to be protected again NMI or MCE
13322 * handlers seeing an inconsistent instruction while you patch.
13323 */
13324-void *__init_or_module text_poke_early(void *addr, const void *opcode,
13325+void *__kprobes text_poke_early(void *addr, const void *opcode,
13326 size_t len)
13327 {
13328 unsigned long flags;
13329 local_irq_save(flags);
13330- memcpy(addr, opcode, len);
13331+
13332+ pax_open_kernel();
13333+ memcpy(ktla_ktva(addr), opcode, len);
13334 sync_core();
13335+ pax_close_kernel();
13336+
13337 local_irq_restore(flags);
13338 /* Could also do a CLFLUSH here to speed up CPU recovery; but
13339 that causes hangs on some VIA CPUs. */
13340@@ -613,36 +636,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
13341 */
13342 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
13343 {
13344- unsigned long flags;
13345- char *vaddr;
13346+ unsigned char *vaddr = ktla_ktva(addr);
13347 struct page *pages[2];
13348- int i;
13349+ size_t i;
13350
13351 if (!core_kernel_text((unsigned long)addr)) {
13352- pages[0] = vmalloc_to_page(addr);
13353- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
13354+ pages[0] = vmalloc_to_page(vaddr);
13355+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
13356 } else {
13357- pages[0] = virt_to_page(addr);
13358+ pages[0] = virt_to_page(vaddr);
13359 WARN_ON(!PageReserved(pages[0]));
13360- pages[1] = virt_to_page(addr + PAGE_SIZE);
13361+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
13362 }
13363 BUG_ON(!pages[0]);
13364- local_irq_save(flags);
13365- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
13366- if (pages[1])
13367- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
13368- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
13369- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
13370- clear_fixmap(FIX_TEXT_POKE0);
13371- if (pages[1])
13372- clear_fixmap(FIX_TEXT_POKE1);
13373- local_flush_tlb();
13374- sync_core();
13375- /* Could also do a CLFLUSH here to speed up CPU recovery; but
13376- that causes hangs on some VIA CPUs. */
13377+ text_poke_early(addr, opcode, len);
13378 for (i = 0; i < len; i++)
13379- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
13380- local_irq_restore(flags);
13381+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
13382 return addr;
13383 }
13384
13385diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
13386index f98d84c..e402a69 100644
13387--- a/arch/x86/kernel/apic/apic.c
13388+++ b/arch/x86/kernel/apic/apic.c
13389@@ -174,7 +174,7 @@ int first_system_vector = 0xfe;
13390 /*
13391 * Debug level, exported for io_apic.c
13392 */
13393-unsigned int apic_verbosity;
13394+int apic_verbosity;
13395
13396 int pic_mode;
13397
13398@@ -1853,7 +1853,7 @@ void smp_error_interrupt(struct pt_regs *regs)
13399 apic_write(APIC_ESR, 0);
13400 v1 = apic_read(APIC_ESR);
13401 ack_APIC_irq();
13402- atomic_inc(&irq_err_count);
13403+ atomic_inc_unchecked(&irq_err_count);
13404
13405 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
13406 smp_processor_id(), v0 , v1);
13407diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
13408index 6d939d7..0697fcc 100644
13409--- a/arch/x86/kernel/apic/io_apic.c
13410+++ b/arch/x86/kernel/apic/io_apic.c
13411@@ -1096,7 +1096,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
13412 }
13413 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
13414
13415-void lock_vector_lock(void)
13416+void lock_vector_lock(void) __acquires(vector_lock)
13417 {
13418 /* Used to the online set of cpus does not change
13419 * during assign_irq_vector.
13420@@ -1104,7 +1104,7 @@ void lock_vector_lock(void)
13421 raw_spin_lock(&vector_lock);
13422 }
13423
13424-void unlock_vector_lock(void)
13425+void unlock_vector_lock(void) __releases(vector_lock)
13426 {
13427 raw_spin_unlock(&vector_lock);
13428 }
13429@@ -2510,7 +2510,7 @@ static void ack_apic_edge(struct irq_data *data)
13430 ack_APIC_irq();
13431 }
13432
13433-atomic_t irq_mis_count;
13434+atomic_unchecked_t irq_mis_count;
13435
13436 static void ack_apic_level(struct irq_data *data)
13437 {
13438@@ -2576,7 +2576,7 @@ static void ack_apic_level(struct irq_data *data)
13439 * at the cpu.
13440 */
13441 if (!(v & (1 << (i & 0x1f)))) {
13442- atomic_inc(&irq_mis_count);
13443+ atomic_inc_unchecked(&irq_mis_count);
13444
13445 eoi_ioapic_irq(irq, cfg);
13446 }
13447diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
13448index a46bd38..6b906d7 100644
13449--- a/arch/x86/kernel/apm_32.c
13450+++ b/arch/x86/kernel/apm_32.c
13451@@ -411,7 +411,7 @@ static DEFINE_MUTEX(apm_mutex);
13452 * This is for buggy BIOS's that refer to (real mode) segment 0x40
13453 * even though they are called in protected mode.
13454 */
13455-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
13456+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
13457 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
13458
13459 static const char driver_version[] = "1.16ac"; /* no spaces */
13460@@ -589,7 +589,10 @@ static long __apm_bios_call(void *_call)
13461 BUG_ON(cpu != 0);
13462 gdt = get_cpu_gdt_table(cpu);
13463 save_desc_40 = gdt[0x40 / 8];
13464+
13465+ pax_open_kernel();
13466 gdt[0x40 / 8] = bad_bios_desc;
13467+ pax_close_kernel();
13468
13469 apm_irq_save(flags);
13470 APM_DO_SAVE_SEGS;
13471@@ -598,7 +601,11 @@ static long __apm_bios_call(void *_call)
13472 &call->esi);
13473 APM_DO_RESTORE_SEGS;
13474 apm_irq_restore(flags);
13475+
13476+ pax_open_kernel();
13477 gdt[0x40 / 8] = save_desc_40;
13478+ pax_close_kernel();
13479+
13480 put_cpu();
13481
13482 return call->eax & 0xff;
13483@@ -665,7 +672,10 @@ static long __apm_bios_call_simple(void *_call)
13484 BUG_ON(cpu != 0);
13485 gdt = get_cpu_gdt_table(cpu);
13486 save_desc_40 = gdt[0x40 / 8];
13487+
13488+ pax_open_kernel();
13489 gdt[0x40 / 8] = bad_bios_desc;
13490+ pax_close_kernel();
13491
13492 apm_irq_save(flags);
13493 APM_DO_SAVE_SEGS;
13494@@ -673,7 +683,11 @@ static long __apm_bios_call_simple(void *_call)
13495 &call->eax);
13496 APM_DO_RESTORE_SEGS;
13497 apm_irq_restore(flags);
13498+
13499+ pax_open_kernel();
13500 gdt[0x40 / 8] = save_desc_40;
13501+ pax_close_kernel();
13502+
13503 put_cpu();
13504 return error;
13505 }
13506@@ -2347,12 +2361,15 @@ static int __init apm_init(void)
13507 * code to that CPU.
13508 */
13509 gdt = get_cpu_gdt_table(0);
13510+
13511+ pax_open_kernel();
13512 set_desc_base(&gdt[APM_CS >> 3],
13513 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
13514 set_desc_base(&gdt[APM_CS_16 >> 3],
13515 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
13516 set_desc_base(&gdt[APM_DS >> 3],
13517 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
13518+ pax_close_kernel();
13519
13520 proc_create("apm", 0, NULL, &apm_file_ops);
13521
13522diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
13523index 4f13faf..87db5d2 100644
13524--- a/arch/x86/kernel/asm-offsets.c
13525+++ b/arch/x86/kernel/asm-offsets.c
13526@@ -33,6 +33,8 @@ void common(void) {
13527 OFFSET(TI_status, thread_info, status);
13528 OFFSET(TI_addr_limit, thread_info, addr_limit);
13529 OFFSET(TI_preempt_count, thread_info, preempt_count);
13530+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
13531+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
13532
13533 BLANK();
13534 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
13535@@ -53,8 +55,26 @@ void common(void) {
13536 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
13537 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
13538 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
13539+
13540+#ifdef CONFIG_PAX_KERNEXEC
13541+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
13542 #endif
13543
13544+#ifdef CONFIG_PAX_MEMORY_UDEREF
13545+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
13546+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
13547+#ifdef CONFIG_X86_64
13548+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
13549+#endif
13550+#endif
13551+
13552+#endif
13553+
13554+ BLANK();
13555+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
13556+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
13557+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
13558+
13559 #ifdef CONFIG_XEN
13560 BLANK();
13561 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
13562diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
13563index e72a119..6e2955d 100644
13564--- a/arch/x86/kernel/asm-offsets_64.c
13565+++ b/arch/x86/kernel/asm-offsets_64.c
13566@@ -69,6 +69,7 @@ int main(void)
13567 BLANK();
13568 #undef ENTRY
13569
13570+ DEFINE(TSS_size, sizeof(struct tss_struct));
13571 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
13572 BLANK();
13573
13574diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
13575index 25f24dc..4094a7f 100644
13576--- a/arch/x86/kernel/cpu/Makefile
13577+++ b/arch/x86/kernel/cpu/Makefile
13578@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
13579 CFLAGS_REMOVE_perf_event.o = -pg
13580 endif
13581
13582-# Make sure load_percpu_segment has no stackprotector
13583-nostackp := $(call cc-option, -fno-stack-protector)
13584-CFLAGS_common.o := $(nostackp)
13585-
13586 obj-y := intel_cacheinfo.o scattered.o topology.o
13587 obj-y += proc.o capflags.o powerflags.o common.o
13588 obj-y += vmware.o hypervisor.o sched.o mshyperv.o
13589diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
13590index 0bab2b1..d0a1bf8 100644
13591--- a/arch/x86/kernel/cpu/amd.c
13592+++ b/arch/x86/kernel/cpu/amd.c
13593@@ -664,7 +664,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
13594 unsigned int size)
13595 {
13596 /* AMD errata T13 (order #21922) */
13597- if ((c->x86 == 6)) {
13598+ if (c->x86 == 6) {
13599 /* Duron Rev A0 */
13600 if (c->x86_model == 3 && c->x86_mask == 0)
13601 size = 64;
13602diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
13603index aa003b1..47ea638 100644
13604--- a/arch/x86/kernel/cpu/common.c
13605+++ b/arch/x86/kernel/cpu/common.c
13606@@ -84,60 +84,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
13607
13608 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
13609
13610-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
13611-#ifdef CONFIG_X86_64
13612- /*
13613- * We need valid kernel segments for data and code in long mode too
13614- * IRET will check the segment types kkeil 2000/10/28
13615- * Also sysret mandates a special GDT layout
13616- *
13617- * TLS descriptors are currently at a different place compared to i386.
13618- * Hopefully nobody expects them at a fixed place (Wine?)
13619- */
13620- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
13621- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
13622- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
13623- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
13624- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
13625- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
13626-#else
13627- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
13628- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13629- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
13630- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
13631- /*
13632- * Segments used for calling PnP BIOS have byte granularity.
13633- * They code segments and data segments have fixed 64k limits,
13634- * the transfer segment sizes are set at run time.
13635- */
13636- /* 32-bit code */
13637- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13638- /* 16-bit code */
13639- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13640- /* 16-bit data */
13641- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
13642- /* 16-bit data */
13643- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
13644- /* 16-bit data */
13645- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
13646- /*
13647- * The APM segments have byte granularity and their bases
13648- * are set at run time. All have 64k limits.
13649- */
13650- /* 32-bit code */
13651- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13652- /* 16-bit code */
13653- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13654- /* data */
13655- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
13656-
13657- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13658- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13659- GDT_STACK_CANARY_INIT
13660-#endif
13661-} };
13662-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
13663-
13664 static int __init x86_xsave_setup(char *s)
13665 {
13666 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
13667@@ -372,7 +318,7 @@ void switch_to_new_gdt(int cpu)
13668 {
13669 struct desc_ptr gdt_descr;
13670
13671- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
13672+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
13673 gdt_descr.size = GDT_SIZE - 1;
13674 load_gdt(&gdt_descr);
13675 /* Reload the per-cpu base */
13676@@ -844,6 +790,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
13677 /* Filter out anything that depends on CPUID levels we don't have */
13678 filter_cpuid_features(c, true);
13679
13680+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
13681+ setup_clear_cpu_cap(X86_FEATURE_SEP);
13682+#endif
13683+
13684 /* If the model name is still unset, do table lookup. */
13685 if (!c->x86_model_id[0]) {
13686 const char *p;
13687@@ -1024,6 +974,9 @@ static __init int setup_disablecpuid(char *arg)
13688 }
13689 __setup("clearcpuid=", setup_disablecpuid);
13690
13691+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
13692+EXPORT_PER_CPU_SYMBOL(current_tinfo);
13693+
13694 #ifdef CONFIG_X86_64
13695 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
13696
13697@@ -1039,7 +992,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
13698 EXPORT_PER_CPU_SYMBOL(current_task);
13699
13700 DEFINE_PER_CPU(unsigned long, kernel_stack) =
13701- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
13702+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
13703 EXPORT_PER_CPU_SYMBOL(kernel_stack);
13704
13705 DEFINE_PER_CPU(char *, irq_stack_ptr) =
13706@@ -1104,7 +1057,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
13707 {
13708 memset(regs, 0, sizeof(struct pt_regs));
13709 regs->fs = __KERNEL_PERCPU;
13710- regs->gs = __KERNEL_STACK_CANARY;
13711+ savesegment(gs, regs->gs);
13712
13713 return regs;
13714 }
13715@@ -1159,7 +1112,7 @@ void __cpuinit cpu_init(void)
13716 int i;
13717
13718 cpu = stack_smp_processor_id();
13719- t = &per_cpu(init_tss, cpu);
13720+ t = init_tss + cpu;
13721 oist = &per_cpu(orig_ist, cpu);
13722
13723 #ifdef CONFIG_NUMA
13724@@ -1185,7 +1138,7 @@ void __cpuinit cpu_init(void)
13725 switch_to_new_gdt(cpu);
13726 loadsegment(fs, 0);
13727
13728- load_idt((const struct desc_ptr *)&idt_descr);
13729+ load_idt(&idt_descr);
13730
13731 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
13732 syscall_init();
13733@@ -1194,7 +1147,6 @@ void __cpuinit cpu_init(void)
13734 wrmsrl(MSR_KERNEL_GS_BASE, 0);
13735 barrier();
13736
13737- x86_configure_nx();
13738 if (cpu != 0)
13739 enable_x2apic();
13740
13741@@ -1248,7 +1200,7 @@ void __cpuinit cpu_init(void)
13742 {
13743 int cpu = smp_processor_id();
13744 struct task_struct *curr = current;
13745- struct tss_struct *t = &per_cpu(init_tss, cpu);
13746+ struct tss_struct *t = init_tss + cpu;
13747 struct thread_struct *thread = &curr->thread;
13748
13749 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
13750diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
13751index 5231312..a78a987 100644
13752--- a/arch/x86/kernel/cpu/intel.c
13753+++ b/arch/x86/kernel/cpu/intel.c
13754@@ -174,7 +174,7 @@ static void __cpuinit trap_init_f00f_bug(void)
13755 * Update the IDT descriptor and reload the IDT so that
13756 * it uses the read-only mapped virtual address.
13757 */
13758- idt_descr.address = fix_to_virt(FIX_F00F_IDT);
13759+ idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
13760 load_idt(&idt_descr);
13761 }
13762 #endif
13763diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13764index 319882e..993534e 100644
13765--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
13766+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13767@@ -173,6 +173,8 @@ static void raise_mce(struct mce *m)
13768
13769 /* Error injection interface */
13770 static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13771+ size_t usize, loff_t *off) __size_overflow(3);
13772+static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13773 size_t usize, loff_t *off)
13774 {
13775 struct mce m;
13776diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
13777index 2af127d..8ff7ac0 100644
13778--- a/arch/x86/kernel/cpu/mcheck/mce.c
13779+++ b/arch/x86/kernel/cpu/mcheck/mce.c
13780@@ -42,6 +42,7 @@
13781 #include <asm/processor.h>
13782 #include <asm/mce.h>
13783 #include <asm/msr.h>
13784+#include <asm/local.h>
13785
13786 #include "mce-internal.h"
13787
13788@@ -202,7 +203,7 @@ static void print_mce(struct mce *m)
13789 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
13790 m->cs, m->ip);
13791
13792- if (m->cs == __KERNEL_CS)
13793+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
13794 print_symbol("{%s}", m->ip);
13795 pr_cont("\n");
13796 }
13797@@ -235,10 +236,10 @@ static void print_mce(struct mce *m)
13798
13799 #define PANIC_TIMEOUT 5 /* 5 seconds */
13800
13801-static atomic_t mce_paniced;
13802+static atomic_unchecked_t mce_paniced;
13803
13804 static int fake_panic;
13805-static atomic_t mce_fake_paniced;
13806+static atomic_unchecked_t mce_fake_paniced;
13807
13808 /* Panic in progress. Enable interrupts and wait for final IPI */
13809 static void wait_for_panic(void)
13810@@ -262,7 +263,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13811 /*
13812 * Make sure only one CPU runs in machine check panic
13813 */
13814- if (atomic_inc_return(&mce_paniced) > 1)
13815+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
13816 wait_for_panic();
13817 barrier();
13818
13819@@ -270,7 +271,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13820 console_verbose();
13821 } else {
13822 /* Don't log too much for fake panic */
13823- if (atomic_inc_return(&mce_fake_paniced) > 1)
13824+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
13825 return;
13826 }
13827 /* First print corrected ones that are still unlogged */
13828@@ -610,7 +611,7 @@ static int mce_timed_out(u64 *t)
13829 * might have been modified by someone else.
13830 */
13831 rmb();
13832- if (atomic_read(&mce_paniced))
13833+ if (atomic_read_unchecked(&mce_paniced))
13834 wait_for_panic();
13835 if (!monarch_timeout)
13836 goto out;
13837@@ -1398,7 +1399,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
13838 }
13839
13840 /* Call the installed machine check handler for this CPU setup. */
13841-void (*machine_check_vector)(struct pt_regs *, long error_code) =
13842+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
13843 unexpected_machine_check;
13844
13845 /*
13846@@ -1421,7 +1422,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
13847 return;
13848 }
13849
13850+ pax_open_kernel();
13851 machine_check_vector = do_machine_check;
13852+ pax_close_kernel();
13853
13854 __mcheck_cpu_init_generic();
13855 __mcheck_cpu_init_vendor(c);
13856@@ -1435,7 +1438,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
13857 */
13858
13859 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
13860-static int mce_chrdev_open_count; /* #times opened */
13861+static local_t mce_chrdev_open_count; /* #times opened */
13862 static int mce_chrdev_open_exclu; /* already open exclusive? */
13863
13864 static int mce_chrdev_open(struct inode *inode, struct file *file)
13865@@ -1443,7 +1446,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
13866 spin_lock(&mce_chrdev_state_lock);
13867
13868 if (mce_chrdev_open_exclu ||
13869- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
13870+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
13871 spin_unlock(&mce_chrdev_state_lock);
13872
13873 return -EBUSY;
13874@@ -1451,7 +1454,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
13875
13876 if (file->f_flags & O_EXCL)
13877 mce_chrdev_open_exclu = 1;
13878- mce_chrdev_open_count++;
13879+ local_inc(&mce_chrdev_open_count);
13880
13881 spin_unlock(&mce_chrdev_state_lock);
13882
13883@@ -1462,7 +1465,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
13884 {
13885 spin_lock(&mce_chrdev_state_lock);
13886
13887- mce_chrdev_open_count--;
13888+ local_dec(&mce_chrdev_open_count);
13889 mce_chrdev_open_exclu = 0;
13890
13891 spin_unlock(&mce_chrdev_state_lock);
13892@@ -2171,7 +2174,7 @@ struct dentry *mce_get_debugfs_dir(void)
13893 static void mce_reset(void)
13894 {
13895 cpu_missing = 0;
13896- atomic_set(&mce_fake_paniced, 0);
13897+ atomic_set_unchecked(&mce_fake_paniced, 0);
13898 atomic_set(&mce_executing, 0);
13899 atomic_set(&mce_callin, 0);
13900 atomic_set(&global_nwo, 0);
13901diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
13902index 5c0e653..0882b0a 100644
13903--- a/arch/x86/kernel/cpu/mcheck/p5.c
13904+++ b/arch/x86/kernel/cpu/mcheck/p5.c
13905@@ -12,6 +12,7 @@
13906 #include <asm/system.h>
13907 #include <asm/mce.h>
13908 #include <asm/msr.h>
13909+#include <asm/pgtable.h>
13910
13911 /* By default disabled */
13912 int mce_p5_enabled __read_mostly;
13913@@ -50,7 +51,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
13914 if (!cpu_has(c, X86_FEATURE_MCE))
13915 return;
13916
13917+ pax_open_kernel();
13918 machine_check_vector = pentium_machine_check;
13919+ pax_close_kernel();
13920 /* Make sure the vector pointer is visible before we enable MCEs: */
13921 wmb();
13922
13923diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
13924index 54060f5..c1a7577 100644
13925--- a/arch/x86/kernel/cpu/mcheck/winchip.c
13926+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
13927@@ -11,6 +11,7 @@
13928 #include <asm/system.h>
13929 #include <asm/mce.h>
13930 #include <asm/msr.h>
13931+#include <asm/pgtable.h>
13932
13933 /* Machine check handler for WinChip C6: */
13934 static void winchip_machine_check(struct pt_regs *regs, long error_code)
13935@@ -24,7 +25,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
13936 {
13937 u32 lo, hi;
13938
13939+ pax_open_kernel();
13940 machine_check_vector = winchip_machine_check;
13941+ pax_close_kernel();
13942 /* Make sure the vector pointer is visible before we enable MCEs: */
13943 wmb();
13944
13945diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
13946index 7928963..1b16001 100644
13947--- a/arch/x86/kernel/cpu/mtrr/if.c
13948+++ b/arch/x86/kernel/cpu/mtrr/if.c
13949@@ -91,6 +91,8 @@ mtrr_file_del(unsigned long base, unsigned long size,
13950 * "base=%Lx size=%Lx type=%s" or "disable=%d"
13951 */
13952 static ssize_t
13953+mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos) __size_overflow(3);
13954+static ssize_t
13955 mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos)
13956 {
13957 int i, err;
13958diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
13959index 6b96110..0da73eb 100644
13960--- a/arch/x86/kernel/cpu/mtrr/main.c
13961+++ b/arch/x86/kernel/cpu/mtrr/main.c
13962@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
13963 u64 size_or_mask, size_and_mask;
13964 static bool mtrr_aps_delayed_init;
13965
13966-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
13967+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
13968
13969 const struct mtrr_ops *mtrr_if;
13970
13971diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
13972index df5e41f..816c719 100644
13973--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
13974+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
13975@@ -25,7 +25,7 @@ struct mtrr_ops {
13976 int (*validate_add_page)(unsigned long base, unsigned long size,
13977 unsigned int type);
13978 int (*have_wrcomb)(void);
13979-};
13980+} __do_const;
13981
13982 extern int generic_get_free_region(unsigned long base, unsigned long size,
13983 int replace_reg);
13984diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
13985index 2bda212..78cc605 100644
13986--- a/arch/x86/kernel/cpu/perf_event.c
13987+++ b/arch/x86/kernel/cpu/perf_event.c
13988@@ -1529,7 +1529,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
13989 break;
13990
13991 perf_callchain_store(entry, frame.return_address);
13992- fp = frame.next_frame;
13993+ fp = (const void __force_user *)frame.next_frame;
13994 }
13995 }
13996
13997diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
13998index 13ad899..f642b9a 100644
13999--- a/arch/x86/kernel/crash.c
14000+++ b/arch/x86/kernel/crash.c
14001@@ -36,10 +36,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
14002 {
14003 #ifdef CONFIG_X86_32
14004 struct pt_regs fixed_regs;
14005-#endif
14006
14007-#ifdef CONFIG_X86_32
14008- if (!user_mode_vm(regs)) {
14009+ if (!user_mode(regs)) {
14010 crash_fixup_ss_esp(&fixed_regs, regs);
14011 regs = &fixed_regs;
14012 }
14013diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
14014index 37250fe..bf2ec74 100644
14015--- a/arch/x86/kernel/doublefault_32.c
14016+++ b/arch/x86/kernel/doublefault_32.c
14017@@ -11,7 +11,7 @@
14018
14019 #define DOUBLEFAULT_STACKSIZE (1024)
14020 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
14021-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
14022+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
14023
14024 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
14025
14026@@ -21,7 +21,7 @@ static void doublefault_fn(void)
14027 unsigned long gdt, tss;
14028
14029 store_gdt(&gdt_desc);
14030- gdt = gdt_desc.address;
14031+ gdt = (unsigned long)gdt_desc.address;
14032
14033 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
14034
14035@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
14036 /* 0x2 bit is always set */
14037 .flags = X86_EFLAGS_SF | 0x2,
14038 .sp = STACK_START,
14039- .es = __USER_DS,
14040+ .es = __KERNEL_DS,
14041 .cs = __KERNEL_CS,
14042 .ss = __KERNEL_DS,
14043- .ds = __USER_DS,
14044+ .ds = __KERNEL_DS,
14045 .fs = __KERNEL_PERCPU,
14046
14047 .__cr3 = __pa_nodebug(swapper_pg_dir),
14048diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
14049index 1aae78f..aab3a3d 100644
14050--- a/arch/x86/kernel/dumpstack.c
14051+++ b/arch/x86/kernel/dumpstack.c
14052@@ -2,6 +2,9 @@
14053 * Copyright (C) 1991, 1992 Linus Torvalds
14054 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
14055 */
14056+#ifdef CONFIG_GRKERNSEC_HIDESYM
14057+#define __INCLUDED_BY_HIDESYM 1
14058+#endif
14059 #include <linux/kallsyms.h>
14060 #include <linux/kprobes.h>
14061 #include <linux/uaccess.h>
14062@@ -35,9 +38,8 @@ void printk_address(unsigned long address, int reliable)
14063 static void
14064 print_ftrace_graph_addr(unsigned long addr, void *data,
14065 const struct stacktrace_ops *ops,
14066- struct thread_info *tinfo, int *graph)
14067+ struct task_struct *task, int *graph)
14068 {
14069- struct task_struct *task = tinfo->task;
14070 unsigned long ret_addr;
14071 int index = task->curr_ret_stack;
14072
14073@@ -58,7 +60,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14074 static inline void
14075 print_ftrace_graph_addr(unsigned long addr, void *data,
14076 const struct stacktrace_ops *ops,
14077- struct thread_info *tinfo, int *graph)
14078+ struct task_struct *task, int *graph)
14079 { }
14080 #endif
14081
14082@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14083 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
14084 */
14085
14086-static inline int valid_stack_ptr(struct thread_info *tinfo,
14087- void *p, unsigned int size, void *end)
14088+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
14089 {
14090- void *t = tinfo;
14091 if (end) {
14092 if (p < end && p >= (end-THREAD_SIZE))
14093 return 1;
14094@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
14095 }
14096
14097 unsigned long
14098-print_context_stack(struct thread_info *tinfo,
14099+print_context_stack(struct task_struct *task, void *stack_start,
14100 unsigned long *stack, unsigned long bp,
14101 const struct stacktrace_ops *ops, void *data,
14102 unsigned long *end, int *graph)
14103 {
14104 struct stack_frame *frame = (struct stack_frame *)bp;
14105
14106- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
14107+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
14108 unsigned long addr;
14109
14110 addr = *stack;
14111@@ -102,7 +102,7 @@ print_context_stack(struct thread_info *tinfo,
14112 } else {
14113 ops->address(data, addr, 0);
14114 }
14115- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14116+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14117 }
14118 stack++;
14119 }
14120@@ -111,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
14121 EXPORT_SYMBOL_GPL(print_context_stack);
14122
14123 unsigned long
14124-print_context_stack_bp(struct thread_info *tinfo,
14125+print_context_stack_bp(struct task_struct *task, void *stack_start,
14126 unsigned long *stack, unsigned long bp,
14127 const struct stacktrace_ops *ops, void *data,
14128 unsigned long *end, int *graph)
14129@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14130 struct stack_frame *frame = (struct stack_frame *)bp;
14131 unsigned long *ret_addr = &frame->return_address;
14132
14133- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
14134+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
14135 unsigned long addr = *ret_addr;
14136
14137 if (!__kernel_text_address(addr))
14138@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14139 ops->address(data, addr, 1);
14140 frame = frame->next_frame;
14141 ret_addr = &frame->return_address;
14142- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14143+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14144 }
14145
14146 return (unsigned long)frame;
14147@@ -186,7 +186,7 @@ void dump_stack(void)
14148
14149 bp = stack_frame(current, NULL);
14150 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
14151- current->pid, current->comm, print_tainted(),
14152+ task_pid_nr(current), current->comm, print_tainted(),
14153 init_utsname()->release,
14154 (int)strcspn(init_utsname()->version, " "),
14155 init_utsname()->version);
14156@@ -222,6 +222,8 @@ unsigned __kprobes long oops_begin(void)
14157 }
14158 EXPORT_SYMBOL_GPL(oops_begin);
14159
14160+extern void gr_handle_kernel_exploit(void);
14161+
14162 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14163 {
14164 if (regs && kexec_should_crash(current))
14165@@ -243,7 +245,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14166 panic("Fatal exception in interrupt");
14167 if (panic_on_oops)
14168 panic("Fatal exception");
14169- do_exit(signr);
14170+
14171+ gr_handle_kernel_exploit();
14172+
14173+ do_group_exit(signr);
14174 }
14175
14176 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14177@@ -269,7 +274,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14178
14179 show_registers(regs);
14180 #ifdef CONFIG_X86_32
14181- if (user_mode_vm(regs)) {
14182+ if (user_mode(regs)) {
14183 sp = regs->sp;
14184 ss = regs->ss & 0xffff;
14185 } else {
14186@@ -297,7 +302,7 @@ void die(const char *str, struct pt_regs *regs, long err)
14187 unsigned long flags = oops_begin();
14188 int sig = SIGSEGV;
14189
14190- if (!user_mode_vm(regs))
14191+ if (!user_mode(regs))
14192 report_bug(regs->ip, regs);
14193
14194 if (__die(str, regs, err))
14195diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
14196index c99f9ed..2a15d80 100644
14197--- a/arch/x86/kernel/dumpstack_32.c
14198+++ b/arch/x86/kernel/dumpstack_32.c
14199@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14200 bp = stack_frame(task, regs);
14201
14202 for (;;) {
14203- struct thread_info *context;
14204+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14205
14206- context = (struct thread_info *)
14207- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
14208- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
14209+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14210
14211- stack = (unsigned long *)context->previous_esp;
14212- if (!stack)
14213+ if (stack_start == task_stack_page(task))
14214 break;
14215+ stack = *(unsigned long **)stack_start;
14216 if (ops->stack(data, "IRQ") < 0)
14217 break;
14218 touch_nmi_watchdog();
14219@@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs)
14220 * When in-kernel, we also print out the stack and code at the
14221 * time of the fault..
14222 */
14223- if (!user_mode_vm(regs)) {
14224+ if (!user_mode(regs)) {
14225 unsigned int code_prologue = code_bytes * 43 / 64;
14226 unsigned int code_len = code_bytes;
14227 unsigned char c;
14228 u8 *ip;
14229+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
14230
14231 printk(KERN_EMERG "Stack:\n");
14232 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
14233
14234 printk(KERN_EMERG "Code: ");
14235
14236- ip = (u8 *)regs->ip - code_prologue;
14237+ ip = (u8 *)regs->ip - code_prologue + cs_base;
14238 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
14239 /* try starting at IP */
14240- ip = (u8 *)regs->ip;
14241+ ip = (u8 *)regs->ip + cs_base;
14242 code_len = code_len - code_prologue + 1;
14243 }
14244 for (i = 0; i < code_len; i++, ip++) {
14245@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs)
14246 printk(KERN_CONT " Bad EIP value.");
14247 break;
14248 }
14249- if (ip == (u8 *)regs->ip)
14250+ if (ip == (u8 *)regs->ip + cs_base)
14251 printk(KERN_CONT "<%02x> ", c);
14252 else
14253 printk(KERN_CONT "%02x ", c);
14254@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip)
14255 {
14256 unsigned short ud2;
14257
14258+ ip = ktla_ktva(ip);
14259 if (ip < PAGE_OFFSET)
14260 return 0;
14261 if (probe_kernel_address((unsigned short *)ip, ud2))
14262@@ -139,3 +139,15 @@ int is_valid_bugaddr(unsigned long ip)
14263
14264 return ud2 == 0x0b0f;
14265 }
14266+
14267+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14268+void pax_check_alloca(unsigned long size)
14269+{
14270+ unsigned long sp = (unsigned long)&sp, stack_left;
14271+
14272+ /* all kernel stacks are of the same size */
14273+ stack_left = sp & (THREAD_SIZE - 1);
14274+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14275+}
14276+EXPORT_SYMBOL(pax_check_alloca);
14277+#endif
14278diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
14279index 6d728d9..279514e 100644
14280--- a/arch/x86/kernel/dumpstack_64.c
14281+++ b/arch/x86/kernel/dumpstack_64.c
14282@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14283 unsigned long *irq_stack_end =
14284 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
14285 unsigned used = 0;
14286- struct thread_info *tinfo;
14287 int graph = 0;
14288 unsigned long dummy;
14289+ void *stack_start;
14290
14291 if (!task)
14292 task = current;
14293@@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14294 * current stack address. If the stacks consist of nested
14295 * exceptions
14296 */
14297- tinfo = task_thread_info(task);
14298 for (;;) {
14299 char *id;
14300 unsigned long *estack_end;
14301+
14302 estack_end = in_exception_stack(cpu, (unsigned long)stack,
14303 &used, &id);
14304
14305@@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14306 if (ops->stack(data, id) < 0)
14307 break;
14308
14309- bp = ops->walk_stack(tinfo, stack, bp, ops,
14310+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
14311 data, estack_end, &graph);
14312 ops->stack(data, "<EOE>");
14313 /*
14314@@ -172,7 +172,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14315 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
14316 if (ops->stack(data, "IRQ") < 0)
14317 break;
14318- bp = ops->walk_stack(tinfo, stack, bp,
14319+ bp = ops->walk_stack(task, irq_stack, stack, bp,
14320 ops, data, irq_stack_end, &graph);
14321 /*
14322 * We link to the next stack (which would be
14323@@ -191,7 +191,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14324 /*
14325 * This handles the process stack:
14326 */
14327- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
14328+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14329+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14330 put_cpu();
14331 }
14332 EXPORT_SYMBOL(dump_trace);
14333@@ -305,3 +306,50 @@ int is_valid_bugaddr(unsigned long ip)
14334
14335 return ud2 == 0x0b0f;
14336 }
14337+
14338+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14339+void pax_check_alloca(unsigned long size)
14340+{
14341+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
14342+ unsigned cpu, used;
14343+ char *id;
14344+
14345+ /* check the process stack first */
14346+ stack_start = (unsigned long)task_stack_page(current);
14347+ stack_end = stack_start + THREAD_SIZE;
14348+ if (likely(stack_start <= sp && sp < stack_end)) {
14349+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
14350+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14351+ return;
14352+ }
14353+
14354+ cpu = get_cpu();
14355+
14356+ /* check the irq stacks */
14357+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
14358+ stack_start = stack_end - IRQ_STACK_SIZE;
14359+ if (stack_start <= sp && sp < stack_end) {
14360+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
14361+ put_cpu();
14362+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14363+ return;
14364+ }
14365+
14366+ /* check the exception stacks */
14367+ used = 0;
14368+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
14369+ stack_start = stack_end - EXCEPTION_STKSZ;
14370+ if (stack_end && stack_start <= sp && sp < stack_end) {
14371+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
14372+ put_cpu();
14373+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14374+ return;
14375+ }
14376+
14377+ put_cpu();
14378+
14379+ /* unknown stack */
14380+ BUG();
14381+}
14382+EXPORT_SYMBOL(pax_check_alloca);
14383+#endif
14384diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
14385index cd28a35..c72ed9a 100644
14386--- a/arch/x86/kernel/early_printk.c
14387+++ b/arch/x86/kernel/early_printk.c
14388@@ -7,6 +7,7 @@
14389 #include <linux/pci_regs.h>
14390 #include <linux/pci_ids.h>
14391 #include <linux/errno.h>
14392+#include <linux/sched.h>
14393 #include <asm/io.h>
14394 #include <asm/processor.h>
14395 #include <asm/fcntl.h>
14396diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
14397index f3f6f53..0841b66 100644
14398--- a/arch/x86/kernel/entry_32.S
14399+++ b/arch/x86/kernel/entry_32.S
14400@@ -186,13 +186,146 @@
14401 /*CFI_REL_OFFSET gs, PT_GS*/
14402 .endm
14403 .macro SET_KERNEL_GS reg
14404+
14405+#ifdef CONFIG_CC_STACKPROTECTOR
14406 movl $(__KERNEL_STACK_CANARY), \reg
14407+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
14408+ movl $(__USER_DS), \reg
14409+#else
14410+ xorl \reg, \reg
14411+#endif
14412+
14413 movl \reg, %gs
14414 .endm
14415
14416 #endif /* CONFIG_X86_32_LAZY_GS */
14417
14418-.macro SAVE_ALL
14419+.macro pax_enter_kernel
14420+#ifdef CONFIG_PAX_KERNEXEC
14421+ call pax_enter_kernel
14422+#endif
14423+.endm
14424+
14425+.macro pax_exit_kernel
14426+#ifdef CONFIG_PAX_KERNEXEC
14427+ call pax_exit_kernel
14428+#endif
14429+.endm
14430+
14431+#ifdef CONFIG_PAX_KERNEXEC
14432+ENTRY(pax_enter_kernel)
14433+#ifdef CONFIG_PARAVIRT
14434+ pushl %eax
14435+ pushl %ecx
14436+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
14437+ mov %eax, %esi
14438+#else
14439+ mov %cr0, %esi
14440+#endif
14441+ bts $16, %esi
14442+ jnc 1f
14443+ mov %cs, %esi
14444+ cmp $__KERNEL_CS, %esi
14445+ jz 3f
14446+ ljmp $__KERNEL_CS, $3f
14447+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
14448+2:
14449+#ifdef CONFIG_PARAVIRT
14450+ mov %esi, %eax
14451+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
14452+#else
14453+ mov %esi, %cr0
14454+#endif
14455+3:
14456+#ifdef CONFIG_PARAVIRT
14457+ popl %ecx
14458+ popl %eax
14459+#endif
14460+ ret
14461+ENDPROC(pax_enter_kernel)
14462+
14463+ENTRY(pax_exit_kernel)
14464+#ifdef CONFIG_PARAVIRT
14465+ pushl %eax
14466+ pushl %ecx
14467+#endif
14468+ mov %cs, %esi
14469+ cmp $__KERNEXEC_KERNEL_CS, %esi
14470+ jnz 2f
14471+#ifdef CONFIG_PARAVIRT
14472+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
14473+ mov %eax, %esi
14474+#else
14475+ mov %cr0, %esi
14476+#endif
14477+ btr $16, %esi
14478+ ljmp $__KERNEL_CS, $1f
14479+1:
14480+#ifdef CONFIG_PARAVIRT
14481+ mov %esi, %eax
14482+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
14483+#else
14484+ mov %esi, %cr0
14485+#endif
14486+2:
14487+#ifdef CONFIG_PARAVIRT
14488+ popl %ecx
14489+ popl %eax
14490+#endif
14491+ ret
14492+ENDPROC(pax_exit_kernel)
14493+#endif
14494+
14495+.macro pax_erase_kstack
14496+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14497+ call pax_erase_kstack
14498+#endif
14499+.endm
14500+
14501+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14502+/*
14503+ * ebp: thread_info
14504+ * ecx, edx: can be clobbered
14505+ */
14506+ENTRY(pax_erase_kstack)
14507+ pushl %edi
14508+ pushl %eax
14509+
14510+ mov TI_lowest_stack(%ebp), %edi
14511+ mov $-0xBEEF, %eax
14512+ std
14513+
14514+1: mov %edi, %ecx
14515+ and $THREAD_SIZE_asm - 1, %ecx
14516+ shr $2, %ecx
14517+ repne scasl
14518+ jecxz 2f
14519+
14520+ cmp $2*16, %ecx
14521+ jc 2f
14522+
14523+ mov $2*16, %ecx
14524+ repe scasl
14525+ jecxz 2f
14526+ jne 1b
14527+
14528+2: cld
14529+ mov %esp, %ecx
14530+ sub %edi, %ecx
14531+ shr $2, %ecx
14532+ rep stosl
14533+
14534+ mov TI_task_thread_sp0(%ebp), %edi
14535+ sub $128, %edi
14536+ mov %edi, TI_lowest_stack(%ebp)
14537+
14538+ popl %eax
14539+ popl %edi
14540+ ret
14541+ENDPROC(pax_erase_kstack)
14542+#endif
14543+
14544+.macro __SAVE_ALL _DS
14545 cld
14546 PUSH_GS
14547 pushl_cfi %fs
14548@@ -215,7 +348,7 @@
14549 CFI_REL_OFFSET ecx, 0
14550 pushl_cfi %ebx
14551 CFI_REL_OFFSET ebx, 0
14552- movl $(__USER_DS), %edx
14553+ movl $\_DS, %edx
14554 movl %edx, %ds
14555 movl %edx, %es
14556 movl $(__KERNEL_PERCPU), %edx
14557@@ -223,6 +356,15 @@
14558 SET_KERNEL_GS %edx
14559 .endm
14560
14561+.macro SAVE_ALL
14562+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
14563+ __SAVE_ALL __KERNEL_DS
14564+ pax_enter_kernel
14565+#else
14566+ __SAVE_ALL __USER_DS
14567+#endif
14568+.endm
14569+
14570 .macro RESTORE_INT_REGS
14571 popl_cfi %ebx
14572 CFI_RESTORE ebx
14573@@ -308,7 +450,7 @@ ENTRY(ret_from_fork)
14574 popfl_cfi
14575 jmp syscall_exit
14576 CFI_ENDPROC
14577-END(ret_from_fork)
14578+ENDPROC(ret_from_fork)
14579
14580 /*
14581 * Interrupt exit functions should be protected against kprobes
14582@@ -333,7 +475,15 @@ check_userspace:
14583 movb PT_CS(%esp), %al
14584 andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
14585 cmpl $USER_RPL, %eax
14586+
14587+#ifdef CONFIG_PAX_KERNEXEC
14588+ jae resume_userspace
14589+
14590+ PAX_EXIT_KERNEL
14591+ jmp resume_kernel
14592+#else
14593 jb resume_kernel # not returning to v8086 or userspace
14594+#endif
14595
14596 ENTRY(resume_userspace)
14597 LOCKDEP_SYS_EXIT
14598@@ -345,8 +495,8 @@ ENTRY(resume_userspace)
14599 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
14600 # int/exception return?
14601 jne work_pending
14602- jmp restore_all
14603-END(ret_from_exception)
14604+ jmp restore_all_pax
14605+ENDPROC(ret_from_exception)
14606
14607 #ifdef CONFIG_PREEMPT
14608 ENTRY(resume_kernel)
14609@@ -361,7 +511,7 @@ need_resched:
14610 jz restore_all
14611 call preempt_schedule_irq
14612 jmp need_resched
14613-END(resume_kernel)
14614+ENDPROC(resume_kernel)
14615 #endif
14616 CFI_ENDPROC
14617 /*
14618@@ -395,23 +545,34 @@ sysenter_past_esp:
14619 /*CFI_REL_OFFSET cs, 0*/
14620 /*
14621 * Push current_thread_info()->sysenter_return to the stack.
14622- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
14623- * pushed above; +8 corresponds to copy_thread's esp0 setting.
14624 */
14625- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
14626+ pushl_cfi $0
14627 CFI_REL_OFFSET eip, 0
14628
14629 pushl_cfi %eax
14630 SAVE_ALL
14631+ GET_THREAD_INFO(%ebp)
14632+ movl TI_sysenter_return(%ebp),%ebp
14633+ movl %ebp,PT_EIP(%esp)
14634 ENABLE_INTERRUPTS(CLBR_NONE)
14635
14636 /*
14637 * Load the potential sixth argument from user stack.
14638 * Careful about security.
14639 */
14640+ movl PT_OLDESP(%esp),%ebp
14641+
14642+#ifdef CONFIG_PAX_MEMORY_UDEREF
14643+ mov PT_OLDSS(%esp),%ds
14644+1: movl %ds:(%ebp),%ebp
14645+ push %ss
14646+ pop %ds
14647+#else
14648 cmpl $__PAGE_OFFSET-3,%ebp
14649 jae syscall_fault
14650 1: movl (%ebp),%ebp
14651+#endif
14652+
14653 movl %ebp,PT_EBP(%esp)
14654 .section __ex_table,"a"
14655 .align 4
14656@@ -434,12 +595,24 @@ sysenter_do_call:
14657 testl $_TIF_ALLWORK_MASK, %ecx
14658 jne sysexit_audit
14659 sysenter_exit:
14660+
14661+#ifdef CONFIG_PAX_RANDKSTACK
14662+ pushl_cfi %eax
14663+ movl %esp, %eax
14664+ call pax_randomize_kstack
14665+ popl_cfi %eax
14666+#endif
14667+
14668+ pax_erase_kstack
14669+
14670 /* if something modifies registers it must also disable sysexit */
14671 movl PT_EIP(%esp), %edx
14672 movl PT_OLDESP(%esp), %ecx
14673 xorl %ebp,%ebp
14674 TRACE_IRQS_ON
14675 1: mov PT_FS(%esp), %fs
14676+2: mov PT_DS(%esp), %ds
14677+3: mov PT_ES(%esp), %es
14678 PTGS_TO_GS
14679 ENABLE_INTERRUPTS_SYSEXIT
14680
14681@@ -456,6 +629,9 @@ sysenter_audit:
14682 movl %eax,%edx /* 2nd arg: syscall number */
14683 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
14684 call audit_syscall_entry
14685+
14686+ pax_erase_kstack
14687+
14688 pushl_cfi %ebx
14689 movl PT_EAX(%esp),%eax /* reload syscall number */
14690 jmp sysenter_do_call
14691@@ -482,11 +658,17 @@ sysexit_audit:
14692
14693 CFI_ENDPROC
14694 .pushsection .fixup,"ax"
14695-2: movl $0,PT_FS(%esp)
14696+4: movl $0,PT_FS(%esp)
14697+ jmp 1b
14698+5: movl $0,PT_DS(%esp)
14699+ jmp 1b
14700+6: movl $0,PT_ES(%esp)
14701 jmp 1b
14702 .section __ex_table,"a"
14703 .align 4
14704- .long 1b,2b
14705+ .long 1b,4b
14706+ .long 2b,5b
14707+ .long 3b,6b
14708 .popsection
14709 PTGS_TO_GS_EX
14710 ENDPROC(ia32_sysenter_target)
14711@@ -519,6 +701,15 @@ syscall_exit:
14712 testl $_TIF_ALLWORK_MASK, %ecx # current->work
14713 jne syscall_exit_work
14714
14715+restore_all_pax:
14716+
14717+#ifdef CONFIG_PAX_RANDKSTACK
14718+ movl %esp, %eax
14719+ call pax_randomize_kstack
14720+#endif
14721+
14722+ pax_erase_kstack
14723+
14724 restore_all:
14725 TRACE_IRQS_IRET
14726 restore_all_notrace:
14727@@ -578,14 +769,34 @@ ldt_ss:
14728 * compensating for the offset by changing to the ESPFIX segment with
14729 * a base address that matches for the difference.
14730 */
14731-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
14732+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
14733 mov %esp, %edx /* load kernel esp */
14734 mov PT_OLDESP(%esp), %eax /* load userspace esp */
14735 mov %dx, %ax /* eax: new kernel esp */
14736 sub %eax, %edx /* offset (low word is 0) */
14737+#ifdef CONFIG_SMP
14738+ movl PER_CPU_VAR(cpu_number), %ebx
14739+ shll $PAGE_SHIFT_asm, %ebx
14740+ addl $cpu_gdt_table, %ebx
14741+#else
14742+ movl $cpu_gdt_table, %ebx
14743+#endif
14744 shr $16, %edx
14745- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
14746- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
14747+
14748+#ifdef CONFIG_PAX_KERNEXEC
14749+ mov %cr0, %esi
14750+ btr $16, %esi
14751+ mov %esi, %cr0
14752+#endif
14753+
14754+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
14755+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
14756+
14757+#ifdef CONFIG_PAX_KERNEXEC
14758+ bts $16, %esi
14759+ mov %esi, %cr0
14760+#endif
14761+
14762 pushl_cfi $__ESPFIX_SS
14763 pushl_cfi %eax /* new kernel esp */
14764 /* Disable interrupts, but do not irqtrace this section: we
14765@@ -614,34 +825,28 @@ work_resched:
14766 movl TI_flags(%ebp), %ecx
14767 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
14768 # than syscall tracing?
14769- jz restore_all
14770+ jz restore_all_pax
14771 testb $_TIF_NEED_RESCHED, %cl
14772 jnz work_resched
14773
14774 work_notifysig: # deal with pending signals and
14775 # notify-resume requests
14776+ movl %esp, %eax
14777 #ifdef CONFIG_VM86
14778 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
14779- movl %esp, %eax
14780- jne work_notifysig_v86 # returning to kernel-space or
14781+ jz 1f # returning to kernel-space or
14782 # vm86-space
14783- xorl %edx, %edx
14784- call do_notify_resume
14785- jmp resume_userspace_sig
14786
14787- ALIGN
14788-work_notifysig_v86:
14789 pushl_cfi %ecx # save ti_flags for do_notify_resume
14790 call save_v86_state # %eax contains pt_regs pointer
14791 popl_cfi %ecx
14792 movl %eax, %esp
14793-#else
14794- movl %esp, %eax
14795+1:
14796 #endif
14797 xorl %edx, %edx
14798 call do_notify_resume
14799 jmp resume_userspace_sig
14800-END(work_pending)
14801+ENDPROC(work_pending)
14802
14803 # perform syscall exit tracing
14804 ALIGN
14805@@ -649,11 +854,14 @@ syscall_trace_entry:
14806 movl $-ENOSYS,PT_EAX(%esp)
14807 movl %esp, %eax
14808 call syscall_trace_enter
14809+
14810+ pax_erase_kstack
14811+
14812 /* What it returned is what we'll actually use. */
14813 cmpl $(nr_syscalls), %eax
14814 jnae syscall_call
14815 jmp syscall_exit
14816-END(syscall_trace_entry)
14817+ENDPROC(syscall_trace_entry)
14818
14819 # perform syscall exit tracing
14820 ALIGN
14821@@ -666,20 +874,24 @@ syscall_exit_work:
14822 movl %esp, %eax
14823 call syscall_trace_leave
14824 jmp resume_userspace
14825-END(syscall_exit_work)
14826+ENDPROC(syscall_exit_work)
14827 CFI_ENDPROC
14828
14829 RING0_INT_FRAME # can't unwind into user space anyway
14830 syscall_fault:
14831+#ifdef CONFIG_PAX_MEMORY_UDEREF
14832+ push %ss
14833+ pop %ds
14834+#endif
14835 GET_THREAD_INFO(%ebp)
14836 movl $-EFAULT,PT_EAX(%esp)
14837 jmp resume_userspace
14838-END(syscall_fault)
14839+ENDPROC(syscall_fault)
14840
14841 syscall_badsys:
14842 movl $-ENOSYS,PT_EAX(%esp)
14843 jmp resume_userspace
14844-END(syscall_badsys)
14845+ENDPROC(syscall_badsys)
14846 CFI_ENDPROC
14847 /*
14848 * End of kprobes section
14849@@ -753,6 +965,36 @@ ptregs_clone:
14850 CFI_ENDPROC
14851 ENDPROC(ptregs_clone)
14852
14853+ ALIGN;
14854+ENTRY(kernel_execve)
14855+ CFI_STARTPROC
14856+ pushl_cfi %ebp
14857+ sub $PT_OLDSS+4,%esp
14858+ pushl_cfi %edi
14859+ pushl_cfi %ecx
14860+ pushl_cfi %eax
14861+ lea 3*4(%esp),%edi
14862+ mov $PT_OLDSS/4+1,%ecx
14863+ xorl %eax,%eax
14864+ rep stosl
14865+ popl_cfi %eax
14866+ popl_cfi %ecx
14867+ popl_cfi %edi
14868+ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
14869+ pushl_cfi %esp
14870+ call sys_execve
14871+ add $4,%esp
14872+ CFI_ADJUST_CFA_OFFSET -4
14873+ GET_THREAD_INFO(%ebp)
14874+ test %eax,%eax
14875+ jz syscall_exit
14876+ add $PT_OLDSS+4,%esp
14877+ CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4
14878+ popl_cfi %ebp
14879+ ret
14880+ CFI_ENDPROC
14881+ENDPROC(kernel_execve)
14882+
14883 .macro FIXUP_ESPFIX_STACK
14884 /*
14885 * Switch back for ESPFIX stack to the normal zerobased stack
14886@@ -762,8 +1004,15 @@ ENDPROC(ptregs_clone)
14887 * normal stack and adjusts ESP with the matching offset.
14888 */
14889 /* fixup the stack */
14890- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
14891- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
14892+#ifdef CONFIG_SMP
14893+ movl PER_CPU_VAR(cpu_number), %ebx
14894+ shll $PAGE_SHIFT_asm, %ebx
14895+ addl $cpu_gdt_table, %ebx
14896+#else
14897+ movl $cpu_gdt_table, %ebx
14898+#endif
14899+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
14900+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
14901 shl $16, %eax
14902 addl %esp, %eax /* the adjusted stack pointer */
14903 pushl_cfi $__KERNEL_DS
14904@@ -816,7 +1065,7 @@ vector=vector+1
14905 .endr
14906 2: jmp common_interrupt
14907 .endr
14908-END(irq_entries_start)
14909+ENDPROC(irq_entries_start)
14910
14911 .previous
14912 END(interrupt)
14913@@ -864,7 +1113,7 @@ ENTRY(coprocessor_error)
14914 pushl_cfi $do_coprocessor_error
14915 jmp error_code
14916 CFI_ENDPROC
14917-END(coprocessor_error)
14918+ENDPROC(coprocessor_error)
14919
14920 ENTRY(simd_coprocessor_error)
14921 RING0_INT_FRAME
14922@@ -885,7 +1134,7 @@ ENTRY(simd_coprocessor_error)
14923 #endif
14924 jmp error_code
14925 CFI_ENDPROC
14926-END(simd_coprocessor_error)
14927+ENDPROC(simd_coprocessor_error)
14928
14929 ENTRY(device_not_available)
14930 RING0_INT_FRAME
14931@@ -893,7 +1142,7 @@ ENTRY(device_not_available)
14932 pushl_cfi $do_device_not_available
14933 jmp error_code
14934 CFI_ENDPROC
14935-END(device_not_available)
14936+ENDPROC(device_not_available)
14937
14938 #ifdef CONFIG_PARAVIRT
14939 ENTRY(native_iret)
14940@@ -902,12 +1151,12 @@ ENTRY(native_iret)
14941 .align 4
14942 .long native_iret, iret_exc
14943 .previous
14944-END(native_iret)
14945+ENDPROC(native_iret)
14946
14947 ENTRY(native_irq_enable_sysexit)
14948 sti
14949 sysexit
14950-END(native_irq_enable_sysexit)
14951+ENDPROC(native_irq_enable_sysexit)
14952 #endif
14953
14954 ENTRY(overflow)
14955@@ -916,7 +1165,7 @@ ENTRY(overflow)
14956 pushl_cfi $do_overflow
14957 jmp error_code
14958 CFI_ENDPROC
14959-END(overflow)
14960+ENDPROC(overflow)
14961
14962 ENTRY(bounds)
14963 RING0_INT_FRAME
14964@@ -924,7 +1173,7 @@ ENTRY(bounds)
14965 pushl_cfi $do_bounds
14966 jmp error_code
14967 CFI_ENDPROC
14968-END(bounds)
14969+ENDPROC(bounds)
14970
14971 ENTRY(invalid_op)
14972 RING0_INT_FRAME
14973@@ -932,7 +1181,7 @@ ENTRY(invalid_op)
14974 pushl_cfi $do_invalid_op
14975 jmp error_code
14976 CFI_ENDPROC
14977-END(invalid_op)
14978+ENDPROC(invalid_op)
14979
14980 ENTRY(coprocessor_segment_overrun)
14981 RING0_INT_FRAME
14982@@ -940,35 +1189,35 @@ ENTRY(coprocessor_segment_overrun)
14983 pushl_cfi $do_coprocessor_segment_overrun
14984 jmp error_code
14985 CFI_ENDPROC
14986-END(coprocessor_segment_overrun)
14987+ENDPROC(coprocessor_segment_overrun)
14988
14989 ENTRY(invalid_TSS)
14990 RING0_EC_FRAME
14991 pushl_cfi $do_invalid_TSS
14992 jmp error_code
14993 CFI_ENDPROC
14994-END(invalid_TSS)
14995+ENDPROC(invalid_TSS)
14996
14997 ENTRY(segment_not_present)
14998 RING0_EC_FRAME
14999 pushl_cfi $do_segment_not_present
15000 jmp error_code
15001 CFI_ENDPROC
15002-END(segment_not_present)
15003+ENDPROC(segment_not_present)
15004
15005 ENTRY(stack_segment)
15006 RING0_EC_FRAME
15007 pushl_cfi $do_stack_segment
15008 jmp error_code
15009 CFI_ENDPROC
15010-END(stack_segment)
15011+ENDPROC(stack_segment)
15012
15013 ENTRY(alignment_check)
15014 RING0_EC_FRAME
15015 pushl_cfi $do_alignment_check
15016 jmp error_code
15017 CFI_ENDPROC
15018-END(alignment_check)
15019+ENDPROC(alignment_check)
15020
15021 ENTRY(divide_error)
15022 RING0_INT_FRAME
15023@@ -976,7 +1225,7 @@ ENTRY(divide_error)
15024 pushl_cfi $do_divide_error
15025 jmp error_code
15026 CFI_ENDPROC
15027-END(divide_error)
15028+ENDPROC(divide_error)
15029
15030 #ifdef CONFIG_X86_MCE
15031 ENTRY(machine_check)
15032@@ -985,7 +1234,7 @@ ENTRY(machine_check)
15033 pushl_cfi machine_check_vector
15034 jmp error_code
15035 CFI_ENDPROC
15036-END(machine_check)
15037+ENDPROC(machine_check)
15038 #endif
15039
15040 ENTRY(spurious_interrupt_bug)
15041@@ -994,7 +1243,7 @@ ENTRY(spurious_interrupt_bug)
15042 pushl_cfi $do_spurious_interrupt_bug
15043 jmp error_code
15044 CFI_ENDPROC
15045-END(spurious_interrupt_bug)
15046+ENDPROC(spurious_interrupt_bug)
15047 /*
15048 * End of kprobes section
15049 */
15050@@ -1109,7 +1358,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
15051
15052 ENTRY(mcount)
15053 ret
15054-END(mcount)
15055+ENDPROC(mcount)
15056
15057 ENTRY(ftrace_caller)
15058 cmpl $0, function_trace_stop
15059@@ -1138,7 +1387,7 @@ ftrace_graph_call:
15060 .globl ftrace_stub
15061 ftrace_stub:
15062 ret
15063-END(ftrace_caller)
15064+ENDPROC(ftrace_caller)
15065
15066 #else /* ! CONFIG_DYNAMIC_FTRACE */
15067
15068@@ -1174,7 +1423,7 @@ trace:
15069 popl %ecx
15070 popl %eax
15071 jmp ftrace_stub
15072-END(mcount)
15073+ENDPROC(mcount)
15074 #endif /* CONFIG_DYNAMIC_FTRACE */
15075 #endif /* CONFIG_FUNCTION_TRACER */
15076
15077@@ -1195,7 +1444,7 @@ ENTRY(ftrace_graph_caller)
15078 popl %ecx
15079 popl %eax
15080 ret
15081-END(ftrace_graph_caller)
15082+ENDPROC(ftrace_graph_caller)
15083
15084 .globl return_to_handler
15085 return_to_handler:
15086@@ -1209,7 +1458,6 @@ return_to_handler:
15087 jmp *%ecx
15088 #endif
15089
15090-.section .rodata,"a"
15091 #include "syscall_table_32.S"
15092
15093 syscall_table_size=(.-sys_call_table)
15094@@ -1255,15 +1503,18 @@ error_code:
15095 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
15096 REG_TO_PTGS %ecx
15097 SET_KERNEL_GS %ecx
15098- movl $(__USER_DS), %ecx
15099+ movl $(__KERNEL_DS), %ecx
15100 movl %ecx, %ds
15101 movl %ecx, %es
15102+
15103+ pax_enter_kernel
15104+
15105 TRACE_IRQS_OFF
15106 movl %esp,%eax # pt_regs pointer
15107 call *%edi
15108 jmp ret_from_exception
15109 CFI_ENDPROC
15110-END(page_fault)
15111+ENDPROC(page_fault)
15112
15113 /*
15114 * Debug traps and NMI can happen at the one SYSENTER instruction
15115@@ -1305,7 +1556,7 @@ debug_stack_correct:
15116 call do_debug
15117 jmp ret_from_exception
15118 CFI_ENDPROC
15119-END(debug)
15120+ENDPROC(debug)
15121
15122 /*
15123 * NMI is doubly nasty. It can happen _while_ we're handling
15124@@ -1342,6 +1593,9 @@ nmi_stack_correct:
15125 xorl %edx,%edx # zero error code
15126 movl %esp,%eax # pt_regs pointer
15127 call do_nmi
15128+
15129+ pax_exit_kernel
15130+
15131 jmp restore_all_notrace
15132 CFI_ENDPROC
15133
15134@@ -1378,12 +1632,15 @@ nmi_espfix_stack:
15135 FIXUP_ESPFIX_STACK # %eax == %esp
15136 xorl %edx,%edx # zero error code
15137 call do_nmi
15138+
15139+ pax_exit_kernel
15140+
15141 RESTORE_REGS
15142 lss 12+4(%esp), %esp # back to espfix stack
15143 CFI_ADJUST_CFA_OFFSET -24
15144 jmp irq_return
15145 CFI_ENDPROC
15146-END(nmi)
15147+ENDPROC(nmi)
15148
15149 ENTRY(int3)
15150 RING0_INT_FRAME
15151@@ -1395,14 +1652,14 @@ ENTRY(int3)
15152 call do_int3
15153 jmp ret_from_exception
15154 CFI_ENDPROC
15155-END(int3)
15156+ENDPROC(int3)
15157
15158 ENTRY(general_protection)
15159 RING0_EC_FRAME
15160 pushl_cfi $do_general_protection
15161 jmp error_code
15162 CFI_ENDPROC
15163-END(general_protection)
15164+ENDPROC(general_protection)
15165
15166 #ifdef CONFIG_KVM_GUEST
15167 ENTRY(async_page_fault)
15168@@ -1410,7 +1667,7 @@ ENTRY(async_page_fault)
15169 pushl_cfi $do_async_page_fault
15170 jmp error_code
15171 CFI_ENDPROC
15172-END(async_page_fault)
15173+ENDPROC(async_page_fault)
15174 #endif
15175
15176 /*
15177diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
15178index faf8d5e..4f16a68 100644
15179--- a/arch/x86/kernel/entry_64.S
15180+++ b/arch/x86/kernel/entry_64.S
15181@@ -55,6 +55,8 @@
15182 #include <asm/paravirt.h>
15183 #include <asm/ftrace.h>
15184 #include <asm/percpu.h>
15185+#include <asm/pgtable.h>
15186+#include <asm/alternative-asm.h>
15187
15188 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
15189 #include <linux/elf-em.h>
15190@@ -68,8 +70,9 @@
15191 #ifdef CONFIG_FUNCTION_TRACER
15192 #ifdef CONFIG_DYNAMIC_FTRACE
15193 ENTRY(mcount)
15194+ pax_force_retaddr
15195 retq
15196-END(mcount)
15197+ENDPROC(mcount)
15198
15199 ENTRY(ftrace_caller)
15200 cmpl $0, function_trace_stop
15201@@ -92,8 +95,9 @@ GLOBAL(ftrace_graph_call)
15202 #endif
15203
15204 GLOBAL(ftrace_stub)
15205+ pax_force_retaddr
15206 retq
15207-END(ftrace_caller)
15208+ENDPROC(ftrace_caller)
15209
15210 #else /* ! CONFIG_DYNAMIC_FTRACE */
15211 ENTRY(mcount)
15212@@ -112,6 +116,7 @@ ENTRY(mcount)
15213 #endif
15214
15215 GLOBAL(ftrace_stub)
15216+ pax_force_retaddr
15217 retq
15218
15219 trace:
15220@@ -121,12 +126,13 @@ trace:
15221 movq 8(%rbp), %rsi
15222 subq $MCOUNT_INSN_SIZE, %rdi
15223
15224+ pax_force_fptr ftrace_trace_function
15225 call *ftrace_trace_function
15226
15227 MCOUNT_RESTORE_FRAME
15228
15229 jmp ftrace_stub
15230-END(mcount)
15231+ENDPROC(mcount)
15232 #endif /* CONFIG_DYNAMIC_FTRACE */
15233 #endif /* CONFIG_FUNCTION_TRACER */
15234
15235@@ -146,8 +152,9 @@ ENTRY(ftrace_graph_caller)
15236
15237 MCOUNT_RESTORE_FRAME
15238
15239+ pax_force_retaddr
15240 retq
15241-END(ftrace_graph_caller)
15242+ENDPROC(ftrace_graph_caller)
15243
15244 GLOBAL(return_to_handler)
15245 subq $24, %rsp
15246@@ -163,6 +170,7 @@ GLOBAL(return_to_handler)
15247 movq 8(%rsp), %rdx
15248 movq (%rsp), %rax
15249 addq $24, %rsp
15250+ pax_force_fptr %rdi
15251 jmp *%rdi
15252 #endif
15253
15254@@ -178,6 +186,282 @@ ENTRY(native_usergs_sysret64)
15255 ENDPROC(native_usergs_sysret64)
15256 #endif /* CONFIG_PARAVIRT */
15257
15258+ .macro ljmpq sel, off
15259+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
15260+ .byte 0x48; ljmp *1234f(%rip)
15261+ .pushsection .rodata
15262+ .align 16
15263+ 1234: .quad \off; .word \sel
15264+ .popsection
15265+#else
15266+ pushq $\sel
15267+ pushq $\off
15268+ lretq
15269+#endif
15270+ .endm
15271+
15272+ .macro pax_enter_kernel
15273+ pax_set_fptr_mask
15274+#ifdef CONFIG_PAX_KERNEXEC
15275+ call pax_enter_kernel
15276+#endif
15277+ .endm
15278+
15279+ .macro pax_exit_kernel
15280+#ifdef CONFIG_PAX_KERNEXEC
15281+ call pax_exit_kernel
15282+#endif
15283+ .endm
15284+
15285+#ifdef CONFIG_PAX_KERNEXEC
15286+ENTRY(pax_enter_kernel)
15287+ pushq %rdi
15288+
15289+#ifdef CONFIG_PARAVIRT
15290+ PV_SAVE_REGS(CLBR_RDI)
15291+#endif
15292+
15293+ GET_CR0_INTO_RDI
15294+ bts $16,%rdi
15295+ jnc 3f
15296+ mov %cs,%edi
15297+ cmp $__KERNEL_CS,%edi
15298+ jnz 2f
15299+1:
15300+
15301+#ifdef CONFIG_PARAVIRT
15302+ PV_RESTORE_REGS(CLBR_RDI)
15303+#endif
15304+
15305+ popq %rdi
15306+ pax_force_retaddr
15307+ retq
15308+
15309+2: ljmpq __KERNEL_CS,1f
15310+3: ljmpq __KERNEXEC_KERNEL_CS,4f
15311+4: SET_RDI_INTO_CR0
15312+ jmp 1b
15313+ENDPROC(pax_enter_kernel)
15314+
15315+ENTRY(pax_exit_kernel)
15316+ pushq %rdi
15317+
15318+#ifdef CONFIG_PARAVIRT
15319+ PV_SAVE_REGS(CLBR_RDI)
15320+#endif
15321+
15322+ mov %cs,%rdi
15323+ cmp $__KERNEXEC_KERNEL_CS,%edi
15324+ jz 2f
15325+1:
15326+
15327+#ifdef CONFIG_PARAVIRT
15328+ PV_RESTORE_REGS(CLBR_RDI);
15329+#endif
15330+
15331+ popq %rdi
15332+ pax_force_retaddr
15333+ retq
15334+
15335+2: GET_CR0_INTO_RDI
15336+ btr $16,%rdi
15337+ ljmpq __KERNEL_CS,3f
15338+3: SET_RDI_INTO_CR0
15339+ jmp 1b
15340+#ifdef CONFIG_PARAVIRT
15341+ PV_RESTORE_REGS(CLBR_RDI);
15342+#endif
15343+
15344+ popq %rdi
15345+ pax_force_retaddr
15346+ retq
15347+ENDPROC(pax_exit_kernel)
15348+#endif
15349+
15350+ .macro pax_enter_kernel_user
15351+ pax_set_fptr_mask
15352+#ifdef CONFIG_PAX_MEMORY_UDEREF
15353+ call pax_enter_kernel_user
15354+#endif
15355+ .endm
15356+
15357+ .macro pax_exit_kernel_user
15358+#ifdef CONFIG_PAX_MEMORY_UDEREF
15359+ call pax_exit_kernel_user
15360+#endif
15361+#ifdef CONFIG_PAX_RANDKSTACK
15362+ pushq %rax
15363+ call pax_randomize_kstack
15364+ popq %rax
15365+#endif
15366+ .endm
15367+
15368+#ifdef CONFIG_PAX_MEMORY_UDEREF
15369+ENTRY(pax_enter_kernel_user)
15370+ pushq %rdi
15371+ pushq %rbx
15372+
15373+#ifdef CONFIG_PARAVIRT
15374+ PV_SAVE_REGS(CLBR_RDI)
15375+#endif
15376+
15377+ GET_CR3_INTO_RDI
15378+ mov %rdi,%rbx
15379+ add $__START_KERNEL_map,%rbx
15380+ sub phys_base(%rip),%rbx
15381+
15382+#ifdef CONFIG_PARAVIRT
15383+ pushq %rdi
15384+ cmpl $0, pv_info+PARAVIRT_enabled
15385+ jz 1f
15386+ i = 0
15387+ .rept USER_PGD_PTRS
15388+ mov i*8(%rbx),%rsi
15389+ mov $0,%sil
15390+ lea i*8(%rbx),%rdi
15391+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15392+ i = i + 1
15393+ .endr
15394+ jmp 2f
15395+1:
15396+#endif
15397+
15398+ i = 0
15399+ .rept USER_PGD_PTRS
15400+ movb $0,i*8(%rbx)
15401+ i = i + 1
15402+ .endr
15403+
15404+#ifdef CONFIG_PARAVIRT
15405+2: popq %rdi
15406+#endif
15407+ SET_RDI_INTO_CR3
15408+
15409+#ifdef CONFIG_PAX_KERNEXEC
15410+ GET_CR0_INTO_RDI
15411+ bts $16,%rdi
15412+ SET_RDI_INTO_CR0
15413+#endif
15414+
15415+#ifdef CONFIG_PARAVIRT
15416+ PV_RESTORE_REGS(CLBR_RDI)
15417+#endif
15418+
15419+ popq %rbx
15420+ popq %rdi
15421+ pax_force_retaddr
15422+ retq
15423+ENDPROC(pax_enter_kernel_user)
15424+
15425+ENTRY(pax_exit_kernel_user)
15426+ push %rdi
15427+
15428+#ifdef CONFIG_PARAVIRT
15429+ pushq %rbx
15430+ PV_SAVE_REGS(CLBR_RDI)
15431+#endif
15432+
15433+#ifdef CONFIG_PAX_KERNEXEC
15434+ GET_CR0_INTO_RDI
15435+ btr $16,%rdi
15436+ SET_RDI_INTO_CR0
15437+#endif
15438+
15439+ GET_CR3_INTO_RDI
15440+ add $__START_KERNEL_map,%rdi
15441+ sub phys_base(%rip),%rdi
15442+
15443+#ifdef CONFIG_PARAVIRT
15444+ cmpl $0, pv_info+PARAVIRT_enabled
15445+ jz 1f
15446+ mov %rdi,%rbx
15447+ i = 0
15448+ .rept USER_PGD_PTRS
15449+ mov i*8(%rbx),%rsi
15450+ mov $0x67,%sil
15451+ lea i*8(%rbx),%rdi
15452+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15453+ i = i + 1
15454+ .endr
15455+ jmp 2f
15456+1:
15457+#endif
15458+
15459+ i = 0
15460+ .rept USER_PGD_PTRS
15461+ movb $0x67,i*8(%rdi)
15462+ i = i + 1
15463+ .endr
15464+
15465+#ifdef CONFIG_PARAVIRT
15466+2: PV_RESTORE_REGS(CLBR_RDI)
15467+ popq %rbx
15468+#endif
15469+
15470+ popq %rdi
15471+ pax_force_retaddr
15472+ retq
15473+ENDPROC(pax_exit_kernel_user)
15474+#endif
15475+
15476+.macro pax_erase_kstack
15477+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15478+ call pax_erase_kstack
15479+#endif
15480+.endm
15481+
15482+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15483+/*
15484+ * r11: thread_info
15485+ * rcx, rdx: can be clobbered
15486+ */
15487+ENTRY(pax_erase_kstack)
15488+ pushq %rdi
15489+ pushq %rax
15490+ pushq %r11
15491+
15492+ GET_THREAD_INFO(%r11)
15493+ mov TI_lowest_stack(%r11), %rdi
15494+ mov $-0xBEEF, %rax
15495+ std
15496+
15497+1: mov %edi, %ecx
15498+ and $THREAD_SIZE_asm - 1, %ecx
15499+ shr $3, %ecx
15500+ repne scasq
15501+ jecxz 2f
15502+
15503+ cmp $2*8, %ecx
15504+ jc 2f
15505+
15506+ mov $2*8, %ecx
15507+ repe scasq
15508+ jecxz 2f
15509+ jne 1b
15510+
15511+2: cld
15512+ mov %esp, %ecx
15513+ sub %edi, %ecx
15514+
15515+ cmp $THREAD_SIZE_asm, %rcx
15516+ jb 3f
15517+ ud2
15518+3:
15519+
15520+ shr $3, %ecx
15521+ rep stosq
15522+
15523+ mov TI_task_thread_sp0(%r11), %rdi
15524+ sub $256, %rdi
15525+ mov %rdi, TI_lowest_stack(%r11)
15526+
15527+ popq %r11
15528+ popq %rax
15529+ popq %rdi
15530+ pax_force_retaddr
15531+ ret
15532+ENDPROC(pax_erase_kstack)
15533+#endif
15534
15535 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
15536 #ifdef CONFIG_TRACE_IRQFLAGS
15537@@ -231,8 +515,8 @@ ENDPROC(native_usergs_sysret64)
15538 .endm
15539
15540 .macro UNFAKE_STACK_FRAME
15541- addq $8*6, %rsp
15542- CFI_ADJUST_CFA_OFFSET -(6*8)
15543+ addq $8*6 + ARG_SKIP, %rsp
15544+ CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
15545 .endm
15546
15547 /*
15548@@ -319,7 +603,7 @@ ENDPROC(native_usergs_sysret64)
15549 movq %rsp, %rsi
15550
15551 leaq -RBP(%rsp),%rdi /* arg1 for handler */
15552- testl $3, CS(%rdi)
15553+ testb $3, CS(%rdi)
15554 je 1f
15555 SWAPGS
15556 /*
15557@@ -355,9 +639,10 @@ ENTRY(save_rest)
15558 movq_cfi r15, R15+16
15559 movq %r11, 8(%rsp) /* return address */
15560 FIXUP_TOP_OF_STACK %r11, 16
15561+ pax_force_retaddr
15562 ret
15563 CFI_ENDPROC
15564-END(save_rest)
15565+ENDPROC(save_rest)
15566
15567 /* save complete stack frame */
15568 .pushsection .kprobes.text, "ax"
15569@@ -386,9 +671,10 @@ ENTRY(save_paranoid)
15570 js 1f /* negative -> in kernel */
15571 SWAPGS
15572 xorl %ebx,%ebx
15573-1: ret
15574+1: pax_force_retaddr_bts
15575+ ret
15576 CFI_ENDPROC
15577-END(save_paranoid)
15578+ENDPROC(save_paranoid)
15579 .popsection
15580
15581 /*
15582@@ -410,7 +696,7 @@ ENTRY(ret_from_fork)
15583
15584 RESTORE_REST
15585
15586- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
15587+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
15588 je int_ret_from_sys_call
15589
15590 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
15591@@ -420,7 +706,7 @@ ENTRY(ret_from_fork)
15592 jmp ret_from_sys_call # go to the SYSRET fastpath
15593
15594 CFI_ENDPROC
15595-END(ret_from_fork)
15596+ENDPROC(ret_from_fork)
15597
15598 /*
15599 * System call entry. Up to 6 arguments in registers are supported.
15600@@ -456,7 +742,7 @@ END(ret_from_fork)
15601 ENTRY(system_call)
15602 CFI_STARTPROC simple
15603 CFI_SIGNAL_FRAME
15604- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
15605+ CFI_DEF_CFA rsp,0
15606 CFI_REGISTER rip,rcx
15607 /*CFI_REGISTER rflags,r11*/
15608 SWAPGS_UNSAFE_STACK
15609@@ -469,12 +755,13 @@ ENTRY(system_call_after_swapgs)
15610
15611 movq %rsp,PER_CPU_VAR(old_rsp)
15612 movq PER_CPU_VAR(kernel_stack),%rsp
15613+ SAVE_ARGS 8*6,0
15614+ pax_enter_kernel_user
15615 /*
15616 * No need to follow this irqs off/on section - it's straight
15617 * and short:
15618 */
15619 ENABLE_INTERRUPTS(CLBR_NONE)
15620- SAVE_ARGS 8,0
15621 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
15622 movq %rcx,RIP-ARGOFFSET(%rsp)
15623 CFI_REL_OFFSET rip,RIP-ARGOFFSET
15624@@ -484,7 +771,7 @@ ENTRY(system_call_after_swapgs)
15625 system_call_fastpath:
15626 cmpq $__NR_syscall_max,%rax
15627 ja badsys
15628- movq %r10,%rcx
15629+ movq R10-ARGOFFSET(%rsp),%rcx
15630 call *sys_call_table(,%rax,8) # XXX: rip relative
15631 movq %rax,RAX-ARGOFFSET(%rsp)
15632 /*
15633@@ -503,6 +790,8 @@ sysret_check:
15634 andl %edi,%edx
15635 jnz sysret_careful
15636 CFI_REMEMBER_STATE
15637+ pax_exit_kernel_user
15638+ pax_erase_kstack
15639 /*
15640 * sysretq will re-enable interrupts:
15641 */
15642@@ -554,14 +843,18 @@ badsys:
15643 * jump back to the normal fast path.
15644 */
15645 auditsys:
15646- movq %r10,%r9 /* 6th arg: 4th syscall arg */
15647+ movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
15648 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
15649 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
15650 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
15651 movq %rax,%rsi /* 2nd arg: syscall number */
15652 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
15653 call audit_syscall_entry
15654+
15655+ pax_erase_kstack
15656+
15657 LOAD_ARGS 0 /* reload call-clobbered registers */
15658+ pax_set_fptr_mask
15659 jmp system_call_fastpath
15660
15661 /*
15662@@ -591,16 +884,20 @@ tracesys:
15663 FIXUP_TOP_OF_STACK %rdi
15664 movq %rsp,%rdi
15665 call syscall_trace_enter
15666+
15667+ pax_erase_kstack
15668+
15669 /*
15670 * Reload arg registers from stack in case ptrace changed them.
15671 * We don't reload %rax because syscall_trace_enter() returned
15672 * the value it wants us to use in the table lookup.
15673 */
15674 LOAD_ARGS ARGOFFSET, 1
15675+ pax_set_fptr_mask
15676 RESTORE_REST
15677 cmpq $__NR_syscall_max,%rax
15678 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
15679- movq %r10,%rcx /* fixup for C */
15680+ movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
15681 call *sys_call_table(,%rax,8)
15682 movq %rax,RAX-ARGOFFSET(%rsp)
15683 /* Use IRET because user could have changed frame */
15684@@ -612,7 +909,7 @@ tracesys:
15685 GLOBAL(int_ret_from_sys_call)
15686 DISABLE_INTERRUPTS(CLBR_NONE)
15687 TRACE_IRQS_OFF
15688- testl $3,CS-ARGOFFSET(%rsp)
15689+ testb $3,CS-ARGOFFSET(%rsp)
15690 je retint_restore_args
15691 movl $_TIF_ALLWORK_MASK,%edi
15692 /* edi: mask to check */
15693@@ -623,6 +920,7 @@ GLOBAL(int_with_check)
15694 andl %edi,%edx
15695 jnz int_careful
15696 andl $~TS_COMPAT,TI_status(%rcx)
15697+ pax_erase_kstack
15698 jmp retint_swapgs
15699
15700 /* Either reschedule or signal or syscall exit tracking needed. */
15701@@ -669,7 +967,7 @@ int_restore_rest:
15702 TRACE_IRQS_OFF
15703 jmp int_with_check
15704 CFI_ENDPROC
15705-END(system_call)
15706+ENDPROC(system_call)
15707
15708 /*
15709 * Certain special system calls that need to save a complete full stack frame.
15710@@ -685,7 +983,7 @@ ENTRY(\label)
15711 call \func
15712 jmp ptregscall_common
15713 CFI_ENDPROC
15714-END(\label)
15715+ENDPROC(\label)
15716 .endm
15717
15718 PTREGSCALL stub_clone, sys_clone, %r8
15719@@ -703,9 +1001,10 @@ ENTRY(ptregscall_common)
15720 movq_cfi_restore R12+8, r12
15721 movq_cfi_restore RBP+8, rbp
15722 movq_cfi_restore RBX+8, rbx
15723+ pax_force_retaddr
15724 ret $REST_SKIP /* pop extended registers */
15725 CFI_ENDPROC
15726-END(ptregscall_common)
15727+ENDPROC(ptregscall_common)
15728
15729 ENTRY(stub_execve)
15730 CFI_STARTPROC
15731@@ -720,7 +1019,7 @@ ENTRY(stub_execve)
15732 RESTORE_REST
15733 jmp int_ret_from_sys_call
15734 CFI_ENDPROC
15735-END(stub_execve)
15736+ENDPROC(stub_execve)
15737
15738 /*
15739 * sigreturn is special because it needs to restore all registers on return.
15740@@ -738,7 +1037,7 @@ ENTRY(stub_rt_sigreturn)
15741 RESTORE_REST
15742 jmp int_ret_from_sys_call
15743 CFI_ENDPROC
15744-END(stub_rt_sigreturn)
15745+ENDPROC(stub_rt_sigreturn)
15746
15747 /*
15748 * Build the entry stubs and pointer table with some assembler magic.
15749@@ -773,7 +1072,7 @@ vector=vector+1
15750 2: jmp common_interrupt
15751 .endr
15752 CFI_ENDPROC
15753-END(irq_entries_start)
15754+ENDPROC(irq_entries_start)
15755
15756 .previous
15757 END(interrupt)
15758@@ -793,6 +1092,16 @@ END(interrupt)
15759 subq $ORIG_RAX-RBP, %rsp
15760 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
15761 SAVE_ARGS_IRQ
15762+#ifdef CONFIG_PAX_MEMORY_UDEREF
15763+ testb $3, CS(%rdi)
15764+ jnz 1f
15765+ pax_enter_kernel
15766+ jmp 2f
15767+1: pax_enter_kernel_user
15768+2:
15769+#else
15770+ pax_enter_kernel
15771+#endif
15772 call \func
15773 .endm
15774
15775@@ -824,7 +1133,7 @@ ret_from_intr:
15776
15777 exit_intr:
15778 GET_THREAD_INFO(%rcx)
15779- testl $3,CS-ARGOFFSET(%rsp)
15780+ testb $3,CS-ARGOFFSET(%rsp)
15781 je retint_kernel
15782
15783 /* Interrupt came from user space */
15784@@ -846,12 +1155,15 @@ retint_swapgs: /* return to user-space */
15785 * The iretq could re-enable interrupts:
15786 */
15787 DISABLE_INTERRUPTS(CLBR_ANY)
15788+ pax_exit_kernel_user
15789 TRACE_IRQS_IRETQ
15790 SWAPGS
15791 jmp restore_args
15792
15793 retint_restore_args: /* return to kernel space */
15794 DISABLE_INTERRUPTS(CLBR_ANY)
15795+ pax_exit_kernel
15796+ pax_force_retaddr RIP-ARGOFFSET
15797 /*
15798 * The iretq could re-enable interrupts:
15799 */
15800@@ -940,7 +1252,7 @@ ENTRY(retint_kernel)
15801 #endif
15802
15803 CFI_ENDPROC
15804-END(common_interrupt)
15805+ENDPROC(common_interrupt)
15806 /*
15807 * End of kprobes section
15808 */
15809@@ -956,7 +1268,7 @@ ENTRY(\sym)
15810 interrupt \do_sym
15811 jmp ret_from_intr
15812 CFI_ENDPROC
15813-END(\sym)
15814+ENDPROC(\sym)
15815 .endm
15816
15817 #ifdef CONFIG_SMP
15818@@ -1021,12 +1333,22 @@ ENTRY(\sym)
15819 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15820 call error_entry
15821 DEFAULT_FRAME 0
15822+#ifdef CONFIG_PAX_MEMORY_UDEREF
15823+ testb $3, CS(%rsp)
15824+ jnz 1f
15825+ pax_enter_kernel
15826+ jmp 2f
15827+1: pax_enter_kernel_user
15828+2:
15829+#else
15830+ pax_enter_kernel
15831+#endif
15832 movq %rsp,%rdi /* pt_regs pointer */
15833 xorl %esi,%esi /* no error code */
15834 call \do_sym
15835 jmp error_exit /* %ebx: no swapgs flag */
15836 CFI_ENDPROC
15837-END(\sym)
15838+ENDPROC(\sym)
15839 .endm
15840
15841 .macro paranoidzeroentry sym do_sym
15842@@ -1038,15 +1360,25 @@ ENTRY(\sym)
15843 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15844 call save_paranoid
15845 TRACE_IRQS_OFF
15846+#ifdef CONFIG_PAX_MEMORY_UDEREF
15847+ testb $3, CS(%rsp)
15848+ jnz 1f
15849+ pax_enter_kernel
15850+ jmp 2f
15851+1: pax_enter_kernel_user
15852+2:
15853+#else
15854+ pax_enter_kernel
15855+#endif
15856 movq %rsp,%rdi /* pt_regs pointer */
15857 xorl %esi,%esi /* no error code */
15858 call \do_sym
15859 jmp paranoid_exit /* %ebx: no swapgs flag */
15860 CFI_ENDPROC
15861-END(\sym)
15862+ENDPROC(\sym)
15863 .endm
15864
15865-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
15866+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
15867 .macro paranoidzeroentry_ist sym do_sym ist
15868 ENTRY(\sym)
15869 INTR_FRAME
15870@@ -1056,14 +1388,30 @@ ENTRY(\sym)
15871 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15872 call save_paranoid
15873 TRACE_IRQS_OFF
15874+#ifdef CONFIG_PAX_MEMORY_UDEREF
15875+ testb $3, CS(%rsp)
15876+ jnz 1f
15877+ pax_enter_kernel
15878+ jmp 2f
15879+1: pax_enter_kernel_user
15880+2:
15881+#else
15882+ pax_enter_kernel
15883+#endif
15884 movq %rsp,%rdi /* pt_regs pointer */
15885 xorl %esi,%esi /* no error code */
15886+#ifdef CONFIG_SMP
15887+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
15888+ lea init_tss(%r12), %r12
15889+#else
15890+ lea init_tss(%rip), %r12
15891+#endif
15892 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
15893 call \do_sym
15894 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
15895 jmp paranoid_exit /* %ebx: no swapgs flag */
15896 CFI_ENDPROC
15897-END(\sym)
15898+ENDPROC(\sym)
15899 .endm
15900
15901 .macro errorentry sym do_sym
15902@@ -1074,13 +1422,23 @@ ENTRY(\sym)
15903 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15904 call error_entry
15905 DEFAULT_FRAME 0
15906+#ifdef CONFIG_PAX_MEMORY_UDEREF
15907+ testb $3, CS(%rsp)
15908+ jnz 1f
15909+ pax_enter_kernel
15910+ jmp 2f
15911+1: pax_enter_kernel_user
15912+2:
15913+#else
15914+ pax_enter_kernel
15915+#endif
15916 movq %rsp,%rdi /* pt_regs pointer */
15917 movq ORIG_RAX(%rsp),%rsi /* get error code */
15918 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
15919 call \do_sym
15920 jmp error_exit /* %ebx: no swapgs flag */
15921 CFI_ENDPROC
15922-END(\sym)
15923+ENDPROC(\sym)
15924 .endm
15925
15926 /* error code is on the stack already */
15927@@ -1093,13 +1451,23 @@ ENTRY(\sym)
15928 call save_paranoid
15929 DEFAULT_FRAME 0
15930 TRACE_IRQS_OFF
15931+#ifdef CONFIG_PAX_MEMORY_UDEREF
15932+ testb $3, CS(%rsp)
15933+ jnz 1f
15934+ pax_enter_kernel
15935+ jmp 2f
15936+1: pax_enter_kernel_user
15937+2:
15938+#else
15939+ pax_enter_kernel
15940+#endif
15941 movq %rsp,%rdi /* pt_regs pointer */
15942 movq ORIG_RAX(%rsp),%rsi /* get error code */
15943 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
15944 call \do_sym
15945 jmp paranoid_exit /* %ebx: no swapgs flag */
15946 CFI_ENDPROC
15947-END(\sym)
15948+ENDPROC(\sym)
15949 .endm
15950
15951 zeroentry divide_error do_divide_error
15952@@ -1129,9 +1497,10 @@ gs_change:
15953 2: mfence /* workaround */
15954 SWAPGS
15955 popfq_cfi
15956+ pax_force_retaddr
15957 ret
15958 CFI_ENDPROC
15959-END(native_load_gs_index)
15960+ENDPROC(native_load_gs_index)
15961
15962 .section __ex_table,"a"
15963 .align 8
15964@@ -1153,13 +1522,14 @@ ENTRY(kernel_thread_helper)
15965 * Here we are in the child and the registers are set as they were
15966 * at kernel_thread() invocation in the parent.
15967 */
15968+ pax_force_fptr %rsi
15969 call *%rsi
15970 # exit
15971 mov %eax, %edi
15972 call do_exit
15973 ud2 # padding for call trace
15974 CFI_ENDPROC
15975-END(kernel_thread_helper)
15976+ENDPROC(kernel_thread_helper)
15977
15978 /*
15979 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
15980@@ -1186,11 +1556,11 @@ ENTRY(kernel_execve)
15981 RESTORE_REST
15982 testq %rax,%rax
15983 je int_ret_from_sys_call
15984- RESTORE_ARGS
15985 UNFAKE_STACK_FRAME
15986+ pax_force_retaddr
15987 ret
15988 CFI_ENDPROC
15989-END(kernel_execve)
15990+ENDPROC(kernel_execve)
15991
15992 /* Call softirq on interrupt stack. Interrupts are off. */
15993 ENTRY(call_softirq)
15994@@ -1208,9 +1578,10 @@ ENTRY(call_softirq)
15995 CFI_DEF_CFA_REGISTER rsp
15996 CFI_ADJUST_CFA_OFFSET -8
15997 decl PER_CPU_VAR(irq_count)
15998+ pax_force_retaddr
15999 ret
16000 CFI_ENDPROC
16001-END(call_softirq)
16002+ENDPROC(call_softirq)
16003
16004 #ifdef CONFIG_XEN
16005 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
16006@@ -1248,7 +1619,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
16007 decl PER_CPU_VAR(irq_count)
16008 jmp error_exit
16009 CFI_ENDPROC
16010-END(xen_do_hypervisor_callback)
16011+ENDPROC(xen_do_hypervisor_callback)
16012
16013 /*
16014 * Hypervisor uses this for application faults while it executes.
16015@@ -1307,7 +1678,7 @@ ENTRY(xen_failsafe_callback)
16016 SAVE_ALL
16017 jmp error_exit
16018 CFI_ENDPROC
16019-END(xen_failsafe_callback)
16020+ENDPROC(xen_failsafe_callback)
16021
16022 apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
16023 xen_hvm_callback_vector xen_evtchn_do_upcall
16024@@ -1356,16 +1727,31 @@ ENTRY(paranoid_exit)
16025 TRACE_IRQS_OFF
16026 testl %ebx,%ebx /* swapgs needed? */
16027 jnz paranoid_restore
16028- testl $3,CS(%rsp)
16029+ testb $3,CS(%rsp)
16030 jnz paranoid_userspace
16031+#ifdef CONFIG_PAX_MEMORY_UDEREF
16032+ pax_exit_kernel
16033+ TRACE_IRQS_IRETQ 0
16034+ SWAPGS_UNSAFE_STACK
16035+ RESTORE_ALL 8
16036+ pax_force_retaddr_bts
16037+ jmp irq_return
16038+#endif
16039 paranoid_swapgs:
16040+#ifdef CONFIG_PAX_MEMORY_UDEREF
16041+ pax_exit_kernel_user
16042+#else
16043+ pax_exit_kernel
16044+#endif
16045 TRACE_IRQS_IRETQ 0
16046 SWAPGS_UNSAFE_STACK
16047 RESTORE_ALL 8
16048 jmp irq_return
16049 paranoid_restore:
16050+ pax_exit_kernel
16051 TRACE_IRQS_IRETQ 0
16052 RESTORE_ALL 8
16053+ pax_force_retaddr_bts
16054 jmp irq_return
16055 paranoid_userspace:
16056 GET_THREAD_INFO(%rcx)
16057@@ -1394,7 +1780,7 @@ paranoid_schedule:
16058 TRACE_IRQS_OFF
16059 jmp paranoid_userspace
16060 CFI_ENDPROC
16061-END(paranoid_exit)
16062+ENDPROC(paranoid_exit)
16063
16064 /*
16065 * Exception entry point. This expects an error code/orig_rax on the stack.
16066@@ -1421,12 +1807,13 @@ ENTRY(error_entry)
16067 movq_cfi r14, R14+8
16068 movq_cfi r15, R15+8
16069 xorl %ebx,%ebx
16070- testl $3,CS+8(%rsp)
16071+ testb $3,CS+8(%rsp)
16072 je error_kernelspace
16073 error_swapgs:
16074 SWAPGS
16075 error_sti:
16076 TRACE_IRQS_OFF
16077+ pax_force_retaddr_bts
16078 ret
16079
16080 /*
16081@@ -1453,7 +1840,7 @@ bstep_iret:
16082 movq %rcx,RIP+8(%rsp)
16083 jmp error_swapgs
16084 CFI_ENDPROC
16085-END(error_entry)
16086+ENDPROC(error_entry)
16087
16088
16089 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
16090@@ -1473,7 +1860,7 @@ ENTRY(error_exit)
16091 jnz retint_careful
16092 jmp retint_swapgs
16093 CFI_ENDPROC
16094-END(error_exit)
16095+ENDPROC(error_exit)
16096
16097
16098 /* runs on exception stack */
16099@@ -1485,6 +1872,16 @@ ENTRY(nmi)
16100 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16101 call save_paranoid
16102 DEFAULT_FRAME 0
16103+#ifdef CONFIG_PAX_MEMORY_UDEREF
16104+ testb $3, CS(%rsp)
16105+ jnz 1f
16106+ pax_enter_kernel
16107+ jmp 2f
16108+1: pax_enter_kernel_user
16109+2:
16110+#else
16111+ pax_enter_kernel
16112+#endif
16113 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
16114 movq %rsp,%rdi
16115 movq $-1,%rsi
16116@@ -1495,12 +1892,28 @@ ENTRY(nmi)
16117 DISABLE_INTERRUPTS(CLBR_NONE)
16118 testl %ebx,%ebx /* swapgs needed? */
16119 jnz nmi_restore
16120- testl $3,CS(%rsp)
16121+ testb $3,CS(%rsp)
16122 jnz nmi_userspace
16123+#ifdef CONFIG_PAX_MEMORY_UDEREF
16124+ pax_exit_kernel
16125+ SWAPGS_UNSAFE_STACK
16126+ RESTORE_ALL 8
16127+ pax_force_retaddr_bts
16128+ jmp irq_return
16129+#endif
16130 nmi_swapgs:
16131+#ifdef CONFIG_PAX_MEMORY_UDEREF
16132+ pax_exit_kernel_user
16133+#else
16134+ pax_exit_kernel
16135+#endif
16136 SWAPGS_UNSAFE_STACK
16137+ RESTORE_ALL 8
16138+ jmp irq_return
16139 nmi_restore:
16140+ pax_exit_kernel
16141 RESTORE_ALL 8
16142+ pax_force_retaddr_bts
16143 jmp irq_return
16144 nmi_userspace:
16145 GET_THREAD_INFO(%rcx)
16146@@ -1529,14 +1942,14 @@ nmi_schedule:
16147 jmp paranoid_exit
16148 CFI_ENDPROC
16149 #endif
16150-END(nmi)
16151+ENDPROC(nmi)
16152
16153 ENTRY(ignore_sysret)
16154 CFI_STARTPROC
16155 mov $-ENOSYS,%eax
16156 sysret
16157 CFI_ENDPROC
16158-END(ignore_sysret)
16159+ENDPROC(ignore_sysret)
16160
16161 /*
16162 * End of kprobes section
16163diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
16164index c9a281f..ce2f317 100644
16165--- a/arch/x86/kernel/ftrace.c
16166+++ b/arch/x86/kernel/ftrace.c
16167@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the IP to write to */
16168 static const void *mod_code_newcode; /* holds the text to write to the IP */
16169
16170 static unsigned nmi_wait_count;
16171-static atomic_t nmi_update_count = ATOMIC_INIT(0);
16172+static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
16173
16174 int ftrace_arch_read_dyn_info(char *buf, int size)
16175 {
16176@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
16177
16178 r = snprintf(buf, size, "%u %u",
16179 nmi_wait_count,
16180- atomic_read(&nmi_update_count));
16181+ atomic_read_unchecked(&nmi_update_count));
16182 return r;
16183 }
16184
16185@@ -177,8 +177,10 @@ void ftrace_nmi_enter(void)
16186
16187 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
16188 smp_rmb();
16189+ pax_open_kernel();
16190 ftrace_mod_code();
16191- atomic_inc(&nmi_update_count);
16192+ pax_close_kernel();
16193+ atomic_inc_unchecked(&nmi_update_count);
16194 }
16195 /* Must have previous changes seen before executions */
16196 smp_mb();
16197@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
16198 {
16199 unsigned char replaced[MCOUNT_INSN_SIZE];
16200
16201+ ip = ktla_ktva(ip);
16202+
16203 /*
16204 * Note: Due to modules and __init, code can
16205 * disappear and change, we need to protect against faulting
16206@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
16207 unsigned char old[MCOUNT_INSN_SIZE], *new;
16208 int ret;
16209
16210- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
16211+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
16212 new = ftrace_call_replace(ip, (unsigned long)func);
16213 ret = ftrace_modify_code(ip, old, new);
16214
16215@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long ip,
16216 {
16217 unsigned char code[MCOUNT_INSN_SIZE];
16218
16219+ ip = ktla_ktva(ip);
16220+
16221 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
16222 return -EFAULT;
16223
16224diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
16225index 3bb0850..55a56f4 100644
16226--- a/arch/x86/kernel/head32.c
16227+++ b/arch/x86/kernel/head32.c
16228@@ -19,6 +19,7 @@
16229 #include <asm/io_apic.h>
16230 #include <asm/bios_ebda.h>
16231 #include <asm/tlbflush.h>
16232+#include <asm/boot.h>
16233
16234 static void __init i386_default_early_setup(void)
16235 {
16236@@ -33,7 +34,7 @@ void __init i386_start_kernel(void)
16237 {
16238 memblock_init();
16239
16240- memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
16241+ memblock_x86_reserve_range(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
16242
16243 #ifdef CONFIG_BLK_DEV_INITRD
16244 /* Reserve INITRD */
16245diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
16246index ce0be7c..c41476e 100644
16247--- a/arch/x86/kernel/head_32.S
16248+++ b/arch/x86/kernel/head_32.S
16249@@ -25,6 +25,12 @@
16250 /* Physical address */
16251 #define pa(X) ((X) - __PAGE_OFFSET)
16252
16253+#ifdef CONFIG_PAX_KERNEXEC
16254+#define ta(X) (X)
16255+#else
16256+#define ta(X) ((X) - __PAGE_OFFSET)
16257+#endif
16258+
16259 /*
16260 * References to members of the new_cpu_data structure.
16261 */
16262@@ -54,11 +60,7 @@
16263 * and small than max_low_pfn, otherwise will waste some page table entries
16264 */
16265
16266-#if PTRS_PER_PMD > 1
16267-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
16268-#else
16269-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
16270-#endif
16271+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
16272
16273 /* Number of possible pages in the lowmem region */
16274 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
16275@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
16276 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16277
16278 /*
16279+ * Real beginning of normal "text" segment
16280+ */
16281+ENTRY(stext)
16282+ENTRY(_stext)
16283+
16284+/*
16285 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
16286 * %esi points to the real-mode code as a 32-bit pointer.
16287 * CS and DS must be 4 GB flat segments, but we don't depend on
16288@@ -84,6 +92,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16289 * can.
16290 */
16291 __HEAD
16292+
16293+#ifdef CONFIG_PAX_KERNEXEC
16294+ jmp startup_32
16295+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
16296+.fill PAGE_SIZE-5,1,0xcc
16297+#endif
16298+
16299 ENTRY(startup_32)
16300 movl pa(stack_start),%ecx
16301
16302@@ -105,6 +120,57 @@ ENTRY(startup_32)
16303 2:
16304 leal -__PAGE_OFFSET(%ecx),%esp
16305
16306+#ifdef CONFIG_SMP
16307+ movl $pa(cpu_gdt_table),%edi
16308+ movl $__per_cpu_load,%eax
16309+ movw %ax,__KERNEL_PERCPU + 2(%edi)
16310+ rorl $16,%eax
16311+ movb %al,__KERNEL_PERCPU + 4(%edi)
16312+ movb %ah,__KERNEL_PERCPU + 7(%edi)
16313+ movl $__per_cpu_end - 1,%eax
16314+ subl $__per_cpu_start,%eax
16315+ movw %ax,__KERNEL_PERCPU + 0(%edi)
16316+#endif
16317+
16318+#ifdef CONFIG_PAX_MEMORY_UDEREF
16319+ movl $NR_CPUS,%ecx
16320+ movl $pa(cpu_gdt_table),%edi
16321+1:
16322+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
16323+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
16324+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
16325+ addl $PAGE_SIZE_asm,%edi
16326+ loop 1b
16327+#endif
16328+
16329+#ifdef CONFIG_PAX_KERNEXEC
16330+ movl $pa(boot_gdt),%edi
16331+ movl $__LOAD_PHYSICAL_ADDR,%eax
16332+ movw %ax,__BOOT_CS + 2(%edi)
16333+ rorl $16,%eax
16334+ movb %al,__BOOT_CS + 4(%edi)
16335+ movb %ah,__BOOT_CS + 7(%edi)
16336+ rorl $16,%eax
16337+
16338+ ljmp $(__BOOT_CS),$1f
16339+1:
16340+
16341+ movl $NR_CPUS,%ecx
16342+ movl $pa(cpu_gdt_table),%edi
16343+ addl $__PAGE_OFFSET,%eax
16344+1:
16345+ movw %ax,__KERNEL_CS + 2(%edi)
16346+ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
16347+ rorl $16,%eax
16348+ movb %al,__KERNEL_CS + 4(%edi)
16349+ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
16350+ movb %ah,__KERNEL_CS + 7(%edi)
16351+ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
16352+ rorl $16,%eax
16353+ addl $PAGE_SIZE_asm,%edi
16354+ loop 1b
16355+#endif
16356+
16357 /*
16358 * Clear BSS first so that there are no surprises...
16359 */
16360@@ -195,8 +261,11 @@ ENTRY(startup_32)
16361 movl %eax, pa(max_pfn_mapped)
16362
16363 /* Do early initialization of the fixmap area */
16364- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16365- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
16366+#ifdef CONFIG_COMPAT_VDSO
16367+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
16368+#else
16369+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
16370+#endif
16371 #else /* Not PAE */
16372
16373 page_pde_offset = (__PAGE_OFFSET >> 20);
16374@@ -226,8 +295,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16375 movl %eax, pa(max_pfn_mapped)
16376
16377 /* Do early initialization of the fixmap area */
16378- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16379- movl %eax,pa(initial_page_table+0xffc)
16380+#ifdef CONFIG_COMPAT_VDSO
16381+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
16382+#else
16383+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
16384+#endif
16385 #endif
16386
16387 #ifdef CONFIG_PARAVIRT
16388@@ -241,9 +313,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16389 cmpl $num_subarch_entries, %eax
16390 jae bad_subarch
16391
16392- movl pa(subarch_entries)(,%eax,4), %eax
16393- subl $__PAGE_OFFSET, %eax
16394- jmp *%eax
16395+ jmp *pa(subarch_entries)(,%eax,4)
16396
16397 bad_subarch:
16398 WEAK(lguest_entry)
16399@@ -255,10 +325,10 @@ WEAK(xen_entry)
16400 __INITDATA
16401
16402 subarch_entries:
16403- .long default_entry /* normal x86/PC */
16404- .long lguest_entry /* lguest hypervisor */
16405- .long xen_entry /* Xen hypervisor */
16406- .long default_entry /* Moorestown MID */
16407+ .long ta(default_entry) /* normal x86/PC */
16408+ .long ta(lguest_entry) /* lguest hypervisor */
16409+ .long ta(xen_entry) /* Xen hypervisor */
16410+ .long ta(default_entry) /* Moorestown MID */
16411 num_subarch_entries = (. - subarch_entries) / 4
16412 .previous
16413 #else
16414@@ -312,6 +382,7 @@ default_entry:
16415 orl %edx,%eax
16416 movl %eax,%cr4
16417
16418+#ifdef CONFIG_X86_PAE
16419 testb $X86_CR4_PAE, %al # check if PAE is enabled
16420 jz 6f
16421
16422@@ -340,6 +411,9 @@ default_entry:
16423 /* Make changes effective */
16424 wrmsr
16425
16426+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
16427+#endif
16428+
16429 6:
16430
16431 /*
16432@@ -443,7 +517,7 @@ is386: movl $2,%ecx # set MP
16433 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
16434 movl %eax,%ss # after changing gdt.
16435
16436- movl $(__USER_DS),%eax # DS/ES contains default USER segment
16437+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
16438 movl %eax,%ds
16439 movl %eax,%es
16440
16441@@ -457,15 +531,22 @@ is386: movl $2,%ecx # set MP
16442 */
16443 cmpb $0,ready
16444 jne 1f
16445- movl $gdt_page,%eax
16446+ movl $cpu_gdt_table,%eax
16447 movl $stack_canary,%ecx
16448+#ifdef CONFIG_SMP
16449+ addl $__per_cpu_load,%ecx
16450+#endif
16451 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
16452 shrl $16, %ecx
16453 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
16454 movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
16455 1:
16456-#endif
16457 movl $(__KERNEL_STACK_CANARY),%eax
16458+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
16459+ movl $(__USER_DS),%eax
16460+#else
16461+ xorl %eax,%eax
16462+#endif
16463 movl %eax,%gs
16464
16465 xorl %eax,%eax # Clear LDT
16466@@ -558,22 +639,22 @@ early_page_fault:
16467 jmp early_fault
16468
16469 early_fault:
16470- cld
16471 #ifdef CONFIG_PRINTK
16472+ cmpl $1,%ss:early_recursion_flag
16473+ je hlt_loop
16474+ incl %ss:early_recursion_flag
16475+ cld
16476 pusha
16477 movl $(__KERNEL_DS),%eax
16478 movl %eax,%ds
16479 movl %eax,%es
16480- cmpl $2,early_recursion_flag
16481- je hlt_loop
16482- incl early_recursion_flag
16483 movl %cr2,%eax
16484 pushl %eax
16485 pushl %edx /* trapno */
16486 pushl $fault_msg
16487 call printk
16488+; call dump_stack
16489 #endif
16490- call dump_stack
16491 hlt_loop:
16492 hlt
16493 jmp hlt_loop
16494@@ -581,8 +662,11 @@ hlt_loop:
16495 /* This is the default interrupt "handler" :-) */
16496 ALIGN
16497 ignore_int:
16498- cld
16499 #ifdef CONFIG_PRINTK
16500+ cmpl $2,%ss:early_recursion_flag
16501+ je hlt_loop
16502+ incl %ss:early_recursion_flag
16503+ cld
16504 pushl %eax
16505 pushl %ecx
16506 pushl %edx
16507@@ -591,9 +675,6 @@ ignore_int:
16508 movl $(__KERNEL_DS),%eax
16509 movl %eax,%ds
16510 movl %eax,%es
16511- cmpl $2,early_recursion_flag
16512- je hlt_loop
16513- incl early_recursion_flag
16514 pushl 16(%esp)
16515 pushl 24(%esp)
16516 pushl 32(%esp)
16517@@ -622,29 +703,43 @@ ENTRY(initial_code)
16518 /*
16519 * BSS section
16520 */
16521-__PAGE_ALIGNED_BSS
16522- .align PAGE_SIZE
16523 #ifdef CONFIG_X86_PAE
16524+.section .initial_pg_pmd,"a",@progbits
16525 initial_pg_pmd:
16526 .fill 1024*KPMDS,4,0
16527 #else
16528+.section .initial_page_table,"a",@progbits
16529 ENTRY(initial_page_table)
16530 .fill 1024,4,0
16531 #endif
16532+.section .initial_pg_fixmap,"a",@progbits
16533 initial_pg_fixmap:
16534 .fill 1024,4,0
16535+.section .empty_zero_page,"a",@progbits
16536 ENTRY(empty_zero_page)
16537 .fill 4096,1,0
16538+.section .swapper_pg_dir,"a",@progbits
16539 ENTRY(swapper_pg_dir)
16540+#ifdef CONFIG_X86_PAE
16541+ .fill 4,8,0
16542+#else
16543 .fill 1024,4,0
16544+#endif
16545+
16546+/*
16547+ * The IDT has to be page-aligned to simplify the Pentium
16548+ * F0 0F bug workaround.. We have a special link segment
16549+ * for this.
16550+ */
16551+.section .idt,"a",@progbits
16552+ENTRY(idt_table)
16553+ .fill 256,8,0
16554
16555 /*
16556 * This starts the data section.
16557 */
16558 #ifdef CONFIG_X86_PAE
16559-__PAGE_ALIGNED_DATA
16560- /* Page-aligned for the benefit of paravirt? */
16561- .align PAGE_SIZE
16562+.section .initial_page_table,"a",@progbits
16563 ENTRY(initial_page_table)
16564 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
16565 # if KPMDS == 3
16566@@ -663,18 +758,27 @@ ENTRY(initial_page_table)
16567 # error "Kernel PMDs should be 1, 2 or 3"
16568 # endif
16569 .align PAGE_SIZE /* needs to be page-sized too */
16570+
16571+#ifdef CONFIG_PAX_PER_CPU_PGD
16572+ENTRY(cpu_pgd)
16573+ .rept NR_CPUS
16574+ .fill 4,8,0
16575+ .endr
16576+#endif
16577+
16578 #endif
16579
16580 .data
16581 .balign 4
16582 ENTRY(stack_start)
16583- .long init_thread_union+THREAD_SIZE
16584+ .long init_thread_union+THREAD_SIZE-8
16585
16586+ready: .byte 0
16587+
16588+.section .rodata,"a",@progbits
16589 early_recursion_flag:
16590 .long 0
16591
16592-ready: .byte 0
16593-
16594 int_msg:
16595 .asciz "Unknown interrupt or fault at: %p %p %p\n"
16596
16597@@ -707,7 +811,7 @@ fault_msg:
16598 .word 0 # 32 bit align gdt_desc.address
16599 boot_gdt_descr:
16600 .word __BOOT_DS+7
16601- .long boot_gdt - __PAGE_OFFSET
16602+ .long pa(boot_gdt)
16603
16604 .word 0 # 32-bit align idt_desc.address
16605 idt_descr:
16606@@ -718,7 +822,7 @@ idt_descr:
16607 .word 0 # 32 bit align gdt_desc.address
16608 ENTRY(early_gdt_descr)
16609 .word GDT_ENTRIES*8-1
16610- .long gdt_page /* Overwritten for secondary CPUs */
16611+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
16612
16613 /*
16614 * The boot_gdt must mirror the equivalent in setup.S and is
16615@@ -727,5 +831,65 @@ ENTRY(early_gdt_descr)
16616 .align L1_CACHE_BYTES
16617 ENTRY(boot_gdt)
16618 .fill GDT_ENTRY_BOOT_CS,8,0
16619- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
16620- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
16621+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
16622+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
16623+
16624+ .align PAGE_SIZE_asm
16625+ENTRY(cpu_gdt_table)
16626+ .rept NR_CPUS
16627+ .quad 0x0000000000000000 /* NULL descriptor */
16628+ .quad 0x0000000000000000 /* 0x0b reserved */
16629+ .quad 0x0000000000000000 /* 0x13 reserved */
16630+ .quad 0x0000000000000000 /* 0x1b reserved */
16631+
16632+#ifdef CONFIG_PAX_KERNEXEC
16633+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
16634+#else
16635+ .quad 0x0000000000000000 /* 0x20 unused */
16636+#endif
16637+
16638+ .quad 0x0000000000000000 /* 0x28 unused */
16639+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
16640+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
16641+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
16642+ .quad 0x0000000000000000 /* 0x4b reserved */
16643+ .quad 0x0000000000000000 /* 0x53 reserved */
16644+ .quad 0x0000000000000000 /* 0x5b reserved */
16645+
16646+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
16647+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
16648+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
16649+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
16650+
16651+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
16652+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
16653+
16654+ /*
16655+ * Segments used for calling PnP BIOS have byte granularity.
16656+ * The code segments and data segments have fixed 64k limits,
16657+ * the transfer segment sizes are set at run time.
16658+ */
16659+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
16660+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
16661+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
16662+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
16663+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
16664+
16665+ /*
16666+ * The APM segments have byte granularity and their bases
16667+ * are set at run time. All have 64k limits.
16668+ */
16669+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
16670+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
16671+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
16672+
16673+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
16674+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
16675+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
16676+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
16677+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
16678+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
16679+
16680+ /* Be sure this is zeroed to avoid false validations in Xen */
16681+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
16682+ .endr
16683diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
16684index e11e394..9aebc5d 100644
16685--- a/arch/x86/kernel/head_64.S
16686+++ b/arch/x86/kernel/head_64.S
16687@@ -19,6 +19,8 @@
16688 #include <asm/cache.h>
16689 #include <asm/processor-flags.h>
16690 #include <asm/percpu.h>
16691+#include <asm/cpufeature.h>
16692+#include <asm/alternative-asm.h>
16693
16694 #ifdef CONFIG_PARAVIRT
16695 #include <asm/asm-offsets.h>
16696@@ -38,6 +40,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
16697 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
16698 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
16699 L3_START_KERNEL = pud_index(__START_KERNEL_map)
16700+L4_VMALLOC_START = pgd_index(VMALLOC_START)
16701+L3_VMALLOC_START = pud_index(VMALLOC_START)
16702+L4_VMALLOC_END = pgd_index(VMALLOC_END)
16703+L3_VMALLOC_END = pud_index(VMALLOC_END)
16704+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
16705+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
16706
16707 .text
16708 __HEAD
16709@@ -85,35 +93,23 @@ startup_64:
16710 */
16711 addq %rbp, init_level4_pgt + 0(%rip)
16712 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
16713+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
16714+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
16715+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
16716 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
16717
16718 addq %rbp, level3_ident_pgt + 0(%rip)
16719+#ifndef CONFIG_XEN
16720+ addq %rbp, level3_ident_pgt + 8(%rip)
16721+#endif
16722
16723- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
16724- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
16725+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
16726+
16727+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
16728+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
16729
16730 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
16731-
16732- /* Add an Identity mapping if I am above 1G */
16733- leaq _text(%rip), %rdi
16734- andq $PMD_PAGE_MASK, %rdi
16735-
16736- movq %rdi, %rax
16737- shrq $PUD_SHIFT, %rax
16738- andq $(PTRS_PER_PUD - 1), %rax
16739- jz ident_complete
16740-
16741- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
16742- leaq level3_ident_pgt(%rip), %rbx
16743- movq %rdx, 0(%rbx, %rax, 8)
16744-
16745- movq %rdi, %rax
16746- shrq $PMD_SHIFT, %rax
16747- andq $(PTRS_PER_PMD - 1), %rax
16748- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
16749- leaq level2_spare_pgt(%rip), %rbx
16750- movq %rdx, 0(%rbx, %rax, 8)
16751-ident_complete:
16752+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
16753
16754 /*
16755 * Fixup the kernel text+data virtual addresses. Note that
16756@@ -160,8 +156,8 @@ ENTRY(secondary_startup_64)
16757 * after the boot processor executes this code.
16758 */
16759
16760- /* Enable PAE mode and PGE */
16761- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
16762+ /* Enable PAE mode and PSE/PGE */
16763+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
16764 movq %rax, %cr4
16765
16766 /* Setup early boot stage 4 level pagetables. */
16767@@ -183,9 +179,17 @@ ENTRY(secondary_startup_64)
16768 movl $MSR_EFER, %ecx
16769 rdmsr
16770 btsl $_EFER_SCE, %eax /* Enable System Call */
16771- btl $20,%edi /* No Execute supported? */
16772+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
16773 jnc 1f
16774 btsl $_EFER_NX, %eax
16775+ leaq init_level4_pgt(%rip), %rdi
16776+#ifndef CONFIG_EFI
16777+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
16778+#endif
16779+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
16780+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
16781+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
16782+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
16783 1: wrmsr /* Make changes effective */
16784
16785 /* Setup cr0 */
16786@@ -247,6 +251,7 @@ ENTRY(secondary_startup_64)
16787 * jump. In addition we need to ensure %cs is set so we make this
16788 * a far return.
16789 */
16790+ pax_set_fptr_mask
16791 movq initial_code(%rip),%rax
16792 pushq $0 # fake return address to stop unwinder
16793 pushq $__KERNEL_CS # set correct cs
16794@@ -269,7 +274,7 @@ ENTRY(secondary_startup_64)
16795 bad_address:
16796 jmp bad_address
16797
16798- .section ".init.text","ax"
16799+ __INIT
16800 #ifdef CONFIG_EARLY_PRINTK
16801 .globl early_idt_handlers
16802 early_idt_handlers:
16803@@ -314,18 +319,23 @@ ENTRY(early_idt_handler)
16804 #endif /* EARLY_PRINTK */
16805 1: hlt
16806 jmp 1b
16807+ .previous
16808
16809 #ifdef CONFIG_EARLY_PRINTK
16810+ __INITDATA
16811 early_recursion_flag:
16812 .long 0
16813+ .previous
16814
16815+ .section .rodata,"a",@progbits
16816 early_idt_msg:
16817 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
16818 early_idt_ripmsg:
16819 .asciz "RIP %s\n"
16820+ .previous
16821 #endif /* CONFIG_EARLY_PRINTK */
16822- .previous
16823
16824+ .section .rodata,"a",@progbits
16825 #define NEXT_PAGE(name) \
16826 .balign PAGE_SIZE; \
16827 ENTRY(name)
16828@@ -338,7 +348,6 @@ ENTRY(name)
16829 i = i + 1 ; \
16830 .endr
16831
16832- .data
16833 /*
16834 * This default setting generates an ident mapping at address 0x100000
16835 * and a mapping for the kernel that precisely maps virtual address
16836@@ -349,13 +358,41 @@ NEXT_PAGE(init_level4_pgt)
16837 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16838 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
16839 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16840+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
16841+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
16842+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
16843+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
16844+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
16845+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
16846 .org init_level4_pgt + L4_START_KERNEL*8, 0
16847 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
16848 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
16849
16850+#ifdef CONFIG_PAX_PER_CPU_PGD
16851+NEXT_PAGE(cpu_pgd)
16852+ .rept NR_CPUS
16853+ .fill 512,8,0
16854+ .endr
16855+#endif
16856+
16857 NEXT_PAGE(level3_ident_pgt)
16858 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16859+#ifdef CONFIG_XEN
16860 .fill 511,8,0
16861+#else
16862+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
16863+ .fill 510,8,0
16864+#endif
16865+
16866+NEXT_PAGE(level3_vmalloc_start_pgt)
16867+ .fill 512,8,0
16868+
16869+NEXT_PAGE(level3_vmalloc_end_pgt)
16870+ .fill 512,8,0
16871+
16872+NEXT_PAGE(level3_vmemmap_pgt)
16873+ .fill L3_VMEMMAP_START,8,0
16874+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
16875
16876 NEXT_PAGE(level3_kernel_pgt)
16877 .fill L3_START_KERNEL,8,0
16878@@ -363,20 +400,23 @@ NEXT_PAGE(level3_kernel_pgt)
16879 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
16880 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
16881
16882+NEXT_PAGE(level2_vmemmap_pgt)
16883+ .fill 512,8,0
16884+
16885 NEXT_PAGE(level2_fixmap_pgt)
16886- .fill 506,8,0
16887- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
16888- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
16889- .fill 5,8,0
16890+ .fill 507,8,0
16891+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
16892+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
16893+ .fill 4,8,0
16894
16895-NEXT_PAGE(level1_fixmap_pgt)
16896+NEXT_PAGE(level1_vsyscall_pgt)
16897 .fill 512,8,0
16898
16899-NEXT_PAGE(level2_ident_pgt)
16900- /* Since I easily can, map the first 1G.
16901+ /* Since I easily can, map the first 2G.
16902 * Don't set NX because code runs from these pages.
16903 */
16904- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
16905+NEXT_PAGE(level2_ident_pgt)
16906+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
16907
16908 NEXT_PAGE(level2_kernel_pgt)
16909 /*
16910@@ -389,33 +429,55 @@ NEXT_PAGE(level2_kernel_pgt)
16911 * If you want to increase this then increase MODULES_VADDR
16912 * too.)
16913 */
16914- PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
16915- KERNEL_IMAGE_SIZE/PMD_SIZE)
16916-
16917-NEXT_PAGE(level2_spare_pgt)
16918- .fill 512, 8, 0
16919+ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
16920
16921 #undef PMDS
16922 #undef NEXT_PAGE
16923
16924- .data
16925+ .align PAGE_SIZE
16926+ENTRY(cpu_gdt_table)
16927+ .rept NR_CPUS
16928+ .quad 0x0000000000000000 /* NULL descriptor */
16929+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
16930+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
16931+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
16932+ .quad 0x00cffb000000ffff /* __USER32_CS */
16933+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
16934+ .quad 0x00affb000000ffff /* __USER_CS */
16935+
16936+#ifdef CONFIG_PAX_KERNEXEC
16937+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
16938+#else
16939+ .quad 0x0 /* unused */
16940+#endif
16941+
16942+ .quad 0,0 /* TSS */
16943+ .quad 0,0 /* LDT */
16944+ .quad 0,0,0 /* three TLS descriptors */
16945+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
16946+ /* asm/segment.h:GDT_ENTRIES must match this */
16947+
16948+ /* zero the remaining page */
16949+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
16950+ .endr
16951+
16952 .align 16
16953 .globl early_gdt_descr
16954 early_gdt_descr:
16955 .word GDT_ENTRIES*8-1
16956 early_gdt_descr_base:
16957- .quad INIT_PER_CPU_VAR(gdt_page)
16958+ .quad cpu_gdt_table
16959
16960 ENTRY(phys_base)
16961 /* This must match the first entry in level2_kernel_pgt */
16962 .quad 0x0000000000000000
16963
16964 #include "../../x86/xen/xen-head.S"
16965-
16966- .section .bss, "aw", @nobits
16967+
16968+ .section .rodata,"a",@progbits
16969 .align L1_CACHE_BYTES
16970 ENTRY(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..d1d6be7 100644
17003--- a/arch/x86/kernel/i387.c
17004+++ b/arch/x86/kernel/i387.c
17005@@ -188,6 +188,9 @@ int xfpregs_active(struct task_struct *target, const struct user_regset *regset)
17006
17007 int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17008 unsigned int pos, unsigned int count,
17009+ void *kbuf, void __user *ubuf) __size_overflow(4);
17010+int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17011+ unsigned int pos, unsigned int count,
17012 void *kbuf, void __user *ubuf)
17013 {
17014 int ret;
17015@@ -207,6 +210,9 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17016
17017 int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17018 unsigned int pos, unsigned int count,
17019+ const void *kbuf, const void __user *ubuf) __size_overflow(4);
17020+int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17021+ unsigned int pos, unsigned int count,
17022 const void *kbuf, const void __user *ubuf)
17023 {
17024 int ret;
17025@@ -240,6 +246,9 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17026
17027 int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17028 unsigned int pos, unsigned int count,
17029+ void *kbuf, void __user *ubuf) __size_overflow(4);
17030+int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17031+ unsigned int pos, unsigned int count,
17032 void *kbuf, void __user *ubuf)
17033 {
17034 int ret;
17035@@ -269,6 +278,9 @@ int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17036
17037 int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
17038 unsigned int pos, unsigned int count,
17039+ const void *kbuf, const void __user *ubuf) __size_overflow(4);
17040+int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
17041+ unsigned int pos, unsigned int count,
17042 const void *kbuf, const void __user *ubuf)
17043 {
17044 int ret;
17045@@ -439,6 +451,9 @@ static void convert_to_fxsr(struct task_struct *tsk,
17046
17047 int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17048 unsigned int pos, unsigned int count,
17049+ void *kbuf, void __user *ubuf) __size_overflow(3,4);
17050+int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17051+ unsigned int pos, unsigned int count,
17052 void *kbuf, void __user *ubuf)
17053 {
17054 struct user_i387_ia32_struct env;
17055@@ -471,6 +486,9 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17056
17057 int fpregs_set(struct task_struct *target, const struct user_regset *regset,
17058 unsigned int pos, unsigned int count,
17059+ const void *kbuf, const void __user *ubuf) __size_overflow(3,4);
17060+int fpregs_set(struct task_struct *target, const struct user_regset *regset,
17061+ unsigned int pos, unsigned int count,
17062 const void *kbuf, const void __user *ubuf)
17063 {
17064 struct user_i387_ia32_struct env;
17065@@ -619,6 +637,8 @@ static inline int restore_i387_fsave(struct _fpstate_ia32 __user *buf)
17066 }
17067
17068 static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,
17069+ unsigned int size) __size_overflow(2);
17070+static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,
17071 unsigned int size)
17072 {
17073 struct task_struct *tsk = current;
17074diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
17075index 6104852..6114160 100644
17076--- a/arch/x86/kernel/i8259.c
17077+++ b/arch/x86/kernel/i8259.c
17078@@ -210,7 +210,7 @@ spurious_8259A_irq:
17079 "spurious 8259A interrupt: IRQ%d.\n", irq);
17080 spurious_irq_mask |= irqmask;
17081 }
17082- atomic_inc(&irq_err_count);
17083+ atomic_inc_unchecked(&irq_err_count);
17084 /*
17085 * Theoretically we do not have to handle this IRQ,
17086 * but in Linux this does not cause problems and is
17087diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
17088index 43e9ccf..44ccf6f 100644
17089--- a/arch/x86/kernel/init_task.c
17090+++ b/arch/x86/kernel/init_task.c
17091@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
17092 * way process stacks are handled. This is done by having a special
17093 * "init_task" linker map entry..
17094 */
17095-union thread_union init_thread_union __init_task_data =
17096- { INIT_THREAD_INFO(init_task) };
17097+union thread_union init_thread_union __init_task_data;
17098
17099 /*
17100 * Initial task structure.
17101@@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
17102 * section. Since TSS's are completely CPU-local, we want them
17103 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
17104 */
17105-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
17106-
17107+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
17108+EXPORT_SYMBOL(init_tss);
17109diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
17110index 8c96897..be66bfa 100644
17111--- a/arch/x86/kernel/ioport.c
17112+++ b/arch/x86/kernel/ioport.c
17113@@ -6,6 +6,7 @@
17114 #include <linux/sched.h>
17115 #include <linux/kernel.h>
17116 #include <linux/capability.h>
17117+#include <linux/security.h>
17118 #include <linux/errno.h>
17119 #include <linux/types.h>
17120 #include <linux/ioport.h>
17121@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17122
17123 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
17124 return -EINVAL;
17125+#ifdef CONFIG_GRKERNSEC_IO
17126+ if (turn_on && grsec_disable_privio) {
17127+ gr_handle_ioperm();
17128+ return -EPERM;
17129+ }
17130+#endif
17131 if (turn_on && !capable(CAP_SYS_RAWIO))
17132 return -EPERM;
17133
17134@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17135 * because the ->io_bitmap_max value must match the bitmap
17136 * contents:
17137 */
17138- tss = &per_cpu(init_tss, get_cpu());
17139+ tss = init_tss + get_cpu();
17140
17141 if (turn_on)
17142 bitmap_clear(t->io_bitmap_ptr, from, num);
17143@@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
17144 return -EINVAL;
17145 /* Trying to gain more privileges? */
17146 if (level > old) {
17147+#ifdef CONFIG_GRKERNSEC_IO
17148+ if (grsec_disable_privio) {
17149+ gr_handle_iopl();
17150+ return -EPERM;
17151+ }
17152+#endif
17153 if (!capable(CAP_SYS_RAWIO))
17154 return -EPERM;
17155 }
17156diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
17157index 429e0c9..17b3ece 100644
17158--- a/arch/x86/kernel/irq.c
17159+++ b/arch/x86/kernel/irq.c
17160@@ -18,7 +18,7 @@
17161 #include <asm/mce.h>
17162 #include <asm/hw_irq.h>
17163
17164-atomic_t irq_err_count;
17165+atomic_unchecked_t irq_err_count;
17166
17167 /* Function pointer for generic interrupt vector handling */
17168 void (*x86_platform_ipi_callback)(void) = NULL;
17169@@ -117,9 +117,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
17170 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
17171 seq_printf(p, " Machine check polls\n");
17172 #endif
17173- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
17174+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
17175 #if defined(CONFIG_X86_IO_APIC)
17176- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
17177+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
17178 #endif
17179 return 0;
17180 }
17181@@ -159,10 +159,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
17182
17183 u64 arch_irq_stat(void)
17184 {
17185- u64 sum = atomic_read(&irq_err_count);
17186+ u64 sum = atomic_read_unchecked(&irq_err_count);
17187
17188 #ifdef CONFIG_X86_IO_APIC
17189- sum += atomic_read(&irq_mis_count);
17190+ sum += atomic_read_unchecked(&irq_mis_count);
17191 #endif
17192 return sum;
17193 }
17194diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
17195index 7209070..cbcd71a 100644
17196--- a/arch/x86/kernel/irq_32.c
17197+++ b/arch/x86/kernel/irq_32.c
17198@@ -36,7 +36,7 @@ static int check_stack_overflow(void)
17199 __asm__ __volatile__("andl %%esp,%0" :
17200 "=r" (sp) : "0" (THREAD_SIZE - 1));
17201
17202- return sp < (sizeof(struct thread_info) + STACK_WARN);
17203+ return sp < STACK_WARN;
17204 }
17205
17206 static void print_stack_overflow(void)
17207@@ -54,8 +54,8 @@ static inline void print_stack_overflow(void) { }
17208 * per-CPU IRQ handling contexts (thread information and stack)
17209 */
17210 union irq_ctx {
17211- struct thread_info tinfo;
17212- u32 stack[THREAD_SIZE/sizeof(u32)];
17213+ unsigned long previous_esp;
17214+ u32 stack[THREAD_SIZE/sizeof(u32)];
17215 } __attribute__((aligned(THREAD_SIZE)));
17216
17217 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
17218@@ -75,10 +75,9 @@ static void call_on_stack(void *func, void *stack)
17219 static inline int
17220 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17221 {
17222- union irq_ctx *curctx, *irqctx;
17223+ union irq_ctx *irqctx;
17224 u32 *isp, arg1, arg2;
17225
17226- curctx = (union irq_ctx *) current_thread_info();
17227 irqctx = __this_cpu_read(hardirq_ctx);
17228
17229 /*
17230@@ -87,21 +86,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17231 * handler) we can't do that and just have to keep using the
17232 * current stack (which is the irq stack already after all)
17233 */
17234- if (unlikely(curctx == irqctx))
17235+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
17236 return 0;
17237
17238 /* build the stack frame on the IRQ stack */
17239- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17240- irqctx->tinfo.task = curctx->tinfo.task;
17241- irqctx->tinfo.previous_esp = current_stack_pointer;
17242+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17243+ irqctx->previous_esp = current_stack_pointer;
17244
17245- /*
17246- * Copy the softirq bits in preempt_count so that the
17247- * softirq checks work in the hardirq context.
17248- */
17249- irqctx->tinfo.preempt_count =
17250- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
17251- (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
17252+#ifdef CONFIG_PAX_MEMORY_UDEREF
17253+ __set_fs(MAKE_MM_SEG(0));
17254+#endif
17255
17256 if (unlikely(overflow))
17257 call_on_stack(print_stack_overflow, isp);
17258@@ -113,6 +107,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17259 : "0" (irq), "1" (desc), "2" (isp),
17260 "D" (desc->handle_irq)
17261 : "memory", "cc", "ecx");
17262+
17263+#ifdef CONFIG_PAX_MEMORY_UDEREF
17264+ __set_fs(current_thread_info()->addr_limit);
17265+#endif
17266+
17267 return 1;
17268 }
17269
17270@@ -121,29 +120,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17271 */
17272 void __cpuinit irq_ctx_init(int cpu)
17273 {
17274- union irq_ctx *irqctx;
17275-
17276 if (per_cpu(hardirq_ctx, cpu))
17277 return;
17278
17279- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17280- THREAD_FLAGS,
17281- THREAD_ORDER));
17282- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17283- irqctx->tinfo.cpu = cpu;
17284- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
17285- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17286-
17287- per_cpu(hardirq_ctx, cpu) = irqctx;
17288-
17289- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17290- THREAD_FLAGS,
17291- THREAD_ORDER));
17292- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17293- irqctx->tinfo.cpu = cpu;
17294- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17295-
17296- per_cpu(softirq_ctx, cpu) = irqctx;
17297+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
17298+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
17299
17300 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17301 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17302@@ -152,7 +133,6 @@ void __cpuinit irq_ctx_init(int cpu)
17303 asmlinkage void do_softirq(void)
17304 {
17305 unsigned long flags;
17306- struct thread_info *curctx;
17307 union irq_ctx *irqctx;
17308 u32 *isp;
17309
17310@@ -162,15 +142,22 @@ asmlinkage void do_softirq(void)
17311 local_irq_save(flags);
17312
17313 if (local_softirq_pending()) {
17314- curctx = current_thread_info();
17315 irqctx = __this_cpu_read(softirq_ctx);
17316- irqctx->tinfo.task = curctx->task;
17317- irqctx->tinfo.previous_esp = current_stack_pointer;
17318+ irqctx->previous_esp = current_stack_pointer;
17319
17320 /* build the stack frame on the softirq stack */
17321- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17322+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17323+
17324+#ifdef CONFIG_PAX_MEMORY_UDEREF
17325+ __set_fs(MAKE_MM_SEG(0));
17326+#endif
17327
17328 call_on_stack(__do_softirq, isp);
17329+
17330+#ifdef CONFIG_PAX_MEMORY_UDEREF
17331+ __set_fs(current_thread_info()->addr_limit);
17332+#endif
17333+
17334 /*
17335 * Shouldn't happen, we returned above if in_interrupt():
17336 */
17337diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
17338index 69bca46..0bac999 100644
17339--- a/arch/x86/kernel/irq_64.c
17340+++ b/arch/x86/kernel/irq_64.c
17341@@ -38,7 +38,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
17342 #ifdef CONFIG_DEBUG_STACKOVERFLOW
17343 u64 curbase = (u64)task_stack_page(current);
17344
17345- if (user_mode_vm(regs))
17346+ if (user_mode(regs))
17347 return;
17348
17349 WARN_ONCE(regs->sp >= curbase &&
17350diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
17351index faba577..93b9e71 100644
17352--- a/arch/x86/kernel/kgdb.c
17353+++ b/arch/x86/kernel/kgdb.c
17354@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
17355 #ifdef CONFIG_X86_32
17356 switch (regno) {
17357 case GDB_SS:
17358- if (!user_mode_vm(regs))
17359+ if (!user_mode(regs))
17360 *(unsigned long *)mem = __KERNEL_DS;
17361 break;
17362 case GDB_SP:
17363- if (!user_mode_vm(regs))
17364+ if (!user_mode(regs))
17365 *(unsigned long *)mem = kernel_stack_pointer(regs);
17366 break;
17367 case GDB_GS:
17368@@ -473,12 +473,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
17369 case 'k':
17370 /* clear the trace bit */
17371 linux_regs->flags &= ~X86_EFLAGS_TF;
17372- atomic_set(&kgdb_cpu_doing_single_step, -1);
17373+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
17374
17375 /* set the trace bit if we're stepping */
17376 if (remcomInBuffer[0] == 's') {
17377 linux_regs->flags |= X86_EFLAGS_TF;
17378- atomic_set(&kgdb_cpu_doing_single_step,
17379+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
17380 raw_smp_processor_id());
17381 }
17382
17383@@ -543,7 +543,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
17384
17385 switch (cmd) {
17386 case DIE_DEBUG:
17387- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
17388+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
17389 if (user_mode(regs))
17390 return single_step_cont(regs, args);
17391 break;
17392diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
17393index 7da647d..56fe348 100644
17394--- a/arch/x86/kernel/kprobes.c
17395+++ b/arch/x86/kernel/kprobes.c
17396@@ -118,8 +118,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
17397 } __attribute__((packed)) *insn;
17398
17399 insn = (struct __arch_relative_insn *)from;
17400+
17401+ pax_open_kernel();
17402 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
17403 insn->op = op;
17404+ pax_close_kernel();
17405 }
17406
17407 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
17408@@ -156,7 +159,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
17409 kprobe_opcode_t opcode;
17410 kprobe_opcode_t *orig_opcodes = opcodes;
17411
17412- if (search_exception_tables((unsigned long)opcodes))
17413+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
17414 return 0; /* Page fault may occur on this address. */
17415
17416 retry:
17417@@ -317,7 +320,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
17418 }
17419 }
17420 insn_get_length(&insn);
17421+ pax_open_kernel();
17422 memcpy(dest, insn.kaddr, insn.length);
17423+ pax_close_kernel();
17424
17425 #ifdef CONFIG_X86_64
17426 if (insn_rip_relative(&insn)) {
17427@@ -341,7 +346,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
17428 (u8 *) dest;
17429 BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
17430 disp = (u8 *) dest + insn_offset_displacement(&insn);
17431+ pax_open_kernel();
17432 *(s32 *) disp = (s32) newdisp;
17433+ pax_close_kernel();
17434 }
17435 #endif
17436 return insn.length;
17437@@ -355,12 +362,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
17438 */
17439 __copy_instruction(p->ainsn.insn, p->addr, 0);
17440
17441- if (can_boost(p->addr))
17442+ if (can_boost(ktla_ktva(p->addr)))
17443 p->ainsn.boostable = 0;
17444 else
17445 p->ainsn.boostable = -1;
17446
17447- p->opcode = *p->addr;
17448+ p->opcode = *(ktla_ktva(p->addr));
17449 }
17450
17451 int __kprobes arch_prepare_kprobe(struct kprobe *p)
17452@@ -477,7 +484,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17453 * nor set current_kprobe, because it doesn't use single
17454 * stepping.
17455 */
17456- regs->ip = (unsigned long)p->ainsn.insn;
17457+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17458 preempt_enable_no_resched();
17459 return;
17460 }
17461@@ -496,7 +503,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17462 if (p->opcode == BREAKPOINT_INSTRUCTION)
17463 regs->ip = (unsigned long)p->addr;
17464 else
17465- regs->ip = (unsigned long)p->ainsn.insn;
17466+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17467 }
17468
17469 /*
17470@@ -575,7 +582,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
17471 setup_singlestep(p, regs, kcb, 0);
17472 return 1;
17473 }
17474- } else if (*addr != BREAKPOINT_INSTRUCTION) {
17475+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
17476 /*
17477 * The breakpoint instruction was removed right
17478 * after we hit it. Another cpu has removed
17479@@ -683,6 +690,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
17480 " movq %rax, 152(%rsp)\n"
17481 RESTORE_REGS_STRING
17482 " popfq\n"
17483+#ifdef KERNEXEC_PLUGIN
17484+ " btsq $63,(%rsp)\n"
17485+#endif
17486 #else
17487 " pushf\n"
17488 SAVE_REGS_STRING
17489@@ -820,7 +830,7 @@ static void __kprobes resume_execution(struct kprobe *p,
17490 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
17491 {
17492 unsigned long *tos = stack_addr(regs);
17493- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
17494+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
17495 unsigned long orig_ip = (unsigned long)p->addr;
17496 kprobe_opcode_t *insn = p->ainsn.insn;
17497
17498@@ -1002,7 +1012,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
17499 struct die_args *args = data;
17500 int ret = NOTIFY_DONE;
17501
17502- if (args->regs && user_mode_vm(args->regs))
17503+ if (args->regs && user_mode(args->regs))
17504 return ret;
17505
17506 switch (val) {
17507@@ -1384,7 +1394,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17508 * Verify if the address gap is in 2GB range, because this uses
17509 * a relative jump.
17510 */
17511- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
17512+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
17513 if (abs(rel) > 0x7fffffff)
17514 return -ERANGE;
17515
17516@@ -1405,11 +1415,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17517 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
17518
17519 /* Set probe function call */
17520- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
17521+ synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
17522
17523 /* Set returning jmp instruction at the tail of out-of-line buffer */
17524 synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
17525- (u8 *)op->kp.addr + op->optinsn.size);
17526+ (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
17527
17528 flush_icache_range((unsigned long) buf,
17529 (unsigned long) buf + TMPL_END_IDX +
17530@@ -1431,7 +1441,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
17531 ((long)op->kp.addr + RELATIVEJUMP_SIZE));
17532
17533 /* Backup instructions which will be replaced by jump address */
17534- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
17535+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
17536 RELATIVE_ADDR_SIZE);
17537
17538 insn_buf[0] = RELATIVEJUMP_OPCODE;
17539diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
17540index a9c2116..a52d4fc 100644
17541--- a/arch/x86/kernel/kvm.c
17542+++ b/arch/x86/kernel/kvm.c
17543@@ -437,6 +437,7 @@ static void __init paravirt_ops_setup(void)
17544 pv_mmu_ops.set_pud = kvm_set_pud;
17545 #if PAGETABLE_LEVELS == 4
17546 pv_mmu_ops.set_pgd = kvm_set_pgd;
17547+ pv_mmu_ops.set_pgd_batched = kvm_set_pgd;
17548 #endif
17549 #endif
17550 pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
17551diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
17552index ea69726..8b497c9 100644
17553--- a/arch/x86/kernel/ldt.c
17554+++ b/arch/x86/kernel/ldt.c
17555@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
17556 if (reload) {
17557 #ifdef CONFIG_SMP
17558 preempt_disable();
17559- load_LDT(pc);
17560+ load_LDT_nolock(pc);
17561 if (!cpumask_equal(mm_cpumask(current->mm),
17562 cpumask_of(smp_processor_id())))
17563 smp_call_function(flush_ldt, current->mm, 1);
17564 preempt_enable();
17565 #else
17566- load_LDT(pc);
17567+ load_LDT_nolock(pc);
17568 #endif
17569 }
17570 if (oldsize) {
17571@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
17572 return err;
17573
17574 for (i = 0; i < old->size; i++)
17575- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
17576+ write_ldt_entry(new->ldt, i, old->ldt + i);
17577 return 0;
17578 }
17579
17580@@ -116,6 +116,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
17581 retval = copy_ldt(&mm->context, &old_mm->context);
17582 mutex_unlock(&old_mm->context.lock);
17583 }
17584+
17585+ if (tsk == current) {
17586+ mm->context.vdso = 0;
17587+
17588+#ifdef CONFIG_X86_32
17589+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17590+ mm->context.user_cs_base = 0UL;
17591+ mm->context.user_cs_limit = ~0UL;
17592+
17593+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17594+ cpus_clear(mm->context.cpu_user_cs_mask);
17595+#endif
17596+
17597+#endif
17598+#endif
17599+
17600+ }
17601+
17602 return retval;
17603 }
17604
17605@@ -141,6 +159,7 @@ void destroy_context(struct mm_struct *mm)
17606 }
17607 }
17608
17609+static int read_ldt(void __user *ptr, unsigned long bytecount) __size_overflow(2);
17610 static int read_ldt(void __user *ptr, unsigned long bytecount)
17611 {
17612 int err;
17613@@ -230,6 +249,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
17614 }
17615 }
17616
17617+#ifdef CONFIG_PAX_SEGMEXEC
17618+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
17619+ error = -EINVAL;
17620+ goto out_unlock;
17621+ }
17622+#endif
17623+
17624 fill_ldt(&ldt, &ldt_info);
17625 if (oldmode)
17626 ldt.avl = 0;
17627diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
17628index a3fa43b..8966f4c 100644
17629--- a/arch/x86/kernel/machine_kexec_32.c
17630+++ b/arch/x86/kernel/machine_kexec_32.c
17631@@ -27,7 +27,7 @@
17632 #include <asm/cacheflush.h>
17633 #include <asm/debugreg.h>
17634
17635-static void set_idt(void *newidt, __u16 limit)
17636+static void set_idt(struct desc_struct *newidt, __u16 limit)
17637 {
17638 struct desc_ptr curidt;
17639
17640@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit)
17641 }
17642
17643
17644-static void set_gdt(void *newgdt, __u16 limit)
17645+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
17646 {
17647 struct desc_ptr curgdt;
17648
17649@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
17650 }
17651
17652 control_page = page_address(image->control_code_page);
17653- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
17654+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
17655
17656 relocate_kernel_ptr = control_page;
17657 page_list[PA_CONTROL_PAGE] = __pa(control_page);
17658diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
17659index 3ca42d0..79d24cd 100644
17660--- a/arch/x86/kernel/microcode_intel.c
17661+++ b/arch/x86/kernel/microcode_intel.c
17662@@ -434,15 +434,16 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
17663 return ret;
17664 }
17665
17666+static int get_ucode_user(void *to, const void *from, size_t n) __size_overflow(3);
17667 static int get_ucode_user(void *to, const void *from, size_t n)
17668 {
17669- return copy_from_user(to, from, n);
17670+ return copy_from_user(to, (const void __force_user *)from, n);
17671 }
17672
17673 static enum ucode_state
17674 request_microcode_user(int cpu, const void __user *buf, size_t size)
17675 {
17676- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
17677+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
17678 }
17679
17680 static void microcode_fini_cpu(int cpu)
17681diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
17682index 925179f..267ac7a 100644
17683--- a/arch/x86/kernel/module.c
17684+++ b/arch/x86/kernel/module.c
17685@@ -36,15 +36,60 @@
17686 #define DEBUGP(fmt...)
17687 #endif
17688
17689-void *module_alloc(unsigned long size)
17690+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
17691 {
17692- if (PAGE_ALIGN(size) > MODULES_LEN)
17693+ if (size == 0 || PAGE_ALIGN(size) > MODULES_LEN)
17694 return NULL;
17695 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
17696- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
17697+ GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
17698 -1, __builtin_return_address(0));
17699 }
17700
17701+void *module_alloc(unsigned long size)
17702+{
17703+
17704+#ifdef CONFIG_PAX_KERNEXEC
17705+ return __module_alloc(size, PAGE_KERNEL);
17706+#else
17707+ return __module_alloc(size, PAGE_KERNEL_EXEC);
17708+#endif
17709+
17710+}
17711+
17712+#ifdef CONFIG_PAX_KERNEXEC
17713+#ifdef CONFIG_X86_32
17714+void *module_alloc_exec(unsigned long size)
17715+{
17716+ struct vm_struct *area;
17717+
17718+ if (size == 0)
17719+ return NULL;
17720+
17721+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
17722+ return area ? area->addr : NULL;
17723+}
17724+EXPORT_SYMBOL(module_alloc_exec);
17725+
17726+void module_free_exec(struct module *mod, void *module_region)
17727+{
17728+ vunmap(module_region);
17729+}
17730+EXPORT_SYMBOL(module_free_exec);
17731+#else
17732+void module_free_exec(struct module *mod, void *module_region)
17733+{
17734+ module_free(mod, module_region);
17735+}
17736+EXPORT_SYMBOL(module_free_exec);
17737+
17738+void *module_alloc_exec(unsigned long size)
17739+{
17740+ return __module_alloc(size, PAGE_KERNEL_RX);
17741+}
17742+EXPORT_SYMBOL(module_alloc_exec);
17743+#endif
17744+#endif
17745+
17746 #ifdef CONFIG_X86_32
17747 int apply_relocate(Elf32_Shdr *sechdrs,
17748 const char *strtab,
17749@@ -55,14 +100,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
17750 unsigned int i;
17751 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
17752 Elf32_Sym *sym;
17753- uint32_t *location;
17754+ uint32_t *plocation, location;
17755
17756 DEBUGP("Applying relocate section %u to %u\n", relsec,
17757 sechdrs[relsec].sh_info);
17758 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
17759 /* This is where to make the change */
17760- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
17761- + rel[i].r_offset;
17762+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
17763+ location = (uint32_t)plocation;
17764+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
17765+ plocation = ktla_ktva((void *)plocation);
17766 /* This is the symbol it is referring to. Note that all
17767 undefined symbols have been resolved. */
17768 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
17769@@ -71,11 +118,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
17770 switch (ELF32_R_TYPE(rel[i].r_info)) {
17771 case R_386_32:
17772 /* We add the value into the location given */
17773- *location += sym->st_value;
17774+ pax_open_kernel();
17775+ *plocation += sym->st_value;
17776+ pax_close_kernel();
17777 break;
17778 case R_386_PC32:
17779 /* Add the value, subtract its postition */
17780- *location += sym->st_value - (uint32_t)location;
17781+ pax_open_kernel();
17782+ *plocation += sym->st_value - location;
17783+ pax_close_kernel();
17784 break;
17785 default:
17786 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
17787@@ -120,21 +171,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
17788 case R_X86_64_NONE:
17789 break;
17790 case R_X86_64_64:
17791+ pax_open_kernel();
17792 *(u64 *)loc = val;
17793+ pax_close_kernel();
17794 break;
17795 case R_X86_64_32:
17796+ pax_open_kernel();
17797 *(u32 *)loc = val;
17798+ pax_close_kernel();
17799 if (val != *(u32 *)loc)
17800 goto overflow;
17801 break;
17802 case R_X86_64_32S:
17803+ pax_open_kernel();
17804 *(s32 *)loc = val;
17805+ pax_close_kernel();
17806 if ((s64)val != *(s32 *)loc)
17807 goto overflow;
17808 break;
17809 case R_X86_64_PC32:
17810 val -= (u64)loc;
17811+ pax_open_kernel();
17812 *(u32 *)loc = val;
17813+ pax_close_kernel();
17814+
17815 #if 0
17816 if ((s64)val != *(s32 *)loc)
17817 goto overflow;
17818diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
17819index e88f37b..1353db6 100644
17820--- a/arch/x86/kernel/nmi.c
17821+++ b/arch/x86/kernel/nmi.c
17822@@ -408,6 +408,17 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
17823 dotraplinkage notrace __kprobes void
17824 do_nmi(struct pt_regs *regs, long error_code)
17825 {
17826+
17827+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17828+ if (!user_mode(regs)) {
17829+ unsigned long cs = regs->cs & 0xFFFF;
17830+ unsigned long ip = ktva_ktla(regs->ip);
17831+
17832+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
17833+ regs->ip = ip;
17834+ }
17835+#endif
17836+
17837 nmi_enter();
17838
17839 inc_irq_stat(__nmi_count);
17840diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
17841index 676b8c7..870ba04 100644
17842--- a/arch/x86/kernel/paravirt-spinlocks.c
17843+++ b/arch/x86/kernel/paravirt-spinlocks.c
17844@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
17845 arch_spin_lock(lock);
17846 }
17847
17848-struct pv_lock_ops pv_lock_ops = {
17849+struct pv_lock_ops pv_lock_ops __read_only = {
17850 #ifdef CONFIG_SMP
17851 .spin_is_locked = __ticket_spin_is_locked,
17852 .spin_is_contended = __ticket_spin_is_contended,
17853diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
17854index d90272e..6bb013b 100644
17855--- a/arch/x86/kernel/paravirt.c
17856+++ b/arch/x86/kernel/paravirt.c
17857@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
17858 {
17859 return x;
17860 }
17861+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
17862+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
17863+#endif
17864
17865 void __init default_banner(void)
17866 {
17867@@ -145,15 +148,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
17868 if (opfunc == NULL)
17869 /* If there's no function, patch it with a ud2a (BUG) */
17870 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
17871- else if (opfunc == _paravirt_nop)
17872+ else if (opfunc == (void *)_paravirt_nop)
17873 /* If the operation is a nop, then nop the callsite */
17874 ret = paravirt_patch_nop();
17875
17876 /* identity functions just return their single argument */
17877- else if (opfunc == _paravirt_ident_32)
17878+ else if (opfunc == (void *)_paravirt_ident_32)
17879 ret = paravirt_patch_ident_32(insnbuf, len);
17880- else if (opfunc == _paravirt_ident_64)
17881+ else if (opfunc == (void *)_paravirt_ident_64)
17882 ret = paravirt_patch_ident_64(insnbuf, len);
17883+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
17884+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
17885+ ret = paravirt_patch_ident_64(insnbuf, len);
17886+#endif
17887
17888 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
17889 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
17890@@ -178,7 +185,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
17891 if (insn_len > len || start == NULL)
17892 insn_len = len;
17893 else
17894- memcpy(insnbuf, start, insn_len);
17895+ memcpy(insnbuf, ktla_ktva(start), insn_len);
17896
17897 return insn_len;
17898 }
17899@@ -302,7 +309,7 @@ void arch_flush_lazy_mmu_mode(void)
17900 preempt_enable();
17901 }
17902
17903-struct pv_info pv_info = {
17904+struct pv_info pv_info __read_only = {
17905 .name = "bare hardware",
17906 .paravirt_enabled = 0,
17907 .kernel_rpl = 0,
17908@@ -313,16 +320,16 @@ struct pv_info pv_info = {
17909 #endif
17910 };
17911
17912-struct pv_init_ops pv_init_ops = {
17913+struct pv_init_ops pv_init_ops __read_only = {
17914 .patch = native_patch,
17915 };
17916
17917-struct pv_time_ops pv_time_ops = {
17918+struct pv_time_ops pv_time_ops __read_only = {
17919 .sched_clock = native_sched_clock,
17920 .steal_clock = native_steal_clock,
17921 };
17922
17923-struct pv_irq_ops pv_irq_ops = {
17924+struct pv_irq_ops pv_irq_ops __read_only = {
17925 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
17926 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
17927 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
17928@@ -334,7 +341,7 @@ struct pv_irq_ops pv_irq_ops = {
17929 #endif
17930 };
17931
17932-struct pv_cpu_ops pv_cpu_ops = {
17933+struct pv_cpu_ops pv_cpu_ops __read_only = {
17934 .cpuid = native_cpuid,
17935 .get_debugreg = native_get_debugreg,
17936 .set_debugreg = native_set_debugreg,
17937@@ -395,21 +402,26 @@ struct pv_cpu_ops pv_cpu_ops = {
17938 .end_context_switch = paravirt_nop,
17939 };
17940
17941-struct pv_apic_ops pv_apic_ops = {
17942+struct pv_apic_ops pv_apic_ops __read_only = {
17943 #ifdef CONFIG_X86_LOCAL_APIC
17944 .startup_ipi_hook = paravirt_nop,
17945 #endif
17946 };
17947
17948-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
17949+#ifdef CONFIG_X86_32
17950+#ifdef CONFIG_X86_PAE
17951+/* 64-bit pagetable entries */
17952+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
17953+#else
17954 /* 32-bit pagetable entries */
17955 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
17956+#endif
17957 #else
17958 /* 64-bit pagetable entries */
17959 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
17960 #endif
17961
17962-struct pv_mmu_ops pv_mmu_ops = {
17963+struct pv_mmu_ops pv_mmu_ops __read_only = {
17964
17965 .read_cr2 = native_read_cr2,
17966 .write_cr2 = native_write_cr2,
17967@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
17968 .make_pud = PTE_IDENT,
17969
17970 .set_pgd = native_set_pgd,
17971+ .set_pgd_batched = native_set_pgd_batched,
17972 #endif
17973 #endif /* PAGETABLE_LEVELS >= 3 */
17974
17975@@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = {
17976 },
17977
17978 .set_fixmap = native_set_fixmap,
17979+
17980+#ifdef CONFIG_PAX_KERNEXEC
17981+ .pax_open_kernel = native_pax_open_kernel,
17982+ .pax_close_kernel = native_pax_close_kernel,
17983+#endif
17984+
17985 };
17986
17987 EXPORT_SYMBOL_GPL(pv_time_ops);
17988diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
17989index 35ccf75..7a15747 100644
17990--- a/arch/x86/kernel/pci-iommu_table.c
17991+++ b/arch/x86/kernel/pci-iommu_table.c
17992@@ -2,7 +2,7 @@
17993 #include <asm/iommu_table.h>
17994 #include <linux/string.h>
17995 #include <linux/kallsyms.h>
17996-
17997+#include <linux/sched.h>
17998
17999 #define DEBUG 1
18000
18001diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
18002index ee5d4fb..426649b 100644
18003--- a/arch/x86/kernel/process.c
18004+++ b/arch/x86/kernel/process.c
18005@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_struct *tsk)
18006
18007 void free_thread_info(struct thread_info *ti)
18008 {
18009- free_thread_xstate(ti->task);
18010 free_pages((unsigned long)ti, THREAD_ORDER);
18011 }
18012
18013+static struct kmem_cache *task_struct_cachep;
18014+
18015 void arch_task_cache_init(void)
18016 {
18017- task_xstate_cachep =
18018- kmem_cache_create("task_xstate", xstate_size,
18019+ /* create a slab on which task_structs can be allocated */
18020+ task_struct_cachep =
18021+ kmem_cache_create("task_struct", sizeof(struct task_struct),
18022+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
18023+
18024+ task_xstate_cachep =
18025+ kmem_cache_create("task_xstate", xstate_size,
18026 __alignof__(union thread_xstate),
18027- SLAB_PANIC | SLAB_NOTRACK, NULL);
18028+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
18029+}
18030+
18031+struct task_struct *alloc_task_struct_node(int node)
18032+{
18033+ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
18034+}
18035+
18036+void free_task_struct(struct task_struct *task)
18037+{
18038+ free_thread_xstate(task);
18039+ kmem_cache_free(task_struct_cachep, task);
18040 }
18041
18042 /*
18043@@ -70,7 +87,7 @@ void exit_thread(void)
18044 unsigned long *bp = t->io_bitmap_ptr;
18045
18046 if (bp) {
18047- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
18048+ struct tss_struct *tss = init_tss + get_cpu();
18049
18050 t->io_bitmap_ptr = NULL;
18051 clear_thread_flag(TIF_IO_BITMAP);
18052@@ -106,7 +123,7 @@ void show_regs_common(void)
18053
18054 printk(KERN_CONT "\n");
18055 printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
18056- current->pid, current->comm, print_tainted(),
18057+ task_pid_nr(current), current->comm, print_tainted(),
18058 init_utsname()->release,
18059 (int)strcspn(init_utsname()->version, " "),
18060 init_utsname()->version);
18061@@ -120,6 +137,9 @@ void flush_thread(void)
18062 {
18063 struct task_struct *tsk = current;
18064
18065+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18066+ loadsegment(gs, 0);
18067+#endif
18068 flush_ptrace_hw_breakpoint(tsk);
18069 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
18070 /*
18071@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
18072 regs.di = (unsigned long) arg;
18073
18074 #ifdef CONFIG_X86_32
18075- regs.ds = __USER_DS;
18076- regs.es = __USER_DS;
18077+ regs.ds = __KERNEL_DS;
18078+ regs.es = __KERNEL_DS;
18079 regs.fs = __KERNEL_PERCPU;
18080- regs.gs = __KERNEL_STACK_CANARY;
18081+ savesegment(gs, regs.gs);
18082 #else
18083 regs.ss = __KERNEL_DS;
18084 #endif
18085@@ -411,7 +431,7 @@ bool set_pm_idle_to_default(void)
18086
18087 return ret;
18088 }
18089-void stop_this_cpu(void *dummy)
18090+__noreturn void stop_this_cpu(void *dummy)
18091 {
18092 local_irq_disable();
18093 /*
18094@@ -653,16 +673,37 @@ static int __init idle_setup(char *str)
18095 }
18096 early_param("idle", idle_setup);
18097
18098-unsigned long arch_align_stack(unsigned long sp)
18099+#ifdef CONFIG_PAX_RANDKSTACK
18100+void pax_randomize_kstack(struct pt_regs *regs)
18101 {
18102- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
18103- sp -= get_random_int() % 8192;
18104- return sp & ~0xf;
18105-}
18106+ struct thread_struct *thread = &current->thread;
18107+ unsigned long time;
18108
18109-unsigned long arch_randomize_brk(struct mm_struct *mm)
18110-{
18111- unsigned long range_end = mm->brk + 0x02000000;
18112- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
18113-}
18114+ if (!randomize_va_space)
18115+ return;
18116+
18117+ if (v8086_mode(regs))
18118+ return;
18119
18120+ rdtscl(time);
18121+
18122+ /* P4 seems to return a 0 LSB, ignore it */
18123+#ifdef CONFIG_MPENTIUM4
18124+ time &= 0x3EUL;
18125+ time <<= 2;
18126+#elif defined(CONFIG_X86_64)
18127+ time &= 0xFUL;
18128+ time <<= 4;
18129+#else
18130+ time &= 0x1FUL;
18131+ time <<= 3;
18132+#endif
18133+
18134+ thread->sp0 ^= time;
18135+ load_sp0(init_tss + smp_processor_id(), thread);
18136+
18137+#ifdef CONFIG_X86_64
18138+ percpu_write(kernel_stack, thread->sp0);
18139+#endif
18140+}
18141+#endif
18142diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
18143index 8598296..bfadef0 100644
18144--- a/arch/x86/kernel/process_32.c
18145+++ b/arch/x86/kernel/process_32.c
18146@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
18147 unsigned long thread_saved_pc(struct task_struct *tsk)
18148 {
18149 return ((unsigned long *)tsk->thread.sp)[3];
18150+//XXX return tsk->thread.eip;
18151 }
18152
18153 #ifndef CONFIG_SMP
18154@@ -130,15 +131,14 @@ void __show_regs(struct pt_regs *regs, int all)
18155 unsigned long sp;
18156 unsigned short ss, gs;
18157
18158- if (user_mode_vm(regs)) {
18159+ if (user_mode(regs)) {
18160 sp = regs->sp;
18161 ss = regs->ss & 0xffff;
18162- gs = get_user_gs(regs);
18163 } else {
18164 sp = kernel_stack_pointer(regs);
18165 savesegment(ss, ss);
18166- savesegment(gs, gs);
18167 }
18168+ gs = get_user_gs(regs);
18169
18170 show_regs_common();
18171
18172@@ -200,13 +200,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18173 struct task_struct *tsk;
18174 int err;
18175
18176- childregs = task_pt_regs(p);
18177+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
18178 *childregs = *regs;
18179 childregs->ax = 0;
18180 childregs->sp = sp;
18181
18182 p->thread.sp = (unsigned long) childregs;
18183 p->thread.sp0 = (unsigned long) (childregs+1);
18184+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18185
18186 p->thread.ip = (unsigned long) ret_from_fork;
18187
18188@@ -296,7 +297,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18189 struct thread_struct *prev = &prev_p->thread,
18190 *next = &next_p->thread;
18191 int cpu = smp_processor_id();
18192- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18193+ struct tss_struct *tss = init_tss + cpu;
18194 fpu_switch_t fpu;
18195
18196 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
18197@@ -320,6 +321,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18198 */
18199 lazy_save_gs(prev->gs);
18200
18201+#ifdef CONFIG_PAX_MEMORY_UDEREF
18202+ __set_fs(task_thread_info(next_p)->addr_limit);
18203+#endif
18204+
18205 /*
18206 * Load the per-thread Thread-Local Storage descriptor.
18207 */
18208@@ -350,6 +355,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18209 */
18210 arch_end_context_switch(next_p);
18211
18212+ percpu_write(current_task, next_p);
18213+ percpu_write(current_tinfo, &next_p->tinfo);
18214+
18215 /*
18216 * Restore %gs if needed (which is common)
18217 */
18218@@ -358,8 +366,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18219
18220 switch_fpu_finish(next_p, fpu);
18221
18222- percpu_write(current_task, next_p);
18223-
18224 return prev_p;
18225 }
18226
18227@@ -389,4 +395,3 @@ unsigned long get_wchan(struct task_struct *p)
18228 } while (count++ < 16);
18229 return 0;
18230 }
18231-
18232diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
18233index 6a364a6..b147d11 100644
18234--- a/arch/x86/kernel/process_64.c
18235+++ b/arch/x86/kernel/process_64.c
18236@@ -89,7 +89,7 @@ static void __exit_idle(void)
18237 void exit_idle(void)
18238 {
18239 /* idle loop has pid 0 */
18240- if (current->pid)
18241+ if (task_pid_nr(current))
18242 return;
18243 __exit_idle();
18244 }
18245@@ -264,8 +264,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18246 struct pt_regs *childregs;
18247 struct task_struct *me = current;
18248
18249- childregs = ((struct pt_regs *)
18250- (THREAD_SIZE + task_stack_page(p))) - 1;
18251+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
18252 *childregs = *regs;
18253
18254 childregs->ax = 0;
18255@@ -277,6 +276,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18256 p->thread.sp = (unsigned long) childregs;
18257 p->thread.sp0 = (unsigned long) (childregs+1);
18258 p->thread.usersp = me->thread.usersp;
18259+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18260
18261 set_tsk_thread_flag(p, TIF_FORK);
18262
18263@@ -379,7 +379,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18264 struct thread_struct *prev = &prev_p->thread;
18265 struct thread_struct *next = &next_p->thread;
18266 int cpu = smp_processor_id();
18267- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18268+ struct tss_struct *tss = init_tss + cpu;
18269 unsigned fsindex, gsindex;
18270 fpu_switch_t fpu;
18271
18272@@ -461,10 +461,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18273 prev->usersp = percpu_read(old_rsp);
18274 percpu_write(old_rsp, next->usersp);
18275 percpu_write(current_task, next_p);
18276+ percpu_write(current_tinfo, &next_p->tinfo);
18277
18278- percpu_write(kernel_stack,
18279- (unsigned long)task_stack_page(next_p) +
18280- THREAD_SIZE - KERNEL_STACK_OFFSET);
18281+ percpu_write(kernel_stack, next->sp0);
18282
18283 /*
18284 * Now maybe reload the debug registers and handle I/O bitmaps
18285@@ -519,12 +518,11 @@ unsigned long get_wchan(struct task_struct *p)
18286 if (!p || p == current || p->state == TASK_RUNNING)
18287 return 0;
18288 stack = (unsigned long)task_stack_page(p);
18289- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
18290+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
18291 return 0;
18292 fp = *(u64 *)(p->thread.sp);
18293 do {
18294- if (fp < (unsigned long)stack ||
18295- fp >= (unsigned long)stack+THREAD_SIZE)
18296+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
18297 return 0;
18298 ip = *(u64 *)(fp+8);
18299 if (!in_sched_functions(ip))
18300diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
18301index 8252879..f367ec9 100644
18302--- a/arch/x86/kernel/ptrace.c
18303+++ b/arch/x86/kernel/ptrace.c
18304@@ -791,6 +791,10 @@ static int ioperm_active(struct task_struct *target,
18305 static int ioperm_get(struct task_struct *target,
18306 const struct user_regset *regset,
18307 unsigned int pos, unsigned int count,
18308+ void *kbuf, void __user *ubuf) __size_overflow(3,4);
18309+static int ioperm_get(struct task_struct *target,
18310+ const struct user_regset *regset,
18311+ unsigned int pos, unsigned int count,
18312 void *kbuf, void __user *ubuf)
18313 {
18314 if (!target->thread.io_bitmap_ptr)
18315@@ -822,7 +826,7 @@ long arch_ptrace(struct task_struct *child, long request,
18316 unsigned long addr, unsigned long data)
18317 {
18318 int ret;
18319- unsigned long __user *datap = (unsigned long __user *)data;
18320+ unsigned long __user *datap = (__force unsigned long __user *)data;
18321
18322 switch (request) {
18323 /* read the word at location addr in the USER area. */
18324@@ -907,14 +911,14 @@ long arch_ptrace(struct task_struct *child, long request,
18325 if ((int) addr < 0)
18326 return -EIO;
18327 ret = do_get_thread_area(child, addr,
18328- (struct user_desc __user *)data);
18329+ (__force struct user_desc __user *) data);
18330 break;
18331
18332 case PTRACE_SET_THREAD_AREA:
18333 if ((int) addr < 0)
18334 return -EIO;
18335 ret = do_set_thread_area(child, addr,
18336- (struct user_desc __user *)data, 0);
18337+ (__force struct user_desc __user *) data, 0);
18338 break;
18339 #endif
18340
18341@@ -1331,7 +1335,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
18342 memset(info, 0, sizeof(*info));
18343 info->si_signo = SIGTRAP;
18344 info->si_code = si_code;
18345- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
18346+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
18347 }
18348
18349 void user_single_step_siginfo(struct task_struct *tsk,
18350diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
18351index 42eb330..139955c 100644
18352--- a/arch/x86/kernel/pvclock.c
18353+++ b/arch/x86/kernel/pvclock.c
18354@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
18355 return pv_tsc_khz;
18356 }
18357
18358-static atomic64_t last_value = ATOMIC64_INIT(0);
18359+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
18360
18361 void pvclock_resume(void)
18362 {
18363- atomic64_set(&last_value, 0);
18364+ atomic64_set_unchecked(&last_value, 0);
18365 }
18366
18367 cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18368@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18369 * updating at the same time, and one of them could be slightly behind,
18370 * making the assumption that last_value always go forward fail to hold.
18371 */
18372- last = atomic64_read(&last_value);
18373+ last = atomic64_read_unchecked(&last_value);
18374 do {
18375 if (ret < last)
18376 return last;
18377- last = atomic64_cmpxchg(&last_value, last, ret);
18378+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
18379 } while (unlikely(last != ret));
18380
18381 return ret;
18382diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
18383index 37a458b..e63d183 100644
18384--- a/arch/x86/kernel/reboot.c
18385+++ b/arch/x86/kernel/reboot.c
18386@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
18387 EXPORT_SYMBOL(pm_power_off);
18388
18389 static const struct desc_ptr no_idt = {};
18390-static int reboot_mode;
18391+static unsigned short reboot_mode;
18392 enum reboot_type reboot_type = BOOT_ACPI;
18393 int reboot_force;
18394
18395@@ -324,13 +324,17 @@ core_initcall(reboot_init);
18396 extern const unsigned char machine_real_restart_asm[];
18397 extern const u64 machine_real_restart_gdt[3];
18398
18399-void machine_real_restart(unsigned int type)
18400+__noreturn void machine_real_restart(unsigned int type)
18401 {
18402 void *restart_va;
18403 unsigned long restart_pa;
18404- void (*restart_lowmem)(unsigned int);
18405+ void (* __noreturn restart_lowmem)(unsigned int);
18406 u64 *lowmem_gdt;
18407
18408+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18409+ struct desc_struct *gdt;
18410+#endif
18411+
18412 local_irq_disable();
18413
18414 /* Write zero to CMOS register number 0x0f, which the BIOS POST
18415@@ -356,14 +360,14 @@ void machine_real_restart(unsigned int type)
18416 boot)". This seems like a fairly standard thing that gets set by
18417 REBOOT.COM programs, and the previous reset routine did this
18418 too. */
18419- *((unsigned short *)0x472) = reboot_mode;
18420+ *(unsigned short *)(__va(0x472)) = reboot_mode;
18421
18422 /* Patch the GDT in the low memory trampoline */
18423 lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt);
18424
18425 restart_va = TRAMPOLINE_SYM(machine_real_restart_asm);
18426 restart_pa = virt_to_phys(restart_va);
18427- restart_lowmem = (void (*)(unsigned int))restart_pa;
18428+ restart_lowmem = (void *)restart_pa;
18429
18430 /* GDT[0]: GDT self-pointer */
18431 lowmem_gdt[0] =
18432@@ -374,7 +378,33 @@ void machine_real_restart(unsigned int type)
18433 GDT_ENTRY(0x009b, restart_pa, 0xffff);
18434
18435 /* Jump to the identity-mapped low memory code */
18436+
18437+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18438+ gdt = get_cpu_gdt_table(smp_processor_id());
18439+ pax_open_kernel();
18440+#ifdef CONFIG_PAX_MEMORY_UDEREF
18441+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
18442+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
18443+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
18444+#endif
18445+#ifdef CONFIG_PAX_KERNEXEC
18446+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
18447+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
18448+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
18449+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
18450+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
18451+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
18452+#endif
18453+ pax_close_kernel();
18454+#endif
18455+
18456+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18457+ asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
18458+ unreachable();
18459+#else
18460 restart_lowmem(type);
18461+#endif
18462+
18463 }
18464 #ifdef CONFIG_APM_MODULE
18465 EXPORT_SYMBOL(machine_real_restart);
18466@@ -540,7 +570,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
18467 * try to force a triple fault and then cycle between hitting the keyboard
18468 * controller and doing that
18469 */
18470-static void native_machine_emergency_restart(void)
18471+__noreturn static void native_machine_emergency_restart(void)
18472 {
18473 int i;
18474 int attempt = 0;
18475@@ -664,13 +694,13 @@ void native_machine_shutdown(void)
18476 #endif
18477 }
18478
18479-static void __machine_emergency_restart(int emergency)
18480+static __noreturn void __machine_emergency_restart(int emergency)
18481 {
18482 reboot_emergency = emergency;
18483 machine_ops.emergency_restart();
18484 }
18485
18486-static void native_machine_restart(char *__unused)
18487+static __noreturn void native_machine_restart(char *__unused)
18488 {
18489 printk("machine restart\n");
18490
18491@@ -679,7 +709,7 @@ static void native_machine_restart(char *__unused)
18492 __machine_emergency_restart(0);
18493 }
18494
18495-static void native_machine_halt(void)
18496+static __noreturn void native_machine_halt(void)
18497 {
18498 /* stop other cpus and apics */
18499 machine_shutdown();
18500@@ -690,7 +720,7 @@ static void native_machine_halt(void)
18501 stop_this_cpu(NULL);
18502 }
18503
18504-static void native_machine_power_off(void)
18505+__noreturn static void native_machine_power_off(void)
18506 {
18507 if (pm_power_off) {
18508 if (!reboot_force)
18509@@ -699,6 +729,7 @@ static void native_machine_power_off(void)
18510 }
18511 /* a fallback in case there is no PM info available */
18512 tboot_shutdown(TB_SHUTDOWN_HALT);
18513+ unreachable();
18514 }
18515
18516 struct machine_ops machine_ops = {
18517diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
18518index 7a6f3b3..bed145d7 100644
18519--- a/arch/x86/kernel/relocate_kernel_64.S
18520+++ b/arch/x86/kernel/relocate_kernel_64.S
18521@@ -11,6 +11,7 @@
18522 #include <asm/kexec.h>
18523 #include <asm/processor-flags.h>
18524 #include <asm/pgtable_types.h>
18525+#include <asm/alternative-asm.h>
18526
18527 /*
18528 * Must be relocatable PIC code callable as a C function
18529@@ -160,13 +161,14 @@ identity_mapped:
18530 xorq %rbp, %rbp
18531 xorq %r8, %r8
18532 xorq %r9, %r9
18533- xorq %r10, %r9
18534+ xorq %r10, %r10
18535 xorq %r11, %r11
18536 xorq %r12, %r12
18537 xorq %r13, %r13
18538 xorq %r14, %r14
18539 xorq %r15, %r15
18540
18541+ pax_force_retaddr 0, 1
18542 ret
18543
18544 1:
18545diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
18546index cf0ef98..e3f780b 100644
18547--- a/arch/x86/kernel/setup.c
18548+++ b/arch/x86/kernel/setup.c
18549@@ -447,7 +447,7 @@ static void __init parse_setup_data(void)
18550
18551 switch (data->type) {
18552 case SETUP_E820_EXT:
18553- parse_e820_ext(data);
18554+ parse_e820_ext((struct setup_data __force_kernel *)data);
18555 break;
18556 case SETUP_DTB:
18557 add_dtb(pa_data);
18558@@ -650,7 +650,7 @@ static void __init trim_bios_range(void)
18559 * area (640->1Mb) as ram even though it is not.
18560 * take them out.
18561 */
18562- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
18563+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
18564 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
18565 }
18566
18567@@ -773,14 +773,14 @@ void __init setup_arch(char **cmdline_p)
18568
18569 if (!boot_params.hdr.root_flags)
18570 root_mountflags &= ~MS_RDONLY;
18571- init_mm.start_code = (unsigned long) _text;
18572- init_mm.end_code = (unsigned long) _etext;
18573+ init_mm.start_code = ktla_ktva((unsigned long) _text);
18574+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
18575 init_mm.end_data = (unsigned long) _edata;
18576 init_mm.brk = _brk_end;
18577
18578- code_resource.start = virt_to_phys(_text);
18579- code_resource.end = virt_to_phys(_etext)-1;
18580- data_resource.start = virt_to_phys(_etext);
18581+ code_resource.start = virt_to_phys(ktla_ktva(_text));
18582+ code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
18583+ data_resource.start = virt_to_phys(_sdata);
18584 data_resource.end = virt_to_phys(_edata)-1;
18585 bss_resource.start = virt_to_phys(&__bss_start);
18586 bss_resource.end = virt_to_phys(&__bss_stop)-1;
18587diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
18588index 71f4727..217419b 100644
18589--- a/arch/x86/kernel/setup_percpu.c
18590+++ b/arch/x86/kernel/setup_percpu.c
18591@@ -21,19 +21,17 @@
18592 #include <asm/cpu.h>
18593 #include <asm/stackprotector.h>
18594
18595-DEFINE_PER_CPU(int, cpu_number);
18596+#ifdef CONFIG_SMP
18597+DEFINE_PER_CPU(unsigned int, cpu_number);
18598 EXPORT_PER_CPU_SYMBOL(cpu_number);
18599+#endif
18600
18601-#ifdef CONFIG_X86_64
18602 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
18603-#else
18604-#define BOOT_PERCPU_OFFSET 0
18605-#endif
18606
18607 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
18608 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
18609
18610-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
18611+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
18612 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
18613 };
18614 EXPORT_SYMBOL(__per_cpu_offset);
18615@@ -96,6 +94,8 @@ static bool __init pcpu_need_numa(void)
18616 * Pointer to the allocated area on success, NULL on failure.
18617 */
18618 static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18619+ unsigned long align) __size_overflow(2);
18620+static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18621 unsigned long align)
18622 {
18623 const unsigned long goal = __pa(MAX_DMA_ADDRESS);
18624@@ -124,6 +124,8 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18625 /*
18626 * Helpers for first chunk memory allocation
18627 */
18628+static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align) __size_overflow(2);
18629+
18630 static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)
18631 {
18632 return pcpu_alloc_bootmem(cpu, size, align);
18633@@ -155,10 +157,10 @@ static inline void setup_percpu_segment(int cpu)
18634 {
18635 #ifdef CONFIG_X86_32
18636 struct desc_struct gdt;
18637+ unsigned long base = per_cpu_offset(cpu);
18638
18639- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
18640- 0x2 | DESCTYPE_S, 0x8);
18641- gdt.s = 1;
18642+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
18643+ 0x83 | DESCTYPE_S, 0xC);
18644 write_gdt_entry(get_cpu_gdt_table(cpu),
18645 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
18646 #endif
18647@@ -207,6 +209,11 @@ void __init setup_per_cpu_areas(void)
18648 /* alrighty, percpu areas up and running */
18649 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
18650 for_each_possible_cpu(cpu) {
18651+#ifdef CONFIG_CC_STACKPROTECTOR
18652+#ifdef CONFIG_X86_32
18653+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
18654+#endif
18655+#endif
18656 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
18657 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
18658 per_cpu(cpu_number, cpu) = cpu;
18659@@ -247,6 +254,12 @@ void __init setup_per_cpu_areas(void)
18660 */
18661 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
18662 #endif
18663+#ifdef CONFIG_CC_STACKPROTECTOR
18664+#ifdef CONFIG_X86_32
18665+ if (!cpu)
18666+ per_cpu(stack_canary.canary, cpu) = canary;
18667+#endif
18668+#endif
18669 /*
18670 * Up to this point, the boot CPU has been using .init.data
18671 * area. Reload any changed state for the boot CPU.
18672diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
18673index 54ddaeb2..22c3bdc 100644
18674--- a/arch/x86/kernel/signal.c
18675+++ b/arch/x86/kernel/signal.c
18676@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsigned long sp)
18677 * Align the stack pointer according to the i386 ABI,
18678 * i.e. so that on function entry ((sp + 4) & 15) == 0.
18679 */
18680- sp = ((sp + 4) & -16ul) - 4;
18681+ sp = ((sp - 12) & -16ul) - 4;
18682 #else /* !CONFIG_X86_32 */
18683 sp = round_down(sp, 16) - 8;
18684 #endif
18685@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
18686 * Return an always-bogus address instead so we will die with SIGSEGV.
18687 */
18688 if (onsigstack && !likely(on_sig_stack(sp)))
18689- return (void __user *)-1L;
18690+ return (__force void __user *)-1L;
18691
18692 /* save i387 state */
18693 if (used_math() && save_i387_xstate(*fpstate) < 0)
18694- return (void __user *)-1L;
18695+ return (__force void __user *)-1L;
18696
18697 return (void __user *)sp;
18698 }
18699@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
18700 }
18701
18702 if (current->mm->context.vdso)
18703- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
18704+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
18705 else
18706- restorer = &frame->retcode;
18707+ restorer = (void __user *)&frame->retcode;
18708 if (ka->sa.sa_flags & SA_RESTORER)
18709 restorer = ka->sa.sa_restorer;
18710
18711@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
18712 * reasons and because gdb uses it as a signature to notice
18713 * signal handler stack frames.
18714 */
18715- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
18716+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
18717
18718 if (err)
18719 return -EFAULT;
18720@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
18721 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
18722
18723 /* Set up to return from userspace. */
18724- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
18725+ if (current->mm->context.vdso)
18726+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
18727+ else
18728+ restorer = (void __user *)&frame->retcode;
18729 if (ka->sa.sa_flags & SA_RESTORER)
18730 restorer = ka->sa.sa_restorer;
18731 put_user_ex(restorer, &frame->pretcode);
18732@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
18733 * reasons and because gdb uses it as a signature to notice
18734 * signal handler stack frames.
18735 */
18736- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
18737+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
18738 } put_user_catch(err);
18739
18740 if (err)
18741@@ -769,7 +772,7 @@ static void do_signal(struct pt_regs *regs)
18742 * X86_32: vm86 regs switched out by assembly code before reaching
18743 * here, so testing against kernel CS suffices.
18744 */
18745- if (!user_mode(regs))
18746+ if (!user_mode_novm(regs))
18747 return;
18748
18749 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
18750diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
18751index 9f548cb..caf76f7 100644
18752--- a/arch/x86/kernel/smpboot.c
18753+++ b/arch/x86/kernel/smpboot.c
18754@@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
18755 set_idle_for_cpu(cpu, c_idle.idle);
18756 do_rest:
18757 per_cpu(current_task, cpu) = c_idle.idle;
18758+ per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
18759 #ifdef CONFIG_X86_32
18760 /* Stack for startup_32 can be just as for start_secondary onwards */
18761 irq_ctx_init(cpu);
18762 #else
18763 clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
18764 initial_gs = per_cpu_offset(cpu);
18765- per_cpu(kernel_stack, cpu) =
18766- (unsigned long)task_stack_page(c_idle.idle) -
18767- KERNEL_STACK_OFFSET + THREAD_SIZE;
18768+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
18769 #endif
18770+
18771+ pax_open_kernel();
18772 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
18773+ pax_close_kernel();
18774+
18775 initial_code = (unsigned long)start_secondary;
18776 stack_start = c_idle.idle->thread.sp;
18777
18778@@ -861,6 +864,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
18779
18780 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
18781
18782+#ifdef CONFIG_PAX_PER_CPU_PGD
18783+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
18784+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
18785+ KERNEL_PGD_PTRS);
18786+#endif
18787+
18788 err = do_boot_cpu(apicid, cpu);
18789 if (err) {
18790 pr_debug("do_boot_cpu failed %d\n", err);
18791diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
18792index c346d11..d43b163 100644
18793--- a/arch/x86/kernel/step.c
18794+++ b/arch/x86/kernel/step.c
18795@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
18796 struct desc_struct *desc;
18797 unsigned long base;
18798
18799- seg &= ~7UL;
18800+ seg >>= 3;
18801
18802 mutex_lock(&child->mm->context.lock);
18803- if (unlikely((seg >> 3) >= child->mm->context.size))
18804+ if (unlikely(seg >= child->mm->context.size))
18805 addr = -1L; /* bogus selector, access would fault */
18806 else {
18807 desc = child->mm->context.ldt + seg;
18808@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
18809 addr += base;
18810 }
18811 mutex_unlock(&child->mm->context.lock);
18812- }
18813+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
18814+ addr = ktla_ktva(addr);
18815
18816 return addr;
18817 }
18818@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
18819 unsigned char opcode[15];
18820 unsigned long addr = convert_ip_to_linear(child, regs);
18821
18822+ if (addr == -EINVAL)
18823+ return 0;
18824+
18825 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
18826 for (i = 0; i < copied; i++) {
18827 switch (opcode[i]) {
18828diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
18829index 0b0cb5f..db6b9ed 100644
18830--- a/arch/x86/kernel/sys_i386_32.c
18831+++ b/arch/x86/kernel/sys_i386_32.c
18832@@ -24,17 +24,224 @@
18833
18834 #include <asm/syscalls.h>
18835
18836-/*
18837- * Do a system call from kernel instead of calling sys_execve so we
18838- * end up with proper pt_regs.
18839- */
18840-int kernel_execve(const char *filename,
18841- const char *const argv[],
18842- const char *const envp[])
18843+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
18844 {
18845- long __res;
18846- asm volatile ("int $0x80"
18847- : "=a" (__res)
18848- : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
18849- return __res;
18850+ unsigned long pax_task_size = TASK_SIZE;
18851+
18852+#ifdef CONFIG_PAX_SEGMEXEC
18853+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
18854+ pax_task_size = SEGMEXEC_TASK_SIZE;
18855+#endif
18856+
18857+ if (len > pax_task_size || addr > pax_task_size - len)
18858+ return -EINVAL;
18859+
18860+ return 0;
18861+}
18862+
18863+unsigned long
18864+arch_get_unmapped_area(struct file *filp, unsigned long addr,
18865+ unsigned long len, unsigned long pgoff, unsigned long flags)
18866+{
18867+ struct mm_struct *mm = current->mm;
18868+ struct vm_area_struct *vma;
18869+ unsigned long start_addr, pax_task_size = TASK_SIZE;
18870+
18871+#ifdef CONFIG_PAX_SEGMEXEC
18872+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
18873+ pax_task_size = SEGMEXEC_TASK_SIZE;
18874+#endif
18875+
18876+ pax_task_size -= PAGE_SIZE;
18877+
18878+ if (len > pax_task_size)
18879+ return -ENOMEM;
18880+
18881+ if (flags & MAP_FIXED)
18882+ return addr;
18883+
18884+#ifdef CONFIG_PAX_RANDMMAP
18885+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
18886+#endif
18887+
18888+ if (addr) {
18889+ addr = PAGE_ALIGN(addr);
18890+ if (pax_task_size - len >= addr) {
18891+ vma = find_vma(mm, addr);
18892+ if (check_heap_stack_gap(vma, addr, len))
18893+ return addr;
18894+ }
18895+ }
18896+ if (len > mm->cached_hole_size) {
18897+ start_addr = addr = mm->free_area_cache;
18898+ } else {
18899+ start_addr = addr = mm->mmap_base;
18900+ mm->cached_hole_size = 0;
18901+ }
18902+
18903+#ifdef CONFIG_PAX_PAGEEXEC
18904+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
18905+ start_addr = 0x00110000UL;
18906+
18907+#ifdef CONFIG_PAX_RANDMMAP
18908+ if (mm->pax_flags & MF_PAX_RANDMMAP)
18909+ start_addr += mm->delta_mmap & 0x03FFF000UL;
18910+#endif
18911+
18912+ if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
18913+ start_addr = addr = mm->mmap_base;
18914+ else
18915+ addr = start_addr;
18916+ }
18917+#endif
18918+
18919+full_search:
18920+ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
18921+ /* At this point: (!vma || addr < vma->vm_end). */
18922+ if (pax_task_size - len < addr) {
18923+ /*
18924+ * Start a new search - just in case we missed
18925+ * some holes.
18926+ */
18927+ if (start_addr != mm->mmap_base) {
18928+ start_addr = addr = mm->mmap_base;
18929+ mm->cached_hole_size = 0;
18930+ goto full_search;
18931+ }
18932+ return -ENOMEM;
18933+ }
18934+ if (check_heap_stack_gap(vma, addr, len))
18935+ break;
18936+ if (addr + mm->cached_hole_size < vma->vm_start)
18937+ mm->cached_hole_size = vma->vm_start - addr;
18938+ addr = vma->vm_end;
18939+ if (mm->start_brk <= addr && addr < mm->mmap_base) {
18940+ start_addr = addr = mm->mmap_base;
18941+ mm->cached_hole_size = 0;
18942+ goto full_search;
18943+ }
18944+ }
18945+
18946+ /*
18947+ * Remember the place where we stopped the search:
18948+ */
18949+ mm->free_area_cache = addr + len;
18950+ return addr;
18951+}
18952+
18953+unsigned long
18954+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
18955+ const unsigned long len, const unsigned long pgoff,
18956+ const unsigned long flags)
18957+{
18958+ struct vm_area_struct *vma;
18959+ struct mm_struct *mm = current->mm;
18960+ unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
18961+
18962+#ifdef CONFIG_PAX_SEGMEXEC
18963+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
18964+ pax_task_size = SEGMEXEC_TASK_SIZE;
18965+#endif
18966+
18967+ pax_task_size -= PAGE_SIZE;
18968+
18969+ /* requested length too big for entire address space */
18970+ if (len > pax_task_size)
18971+ return -ENOMEM;
18972+
18973+ if (flags & MAP_FIXED)
18974+ return addr;
18975+
18976+#ifdef CONFIG_PAX_PAGEEXEC
18977+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
18978+ goto bottomup;
18979+#endif
18980+
18981+#ifdef CONFIG_PAX_RANDMMAP
18982+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
18983+#endif
18984+
18985+ /* requesting a specific address */
18986+ if (addr) {
18987+ addr = PAGE_ALIGN(addr);
18988+ if (pax_task_size - len >= addr) {
18989+ vma = find_vma(mm, addr);
18990+ if (check_heap_stack_gap(vma, addr, len))
18991+ return addr;
18992+ }
18993+ }
18994+
18995+ /* check if free_area_cache is useful for us */
18996+ if (len <= mm->cached_hole_size) {
18997+ mm->cached_hole_size = 0;
18998+ mm->free_area_cache = mm->mmap_base;
18999+ }
19000+
19001+ /* either no address requested or can't fit in requested address hole */
19002+ addr = mm->free_area_cache;
19003+
19004+ /* make sure it can fit in the remaining address space */
19005+ if (addr > len) {
19006+ vma = find_vma(mm, addr-len);
19007+ if (check_heap_stack_gap(vma, addr - len, len))
19008+ /* remember the address as a hint for next time */
19009+ return (mm->free_area_cache = addr-len);
19010+ }
19011+
19012+ if (mm->mmap_base < len)
19013+ goto bottomup;
19014+
19015+ addr = mm->mmap_base-len;
19016+
19017+ do {
19018+ /*
19019+ * Lookup failure means no vma is above this address,
19020+ * else if new region fits below vma->vm_start,
19021+ * return with success:
19022+ */
19023+ vma = find_vma(mm, addr);
19024+ if (check_heap_stack_gap(vma, addr, len))
19025+ /* remember the address as a hint for next time */
19026+ return (mm->free_area_cache = addr);
19027+
19028+ /* remember the largest hole we saw so far */
19029+ if (addr + mm->cached_hole_size < vma->vm_start)
19030+ mm->cached_hole_size = vma->vm_start - addr;
19031+
19032+ /* try just below the current vma->vm_start */
19033+ addr = skip_heap_stack_gap(vma, len);
19034+ } while (!IS_ERR_VALUE(addr));
19035+
19036+bottomup:
19037+ /*
19038+ * A failed mmap() very likely causes application failure,
19039+ * so fall back to the bottom-up function here. This scenario
19040+ * can happen with large stack limits and large mmap()
19041+ * allocations.
19042+ */
19043+
19044+#ifdef CONFIG_PAX_SEGMEXEC
19045+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
19046+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
19047+ else
19048+#endif
19049+
19050+ mm->mmap_base = TASK_UNMAPPED_BASE;
19051+
19052+#ifdef CONFIG_PAX_RANDMMAP
19053+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19054+ mm->mmap_base += mm->delta_mmap;
19055+#endif
19056+
19057+ mm->free_area_cache = mm->mmap_base;
19058+ mm->cached_hole_size = ~0UL;
19059+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19060+ /*
19061+ * Restore the topdown base:
19062+ */
19063+ mm->mmap_base = base;
19064+ mm->free_area_cache = base;
19065+ mm->cached_hole_size = ~0UL;
19066+
19067+ return addr;
19068 }
19069diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
19070index 0514890..3dbebce 100644
19071--- a/arch/x86/kernel/sys_x86_64.c
19072+++ b/arch/x86/kernel/sys_x86_64.c
19073@@ -95,8 +95,8 @@ out:
19074 return error;
19075 }
19076
19077-static void find_start_end(unsigned long flags, unsigned long *begin,
19078- unsigned long *end)
19079+static void find_start_end(struct mm_struct *mm, unsigned long flags,
19080+ unsigned long *begin, unsigned long *end)
19081 {
19082 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
19083 unsigned long new_begin;
19084@@ -115,7 +115,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
19085 *begin = new_begin;
19086 }
19087 } else {
19088- *begin = TASK_UNMAPPED_BASE;
19089+ *begin = mm->mmap_base;
19090 *end = TASK_SIZE;
19091 }
19092 }
19093@@ -132,16 +132,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
19094 if (flags & MAP_FIXED)
19095 return addr;
19096
19097- find_start_end(flags, &begin, &end);
19098+ find_start_end(mm, flags, &begin, &end);
19099
19100 if (len > end)
19101 return -ENOMEM;
19102
19103+#ifdef CONFIG_PAX_RANDMMAP
19104+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19105+#endif
19106+
19107 if (addr) {
19108 addr = PAGE_ALIGN(addr);
19109 vma = find_vma(mm, addr);
19110- if (end - len >= addr &&
19111- (!vma || addr + len <= vma->vm_start))
19112+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
19113 return addr;
19114 }
19115 if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
19116@@ -172,7 +175,7 @@ full_search:
19117 }
19118 return -ENOMEM;
19119 }
19120- if (!vma || addr + len <= vma->vm_start) {
19121+ if (check_heap_stack_gap(vma, addr, len)) {
19122 /*
19123 * Remember the place where we stopped the search:
19124 */
19125@@ -195,7 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19126 {
19127 struct vm_area_struct *vma;
19128 struct mm_struct *mm = current->mm;
19129- unsigned long addr = addr0;
19130+ unsigned long base = mm->mmap_base, addr = addr0;
19131
19132 /* requested length too big for entire address space */
19133 if (len > TASK_SIZE)
19134@@ -208,13 +211,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19135 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
19136 goto bottomup;
19137
19138+#ifdef CONFIG_PAX_RANDMMAP
19139+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19140+#endif
19141+
19142 /* requesting a specific address */
19143 if (addr) {
19144 addr = PAGE_ALIGN(addr);
19145- vma = find_vma(mm, addr);
19146- if (TASK_SIZE - len >= addr &&
19147- (!vma || addr + len <= vma->vm_start))
19148- return addr;
19149+ if (TASK_SIZE - len >= addr) {
19150+ vma = find_vma(mm, addr);
19151+ if (check_heap_stack_gap(vma, addr, len))
19152+ return addr;
19153+ }
19154 }
19155
19156 /* check if free_area_cache is useful for us */
19157@@ -232,7 +240,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19158 ALIGN_TOPDOWN);
19159
19160 vma = find_vma(mm, tmp_addr);
19161- if (!vma || tmp_addr + len <= vma->vm_start)
19162+ if (check_heap_stack_gap(vma, tmp_addr, len))
19163 /* remember the address as a hint for next time */
19164 return mm->free_area_cache = tmp_addr;
19165 }
19166@@ -251,7 +259,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19167 * return with success:
19168 */
19169 vma = find_vma(mm, addr);
19170- if (!vma || addr+len <= vma->vm_start)
19171+ if (check_heap_stack_gap(vma, addr, len))
19172 /* remember the address as a hint for next time */
19173 return mm->free_area_cache = addr;
19174
19175@@ -260,8 +268,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19176 mm->cached_hole_size = vma->vm_start - addr;
19177
19178 /* try just below the current vma->vm_start */
19179- addr = vma->vm_start-len;
19180- } while (len < vma->vm_start);
19181+ addr = skip_heap_stack_gap(vma, len);
19182+ } while (!IS_ERR_VALUE(addr));
19183
19184 bottomup:
19185 /*
19186@@ -270,13 +278,21 @@ bottomup:
19187 * can happen with large stack limits and large mmap()
19188 * allocations.
19189 */
19190+ mm->mmap_base = TASK_UNMAPPED_BASE;
19191+
19192+#ifdef CONFIG_PAX_RANDMMAP
19193+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19194+ mm->mmap_base += mm->delta_mmap;
19195+#endif
19196+
19197+ mm->free_area_cache = mm->mmap_base;
19198 mm->cached_hole_size = ~0UL;
19199- mm->free_area_cache = TASK_UNMAPPED_BASE;
19200 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19201 /*
19202 * Restore the topdown base:
19203 */
19204- mm->free_area_cache = mm->mmap_base;
19205+ mm->mmap_base = base;
19206+ mm->free_area_cache = base;
19207 mm->cached_hole_size = ~0UL;
19208
19209 return addr;
19210diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
19211index 9a0e312..e6f66f2 100644
19212--- a/arch/x86/kernel/syscall_table_32.S
19213+++ b/arch/x86/kernel/syscall_table_32.S
19214@@ -1,3 +1,4 @@
19215+.section .rodata,"a",@progbits
19216 ENTRY(sys_call_table)
19217 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
19218 .long sys_exit
19219diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
19220index e2410e2..4fe3fbc 100644
19221--- a/arch/x86/kernel/tboot.c
19222+++ b/arch/x86/kernel/tboot.c
19223@@ -219,7 +219,7 @@ static int tboot_setup_sleep(void)
19224
19225 void tboot_shutdown(u32 shutdown_type)
19226 {
19227- void (*shutdown)(void);
19228+ void (* __noreturn shutdown)(void);
19229
19230 if (!tboot_enabled())
19231 return;
19232@@ -241,7 +241,7 @@ void tboot_shutdown(u32 shutdown_type)
19233
19234 switch_to_tboot_pt();
19235
19236- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
19237+ shutdown = (void *)tboot->shutdown_entry;
19238 shutdown();
19239
19240 /* should not reach here */
19241@@ -298,7 +298,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
19242 tboot_shutdown(acpi_shutdown_map[sleep_state]);
19243 }
19244
19245-static atomic_t ap_wfs_count;
19246+static atomic_unchecked_t ap_wfs_count;
19247
19248 static int tboot_wait_for_aps(int num_aps)
19249 {
19250@@ -322,9 +322,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
19251 {
19252 switch (action) {
19253 case CPU_DYING:
19254- atomic_inc(&ap_wfs_count);
19255+ atomic_inc_unchecked(&ap_wfs_count);
19256 if (num_online_cpus() == 1)
19257- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
19258+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
19259 return NOTIFY_BAD;
19260 break;
19261 }
19262@@ -343,7 +343,7 @@ static __init int tboot_late_init(void)
19263
19264 tboot_create_trampoline();
19265
19266- atomic_set(&ap_wfs_count, 0);
19267+ atomic_set_unchecked(&ap_wfs_count, 0);
19268 register_hotcpu_notifier(&tboot_cpu_notifier);
19269 return 0;
19270 }
19271diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
19272index dd5fbf4..b7f2232 100644
19273--- a/arch/x86/kernel/time.c
19274+++ b/arch/x86/kernel/time.c
19275@@ -31,9 +31,9 @@ unsigned long profile_pc(struct pt_regs *regs)
19276 {
19277 unsigned long pc = instruction_pointer(regs);
19278
19279- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
19280+ if (!user_mode(regs) && in_lock_functions(pc)) {
19281 #ifdef CONFIG_FRAME_POINTER
19282- return *(unsigned long *)(regs->bp + sizeof(long));
19283+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
19284 #else
19285 unsigned long *sp =
19286 (unsigned long *)kernel_stack_pointer(regs);
19287@@ -42,11 +42,17 @@ unsigned long profile_pc(struct pt_regs *regs)
19288 * or above a saved flags. Eflags has bits 22-31 zero,
19289 * kernel addresses don't.
19290 */
19291+
19292+#ifdef CONFIG_PAX_KERNEXEC
19293+ return ktla_ktva(sp[0]);
19294+#else
19295 if (sp[0] >> 22)
19296 return sp[0];
19297 if (sp[1] >> 22)
19298 return sp[1];
19299 #endif
19300+
19301+#endif
19302 }
19303 return pc;
19304 }
19305diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
19306index 6bb7b85..dd853e1 100644
19307--- a/arch/x86/kernel/tls.c
19308+++ b/arch/x86/kernel/tls.c
19309@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
19310 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
19311 return -EINVAL;
19312
19313+#ifdef CONFIG_PAX_SEGMEXEC
19314+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
19315+ return -EINVAL;
19316+#endif
19317+
19318 set_tls_desc(p, idx, &info, 1);
19319
19320 return 0;
19321diff --git a/arch/x86/kernel/tls.h b/arch/x86/kernel/tls.h
19322index 2f083a2..7d3fecc 100644
19323--- a/arch/x86/kernel/tls.h
19324+++ b/arch/x86/kernel/tls.h
19325@@ -16,6 +16,6 @@
19326
19327 extern user_regset_active_fn regset_tls_active;
19328 extern user_regset_get_fn regset_tls_get;
19329-extern user_regset_set_fn regset_tls_set;
19330+extern user_regset_set_fn regset_tls_set __size_overflow(4);
19331
19332 #endif /* _ARCH_X86_KERNEL_TLS_H */
19333diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
19334index 451c0a7..e57f551 100644
19335--- a/arch/x86/kernel/trampoline_32.S
19336+++ b/arch/x86/kernel/trampoline_32.S
19337@@ -32,6 +32,12 @@
19338 #include <asm/segment.h>
19339 #include <asm/page_types.h>
19340
19341+#ifdef CONFIG_PAX_KERNEXEC
19342+#define ta(X) (X)
19343+#else
19344+#define ta(X) ((X) - __PAGE_OFFSET)
19345+#endif
19346+
19347 #ifdef CONFIG_SMP
19348
19349 .section ".x86_trampoline","a"
19350@@ -62,7 +68,7 @@ r_base = .
19351 inc %ax # protected mode (PE) bit
19352 lmsw %ax # into protected mode
19353 # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
19354- ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET)
19355+ ljmpl $__BOOT_CS, $ta(startup_32_smp)
19356
19357 # These need to be in the same 64K segment as the above;
19358 # hence we don't use the boot_gdt_descr defined in head.S
19359diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
19360index 09ff517..df19fbff 100644
19361--- a/arch/x86/kernel/trampoline_64.S
19362+++ b/arch/x86/kernel/trampoline_64.S
19363@@ -90,7 +90,7 @@ startup_32:
19364 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
19365 movl %eax, %ds
19366
19367- movl $X86_CR4_PAE, %eax
19368+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
19369 movl %eax, %cr4 # Enable PAE mode
19370
19371 # Setup trampoline 4 level pagetables
19372@@ -138,7 +138,7 @@ tidt:
19373 # so the kernel can live anywhere
19374 .balign 4
19375 tgdt:
19376- .short tgdt_end - tgdt # gdt limit
19377+ .short tgdt_end - tgdt - 1 # gdt limit
19378 .long tgdt - r_base
19379 .short 0
19380 .quad 0x00cf9b000000ffff # __KERNEL32_CS
19381diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
19382index 31d9d0f..e244dd9 100644
19383--- a/arch/x86/kernel/traps.c
19384+++ b/arch/x86/kernel/traps.c
19385@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
19386
19387 /* Do we ignore FPU interrupts ? */
19388 char ignore_fpu_irq;
19389-
19390-/*
19391- * The IDT has to be page-aligned to simplify the Pentium
19392- * F0 0F bug workaround.
19393- */
19394-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
19395 #endif
19396
19397 DECLARE_BITMAP(used_vectors, NR_VECTORS);
19398@@ -108,13 +102,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
19399 }
19400
19401 static void __kprobes
19402-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19403+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
19404 long error_code, siginfo_t *info)
19405 {
19406 struct task_struct *tsk = current;
19407
19408 #ifdef CONFIG_X86_32
19409- if (regs->flags & X86_VM_MASK) {
19410+ if (v8086_mode(regs)) {
19411 /*
19412 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
19413 * On nmi (interrupt 2), do_trap should not be called.
19414@@ -125,7 +119,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19415 }
19416 #endif
19417
19418- if (!user_mode(regs))
19419+ if (!user_mode_novm(regs))
19420 goto kernel_trap;
19421
19422 #ifdef CONFIG_X86_32
19423@@ -148,7 +142,7 @@ trap_signal:
19424 printk_ratelimit()) {
19425 printk(KERN_INFO
19426 "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
19427- tsk->comm, tsk->pid, str,
19428+ tsk->comm, task_pid_nr(tsk), str,
19429 regs->ip, regs->sp, error_code);
19430 print_vma_addr(" in ", regs->ip);
19431 printk("\n");
19432@@ -165,8 +159,20 @@ kernel_trap:
19433 if (!fixup_exception(regs)) {
19434 tsk->thread.error_code = error_code;
19435 tsk->thread.trap_no = trapnr;
19436+
19437+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19438+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
19439+ str = "PAX: suspicious stack segment fault";
19440+#endif
19441+
19442 die(str, regs, error_code);
19443 }
19444+
19445+#ifdef CONFIG_PAX_REFCOUNT
19446+ if (trapnr == 4)
19447+ pax_report_refcount_overflow(regs);
19448+#endif
19449+
19450 return;
19451
19452 #ifdef CONFIG_X86_32
19453@@ -255,14 +261,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
19454 conditional_sti(regs);
19455
19456 #ifdef CONFIG_X86_32
19457- if (regs->flags & X86_VM_MASK)
19458+ if (v8086_mode(regs))
19459 goto gp_in_vm86;
19460 #endif
19461
19462 tsk = current;
19463- if (!user_mode(regs))
19464+ if (!user_mode_novm(regs))
19465 goto gp_in_kernel;
19466
19467+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
19468+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
19469+ struct mm_struct *mm = tsk->mm;
19470+ unsigned long limit;
19471+
19472+ down_write(&mm->mmap_sem);
19473+ limit = mm->context.user_cs_limit;
19474+ if (limit < TASK_SIZE) {
19475+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
19476+ up_write(&mm->mmap_sem);
19477+ return;
19478+ }
19479+ up_write(&mm->mmap_sem);
19480+ }
19481+#endif
19482+
19483 tsk->thread.error_code = error_code;
19484 tsk->thread.trap_no = 13;
19485
19486@@ -295,6 +317,13 @@ gp_in_kernel:
19487 if (notify_die(DIE_GPF, "general protection fault", regs,
19488 error_code, 13, SIGSEGV) == NOTIFY_STOP)
19489 return;
19490+
19491+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19492+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
19493+ die("PAX: suspicious general protection fault", regs, error_code);
19494+ else
19495+#endif
19496+
19497 die("general protection fault", regs, error_code);
19498 }
19499
19500@@ -414,7 +443,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19501 /* It's safe to allow irq's after DR6 has been saved */
19502 preempt_conditional_sti(regs);
19503
19504- if (regs->flags & X86_VM_MASK) {
19505+ if (v8086_mode(regs)) {
19506 handle_vm86_trap((struct kernel_vm86_regs *) regs,
19507 error_code, 1);
19508 preempt_conditional_cli(regs);
19509@@ -428,7 +457,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19510 * We already checked v86 mode above, so we can check for kernel mode
19511 * by just checking the CPL of CS.
19512 */
19513- if ((dr6 & DR_STEP) && !user_mode(regs)) {
19514+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
19515 tsk->thread.debugreg6 &= ~DR_STEP;
19516 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
19517 regs->flags &= ~X86_EFLAGS_TF;
19518@@ -457,7 +486,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
19519 return;
19520 conditional_sti(regs);
19521
19522- if (!user_mode_vm(regs))
19523+ if (!user_mode(regs))
19524 {
19525 if (!fixup_exception(regs)) {
19526 task->thread.error_code = error_code;
19527@@ -569,8 +598,8 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void)
19528 void __math_state_restore(struct task_struct *tsk)
19529 {
19530 /* We need a safe address that is cheap to find and that is already
19531- in L1. We've just brought in "tsk->thread.has_fpu", so use that */
19532-#define safe_address (tsk->thread.has_fpu)
19533+ in L1. */
19534+#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0)
19535
19536 /* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
19537 is pending. Clear the x87 state here by setting it to fixed
19538diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
19539index b9242ba..50c5edd 100644
19540--- a/arch/x86/kernel/verify_cpu.S
19541+++ b/arch/x86/kernel/verify_cpu.S
19542@@ -20,6 +20,7 @@
19543 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
19544 * arch/x86/kernel/trampoline_64.S: secondary processor verification
19545 * arch/x86/kernel/head_32.S: processor startup
19546+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
19547 *
19548 * verify_cpu, returns the status of longmode and SSE in register %eax.
19549 * 0: Success 1: Failure
19550diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
19551index 863f875..4307295 100644
19552--- a/arch/x86/kernel/vm86_32.c
19553+++ b/arch/x86/kernel/vm86_32.c
19554@@ -41,6 +41,7 @@
19555 #include <linux/ptrace.h>
19556 #include <linux/audit.h>
19557 #include <linux/stddef.h>
19558+#include <linux/grsecurity.h>
19559
19560 #include <asm/uaccess.h>
19561 #include <asm/io.h>
19562@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
19563 do_exit(SIGSEGV);
19564 }
19565
19566- tss = &per_cpu(init_tss, get_cpu());
19567+ tss = init_tss + get_cpu();
19568 current->thread.sp0 = current->thread.saved_sp0;
19569 current->thread.sysenter_cs = __KERNEL_CS;
19570 load_sp0(tss, &current->thread);
19571@@ -208,6 +209,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
19572 struct task_struct *tsk;
19573 int tmp, ret = -EPERM;
19574
19575+#ifdef CONFIG_GRKERNSEC_VM86
19576+ if (!capable(CAP_SYS_RAWIO)) {
19577+ gr_handle_vm86();
19578+ goto out;
19579+ }
19580+#endif
19581+
19582 tsk = current;
19583 if (tsk->thread.saved_sp0)
19584 goto out;
19585@@ -238,6 +246,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
19586 int tmp, ret;
19587 struct vm86plus_struct __user *v86;
19588
19589+#ifdef CONFIG_GRKERNSEC_VM86
19590+ if (!capable(CAP_SYS_RAWIO)) {
19591+ gr_handle_vm86();
19592+ ret = -EPERM;
19593+ goto out;
19594+ }
19595+#endif
19596+
19597 tsk = current;
19598 switch (cmd) {
19599 case VM86_REQUEST_IRQ:
19600@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
19601 tsk->thread.saved_fs = info->regs32->fs;
19602 tsk->thread.saved_gs = get_user_gs(info->regs32);
19603
19604- tss = &per_cpu(init_tss, get_cpu());
19605+ tss = init_tss + get_cpu();
19606 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
19607 if (cpu_has_sep)
19608 tsk->thread.sysenter_cs = 0;
19609@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
19610 goto cannot_handle;
19611 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
19612 goto cannot_handle;
19613- intr_ptr = (unsigned long __user *) (i << 2);
19614+ intr_ptr = (__force unsigned long __user *) (i << 2);
19615 if (get_user(segoffs, intr_ptr))
19616 goto cannot_handle;
19617 if ((segoffs >> 16) == BIOSSEG)
19618diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
19619index 0f703f1..9e15f64 100644
19620--- a/arch/x86/kernel/vmlinux.lds.S
19621+++ b/arch/x86/kernel/vmlinux.lds.S
19622@@ -26,6 +26,13 @@
19623 #include <asm/page_types.h>
19624 #include <asm/cache.h>
19625 #include <asm/boot.h>
19626+#include <asm/segment.h>
19627+
19628+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19629+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
19630+#else
19631+#define __KERNEL_TEXT_OFFSET 0
19632+#endif
19633
19634 #undef i386 /* in case the preprocessor is a 32bit one */
19635
19636@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
19637
19638 PHDRS {
19639 text PT_LOAD FLAGS(5); /* R_E */
19640+#ifdef CONFIG_X86_32
19641+ module PT_LOAD FLAGS(5); /* R_E */
19642+#endif
19643+#ifdef CONFIG_XEN
19644+ rodata PT_LOAD FLAGS(5); /* R_E */
19645+#else
19646+ rodata PT_LOAD FLAGS(4); /* R__ */
19647+#endif
19648 data PT_LOAD FLAGS(6); /* RW_ */
19649-#ifdef CONFIG_X86_64
19650+ init.begin PT_LOAD FLAGS(6); /* RW_ */
19651 #ifdef CONFIG_SMP
19652 percpu PT_LOAD FLAGS(6); /* RW_ */
19653 #endif
19654+ text.init PT_LOAD FLAGS(5); /* R_E */
19655+ text.exit PT_LOAD FLAGS(5); /* R_E */
19656 init PT_LOAD FLAGS(7); /* RWE */
19657-#endif
19658 note PT_NOTE FLAGS(0); /* ___ */
19659 }
19660
19661 SECTIONS
19662 {
19663 #ifdef CONFIG_X86_32
19664- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
19665- phys_startup_32 = startup_32 - LOAD_OFFSET;
19666+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
19667 #else
19668- . = __START_KERNEL;
19669- phys_startup_64 = startup_64 - LOAD_OFFSET;
19670+ . = __START_KERNEL;
19671 #endif
19672
19673 /* Text and read-only data */
19674- .text : AT(ADDR(.text) - LOAD_OFFSET) {
19675- _text = .;
19676+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
19677 /* bootstrapping code */
19678+#ifdef CONFIG_X86_32
19679+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19680+#else
19681+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19682+#endif
19683+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19684+ _text = .;
19685 HEAD_TEXT
19686 #ifdef CONFIG_X86_32
19687 . = ALIGN(PAGE_SIZE);
19688@@ -108,13 +128,47 @@ SECTIONS
19689 IRQENTRY_TEXT
19690 *(.fixup)
19691 *(.gnu.warning)
19692- /* End of text section */
19693- _etext = .;
19694 } :text = 0x9090
19695
19696- NOTES :text :note
19697+ . += __KERNEL_TEXT_OFFSET;
19698
19699- EXCEPTION_TABLE(16) :text = 0x9090
19700+#ifdef CONFIG_X86_32
19701+ . = ALIGN(PAGE_SIZE);
19702+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
19703+
19704+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
19705+ MODULES_EXEC_VADDR = .;
19706+ BYTE(0)
19707+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
19708+ . = ALIGN(HPAGE_SIZE);
19709+ MODULES_EXEC_END = . - 1;
19710+#endif
19711+
19712+ } :module
19713+#endif
19714+
19715+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
19716+ /* End of text section */
19717+ _etext = . - __KERNEL_TEXT_OFFSET;
19718+ }
19719+
19720+#ifdef CONFIG_X86_32
19721+ . = ALIGN(PAGE_SIZE);
19722+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
19723+ *(.idt)
19724+ . = ALIGN(PAGE_SIZE);
19725+ *(.empty_zero_page)
19726+ *(.initial_pg_fixmap)
19727+ *(.initial_pg_pmd)
19728+ *(.initial_page_table)
19729+ *(.swapper_pg_dir)
19730+ } :rodata
19731+#endif
19732+
19733+ . = ALIGN(PAGE_SIZE);
19734+ NOTES :rodata :note
19735+
19736+ EXCEPTION_TABLE(16) :rodata
19737
19738 #if defined(CONFIG_DEBUG_RODATA)
19739 /* .text should occupy whole number of pages */
19740@@ -126,16 +180,20 @@ SECTIONS
19741
19742 /* Data */
19743 .data : AT(ADDR(.data) - LOAD_OFFSET) {
19744+
19745+#ifdef CONFIG_PAX_KERNEXEC
19746+ . = ALIGN(HPAGE_SIZE);
19747+#else
19748+ . = ALIGN(PAGE_SIZE);
19749+#endif
19750+
19751 /* Start of data section */
19752 _sdata = .;
19753
19754 /* init_task */
19755 INIT_TASK_DATA(THREAD_SIZE)
19756
19757-#ifdef CONFIG_X86_32
19758- /* 32 bit has nosave before _edata */
19759 NOSAVE_DATA
19760-#endif
19761
19762 PAGE_ALIGNED_DATA(PAGE_SIZE)
19763
19764@@ -176,12 +234,19 @@ SECTIONS
19765 #endif /* CONFIG_X86_64 */
19766
19767 /* Init code and data - will be freed after init */
19768- . = ALIGN(PAGE_SIZE);
19769 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
19770+ BYTE(0)
19771+
19772+#ifdef CONFIG_PAX_KERNEXEC
19773+ . = ALIGN(HPAGE_SIZE);
19774+#else
19775+ . = ALIGN(PAGE_SIZE);
19776+#endif
19777+
19778 __init_begin = .; /* paired with __init_end */
19779- }
19780+ } :init.begin
19781
19782-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
19783+#ifdef CONFIG_SMP
19784 /*
19785 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
19786 * output PHDR, so the next output section - .init.text - should
19787@@ -190,12 +255,27 @@ SECTIONS
19788 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
19789 #endif
19790
19791- INIT_TEXT_SECTION(PAGE_SIZE)
19792-#ifdef CONFIG_X86_64
19793- :init
19794-#endif
19795+ . = ALIGN(PAGE_SIZE);
19796+ init_begin = .;
19797+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
19798+ VMLINUX_SYMBOL(_sinittext) = .;
19799+ INIT_TEXT
19800+ VMLINUX_SYMBOL(_einittext) = .;
19801+ . = ALIGN(PAGE_SIZE);
19802+ } :text.init
19803
19804- INIT_DATA_SECTION(16)
19805+ /*
19806+ * .exit.text is discard at runtime, not link time, to deal with
19807+ * references from .altinstructions and .eh_frame
19808+ */
19809+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
19810+ EXIT_TEXT
19811+ . = ALIGN(16);
19812+ } :text.exit
19813+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
19814+
19815+ . = ALIGN(PAGE_SIZE);
19816+ INIT_DATA_SECTION(16) :init
19817
19818 /*
19819 * Code and data for a variety of lowlevel trampolines, to be
19820@@ -269,19 +349,12 @@ SECTIONS
19821 }
19822
19823 . = ALIGN(8);
19824- /*
19825- * .exit.text is discard at runtime, not link time, to deal with
19826- * references from .altinstructions and .eh_frame
19827- */
19828- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
19829- EXIT_TEXT
19830- }
19831
19832 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
19833 EXIT_DATA
19834 }
19835
19836-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
19837+#ifndef CONFIG_SMP
19838 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
19839 #endif
19840
19841@@ -300,16 +373,10 @@ SECTIONS
19842 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
19843 __smp_locks = .;
19844 *(.smp_locks)
19845- . = ALIGN(PAGE_SIZE);
19846 __smp_locks_end = .;
19847+ . = ALIGN(PAGE_SIZE);
19848 }
19849
19850-#ifdef CONFIG_X86_64
19851- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
19852- NOSAVE_DATA
19853- }
19854-#endif
19855-
19856 /* BSS */
19857 . = ALIGN(PAGE_SIZE);
19858 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
19859@@ -325,6 +392,7 @@ SECTIONS
19860 __brk_base = .;
19861 . += 64 * 1024; /* 64k alignment slop space */
19862 *(.brk_reservation) /* areas brk users have reserved */
19863+ . = ALIGN(HPAGE_SIZE);
19864 __brk_limit = .;
19865 }
19866
19867@@ -351,13 +419,12 @@ SECTIONS
19868 * for the boot processor.
19869 */
19870 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
19871-INIT_PER_CPU(gdt_page);
19872 INIT_PER_CPU(irq_stack_union);
19873
19874 /*
19875 * Build-time check on the image size:
19876 */
19877-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
19878+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
19879 "kernel image bigger than KERNEL_IMAGE_SIZE");
19880
19881 #ifdef CONFIG_SMP
19882diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
19883index e4d4a22..47ee71f 100644
19884--- a/arch/x86/kernel/vsyscall_64.c
19885+++ b/arch/x86/kernel/vsyscall_64.c
19886@@ -57,15 +57,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
19887 .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
19888 };
19889
19890-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE;
19891+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
19892
19893 static int __init vsyscall_setup(char *str)
19894 {
19895 if (str) {
19896 if (!strcmp("emulate", str))
19897 vsyscall_mode = EMULATE;
19898- else if (!strcmp("native", str))
19899- vsyscall_mode = NATIVE;
19900 else if (!strcmp("none", str))
19901 vsyscall_mode = NONE;
19902 else
19903@@ -178,7 +176,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
19904
19905 tsk = current;
19906 if (seccomp_mode(&tsk->seccomp))
19907- do_exit(SIGKILL);
19908+ do_group_exit(SIGKILL);
19909
19910 switch (vsyscall_nr) {
19911 case 0:
19912@@ -220,8 +218,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
19913 return true;
19914
19915 sigsegv:
19916- force_sig(SIGSEGV, current);
19917- return true;
19918+ do_group_exit(SIGKILL);
19919 }
19920
19921 /*
19922@@ -274,10 +271,7 @@ void __init map_vsyscall(void)
19923 extern char __vvar_page;
19924 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
19925
19926- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
19927- vsyscall_mode == NATIVE
19928- ? PAGE_KERNEL_VSYSCALL
19929- : PAGE_KERNEL_VVAR);
19930+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
19931 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
19932 (unsigned long)VSYSCALL_START);
19933
19934diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
19935index 9796c2f..f686fbf 100644
19936--- a/arch/x86/kernel/x8664_ksyms_64.c
19937+++ b/arch/x86/kernel/x8664_ksyms_64.c
19938@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
19939 EXPORT_SYMBOL(copy_user_generic_string);
19940 EXPORT_SYMBOL(copy_user_generic_unrolled);
19941 EXPORT_SYMBOL(__copy_user_nocache);
19942-EXPORT_SYMBOL(_copy_from_user);
19943-EXPORT_SYMBOL(_copy_to_user);
19944
19945 EXPORT_SYMBOL(copy_page);
19946 EXPORT_SYMBOL(clear_page);
19947diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
19948index 7110911..e8cdee5 100644
19949--- a/arch/x86/kernel/xsave.c
19950+++ b/arch/x86/kernel/xsave.c
19951@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
19952 fx_sw_user->xstate_size > fx_sw_user->extended_size)
19953 return -EINVAL;
19954
19955- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
19956+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
19957 fx_sw_user->extended_size -
19958 FP_XSTATE_MAGIC2_SIZE));
19959 if (err)
19960@@ -266,7 +266,7 @@ fx_only:
19961 * the other extended state.
19962 */
19963 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
19964- return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
19965+ return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
19966 }
19967
19968 /*
19969@@ -295,7 +295,7 @@ int restore_i387_xstate(void __user *buf)
19970 if (use_xsave())
19971 err = restore_user_xstate(buf);
19972 else
19973- err = fxrstor_checking((__force struct i387_fxsave_struct *)
19974+ err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
19975 buf);
19976 if (unlikely(err)) {
19977 /*
19978diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
19979index f1e3be1..588efc8 100644
19980--- a/arch/x86/kvm/emulate.c
19981+++ b/arch/x86/kvm/emulate.c
19982@@ -249,6 +249,7 @@ struct gprefix {
19983
19984 #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
19985 do { \
19986+ unsigned long _tmp; \
19987 __asm__ __volatile__ ( \
19988 _PRE_EFLAGS("0", "4", "2") \
19989 _op _suffix " %"_x"3,%1; " \
19990@@ -263,8 +264,6 @@ struct gprefix {
19991 /* Raw emulation: instruction has two explicit operands. */
19992 #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
19993 do { \
19994- unsigned long _tmp; \
19995- \
19996 switch ((ctxt)->dst.bytes) { \
19997 case 2: \
19998 ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
19999@@ -280,7 +279,6 @@ struct gprefix {
20000
20001 #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
20002 do { \
20003- unsigned long _tmp; \
20004 switch ((ctxt)->dst.bytes) { \
20005 case 1: \
20006 ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
20007diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
20008index 54abb40..a192606 100644
20009--- a/arch/x86/kvm/lapic.c
20010+++ b/arch/x86/kvm/lapic.c
20011@@ -53,7 +53,7 @@
20012 #define APIC_BUS_CYCLE_NS 1
20013
20014 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
20015-#define apic_debug(fmt, arg...)
20016+#define apic_debug(fmt, arg...) do {} while (0)
20017
20018 #define APIC_LVT_NUM 6
20019 /* 14 is the version for Xeon and Pentium 8.4.8*/
20020diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
20021index f1b36cf..af8a124 100644
20022--- a/arch/x86/kvm/mmu.c
20023+++ b/arch/x86/kvm/mmu.c
20024@@ -3555,7 +3555,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
20025
20026 pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
20027
20028- invlpg_counter = atomic_read(&vcpu->kvm->arch.invlpg_counter);
20029+ invlpg_counter = atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter);
20030
20031 /*
20032 * Assume that the pte write on a page table of the same type
20033@@ -3587,7 +3587,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
20034 }
20035
20036 spin_lock(&vcpu->kvm->mmu_lock);
20037- if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
20038+ if (atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
20039 gentry = 0;
20040 kvm_mmu_free_some_pages(vcpu);
20041 ++vcpu->kvm->stat.mmu_pte_write;
20042diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
20043index 9299410..ade2f9b 100644
20044--- a/arch/x86/kvm/paging_tmpl.h
20045+++ b/arch/x86/kvm/paging_tmpl.h
20046@@ -197,7 +197,7 @@ retry_walk:
20047 if (unlikely(kvm_is_error_hva(host_addr)))
20048 goto error;
20049
20050- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
20051+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
20052 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
20053 goto error;
20054
20055@@ -705,7 +705,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)
20056 if (need_flush)
20057 kvm_flush_remote_tlbs(vcpu->kvm);
20058
20059- atomic_inc(&vcpu->kvm->arch.invlpg_counter);
20060+ atomic_inc_unchecked(&vcpu->kvm->arch.invlpg_counter);
20061
20062 spin_unlock(&vcpu->kvm->mmu_lock);
20063
20064diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
20065index 94a4672..1700ed1 100644
20066--- a/arch/x86/kvm/svm.c
20067+++ b/arch/x86/kvm/svm.c
20068@@ -3037,6 +3037,7 @@ static int svm_set_vm_cr(struct kvm_vcpu *vcpu, u64 data)
20069 return 0;
20070 }
20071
20072+static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data) __size_overflow(3);
20073 static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)
20074 {
20075 struct vcpu_svm *svm = to_svm(vcpu);
20076@@ -3405,7 +3406,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
20077 int cpu = raw_smp_processor_id();
20078
20079 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
20080+
20081+ pax_open_kernel();
20082 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
20083+ pax_close_kernel();
20084+
20085 load_TR_desc();
20086 }
20087
20088@@ -3783,6 +3788,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
20089 #endif
20090 #endif
20091
20092+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20093+ __set_fs(current_thread_info()->addr_limit);
20094+#endif
20095+
20096 reload_tss(vcpu);
20097
20098 local_irq_disable();
20099diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
20100index 4ea7678..c715f2f 100644
20101--- a/arch/x86/kvm/vmx.c
20102+++ b/arch/x86/kvm/vmx.c
20103@@ -1305,7 +1305,11 @@ static void reload_tss(void)
20104 struct desc_struct *descs;
20105
20106 descs = (void *)gdt->address;
20107+
20108+ pax_open_kernel();
20109 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
20110+ pax_close_kernel();
20111+
20112 load_TR_desc();
20113 }
20114
20115@@ -2163,6 +2167,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
20116 * Returns 0 on success, non-0 otherwise.
20117 * Assumes vcpu_load() was already called.
20118 */
20119+static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) __size_overflow(3);
20120 static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
20121 {
20122 struct vcpu_vmx *vmx = to_vmx(vcpu);
20123@@ -2633,8 +2638,11 @@ static __init int hardware_setup(void)
20124 if (!cpu_has_vmx_flexpriority())
20125 flexpriority_enabled = 0;
20126
20127- if (!cpu_has_vmx_tpr_shadow())
20128- kvm_x86_ops->update_cr8_intercept = NULL;
20129+ if (!cpu_has_vmx_tpr_shadow()) {
20130+ pax_open_kernel();
20131+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
20132+ pax_close_kernel();
20133+ }
20134
20135 if (enable_ept && !cpu_has_vmx_ept_2m_page())
20136 kvm_disable_largepages();
20137@@ -3648,7 +3656,7 @@ static void vmx_set_constant_host_state(void)
20138 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
20139
20140 asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
20141- vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
20142+ vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
20143
20144 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
20145 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
20146@@ -6169,6 +6177,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20147 "jmp .Lkvm_vmx_return \n\t"
20148 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
20149 ".Lkvm_vmx_return: "
20150+
20151+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20152+ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
20153+ ".Lkvm_vmx_return2: "
20154+#endif
20155+
20156 /* Save guest registers, load host registers, keep flags */
20157 "mov %0, %c[wordsize](%%"R"sp) \n\t"
20158 "pop %0 \n\t"
20159@@ -6217,6 +6231,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20160 #endif
20161 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
20162 [wordsize]"i"(sizeof(ulong))
20163+
20164+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20165+ ,[cs]"i"(__KERNEL_CS)
20166+#endif
20167+
20168 : "cc", "memory"
20169 , R"ax", R"bx", R"di", R"si"
20170 #ifdef CONFIG_X86_64
20171@@ -6245,7 +6264,16 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20172 }
20173 }
20174
20175- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
20176+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
20177+
20178+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20179+ loadsegment(fs, __KERNEL_PERCPU);
20180+#endif
20181+
20182+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20183+ __set_fs(current_thread_info()->addr_limit);
20184+#endif
20185+
20186 vmx->loaded_vmcs->launched = 1;
20187
20188 vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
20189diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
20190index 4c938da..6cd8090 100644
20191--- a/arch/x86/kvm/x86.c
20192+++ b/arch/x86/kvm/x86.c
20193@@ -907,6 +907,7 @@ static int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data)
20194 return kvm_set_msr(vcpu, index, *data);
20195 }
20196
20197+static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) __size_overflow(2);
20198 static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
20199 {
20200 int version;
20201@@ -1345,8 +1346,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
20202 {
20203 struct kvm *kvm = vcpu->kvm;
20204 int lm = is_long_mode(vcpu);
20205- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20206- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20207+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20208+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20209 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
20210 : kvm->arch.xen_hvm_config.blob_size_32;
20211 u32 page_num = data & ~PAGE_MASK;
20212@@ -2165,6 +2166,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
20213 if (n < msr_list.nmsrs)
20214 goto out;
20215 r = -EFAULT;
20216+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
20217+ goto out;
20218 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
20219 num_msrs_to_save * sizeof(u32)))
20220 goto out;
20221@@ -2340,15 +2343,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
20222 struct kvm_cpuid2 *cpuid,
20223 struct kvm_cpuid_entry2 __user *entries)
20224 {
20225- int r;
20226+ int r, i;
20227
20228 r = -E2BIG;
20229 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
20230 goto out;
20231 r = -EFAULT;
20232- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
20233- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20234+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20235 goto out;
20236+ for (i = 0; i < cpuid->nent; ++i) {
20237+ struct kvm_cpuid_entry2 cpuid_entry;
20238+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
20239+ goto out;
20240+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
20241+ }
20242 vcpu->arch.cpuid_nent = cpuid->nent;
20243 kvm_apic_set_version(vcpu);
20244 kvm_x86_ops->cpuid_update(vcpu);
20245@@ -2363,15 +2371,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
20246 struct kvm_cpuid2 *cpuid,
20247 struct kvm_cpuid_entry2 __user *entries)
20248 {
20249- int r;
20250+ int r, i;
20251
20252 r = -E2BIG;
20253 if (cpuid->nent < vcpu->arch.cpuid_nent)
20254 goto out;
20255 r = -EFAULT;
20256- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
20257- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20258+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20259 goto out;
20260+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
20261+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
20262+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
20263+ goto out;
20264+ }
20265 return 0;
20266
20267 out:
20268@@ -2746,7 +2758,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
20269 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
20270 struct kvm_interrupt *irq)
20271 {
20272- if (irq->irq < 0 || irq->irq >= 256)
20273+ if (irq->irq >= 256)
20274 return -EINVAL;
20275 if (irqchip_in_kernel(vcpu->kvm))
20276 return -ENXIO;
20277@@ -3949,6 +3961,9 @@ gpa_t kvm_mmu_gva_to_gpa_system(struct kvm_vcpu *vcpu, gva_t gva,
20278
20279 static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
20280 struct kvm_vcpu *vcpu, u32 access,
20281+ struct x86_exception *exception) __size_overflow(1,3);
20282+static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
20283+ struct kvm_vcpu *vcpu, u32 access,
20284 struct x86_exception *exception)
20285 {
20286 void *data = val;
20287@@ -3980,6 +3995,9 @@ out:
20288 /* used for instruction fetching */
20289 static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
20290 gva_t addr, void *val, unsigned int bytes,
20291+ struct x86_exception *exception) __size_overflow(2,4);
20292+static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
20293+ gva_t addr, void *val, unsigned int bytes,
20294 struct x86_exception *exception)
20295 {
20296 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20297@@ -4004,6 +4022,9 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_virt);
20298
20299 static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20300 gva_t addr, void *val, unsigned int bytes,
20301+ struct x86_exception *exception) __size_overflow(2,4);
20302+static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20303+ gva_t addr, void *val, unsigned int bytes,
20304 struct x86_exception *exception)
20305 {
20306 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20307@@ -4117,12 +4138,16 @@ static int read_prepare(struct kvm_vcpu *vcpu, void *val, int bytes)
20308 }
20309
20310 static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20311+ void *val, int bytes) __size_overflow(2);
20312+static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20313 void *val, int bytes)
20314 {
20315 return !kvm_read_guest(vcpu->kvm, gpa, val, bytes);
20316 }
20317
20318 static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20319+ void *val, int bytes) __size_overflow(2);
20320+static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20321 void *val, int bytes)
20322 {
20323 return emulator_write_phys(vcpu, gpa, val, bytes);
20324@@ -4273,6 +4298,12 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
20325 const void *old,
20326 const void *new,
20327 unsigned int bytes,
20328+ struct x86_exception *exception) __size_overflow(5);
20329+static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
20330+ unsigned long addr,
20331+ const void *old,
20332+ const void *new,
20333+ unsigned int bytes,
20334 struct x86_exception *exception)
20335 {
20336 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20337@@ -5162,7 +5193,7 @@ static void kvm_set_mmio_spte_mask(void)
20338 kvm_mmu_set_mmio_spte_mask(mask);
20339 }
20340
20341-int kvm_arch_init(void *opaque)
20342+int kvm_arch_init(const void *opaque)
20343 {
20344 int r;
20345 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
20346diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
20347index d36fe23..a4b189f 100644
20348--- a/arch/x86/kvm/x86.h
20349+++ b/arch/x86/kvm/x86.h
20350@@ -119,10 +119,10 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data);
20351
20352 int kvm_read_guest_virt(struct x86_emulate_ctxt *ctxt,
20353 gva_t addr, void *val, unsigned int bytes,
20354- struct x86_exception *exception);
20355+ struct x86_exception *exception) __size_overflow(2,4);
20356
20357 int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20358 gva_t addr, void *val, unsigned int bytes,
20359- struct x86_exception *exception);
20360+ struct x86_exception *exception) __size_overflow(2,4);
20361
20362 #endif
20363diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
20364index cf4603b..7cdde38 100644
20365--- a/arch/x86/lguest/boot.c
20366+++ b/arch/x86/lguest/boot.c
20367@@ -1195,9 +1195,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
20368 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
20369 * Launcher to reboot us.
20370 */
20371-static void lguest_restart(char *reason)
20372+static __noreturn void lguest_restart(char *reason)
20373 {
20374 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
20375+ BUG();
20376 }
20377
20378 /*G:050
20379diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
20380index 042f682..c92afb6 100644
20381--- a/arch/x86/lib/atomic64_32.c
20382+++ b/arch/x86/lib/atomic64_32.c
20383@@ -8,18 +8,30 @@
20384
20385 long long atomic64_read_cx8(long long, const atomic64_t *v);
20386 EXPORT_SYMBOL(atomic64_read_cx8);
20387+long long atomic64_read_unchecked_cx8(long long, const atomic64_unchecked_t *v);
20388+EXPORT_SYMBOL(atomic64_read_unchecked_cx8);
20389 long long atomic64_set_cx8(long long, const atomic64_t *v);
20390 EXPORT_SYMBOL(atomic64_set_cx8);
20391+long long atomic64_set_unchecked_cx8(long long, const atomic64_unchecked_t *v);
20392+EXPORT_SYMBOL(atomic64_set_unchecked_cx8);
20393 long long atomic64_xchg_cx8(long long, unsigned high);
20394 EXPORT_SYMBOL(atomic64_xchg_cx8);
20395 long long atomic64_add_return_cx8(long long a, atomic64_t *v);
20396 EXPORT_SYMBOL(atomic64_add_return_cx8);
20397+long long atomic64_add_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20398+EXPORT_SYMBOL(atomic64_add_return_unchecked_cx8);
20399 long long atomic64_sub_return_cx8(long long a, atomic64_t *v);
20400 EXPORT_SYMBOL(atomic64_sub_return_cx8);
20401+long long atomic64_sub_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20402+EXPORT_SYMBOL(atomic64_sub_return_unchecked_cx8);
20403 long long atomic64_inc_return_cx8(long long a, atomic64_t *v);
20404 EXPORT_SYMBOL(atomic64_inc_return_cx8);
20405+long long atomic64_inc_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20406+EXPORT_SYMBOL(atomic64_inc_return_unchecked_cx8);
20407 long long atomic64_dec_return_cx8(long long a, atomic64_t *v);
20408 EXPORT_SYMBOL(atomic64_dec_return_cx8);
20409+long long atomic64_dec_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20410+EXPORT_SYMBOL(atomic64_dec_return_unchecked_cx8);
20411 long long atomic64_dec_if_positive_cx8(atomic64_t *v);
20412 EXPORT_SYMBOL(atomic64_dec_if_positive_cx8);
20413 int atomic64_inc_not_zero_cx8(atomic64_t *v);
20414@@ -30,26 +42,46 @@ EXPORT_SYMBOL(atomic64_add_unless_cx8);
20415 #ifndef CONFIG_X86_CMPXCHG64
20416 long long atomic64_read_386(long long, const atomic64_t *v);
20417 EXPORT_SYMBOL(atomic64_read_386);
20418+long long atomic64_read_unchecked_386(long long, const atomic64_unchecked_t *v);
20419+EXPORT_SYMBOL(atomic64_read_unchecked_386);
20420 long long atomic64_set_386(long long, const atomic64_t *v);
20421 EXPORT_SYMBOL(atomic64_set_386);
20422+long long atomic64_set_unchecked_386(long long, const atomic64_unchecked_t *v);
20423+EXPORT_SYMBOL(atomic64_set_unchecked_386);
20424 long long atomic64_xchg_386(long long, unsigned high);
20425 EXPORT_SYMBOL(atomic64_xchg_386);
20426 long long atomic64_add_return_386(long long a, atomic64_t *v);
20427 EXPORT_SYMBOL(atomic64_add_return_386);
20428+long long atomic64_add_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20429+EXPORT_SYMBOL(atomic64_add_return_unchecked_386);
20430 long long atomic64_sub_return_386(long long a, atomic64_t *v);
20431 EXPORT_SYMBOL(atomic64_sub_return_386);
20432+long long atomic64_sub_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20433+EXPORT_SYMBOL(atomic64_sub_return_unchecked_386);
20434 long long atomic64_inc_return_386(long long a, atomic64_t *v);
20435 EXPORT_SYMBOL(atomic64_inc_return_386);
20436+long long atomic64_inc_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20437+EXPORT_SYMBOL(atomic64_inc_return_unchecked_386);
20438 long long atomic64_dec_return_386(long long a, atomic64_t *v);
20439 EXPORT_SYMBOL(atomic64_dec_return_386);
20440+long long atomic64_dec_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20441+EXPORT_SYMBOL(atomic64_dec_return_unchecked_386);
20442 long long atomic64_add_386(long long a, atomic64_t *v);
20443 EXPORT_SYMBOL(atomic64_add_386);
20444+long long atomic64_add_unchecked_386(long long a, atomic64_unchecked_t *v);
20445+EXPORT_SYMBOL(atomic64_add_unchecked_386);
20446 long long atomic64_sub_386(long long a, atomic64_t *v);
20447 EXPORT_SYMBOL(atomic64_sub_386);
20448+long long atomic64_sub_unchecked_386(long long a, atomic64_unchecked_t *v);
20449+EXPORT_SYMBOL(atomic64_sub_unchecked_386);
20450 long long atomic64_inc_386(long long a, atomic64_t *v);
20451 EXPORT_SYMBOL(atomic64_inc_386);
20452+long long atomic64_inc_unchecked_386(long long a, atomic64_unchecked_t *v);
20453+EXPORT_SYMBOL(atomic64_inc_unchecked_386);
20454 long long atomic64_dec_386(long long a, atomic64_t *v);
20455 EXPORT_SYMBOL(atomic64_dec_386);
20456+long long atomic64_dec_unchecked_386(long long a, atomic64_unchecked_t *v);
20457+EXPORT_SYMBOL(atomic64_dec_unchecked_386);
20458 long long atomic64_dec_if_positive_386(atomic64_t *v);
20459 EXPORT_SYMBOL(atomic64_dec_if_positive_386);
20460 int atomic64_inc_not_zero_386(atomic64_t *v);
20461diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
20462index e8e7e0d..56fd1b0 100644
20463--- a/arch/x86/lib/atomic64_386_32.S
20464+++ b/arch/x86/lib/atomic64_386_32.S
20465@@ -48,6 +48,10 @@ BEGIN(read)
20466 movl (v), %eax
20467 movl 4(v), %edx
20468 RET_ENDP
20469+BEGIN(read_unchecked)
20470+ movl (v), %eax
20471+ movl 4(v), %edx
20472+RET_ENDP
20473 #undef v
20474
20475 #define v %esi
20476@@ -55,6 +59,10 @@ BEGIN(set)
20477 movl %ebx, (v)
20478 movl %ecx, 4(v)
20479 RET_ENDP
20480+BEGIN(set_unchecked)
20481+ movl %ebx, (v)
20482+ movl %ecx, 4(v)
20483+RET_ENDP
20484 #undef v
20485
20486 #define v %esi
20487@@ -70,6 +78,20 @@ RET_ENDP
20488 BEGIN(add)
20489 addl %eax, (v)
20490 adcl %edx, 4(v)
20491+
20492+#ifdef CONFIG_PAX_REFCOUNT
20493+ jno 0f
20494+ subl %eax, (v)
20495+ sbbl %edx, 4(v)
20496+ int $4
20497+0:
20498+ _ASM_EXTABLE(0b, 0b)
20499+#endif
20500+
20501+RET_ENDP
20502+BEGIN(add_unchecked)
20503+ addl %eax, (v)
20504+ adcl %edx, 4(v)
20505 RET_ENDP
20506 #undef v
20507
20508@@ -77,6 +99,24 @@ RET_ENDP
20509 BEGIN(add_return)
20510 addl (v), %eax
20511 adcl 4(v), %edx
20512+
20513+#ifdef CONFIG_PAX_REFCOUNT
20514+ into
20515+1234:
20516+ _ASM_EXTABLE(1234b, 2f)
20517+#endif
20518+
20519+ movl %eax, (v)
20520+ movl %edx, 4(v)
20521+
20522+#ifdef CONFIG_PAX_REFCOUNT
20523+2:
20524+#endif
20525+
20526+RET_ENDP
20527+BEGIN(add_return_unchecked)
20528+ addl (v), %eax
20529+ adcl 4(v), %edx
20530 movl %eax, (v)
20531 movl %edx, 4(v)
20532 RET_ENDP
20533@@ -86,6 +126,20 @@ RET_ENDP
20534 BEGIN(sub)
20535 subl %eax, (v)
20536 sbbl %edx, 4(v)
20537+
20538+#ifdef CONFIG_PAX_REFCOUNT
20539+ jno 0f
20540+ addl %eax, (v)
20541+ adcl %edx, 4(v)
20542+ int $4
20543+0:
20544+ _ASM_EXTABLE(0b, 0b)
20545+#endif
20546+
20547+RET_ENDP
20548+BEGIN(sub_unchecked)
20549+ subl %eax, (v)
20550+ sbbl %edx, 4(v)
20551 RET_ENDP
20552 #undef v
20553
20554@@ -96,6 +150,27 @@ BEGIN(sub_return)
20555 sbbl $0, %edx
20556 addl (v), %eax
20557 adcl 4(v), %edx
20558+
20559+#ifdef CONFIG_PAX_REFCOUNT
20560+ into
20561+1234:
20562+ _ASM_EXTABLE(1234b, 2f)
20563+#endif
20564+
20565+ movl %eax, (v)
20566+ movl %edx, 4(v)
20567+
20568+#ifdef CONFIG_PAX_REFCOUNT
20569+2:
20570+#endif
20571+
20572+RET_ENDP
20573+BEGIN(sub_return_unchecked)
20574+ negl %edx
20575+ negl %eax
20576+ sbbl $0, %edx
20577+ addl (v), %eax
20578+ adcl 4(v), %edx
20579 movl %eax, (v)
20580 movl %edx, 4(v)
20581 RET_ENDP
20582@@ -105,6 +180,20 @@ RET_ENDP
20583 BEGIN(inc)
20584 addl $1, (v)
20585 adcl $0, 4(v)
20586+
20587+#ifdef CONFIG_PAX_REFCOUNT
20588+ jno 0f
20589+ subl $1, (v)
20590+ sbbl $0, 4(v)
20591+ int $4
20592+0:
20593+ _ASM_EXTABLE(0b, 0b)
20594+#endif
20595+
20596+RET_ENDP
20597+BEGIN(inc_unchecked)
20598+ addl $1, (v)
20599+ adcl $0, 4(v)
20600 RET_ENDP
20601 #undef v
20602
20603@@ -114,6 +203,26 @@ BEGIN(inc_return)
20604 movl 4(v), %edx
20605 addl $1, %eax
20606 adcl $0, %edx
20607+
20608+#ifdef CONFIG_PAX_REFCOUNT
20609+ into
20610+1234:
20611+ _ASM_EXTABLE(1234b, 2f)
20612+#endif
20613+
20614+ movl %eax, (v)
20615+ movl %edx, 4(v)
20616+
20617+#ifdef CONFIG_PAX_REFCOUNT
20618+2:
20619+#endif
20620+
20621+RET_ENDP
20622+BEGIN(inc_return_unchecked)
20623+ movl (v), %eax
20624+ movl 4(v), %edx
20625+ addl $1, %eax
20626+ adcl $0, %edx
20627 movl %eax, (v)
20628 movl %edx, 4(v)
20629 RET_ENDP
20630@@ -123,6 +232,20 @@ RET_ENDP
20631 BEGIN(dec)
20632 subl $1, (v)
20633 sbbl $0, 4(v)
20634+
20635+#ifdef CONFIG_PAX_REFCOUNT
20636+ jno 0f
20637+ addl $1, (v)
20638+ adcl $0, 4(v)
20639+ int $4
20640+0:
20641+ _ASM_EXTABLE(0b, 0b)
20642+#endif
20643+
20644+RET_ENDP
20645+BEGIN(dec_unchecked)
20646+ subl $1, (v)
20647+ sbbl $0, 4(v)
20648 RET_ENDP
20649 #undef v
20650
20651@@ -132,6 +255,26 @@ BEGIN(dec_return)
20652 movl 4(v), %edx
20653 subl $1, %eax
20654 sbbl $0, %edx
20655+
20656+#ifdef CONFIG_PAX_REFCOUNT
20657+ into
20658+1234:
20659+ _ASM_EXTABLE(1234b, 2f)
20660+#endif
20661+
20662+ movl %eax, (v)
20663+ movl %edx, 4(v)
20664+
20665+#ifdef CONFIG_PAX_REFCOUNT
20666+2:
20667+#endif
20668+
20669+RET_ENDP
20670+BEGIN(dec_return_unchecked)
20671+ movl (v), %eax
20672+ movl 4(v), %edx
20673+ subl $1, %eax
20674+ sbbl $0, %edx
20675 movl %eax, (v)
20676 movl %edx, 4(v)
20677 RET_ENDP
20678@@ -143,6 +286,13 @@ BEGIN(add_unless)
20679 adcl %edx, %edi
20680 addl (v), %eax
20681 adcl 4(v), %edx
20682+
20683+#ifdef CONFIG_PAX_REFCOUNT
20684+ into
20685+1234:
20686+ _ASM_EXTABLE(1234b, 2f)
20687+#endif
20688+
20689 cmpl %eax, %esi
20690 je 3f
20691 1:
20692@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
20693 1:
20694 addl $1, %eax
20695 adcl $0, %edx
20696+
20697+#ifdef CONFIG_PAX_REFCOUNT
20698+ into
20699+1234:
20700+ _ASM_EXTABLE(1234b, 2f)
20701+#endif
20702+
20703 movl %eax, (v)
20704 movl %edx, 4(v)
20705 movl $1, %eax
20706@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
20707 movl 4(v), %edx
20708 subl $1, %eax
20709 sbbl $0, %edx
20710+
20711+#ifdef CONFIG_PAX_REFCOUNT
20712+ into
20713+1234:
20714+ _ASM_EXTABLE(1234b, 1f)
20715+#endif
20716+
20717 js 1f
20718 movl %eax, (v)
20719 movl %edx, 4(v)
20720diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
20721index 391a083..d658e9f 100644
20722--- a/arch/x86/lib/atomic64_cx8_32.S
20723+++ b/arch/x86/lib/atomic64_cx8_32.S
20724@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
20725 CFI_STARTPROC
20726
20727 read64 %ecx
20728+ pax_force_retaddr
20729 ret
20730 CFI_ENDPROC
20731 ENDPROC(atomic64_read_cx8)
20732
20733+ENTRY(atomic64_read_unchecked_cx8)
20734+ CFI_STARTPROC
20735+
20736+ read64 %ecx
20737+ pax_force_retaddr
20738+ ret
20739+ CFI_ENDPROC
20740+ENDPROC(atomic64_read_unchecked_cx8)
20741+
20742 ENTRY(atomic64_set_cx8)
20743 CFI_STARTPROC
20744
20745@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
20746 cmpxchg8b (%esi)
20747 jne 1b
20748
20749+ pax_force_retaddr
20750 ret
20751 CFI_ENDPROC
20752 ENDPROC(atomic64_set_cx8)
20753
20754+ENTRY(atomic64_set_unchecked_cx8)
20755+ CFI_STARTPROC
20756+
20757+1:
20758+/* we don't need LOCK_PREFIX since aligned 64-bit writes
20759+ * are atomic on 586 and newer */
20760+ cmpxchg8b (%esi)
20761+ jne 1b
20762+
20763+ pax_force_retaddr
20764+ ret
20765+ CFI_ENDPROC
20766+ENDPROC(atomic64_set_unchecked_cx8)
20767+
20768 ENTRY(atomic64_xchg_cx8)
20769 CFI_STARTPROC
20770
20771@@ -62,12 +87,13 @@ ENTRY(atomic64_xchg_cx8)
20772 cmpxchg8b (%esi)
20773 jne 1b
20774
20775+ pax_force_retaddr
20776 ret
20777 CFI_ENDPROC
20778 ENDPROC(atomic64_xchg_cx8)
20779
20780-.macro addsub_return func ins insc
20781-ENTRY(atomic64_\func\()_return_cx8)
20782+.macro addsub_return func ins insc unchecked=""
20783+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20784 CFI_STARTPROC
20785 SAVE ebp
20786 SAVE ebx
20787@@ -84,27 +110,44 @@ ENTRY(atomic64_\func\()_return_cx8)
20788 movl %edx, %ecx
20789 \ins\()l %esi, %ebx
20790 \insc\()l %edi, %ecx
20791+
20792+.ifb \unchecked
20793+#ifdef CONFIG_PAX_REFCOUNT
20794+ into
20795+2:
20796+ _ASM_EXTABLE(2b, 3f)
20797+#endif
20798+.endif
20799+
20800 LOCK_PREFIX
20801 cmpxchg8b (%ebp)
20802 jne 1b
20803-
20804-10:
20805 movl %ebx, %eax
20806 movl %ecx, %edx
20807+
20808+.ifb \unchecked
20809+#ifdef CONFIG_PAX_REFCOUNT
20810+3:
20811+#endif
20812+.endif
20813+
20814 RESTORE edi
20815 RESTORE esi
20816 RESTORE ebx
20817 RESTORE ebp
20818+ pax_force_retaddr
20819 ret
20820 CFI_ENDPROC
20821-ENDPROC(atomic64_\func\()_return_cx8)
20822+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
20823 .endm
20824
20825 addsub_return add add adc
20826 addsub_return sub sub sbb
20827+addsub_return add add adc _unchecked
20828+addsub_return sub sub sbb _unchecked
20829
20830-.macro incdec_return func ins insc
20831-ENTRY(atomic64_\func\()_return_cx8)
20832+.macro incdec_return func ins insc unchecked
20833+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20834 CFI_STARTPROC
20835 SAVE ebx
20836
20837@@ -114,21 +157,39 @@ ENTRY(atomic64_\func\()_return_cx8)
20838 movl %edx, %ecx
20839 \ins\()l $1, %ebx
20840 \insc\()l $0, %ecx
20841+
20842+.ifb \unchecked
20843+#ifdef CONFIG_PAX_REFCOUNT
20844+ into
20845+2:
20846+ _ASM_EXTABLE(2b, 3f)
20847+#endif
20848+.endif
20849+
20850 LOCK_PREFIX
20851 cmpxchg8b (%esi)
20852 jne 1b
20853
20854-10:
20855 movl %ebx, %eax
20856 movl %ecx, %edx
20857+
20858+.ifb \unchecked
20859+#ifdef CONFIG_PAX_REFCOUNT
20860+3:
20861+#endif
20862+.endif
20863+
20864 RESTORE ebx
20865+ pax_force_retaddr
20866 ret
20867 CFI_ENDPROC
20868-ENDPROC(atomic64_\func\()_return_cx8)
20869+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
20870 .endm
20871
20872 incdec_return inc add adc
20873 incdec_return dec sub sbb
20874+incdec_return inc add adc _unchecked
20875+incdec_return dec sub sbb _unchecked
20876
20877 ENTRY(atomic64_dec_if_positive_cx8)
20878 CFI_STARTPROC
20879@@ -140,6 +201,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
20880 movl %edx, %ecx
20881 subl $1, %ebx
20882 sbb $0, %ecx
20883+
20884+#ifdef CONFIG_PAX_REFCOUNT
20885+ into
20886+1234:
20887+ _ASM_EXTABLE(1234b, 2f)
20888+#endif
20889+
20890 js 2f
20891 LOCK_PREFIX
20892 cmpxchg8b (%esi)
20893@@ -149,6 +217,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
20894 movl %ebx, %eax
20895 movl %ecx, %edx
20896 RESTORE ebx
20897+ pax_force_retaddr
20898 ret
20899 CFI_ENDPROC
20900 ENDPROC(atomic64_dec_if_positive_cx8)
20901@@ -174,6 +243,13 @@ ENTRY(atomic64_add_unless_cx8)
20902 movl %edx, %ecx
20903 addl %esi, %ebx
20904 adcl %edi, %ecx
20905+
20906+#ifdef CONFIG_PAX_REFCOUNT
20907+ into
20908+1234:
20909+ _ASM_EXTABLE(1234b, 3f)
20910+#endif
20911+
20912 LOCK_PREFIX
20913 cmpxchg8b (%ebp)
20914 jne 1b
20915@@ -184,6 +260,7 @@ ENTRY(atomic64_add_unless_cx8)
20916 CFI_ADJUST_CFA_OFFSET -8
20917 RESTORE ebx
20918 RESTORE ebp
20919+ pax_force_retaddr
20920 ret
20921 4:
20922 cmpl %edx, 4(%esp)
20923@@ -206,6 +283,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
20924 movl %edx, %ecx
20925 addl $1, %ebx
20926 adcl $0, %ecx
20927+
20928+#ifdef CONFIG_PAX_REFCOUNT
20929+ into
20930+1234:
20931+ _ASM_EXTABLE(1234b, 3f)
20932+#endif
20933+
20934 LOCK_PREFIX
20935 cmpxchg8b (%esi)
20936 jne 1b
20937@@ -213,6 +297,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
20938 movl $1, %eax
20939 3:
20940 RESTORE ebx
20941+ pax_force_retaddr
20942 ret
20943 4:
20944 testl %edx, %edx
20945diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
20946index 78d16a5..fbcf666 100644
20947--- a/arch/x86/lib/checksum_32.S
20948+++ b/arch/x86/lib/checksum_32.S
20949@@ -28,7 +28,8 @@
20950 #include <linux/linkage.h>
20951 #include <asm/dwarf2.h>
20952 #include <asm/errno.h>
20953-
20954+#include <asm/segment.h>
20955+
20956 /*
20957 * computes a partial checksum, e.g. for TCP/UDP fragments
20958 */
20959@@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
20960
20961 #define ARGBASE 16
20962 #define FP 12
20963-
20964-ENTRY(csum_partial_copy_generic)
20965+
20966+ENTRY(csum_partial_copy_generic_to_user)
20967 CFI_STARTPROC
20968+
20969+#ifdef CONFIG_PAX_MEMORY_UDEREF
20970+ pushl_cfi %gs
20971+ popl_cfi %es
20972+ jmp csum_partial_copy_generic
20973+#endif
20974+
20975+ENTRY(csum_partial_copy_generic_from_user)
20976+
20977+#ifdef CONFIG_PAX_MEMORY_UDEREF
20978+ pushl_cfi %gs
20979+ popl_cfi %ds
20980+#endif
20981+
20982+ENTRY(csum_partial_copy_generic)
20983 subl $4,%esp
20984 CFI_ADJUST_CFA_OFFSET 4
20985 pushl_cfi %edi
20986@@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic)
20987 jmp 4f
20988 SRC(1: movw (%esi), %bx )
20989 addl $2, %esi
20990-DST( movw %bx, (%edi) )
20991+DST( movw %bx, %es:(%edi) )
20992 addl $2, %edi
20993 addw %bx, %ax
20994 adcl $0, %eax
20995@@ -332,30 +348,30 @@ DST( movw %bx, (%edi) )
20996 SRC(1: movl (%esi), %ebx )
20997 SRC( movl 4(%esi), %edx )
20998 adcl %ebx, %eax
20999-DST( movl %ebx, (%edi) )
21000+DST( movl %ebx, %es:(%edi) )
21001 adcl %edx, %eax
21002-DST( movl %edx, 4(%edi) )
21003+DST( movl %edx, %es:4(%edi) )
21004
21005 SRC( movl 8(%esi), %ebx )
21006 SRC( movl 12(%esi), %edx )
21007 adcl %ebx, %eax
21008-DST( movl %ebx, 8(%edi) )
21009+DST( movl %ebx, %es:8(%edi) )
21010 adcl %edx, %eax
21011-DST( movl %edx, 12(%edi) )
21012+DST( movl %edx, %es:12(%edi) )
21013
21014 SRC( movl 16(%esi), %ebx )
21015 SRC( movl 20(%esi), %edx )
21016 adcl %ebx, %eax
21017-DST( movl %ebx, 16(%edi) )
21018+DST( movl %ebx, %es:16(%edi) )
21019 adcl %edx, %eax
21020-DST( movl %edx, 20(%edi) )
21021+DST( movl %edx, %es:20(%edi) )
21022
21023 SRC( movl 24(%esi), %ebx )
21024 SRC( movl 28(%esi), %edx )
21025 adcl %ebx, %eax
21026-DST( movl %ebx, 24(%edi) )
21027+DST( movl %ebx, %es:24(%edi) )
21028 adcl %edx, %eax
21029-DST( movl %edx, 28(%edi) )
21030+DST( movl %edx, %es:28(%edi) )
21031
21032 lea 32(%esi), %esi
21033 lea 32(%edi), %edi
21034@@ -369,7 +385,7 @@ DST( movl %edx, 28(%edi) )
21035 shrl $2, %edx # This clears CF
21036 SRC(3: movl (%esi), %ebx )
21037 adcl %ebx, %eax
21038-DST( movl %ebx, (%edi) )
21039+DST( movl %ebx, %es:(%edi) )
21040 lea 4(%esi), %esi
21041 lea 4(%edi), %edi
21042 dec %edx
21043@@ -381,12 +397,12 @@ DST( movl %ebx, (%edi) )
21044 jb 5f
21045 SRC( movw (%esi), %cx )
21046 leal 2(%esi), %esi
21047-DST( movw %cx, (%edi) )
21048+DST( movw %cx, %es:(%edi) )
21049 leal 2(%edi), %edi
21050 je 6f
21051 shll $16,%ecx
21052 SRC(5: movb (%esi), %cl )
21053-DST( movb %cl, (%edi) )
21054+DST( movb %cl, %es:(%edi) )
21055 6: addl %ecx, %eax
21056 adcl $0, %eax
21057 7:
21058@@ -397,7 +413,7 @@ DST( movb %cl, (%edi) )
21059
21060 6001:
21061 movl ARGBASE+20(%esp), %ebx # src_err_ptr
21062- movl $-EFAULT, (%ebx)
21063+ movl $-EFAULT, %ss:(%ebx)
21064
21065 # zero the complete destination - computing the rest
21066 # is too much work
21067@@ -410,11 +426,15 @@ DST( movb %cl, (%edi) )
21068
21069 6002:
21070 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21071- movl $-EFAULT,(%ebx)
21072+ movl $-EFAULT,%ss:(%ebx)
21073 jmp 5000b
21074
21075 .previous
21076
21077+ pushl_cfi %ss
21078+ popl_cfi %ds
21079+ pushl_cfi %ss
21080+ popl_cfi %es
21081 popl_cfi %ebx
21082 CFI_RESTORE ebx
21083 popl_cfi %esi
21084@@ -424,26 +444,43 @@ DST( movb %cl, (%edi) )
21085 popl_cfi %ecx # equivalent to addl $4,%esp
21086 ret
21087 CFI_ENDPROC
21088-ENDPROC(csum_partial_copy_generic)
21089+ENDPROC(csum_partial_copy_generic_to_user)
21090
21091 #else
21092
21093 /* Version for PentiumII/PPro */
21094
21095 #define ROUND1(x) \
21096+ nop; nop; nop; \
21097 SRC(movl x(%esi), %ebx ) ; \
21098 addl %ebx, %eax ; \
21099- DST(movl %ebx, x(%edi) ) ;
21100+ DST(movl %ebx, %es:x(%edi)) ;
21101
21102 #define ROUND(x) \
21103+ nop; nop; nop; \
21104 SRC(movl x(%esi), %ebx ) ; \
21105 adcl %ebx, %eax ; \
21106- DST(movl %ebx, x(%edi) ) ;
21107+ DST(movl %ebx, %es:x(%edi)) ;
21108
21109 #define ARGBASE 12
21110-
21111-ENTRY(csum_partial_copy_generic)
21112+
21113+ENTRY(csum_partial_copy_generic_to_user)
21114 CFI_STARTPROC
21115+
21116+#ifdef CONFIG_PAX_MEMORY_UDEREF
21117+ pushl_cfi %gs
21118+ popl_cfi %es
21119+ jmp csum_partial_copy_generic
21120+#endif
21121+
21122+ENTRY(csum_partial_copy_generic_from_user)
21123+
21124+#ifdef CONFIG_PAX_MEMORY_UDEREF
21125+ pushl_cfi %gs
21126+ popl_cfi %ds
21127+#endif
21128+
21129+ENTRY(csum_partial_copy_generic)
21130 pushl_cfi %ebx
21131 CFI_REL_OFFSET ebx, 0
21132 pushl_cfi %edi
21133@@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic)
21134 subl %ebx, %edi
21135 lea -1(%esi),%edx
21136 andl $-32,%edx
21137- lea 3f(%ebx,%ebx), %ebx
21138+ lea 3f(%ebx,%ebx,2), %ebx
21139 testl %esi, %esi
21140 jmp *%ebx
21141 1: addl $64,%esi
21142@@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic)
21143 jb 5f
21144 SRC( movw (%esi), %dx )
21145 leal 2(%esi), %esi
21146-DST( movw %dx, (%edi) )
21147+DST( movw %dx, %es:(%edi) )
21148 leal 2(%edi), %edi
21149 je 6f
21150 shll $16,%edx
21151 5:
21152 SRC( movb (%esi), %dl )
21153-DST( movb %dl, (%edi) )
21154+DST( movb %dl, %es:(%edi) )
21155 6: addl %edx, %eax
21156 adcl $0, %eax
21157 7:
21158 .section .fixup, "ax"
21159 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
21160- movl $-EFAULT, (%ebx)
21161+ movl $-EFAULT, %ss:(%ebx)
21162 # zero the complete destination (computing the rest is too much work)
21163 movl ARGBASE+8(%esp),%edi # dst
21164 movl ARGBASE+12(%esp),%ecx # len
21165@@ -505,10 +542,17 @@ DST( movb %dl, (%edi) )
21166 rep; stosb
21167 jmp 7b
21168 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21169- movl $-EFAULT, (%ebx)
21170+ movl $-EFAULT, %ss:(%ebx)
21171 jmp 7b
21172 .previous
21173
21174+#ifdef CONFIG_PAX_MEMORY_UDEREF
21175+ pushl_cfi %ss
21176+ popl_cfi %ds
21177+ pushl_cfi %ss
21178+ popl_cfi %es
21179+#endif
21180+
21181 popl_cfi %esi
21182 CFI_RESTORE esi
21183 popl_cfi %edi
21184@@ -517,7 +561,7 @@ DST( movb %dl, (%edi) )
21185 CFI_RESTORE ebx
21186 ret
21187 CFI_ENDPROC
21188-ENDPROC(csum_partial_copy_generic)
21189+ENDPROC(csum_partial_copy_generic_to_user)
21190
21191 #undef ROUND
21192 #undef ROUND1
21193diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
21194index f2145cf..cea889d 100644
21195--- a/arch/x86/lib/clear_page_64.S
21196+++ b/arch/x86/lib/clear_page_64.S
21197@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
21198 movl $4096/8,%ecx
21199 xorl %eax,%eax
21200 rep stosq
21201+ pax_force_retaddr
21202 ret
21203 CFI_ENDPROC
21204 ENDPROC(clear_page_c)
21205@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
21206 movl $4096,%ecx
21207 xorl %eax,%eax
21208 rep stosb
21209+ pax_force_retaddr
21210 ret
21211 CFI_ENDPROC
21212 ENDPROC(clear_page_c_e)
21213@@ -43,6 +45,7 @@ ENTRY(clear_page)
21214 leaq 64(%rdi),%rdi
21215 jnz .Lloop
21216 nop
21217+ pax_force_retaddr
21218 ret
21219 CFI_ENDPROC
21220 .Lclear_page_end:
21221@@ -58,7 +61,7 @@ ENDPROC(clear_page)
21222
21223 #include <asm/cpufeature.h>
21224
21225- .section .altinstr_replacement,"ax"
21226+ .section .altinstr_replacement,"a"
21227 1: .byte 0xeb /* jmp <disp8> */
21228 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
21229 2: .byte 0xeb /* jmp <disp8> */
21230diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
21231index 1e572c5..2a162cd 100644
21232--- a/arch/x86/lib/cmpxchg16b_emu.S
21233+++ b/arch/x86/lib/cmpxchg16b_emu.S
21234@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
21235
21236 popf
21237 mov $1, %al
21238+ pax_force_retaddr
21239 ret
21240
21241 not_same:
21242 popf
21243 xor %al,%al
21244+ pax_force_retaddr
21245 ret
21246
21247 CFI_ENDPROC
21248diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
21249index 01c805b..dccb07f 100644
21250--- a/arch/x86/lib/copy_page_64.S
21251+++ b/arch/x86/lib/copy_page_64.S
21252@@ -9,6 +9,7 @@ copy_page_c:
21253 CFI_STARTPROC
21254 movl $4096/8,%ecx
21255 rep movsq
21256+ pax_force_retaddr
21257 ret
21258 CFI_ENDPROC
21259 ENDPROC(copy_page_c)
21260@@ -39,7 +40,7 @@ ENTRY(copy_page)
21261 movq 16 (%rsi), %rdx
21262 movq 24 (%rsi), %r8
21263 movq 32 (%rsi), %r9
21264- movq 40 (%rsi), %r10
21265+ movq 40 (%rsi), %r13
21266 movq 48 (%rsi), %r11
21267 movq 56 (%rsi), %r12
21268
21269@@ -50,7 +51,7 @@ ENTRY(copy_page)
21270 movq %rdx, 16 (%rdi)
21271 movq %r8, 24 (%rdi)
21272 movq %r9, 32 (%rdi)
21273- movq %r10, 40 (%rdi)
21274+ movq %r13, 40 (%rdi)
21275 movq %r11, 48 (%rdi)
21276 movq %r12, 56 (%rdi)
21277
21278@@ -69,7 +70,7 @@ ENTRY(copy_page)
21279 movq 16 (%rsi), %rdx
21280 movq 24 (%rsi), %r8
21281 movq 32 (%rsi), %r9
21282- movq 40 (%rsi), %r10
21283+ movq 40 (%rsi), %r13
21284 movq 48 (%rsi), %r11
21285 movq 56 (%rsi), %r12
21286
21287@@ -78,7 +79,7 @@ ENTRY(copy_page)
21288 movq %rdx, 16 (%rdi)
21289 movq %r8, 24 (%rdi)
21290 movq %r9, 32 (%rdi)
21291- movq %r10, 40 (%rdi)
21292+ movq %r13, 40 (%rdi)
21293 movq %r11, 48 (%rdi)
21294 movq %r12, 56 (%rdi)
21295
21296@@ -95,6 +96,7 @@ ENTRY(copy_page)
21297 CFI_RESTORE r13
21298 addq $3*8,%rsp
21299 CFI_ADJUST_CFA_OFFSET -3*8
21300+ pax_force_retaddr
21301 ret
21302 .Lcopy_page_end:
21303 CFI_ENDPROC
21304@@ -105,7 +107,7 @@ ENDPROC(copy_page)
21305
21306 #include <asm/cpufeature.h>
21307
21308- .section .altinstr_replacement,"ax"
21309+ .section .altinstr_replacement,"a"
21310 1: .byte 0xeb /* jmp <disp8> */
21311 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
21312 2:
21313diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
21314index 0248402..821c786 100644
21315--- a/arch/x86/lib/copy_user_64.S
21316+++ b/arch/x86/lib/copy_user_64.S
21317@@ -16,6 +16,7 @@
21318 #include <asm/thread_info.h>
21319 #include <asm/cpufeature.h>
21320 #include <asm/alternative-asm.h>
21321+#include <asm/pgtable.h>
21322
21323 /*
21324 * By placing feature2 after feature1 in altinstructions section, we logically
21325@@ -29,7 +30,7 @@
21326 .byte 0xe9 /* 32bit jump */
21327 .long \orig-1f /* by default jump to orig */
21328 1:
21329- .section .altinstr_replacement,"ax"
21330+ .section .altinstr_replacement,"a"
21331 2: .byte 0xe9 /* near jump with 32bit immediate */
21332 .long \alt1-1b /* offset */ /* or alternatively to alt1 */
21333 3: .byte 0xe9 /* near jump with 32bit immediate */
21334@@ -71,47 +72,20 @@
21335 #endif
21336 .endm
21337
21338-/* Standard copy_to_user with segment limit checking */
21339-ENTRY(_copy_to_user)
21340- CFI_STARTPROC
21341- GET_THREAD_INFO(%rax)
21342- movq %rdi,%rcx
21343- addq %rdx,%rcx
21344- jc bad_to_user
21345- cmpq TI_addr_limit(%rax),%rcx
21346- ja bad_to_user
21347- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21348- copy_user_generic_unrolled,copy_user_generic_string, \
21349- copy_user_enhanced_fast_string
21350- CFI_ENDPROC
21351-ENDPROC(_copy_to_user)
21352-
21353-/* Standard copy_from_user with segment limit checking */
21354-ENTRY(_copy_from_user)
21355- CFI_STARTPROC
21356- GET_THREAD_INFO(%rax)
21357- movq %rsi,%rcx
21358- addq %rdx,%rcx
21359- jc bad_from_user
21360- cmpq TI_addr_limit(%rax),%rcx
21361- ja bad_from_user
21362- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21363- copy_user_generic_unrolled,copy_user_generic_string, \
21364- copy_user_enhanced_fast_string
21365- CFI_ENDPROC
21366-ENDPROC(_copy_from_user)
21367-
21368 .section .fixup,"ax"
21369 /* must zero dest */
21370 ENTRY(bad_from_user)
21371 bad_from_user:
21372 CFI_STARTPROC
21373+ testl %edx,%edx
21374+ js bad_to_user
21375 movl %edx,%ecx
21376 xorl %eax,%eax
21377 rep
21378 stosb
21379 bad_to_user:
21380 movl %edx,%eax
21381+ pax_force_retaddr
21382 ret
21383 CFI_ENDPROC
21384 ENDPROC(bad_from_user)
21385@@ -141,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
21386 jz 17f
21387 1: movq (%rsi),%r8
21388 2: movq 1*8(%rsi),%r9
21389-3: movq 2*8(%rsi),%r10
21390+3: movq 2*8(%rsi),%rax
21391 4: movq 3*8(%rsi),%r11
21392 5: movq %r8,(%rdi)
21393 6: movq %r9,1*8(%rdi)
21394-7: movq %r10,2*8(%rdi)
21395+7: movq %rax,2*8(%rdi)
21396 8: movq %r11,3*8(%rdi)
21397 9: movq 4*8(%rsi),%r8
21398 10: movq 5*8(%rsi),%r9
21399-11: movq 6*8(%rsi),%r10
21400+11: movq 6*8(%rsi),%rax
21401 12: movq 7*8(%rsi),%r11
21402 13: movq %r8,4*8(%rdi)
21403 14: movq %r9,5*8(%rdi)
21404-15: movq %r10,6*8(%rdi)
21405+15: movq %rax,6*8(%rdi)
21406 16: movq %r11,7*8(%rdi)
21407 leaq 64(%rsi),%rsi
21408 leaq 64(%rdi),%rdi
21409@@ -179,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
21410 decl %ecx
21411 jnz 21b
21412 23: xor %eax,%eax
21413+ pax_force_retaddr
21414 ret
21415
21416 .section .fixup,"ax"
21417@@ -251,6 +226,7 @@ ENTRY(copy_user_generic_string)
21418 3: rep
21419 movsb
21420 4: xorl %eax,%eax
21421+ pax_force_retaddr
21422 ret
21423
21424 .section .fixup,"ax"
21425@@ -287,6 +263,7 @@ ENTRY(copy_user_enhanced_fast_string)
21426 1: rep
21427 movsb
21428 2: xorl %eax,%eax
21429+ pax_force_retaddr
21430 ret
21431
21432 .section .fixup,"ax"
21433diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
21434index cb0c112..e3a6895 100644
21435--- a/arch/x86/lib/copy_user_nocache_64.S
21436+++ b/arch/x86/lib/copy_user_nocache_64.S
21437@@ -8,12 +8,14 @@
21438
21439 #include <linux/linkage.h>
21440 #include <asm/dwarf2.h>
21441+#include <asm/alternative-asm.h>
21442
21443 #define FIX_ALIGNMENT 1
21444
21445 #include <asm/current.h>
21446 #include <asm/asm-offsets.h>
21447 #include <asm/thread_info.h>
21448+#include <asm/pgtable.h>
21449
21450 .macro ALIGN_DESTINATION
21451 #ifdef FIX_ALIGNMENT
21452@@ -50,6 +52,15 @@
21453 */
21454 ENTRY(__copy_user_nocache)
21455 CFI_STARTPROC
21456+
21457+#ifdef CONFIG_PAX_MEMORY_UDEREF
21458+ mov $PAX_USER_SHADOW_BASE,%rcx
21459+ cmp %rcx,%rsi
21460+ jae 1f
21461+ add %rcx,%rsi
21462+1:
21463+#endif
21464+
21465 cmpl $8,%edx
21466 jb 20f /* less then 8 bytes, go to byte copy loop */
21467 ALIGN_DESTINATION
21468@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
21469 jz 17f
21470 1: movq (%rsi),%r8
21471 2: movq 1*8(%rsi),%r9
21472-3: movq 2*8(%rsi),%r10
21473+3: movq 2*8(%rsi),%rax
21474 4: movq 3*8(%rsi),%r11
21475 5: movnti %r8,(%rdi)
21476 6: movnti %r9,1*8(%rdi)
21477-7: movnti %r10,2*8(%rdi)
21478+7: movnti %rax,2*8(%rdi)
21479 8: movnti %r11,3*8(%rdi)
21480 9: movq 4*8(%rsi),%r8
21481 10: movq 5*8(%rsi),%r9
21482-11: movq 6*8(%rsi),%r10
21483+11: movq 6*8(%rsi),%rax
21484 12: movq 7*8(%rsi),%r11
21485 13: movnti %r8,4*8(%rdi)
21486 14: movnti %r9,5*8(%rdi)
21487-15: movnti %r10,6*8(%rdi)
21488+15: movnti %rax,6*8(%rdi)
21489 16: movnti %r11,7*8(%rdi)
21490 leaq 64(%rsi),%rsi
21491 leaq 64(%rdi),%rdi
21492@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
21493 jnz 21b
21494 23: xorl %eax,%eax
21495 sfence
21496+ pax_force_retaddr
21497 ret
21498
21499 .section .fixup,"ax"
21500diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
21501index fb903b7..c92b7f7 100644
21502--- a/arch/x86/lib/csum-copy_64.S
21503+++ b/arch/x86/lib/csum-copy_64.S
21504@@ -8,6 +8,7 @@
21505 #include <linux/linkage.h>
21506 #include <asm/dwarf2.h>
21507 #include <asm/errno.h>
21508+#include <asm/alternative-asm.h>
21509
21510 /*
21511 * Checksum copy with exception handling.
21512@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
21513 CFI_RESTORE rbp
21514 addq $7*8, %rsp
21515 CFI_ADJUST_CFA_OFFSET -7*8
21516+ pax_force_retaddr 0, 1
21517 ret
21518 CFI_RESTORE_STATE
21519
21520diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
21521index 459b58a..9570bc7 100644
21522--- a/arch/x86/lib/csum-wrappers_64.c
21523+++ b/arch/x86/lib/csum-wrappers_64.c
21524@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
21525 len -= 2;
21526 }
21527 }
21528- isum = csum_partial_copy_generic((__force const void *)src,
21529+
21530+#ifdef CONFIG_PAX_MEMORY_UDEREF
21531+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
21532+ src += PAX_USER_SHADOW_BASE;
21533+#endif
21534+
21535+ isum = csum_partial_copy_generic((const void __force_kernel *)src,
21536 dst, len, isum, errp, NULL);
21537 if (unlikely(*errp))
21538 goto out_err;
21539@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
21540 }
21541
21542 *errp = 0;
21543- return csum_partial_copy_generic(src, (void __force *)dst,
21544+
21545+#ifdef CONFIG_PAX_MEMORY_UDEREF
21546+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
21547+ dst += PAX_USER_SHADOW_BASE;
21548+#endif
21549+
21550+ return csum_partial_copy_generic(src, (void __force_kernel *)dst,
21551 len, isum, NULL, errp);
21552 }
21553 EXPORT_SYMBOL(csum_partial_copy_to_user);
21554diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
21555index 51f1504..ddac4c1 100644
21556--- a/arch/x86/lib/getuser.S
21557+++ b/arch/x86/lib/getuser.S
21558@@ -33,15 +33,38 @@
21559 #include <asm/asm-offsets.h>
21560 #include <asm/thread_info.h>
21561 #include <asm/asm.h>
21562+#include <asm/segment.h>
21563+#include <asm/pgtable.h>
21564+#include <asm/alternative-asm.h>
21565+
21566+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
21567+#define __copyuser_seg gs;
21568+#else
21569+#define __copyuser_seg
21570+#endif
21571
21572 .text
21573 ENTRY(__get_user_1)
21574 CFI_STARTPROC
21575+
21576+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21577 GET_THREAD_INFO(%_ASM_DX)
21578 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21579 jae bad_get_user
21580-1: movzb (%_ASM_AX),%edx
21581+
21582+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21583+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21584+ cmp %_ASM_DX,%_ASM_AX
21585+ jae 1234f
21586+ add %_ASM_DX,%_ASM_AX
21587+1234:
21588+#endif
21589+
21590+#endif
21591+
21592+1: __copyuser_seg movzb (%_ASM_AX),%edx
21593 xor %eax,%eax
21594+ pax_force_retaddr
21595 ret
21596 CFI_ENDPROC
21597 ENDPROC(__get_user_1)
21598@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
21599 ENTRY(__get_user_2)
21600 CFI_STARTPROC
21601 add $1,%_ASM_AX
21602+
21603+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21604 jc bad_get_user
21605 GET_THREAD_INFO(%_ASM_DX)
21606 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21607 jae bad_get_user
21608-2: movzwl -1(%_ASM_AX),%edx
21609+
21610+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21611+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21612+ cmp %_ASM_DX,%_ASM_AX
21613+ jae 1234f
21614+ add %_ASM_DX,%_ASM_AX
21615+1234:
21616+#endif
21617+
21618+#endif
21619+
21620+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
21621 xor %eax,%eax
21622+ pax_force_retaddr
21623 ret
21624 CFI_ENDPROC
21625 ENDPROC(__get_user_2)
21626@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
21627 ENTRY(__get_user_4)
21628 CFI_STARTPROC
21629 add $3,%_ASM_AX
21630+
21631+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21632 jc bad_get_user
21633 GET_THREAD_INFO(%_ASM_DX)
21634 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21635 jae bad_get_user
21636-3: mov -3(%_ASM_AX),%edx
21637+
21638+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21639+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21640+ cmp %_ASM_DX,%_ASM_AX
21641+ jae 1234f
21642+ add %_ASM_DX,%_ASM_AX
21643+1234:
21644+#endif
21645+
21646+#endif
21647+
21648+3: __copyuser_seg mov -3(%_ASM_AX),%edx
21649 xor %eax,%eax
21650+ pax_force_retaddr
21651 ret
21652 CFI_ENDPROC
21653 ENDPROC(__get_user_4)
21654@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
21655 GET_THREAD_INFO(%_ASM_DX)
21656 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21657 jae bad_get_user
21658+
21659+#ifdef CONFIG_PAX_MEMORY_UDEREF
21660+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21661+ cmp %_ASM_DX,%_ASM_AX
21662+ jae 1234f
21663+ add %_ASM_DX,%_ASM_AX
21664+1234:
21665+#endif
21666+
21667 4: movq -7(%_ASM_AX),%_ASM_DX
21668 xor %eax,%eax
21669+ pax_force_retaddr
21670 ret
21671 CFI_ENDPROC
21672 ENDPROC(__get_user_8)
21673@@ -91,6 +152,7 @@ bad_get_user:
21674 CFI_STARTPROC
21675 xor %edx,%edx
21676 mov $(-EFAULT),%_ASM_AX
21677+ pax_force_retaddr
21678 ret
21679 CFI_ENDPROC
21680 END(bad_get_user)
21681diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
21682index 374562e..a75830b 100644
21683--- a/arch/x86/lib/insn.c
21684+++ b/arch/x86/lib/insn.c
21685@@ -21,6 +21,11 @@
21686 #include <linux/string.h>
21687 #include <asm/inat.h>
21688 #include <asm/insn.h>
21689+#ifdef __KERNEL__
21690+#include <asm/pgtable_types.h>
21691+#else
21692+#define ktla_ktva(addr) addr
21693+#endif
21694
21695 /* Verify next sizeof(t) bytes can be on the same instruction */
21696 #define validate_next(t, insn, n) \
21697@@ -49,8 +54,8 @@
21698 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
21699 {
21700 memset(insn, 0, sizeof(*insn));
21701- insn->kaddr = kaddr;
21702- insn->next_byte = kaddr;
21703+ insn->kaddr = ktla_ktva(kaddr);
21704+ insn->next_byte = ktla_ktva(kaddr);
21705 insn->x86_64 = x86_64 ? 1 : 0;
21706 insn->opnd_bytes = 4;
21707 if (x86_64)
21708diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
21709index 05a95e7..326f2fa 100644
21710--- a/arch/x86/lib/iomap_copy_64.S
21711+++ b/arch/x86/lib/iomap_copy_64.S
21712@@ -17,6 +17,7 @@
21713
21714 #include <linux/linkage.h>
21715 #include <asm/dwarf2.h>
21716+#include <asm/alternative-asm.h>
21717
21718 /*
21719 * override generic version in lib/iomap_copy.c
21720@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
21721 CFI_STARTPROC
21722 movl %edx,%ecx
21723 rep movsd
21724+ pax_force_retaddr
21725 ret
21726 CFI_ENDPROC
21727 ENDPROC(__iowrite32_copy)
21728diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
21729index efbf2a0..8893637 100644
21730--- a/arch/x86/lib/memcpy_64.S
21731+++ b/arch/x86/lib/memcpy_64.S
21732@@ -34,6 +34,7 @@
21733 rep movsq
21734 movl %edx, %ecx
21735 rep movsb
21736+ pax_force_retaddr
21737 ret
21738 .Lmemcpy_e:
21739 .previous
21740@@ -51,6 +52,7 @@
21741
21742 movl %edx, %ecx
21743 rep movsb
21744+ pax_force_retaddr
21745 ret
21746 .Lmemcpy_e_e:
21747 .previous
21748@@ -81,13 +83,13 @@ ENTRY(memcpy)
21749 */
21750 movq 0*8(%rsi), %r8
21751 movq 1*8(%rsi), %r9
21752- movq 2*8(%rsi), %r10
21753+ movq 2*8(%rsi), %rcx
21754 movq 3*8(%rsi), %r11
21755 leaq 4*8(%rsi), %rsi
21756
21757 movq %r8, 0*8(%rdi)
21758 movq %r9, 1*8(%rdi)
21759- movq %r10, 2*8(%rdi)
21760+ movq %rcx, 2*8(%rdi)
21761 movq %r11, 3*8(%rdi)
21762 leaq 4*8(%rdi), %rdi
21763 jae .Lcopy_forward_loop
21764@@ -110,12 +112,12 @@ ENTRY(memcpy)
21765 subq $0x20, %rdx
21766 movq -1*8(%rsi), %r8
21767 movq -2*8(%rsi), %r9
21768- movq -3*8(%rsi), %r10
21769+ movq -3*8(%rsi), %rcx
21770 movq -4*8(%rsi), %r11
21771 leaq -4*8(%rsi), %rsi
21772 movq %r8, -1*8(%rdi)
21773 movq %r9, -2*8(%rdi)
21774- movq %r10, -3*8(%rdi)
21775+ movq %rcx, -3*8(%rdi)
21776 movq %r11, -4*8(%rdi)
21777 leaq -4*8(%rdi), %rdi
21778 jae .Lcopy_backward_loop
21779@@ -135,12 +137,13 @@ ENTRY(memcpy)
21780 */
21781 movq 0*8(%rsi), %r8
21782 movq 1*8(%rsi), %r9
21783- movq -2*8(%rsi, %rdx), %r10
21784+ movq -2*8(%rsi, %rdx), %rcx
21785 movq -1*8(%rsi, %rdx), %r11
21786 movq %r8, 0*8(%rdi)
21787 movq %r9, 1*8(%rdi)
21788- movq %r10, -2*8(%rdi, %rdx)
21789+ movq %rcx, -2*8(%rdi, %rdx)
21790 movq %r11, -1*8(%rdi, %rdx)
21791+ pax_force_retaddr
21792 retq
21793 .p2align 4
21794 .Lless_16bytes:
21795@@ -153,6 +156,7 @@ ENTRY(memcpy)
21796 movq -1*8(%rsi, %rdx), %r9
21797 movq %r8, 0*8(%rdi)
21798 movq %r9, -1*8(%rdi, %rdx)
21799+ pax_force_retaddr
21800 retq
21801 .p2align 4
21802 .Lless_8bytes:
21803@@ -166,6 +170,7 @@ ENTRY(memcpy)
21804 movl -4(%rsi, %rdx), %r8d
21805 movl %ecx, (%rdi)
21806 movl %r8d, -4(%rdi, %rdx)
21807+ pax_force_retaddr
21808 retq
21809 .p2align 4
21810 .Lless_3bytes:
21811@@ -183,6 +188,7 @@ ENTRY(memcpy)
21812 jnz .Lloop_1
21813
21814 .Lend:
21815+ pax_force_retaddr
21816 retq
21817 CFI_ENDPROC
21818 ENDPROC(memcpy)
21819diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
21820index ee16461..c39c199 100644
21821--- a/arch/x86/lib/memmove_64.S
21822+++ b/arch/x86/lib/memmove_64.S
21823@@ -61,13 +61,13 @@ ENTRY(memmove)
21824 5:
21825 sub $0x20, %rdx
21826 movq 0*8(%rsi), %r11
21827- movq 1*8(%rsi), %r10
21828+ movq 1*8(%rsi), %rcx
21829 movq 2*8(%rsi), %r9
21830 movq 3*8(%rsi), %r8
21831 leaq 4*8(%rsi), %rsi
21832
21833 movq %r11, 0*8(%rdi)
21834- movq %r10, 1*8(%rdi)
21835+ movq %rcx, 1*8(%rdi)
21836 movq %r9, 2*8(%rdi)
21837 movq %r8, 3*8(%rdi)
21838 leaq 4*8(%rdi), %rdi
21839@@ -81,10 +81,10 @@ ENTRY(memmove)
21840 4:
21841 movq %rdx, %rcx
21842 movq -8(%rsi, %rdx), %r11
21843- lea -8(%rdi, %rdx), %r10
21844+ lea -8(%rdi, %rdx), %r9
21845 shrq $3, %rcx
21846 rep movsq
21847- movq %r11, (%r10)
21848+ movq %r11, (%r9)
21849 jmp 13f
21850 .Lmemmove_end_forward:
21851
21852@@ -95,14 +95,14 @@ ENTRY(memmove)
21853 7:
21854 movq %rdx, %rcx
21855 movq (%rsi), %r11
21856- movq %rdi, %r10
21857+ movq %rdi, %r9
21858 leaq -8(%rsi, %rdx), %rsi
21859 leaq -8(%rdi, %rdx), %rdi
21860 shrq $3, %rcx
21861 std
21862 rep movsq
21863 cld
21864- movq %r11, (%r10)
21865+ movq %r11, (%r9)
21866 jmp 13f
21867
21868 /*
21869@@ -127,13 +127,13 @@ ENTRY(memmove)
21870 8:
21871 subq $0x20, %rdx
21872 movq -1*8(%rsi), %r11
21873- movq -2*8(%rsi), %r10
21874+ movq -2*8(%rsi), %rcx
21875 movq -3*8(%rsi), %r9
21876 movq -4*8(%rsi), %r8
21877 leaq -4*8(%rsi), %rsi
21878
21879 movq %r11, -1*8(%rdi)
21880- movq %r10, -2*8(%rdi)
21881+ movq %rcx, -2*8(%rdi)
21882 movq %r9, -3*8(%rdi)
21883 movq %r8, -4*8(%rdi)
21884 leaq -4*8(%rdi), %rdi
21885@@ -151,11 +151,11 @@ ENTRY(memmove)
21886 * Move data from 16 bytes to 31 bytes.
21887 */
21888 movq 0*8(%rsi), %r11
21889- movq 1*8(%rsi), %r10
21890+ movq 1*8(%rsi), %rcx
21891 movq -2*8(%rsi, %rdx), %r9
21892 movq -1*8(%rsi, %rdx), %r8
21893 movq %r11, 0*8(%rdi)
21894- movq %r10, 1*8(%rdi)
21895+ movq %rcx, 1*8(%rdi)
21896 movq %r9, -2*8(%rdi, %rdx)
21897 movq %r8, -1*8(%rdi, %rdx)
21898 jmp 13f
21899@@ -167,9 +167,9 @@ ENTRY(memmove)
21900 * Move data from 8 bytes to 15 bytes.
21901 */
21902 movq 0*8(%rsi), %r11
21903- movq -1*8(%rsi, %rdx), %r10
21904+ movq -1*8(%rsi, %rdx), %r9
21905 movq %r11, 0*8(%rdi)
21906- movq %r10, -1*8(%rdi, %rdx)
21907+ movq %r9, -1*8(%rdi, %rdx)
21908 jmp 13f
21909 10:
21910 cmpq $4, %rdx
21911@@ -178,9 +178,9 @@ ENTRY(memmove)
21912 * Move data from 4 bytes to 7 bytes.
21913 */
21914 movl (%rsi), %r11d
21915- movl -4(%rsi, %rdx), %r10d
21916+ movl -4(%rsi, %rdx), %r9d
21917 movl %r11d, (%rdi)
21918- movl %r10d, -4(%rdi, %rdx)
21919+ movl %r9d, -4(%rdi, %rdx)
21920 jmp 13f
21921 11:
21922 cmp $2, %rdx
21923@@ -189,9 +189,9 @@ ENTRY(memmove)
21924 * Move data from 2 bytes to 3 bytes.
21925 */
21926 movw (%rsi), %r11w
21927- movw -2(%rsi, %rdx), %r10w
21928+ movw -2(%rsi, %rdx), %r9w
21929 movw %r11w, (%rdi)
21930- movw %r10w, -2(%rdi, %rdx)
21931+ movw %r9w, -2(%rdi, %rdx)
21932 jmp 13f
21933 12:
21934 cmp $1, %rdx
21935@@ -202,6 +202,7 @@ ENTRY(memmove)
21936 movb (%rsi), %r11b
21937 movb %r11b, (%rdi)
21938 13:
21939+ pax_force_retaddr
21940 retq
21941 CFI_ENDPROC
21942
21943@@ -210,6 +211,7 @@ ENTRY(memmove)
21944 /* Forward moving data. */
21945 movq %rdx, %rcx
21946 rep movsb
21947+ pax_force_retaddr
21948 retq
21949 .Lmemmove_end_forward_efs:
21950 .previous
21951diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
21952index 79bd454..dff325a 100644
21953--- a/arch/x86/lib/memset_64.S
21954+++ b/arch/x86/lib/memset_64.S
21955@@ -31,6 +31,7 @@
21956 movl %r8d,%ecx
21957 rep stosb
21958 movq %r9,%rax
21959+ pax_force_retaddr
21960 ret
21961 .Lmemset_e:
21962 .previous
21963@@ -53,6 +54,7 @@
21964 movl %edx,%ecx
21965 rep stosb
21966 movq %r9,%rax
21967+ pax_force_retaddr
21968 ret
21969 .Lmemset_e_e:
21970 .previous
21971@@ -60,13 +62,13 @@
21972 ENTRY(memset)
21973 ENTRY(__memset)
21974 CFI_STARTPROC
21975- movq %rdi,%r10
21976 movq %rdx,%r11
21977
21978 /* expand byte value */
21979 movzbl %sil,%ecx
21980 movabs $0x0101010101010101,%rax
21981 mul %rcx /* with rax, clobbers rdx */
21982+ movq %rdi,%rdx
21983
21984 /* align dst */
21985 movl %edi,%r9d
21986@@ -120,7 +122,8 @@ ENTRY(__memset)
21987 jnz .Lloop_1
21988
21989 .Lende:
21990- movq %r10,%rax
21991+ movq %rdx,%rax
21992+ pax_force_retaddr
21993 ret
21994
21995 CFI_RESTORE_STATE
21996diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
21997index c9f2d9b..e7fd2c0 100644
21998--- a/arch/x86/lib/mmx_32.c
21999+++ b/arch/x86/lib/mmx_32.c
22000@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22001 {
22002 void *p;
22003 int i;
22004+ unsigned long cr0;
22005
22006 if (unlikely(in_interrupt()))
22007 return __memcpy(to, from, len);
22008@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22009 kernel_fpu_begin();
22010
22011 __asm__ __volatile__ (
22012- "1: prefetch (%0)\n" /* This set is 28 bytes */
22013- " prefetch 64(%0)\n"
22014- " prefetch 128(%0)\n"
22015- " prefetch 192(%0)\n"
22016- " prefetch 256(%0)\n"
22017+ "1: prefetch (%1)\n" /* This set is 28 bytes */
22018+ " prefetch 64(%1)\n"
22019+ " prefetch 128(%1)\n"
22020+ " prefetch 192(%1)\n"
22021+ " prefetch 256(%1)\n"
22022 "2: \n"
22023 ".section .fixup, \"ax\"\n"
22024- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22025+ "3: \n"
22026+
22027+#ifdef CONFIG_PAX_KERNEXEC
22028+ " movl %%cr0, %0\n"
22029+ " movl %0, %%eax\n"
22030+ " andl $0xFFFEFFFF, %%eax\n"
22031+ " movl %%eax, %%cr0\n"
22032+#endif
22033+
22034+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22035+
22036+#ifdef CONFIG_PAX_KERNEXEC
22037+ " movl %0, %%cr0\n"
22038+#endif
22039+
22040 " jmp 2b\n"
22041 ".previous\n"
22042 _ASM_EXTABLE(1b, 3b)
22043- : : "r" (from));
22044+ : "=&r" (cr0) : "r" (from) : "ax");
22045
22046 for ( ; i > 5; i--) {
22047 __asm__ __volatile__ (
22048- "1: prefetch 320(%0)\n"
22049- "2: movq (%0), %%mm0\n"
22050- " movq 8(%0), %%mm1\n"
22051- " movq 16(%0), %%mm2\n"
22052- " movq 24(%0), %%mm3\n"
22053- " movq %%mm0, (%1)\n"
22054- " movq %%mm1, 8(%1)\n"
22055- " movq %%mm2, 16(%1)\n"
22056- " movq %%mm3, 24(%1)\n"
22057- " movq 32(%0), %%mm0\n"
22058- " movq 40(%0), %%mm1\n"
22059- " movq 48(%0), %%mm2\n"
22060- " movq 56(%0), %%mm3\n"
22061- " movq %%mm0, 32(%1)\n"
22062- " movq %%mm1, 40(%1)\n"
22063- " movq %%mm2, 48(%1)\n"
22064- " movq %%mm3, 56(%1)\n"
22065+ "1: prefetch 320(%1)\n"
22066+ "2: movq (%1), %%mm0\n"
22067+ " movq 8(%1), %%mm1\n"
22068+ " movq 16(%1), %%mm2\n"
22069+ " movq 24(%1), %%mm3\n"
22070+ " movq %%mm0, (%2)\n"
22071+ " movq %%mm1, 8(%2)\n"
22072+ " movq %%mm2, 16(%2)\n"
22073+ " movq %%mm3, 24(%2)\n"
22074+ " movq 32(%1), %%mm0\n"
22075+ " movq 40(%1), %%mm1\n"
22076+ " movq 48(%1), %%mm2\n"
22077+ " movq 56(%1), %%mm3\n"
22078+ " movq %%mm0, 32(%2)\n"
22079+ " movq %%mm1, 40(%2)\n"
22080+ " movq %%mm2, 48(%2)\n"
22081+ " movq %%mm3, 56(%2)\n"
22082 ".section .fixup, \"ax\"\n"
22083- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22084+ "3:\n"
22085+
22086+#ifdef CONFIG_PAX_KERNEXEC
22087+ " movl %%cr0, %0\n"
22088+ " movl %0, %%eax\n"
22089+ " andl $0xFFFEFFFF, %%eax\n"
22090+ " movl %%eax, %%cr0\n"
22091+#endif
22092+
22093+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22094+
22095+#ifdef CONFIG_PAX_KERNEXEC
22096+ " movl %0, %%cr0\n"
22097+#endif
22098+
22099 " jmp 2b\n"
22100 ".previous\n"
22101 _ASM_EXTABLE(1b, 3b)
22102- : : "r" (from), "r" (to) : "memory");
22103+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22104
22105 from += 64;
22106 to += 64;
22107@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
22108 static void fast_copy_page(void *to, void *from)
22109 {
22110 int i;
22111+ unsigned long cr0;
22112
22113 kernel_fpu_begin();
22114
22115@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
22116 * but that is for later. -AV
22117 */
22118 __asm__ __volatile__(
22119- "1: prefetch (%0)\n"
22120- " prefetch 64(%0)\n"
22121- " prefetch 128(%0)\n"
22122- " prefetch 192(%0)\n"
22123- " prefetch 256(%0)\n"
22124+ "1: prefetch (%1)\n"
22125+ " prefetch 64(%1)\n"
22126+ " prefetch 128(%1)\n"
22127+ " prefetch 192(%1)\n"
22128+ " prefetch 256(%1)\n"
22129 "2: \n"
22130 ".section .fixup, \"ax\"\n"
22131- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22132+ "3: \n"
22133+
22134+#ifdef CONFIG_PAX_KERNEXEC
22135+ " movl %%cr0, %0\n"
22136+ " movl %0, %%eax\n"
22137+ " andl $0xFFFEFFFF, %%eax\n"
22138+ " movl %%eax, %%cr0\n"
22139+#endif
22140+
22141+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22142+
22143+#ifdef CONFIG_PAX_KERNEXEC
22144+ " movl %0, %%cr0\n"
22145+#endif
22146+
22147 " jmp 2b\n"
22148 ".previous\n"
22149- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22150+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22151
22152 for (i = 0; i < (4096-320)/64; i++) {
22153 __asm__ __volatile__ (
22154- "1: prefetch 320(%0)\n"
22155- "2: movq (%0), %%mm0\n"
22156- " movntq %%mm0, (%1)\n"
22157- " movq 8(%0), %%mm1\n"
22158- " movntq %%mm1, 8(%1)\n"
22159- " movq 16(%0), %%mm2\n"
22160- " movntq %%mm2, 16(%1)\n"
22161- " movq 24(%0), %%mm3\n"
22162- " movntq %%mm3, 24(%1)\n"
22163- " movq 32(%0), %%mm4\n"
22164- " movntq %%mm4, 32(%1)\n"
22165- " movq 40(%0), %%mm5\n"
22166- " movntq %%mm5, 40(%1)\n"
22167- " movq 48(%0), %%mm6\n"
22168- " movntq %%mm6, 48(%1)\n"
22169- " movq 56(%0), %%mm7\n"
22170- " movntq %%mm7, 56(%1)\n"
22171+ "1: prefetch 320(%1)\n"
22172+ "2: movq (%1), %%mm0\n"
22173+ " movntq %%mm0, (%2)\n"
22174+ " movq 8(%1), %%mm1\n"
22175+ " movntq %%mm1, 8(%2)\n"
22176+ " movq 16(%1), %%mm2\n"
22177+ " movntq %%mm2, 16(%2)\n"
22178+ " movq 24(%1), %%mm3\n"
22179+ " movntq %%mm3, 24(%2)\n"
22180+ " movq 32(%1), %%mm4\n"
22181+ " movntq %%mm4, 32(%2)\n"
22182+ " movq 40(%1), %%mm5\n"
22183+ " movntq %%mm5, 40(%2)\n"
22184+ " movq 48(%1), %%mm6\n"
22185+ " movntq %%mm6, 48(%2)\n"
22186+ " movq 56(%1), %%mm7\n"
22187+ " movntq %%mm7, 56(%2)\n"
22188 ".section .fixup, \"ax\"\n"
22189- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22190+ "3:\n"
22191+
22192+#ifdef CONFIG_PAX_KERNEXEC
22193+ " movl %%cr0, %0\n"
22194+ " movl %0, %%eax\n"
22195+ " andl $0xFFFEFFFF, %%eax\n"
22196+ " movl %%eax, %%cr0\n"
22197+#endif
22198+
22199+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22200+
22201+#ifdef CONFIG_PAX_KERNEXEC
22202+ " movl %0, %%cr0\n"
22203+#endif
22204+
22205 " jmp 2b\n"
22206 ".previous\n"
22207- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
22208+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22209
22210 from += 64;
22211 to += 64;
22212@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
22213 static void fast_copy_page(void *to, void *from)
22214 {
22215 int i;
22216+ unsigned long cr0;
22217
22218 kernel_fpu_begin();
22219
22220 __asm__ __volatile__ (
22221- "1: prefetch (%0)\n"
22222- " prefetch 64(%0)\n"
22223- " prefetch 128(%0)\n"
22224- " prefetch 192(%0)\n"
22225- " prefetch 256(%0)\n"
22226+ "1: prefetch (%1)\n"
22227+ " prefetch 64(%1)\n"
22228+ " prefetch 128(%1)\n"
22229+ " prefetch 192(%1)\n"
22230+ " prefetch 256(%1)\n"
22231 "2: \n"
22232 ".section .fixup, \"ax\"\n"
22233- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22234+ "3: \n"
22235+
22236+#ifdef CONFIG_PAX_KERNEXEC
22237+ " movl %%cr0, %0\n"
22238+ " movl %0, %%eax\n"
22239+ " andl $0xFFFEFFFF, %%eax\n"
22240+ " movl %%eax, %%cr0\n"
22241+#endif
22242+
22243+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22244+
22245+#ifdef CONFIG_PAX_KERNEXEC
22246+ " movl %0, %%cr0\n"
22247+#endif
22248+
22249 " jmp 2b\n"
22250 ".previous\n"
22251- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22252+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22253
22254 for (i = 0; i < 4096/64; i++) {
22255 __asm__ __volatile__ (
22256- "1: prefetch 320(%0)\n"
22257- "2: movq (%0), %%mm0\n"
22258- " movq 8(%0), %%mm1\n"
22259- " movq 16(%0), %%mm2\n"
22260- " movq 24(%0), %%mm3\n"
22261- " movq %%mm0, (%1)\n"
22262- " movq %%mm1, 8(%1)\n"
22263- " movq %%mm2, 16(%1)\n"
22264- " movq %%mm3, 24(%1)\n"
22265- " movq 32(%0), %%mm0\n"
22266- " movq 40(%0), %%mm1\n"
22267- " movq 48(%0), %%mm2\n"
22268- " movq 56(%0), %%mm3\n"
22269- " movq %%mm0, 32(%1)\n"
22270- " movq %%mm1, 40(%1)\n"
22271- " movq %%mm2, 48(%1)\n"
22272- " movq %%mm3, 56(%1)\n"
22273+ "1: prefetch 320(%1)\n"
22274+ "2: movq (%1), %%mm0\n"
22275+ " movq 8(%1), %%mm1\n"
22276+ " movq 16(%1), %%mm2\n"
22277+ " movq 24(%1), %%mm3\n"
22278+ " movq %%mm0, (%2)\n"
22279+ " movq %%mm1, 8(%2)\n"
22280+ " movq %%mm2, 16(%2)\n"
22281+ " movq %%mm3, 24(%2)\n"
22282+ " movq 32(%1), %%mm0\n"
22283+ " movq 40(%1), %%mm1\n"
22284+ " movq 48(%1), %%mm2\n"
22285+ " movq 56(%1), %%mm3\n"
22286+ " movq %%mm0, 32(%2)\n"
22287+ " movq %%mm1, 40(%2)\n"
22288+ " movq %%mm2, 48(%2)\n"
22289+ " movq %%mm3, 56(%2)\n"
22290 ".section .fixup, \"ax\"\n"
22291- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22292+ "3:\n"
22293+
22294+#ifdef CONFIG_PAX_KERNEXEC
22295+ " movl %%cr0, %0\n"
22296+ " movl %0, %%eax\n"
22297+ " andl $0xFFFEFFFF, %%eax\n"
22298+ " movl %%eax, %%cr0\n"
22299+#endif
22300+
22301+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22302+
22303+#ifdef CONFIG_PAX_KERNEXEC
22304+ " movl %0, %%cr0\n"
22305+#endif
22306+
22307 " jmp 2b\n"
22308 ".previous\n"
22309 _ASM_EXTABLE(1b, 3b)
22310- : : "r" (from), "r" (to) : "memory");
22311+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22312
22313 from += 64;
22314 to += 64;
22315diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
22316index 69fa106..adda88b 100644
22317--- a/arch/x86/lib/msr-reg.S
22318+++ b/arch/x86/lib/msr-reg.S
22319@@ -3,6 +3,7 @@
22320 #include <asm/dwarf2.h>
22321 #include <asm/asm.h>
22322 #include <asm/msr.h>
22323+#include <asm/alternative-asm.h>
22324
22325 #ifdef CONFIG_X86_64
22326 /*
22327@@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
22328 CFI_STARTPROC
22329 pushq_cfi %rbx
22330 pushq_cfi %rbp
22331- movq %rdi, %r10 /* Save pointer */
22332+ movq %rdi, %r9 /* Save pointer */
22333 xorl %r11d, %r11d /* Return value */
22334 movl (%rdi), %eax
22335 movl 4(%rdi), %ecx
22336@@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
22337 movl 28(%rdi), %edi
22338 CFI_REMEMBER_STATE
22339 1: \op
22340-2: movl %eax, (%r10)
22341+2: movl %eax, (%r9)
22342 movl %r11d, %eax /* Return value */
22343- movl %ecx, 4(%r10)
22344- movl %edx, 8(%r10)
22345- movl %ebx, 12(%r10)
22346- movl %ebp, 20(%r10)
22347- movl %esi, 24(%r10)
22348- movl %edi, 28(%r10)
22349+ movl %ecx, 4(%r9)
22350+ movl %edx, 8(%r9)
22351+ movl %ebx, 12(%r9)
22352+ movl %ebp, 20(%r9)
22353+ movl %esi, 24(%r9)
22354+ movl %edi, 28(%r9)
22355 popq_cfi %rbp
22356 popq_cfi %rbx
22357+ pax_force_retaddr
22358 ret
22359 3:
22360 CFI_RESTORE_STATE
22361diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
22362index 36b0d15..d381858 100644
22363--- a/arch/x86/lib/putuser.S
22364+++ b/arch/x86/lib/putuser.S
22365@@ -15,7 +15,9 @@
22366 #include <asm/thread_info.h>
22367 #include <asm/errno.h>
22368 #include <asm/asm.h>
22369-
22370+#include <asm/segment.h>
22371+#include <asm/pgtable.h>
22372+#include <asm/alternative-asm.h>
22373
22374 /*
22375 * __put_user_X
22376@@ -29,52 +31,119 @@
22377 * as they get called from within inline assembly.
22378 */
22379
22380-#define ENTER CFI_STARTPROC ; \
22381- GET_THREAD_INFO(%_ASM_BX)
22382-#define EXIT ret ; \
22383+#define ENTER CFI_STARTPROC
22384+#define EXIT pax_force_retaddr; ret ; \
22385 CFI_ENDPROC
22386
22387+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22388+#define _DEST %_ASM_CX,%_ASM_BX
22389+#else
22390+#define _DEST %_ASM_CX
22391+#endif
22392+
22393+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22394+#define __copyuser_seg gs;
22395+#else
22396+#define __copyuser_seg
22397+#endif
22398+
22399 .text
22400 ENTRY(__put_user_1)
22401 ENTER
22402+
22403+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22404+ GET_THREAD_INFO(%_ASM_BX)
22405 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
22406 jae bad_put_user
22407-1: movb %al,(%_ASM_CX)
22408+
22409+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22410+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22411+ cmp %_ASM_BX,%_ASM_CX
22412+ jb 1234f
22413+ xor %ebx,%ebx
22414+1234:
22415+#endif
22416+
22417+#endif
22418+
22419+1: __copyuser_seg movb %al,(_DEST)
22420 xor %eax,%eax
22421 EXIT
22422 ENDPROC(__put_user_1)
22423
22424 ENTRY(__put_user_2)
22425 ENTER
22426+
22427+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22428+ GET_THREAD_INFO(%_ASM_BX)
22429 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22430 sub $1,%_ASM_BX
22431 cmp %_ASM_BX,%_ASM_CX
22432 jae bad_put_user
22433-2: movw %ax,(%_ASM_CX)
22434+
22435+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22436+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22437+ cmp %_ASM_BX,%_ASM_CX
22438+ jb 1234f
22439+ xor %ebx,%ebx
22440+1234:
22441+#endif
22442+
22443+#endif
22444+
22445+2: __copyuser_seg movw %ax,(_DEST)
22446 xor %eax,%eax
22447 EXIT
22448 ENDPROC(__put_user_2)
22449
22450 ENTRY(__put_user_4)
22451 ENTER
22452+
22453+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22454+ GET_THREAD_INFO(%_ASM_BX)
22455 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22456 sub $3,%_ASM_BX
22457 cmp %_ASM_BX,%_ASM_CX
22458 jae bad_put_user
22459-3: movl %eax,(%_ASM_CX)
22460+
22461+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22462+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22463+ cmp %_ASM_BX,%_ASM_CX
22464+ jb 1234f
22465+ xor %ebx,%ebx
22466+1234:
22467+#endif
22468+
22469+#endif
22470+
22471+3: __copyuser_seg movl %eax,(_DEST)
22472 xor %eax,%eax
22473 EXIT
22474 ENDPROC(__put_user_4)
22475
22476 ENTRY(__put_user_8)
22477 ENTER
22478+
22479+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22480+ GET_THREAD_INFO(%_ASM_BX)
22481 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22482 sub $7,%_ASM_BX
22483 cmp %_ASM_BX,%_ASM_CX
22484 jae bad_put_user
22485-4: mov %_ASM_AX,(%_ASM_CX)
22486+
22487+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22488+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22489+ cmp %_ASM_BX,%_ASM_CX
22490+ jb 1234f
22491+ xor %ebx,%ebx
22492+1234:
22493+#endif
22494+
22495+#endif
22496+
22497+4: __copyuser_seg mov %_ASM_AX,(_DEST)
22498 #ifdef CONFIG_X86_32
22499-5: movl %edx,4(%_ASM_CX)
22500+5: __copyuser_seg movl %edx,4(_DEST)
22501 #endif
22502 xor %eax,%eax
22503 EXIT
22504diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
22505index 1cad221..de671ee 100644
22506--- a/arch/x86/lib/rwlock.S
22507+++ b/arch/x86/lib/rwlock.S
22508@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
22509 FRAME
22510 0: LOCK_PREFIX
22511 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22512+
22513+#ifdef CONFIG_PAX_REFCOUNT
22514+ jno 1234f
22515+ LOCK_PREFIX
22516+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22517+ int $4
22518+1234:
22519+ _ASM_EXTABLE(1234b, 1234b)
22520+#endif
22521+
22522 1: rep; nop
22523 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
22524 jne 1b
22525 LOCK_PREFIX
22526 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22527+
22528+#ifdef CONFIG_PAX_REFCOUNT
22529+ jno 1234f
22530+ LOCK_PREFIX
22531+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22532+ int $4
22533+1234:
22534+ _ASM_EXTABLE(1234b, 1234b)
22535+#endif
22536+
22537 jnz 0b
22538 ENDFRAME
22539+ pax_force_retaddr
22540 ret
22541 CFI_ENDPROC
22542 END(__write_lock_failed)
22543@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
22544 FRAME
22545 0: LOCK_PREFIX
22546 READ_LOCK_SIZE(inc) (%__lock_ptr)
22547+
22548+#ifdef CONFIG_PAX_REFCOUNT
22549+ jno 1234f
22550+ LOCK_PREFIX
22551+ READ_LOCK_SIZE(dec) (%__lock_ptr)
22552+ int $4
22553+1234:
22554+ _ASM_EXTABLE(1234b, 1234b)
22555+#endif
22556+
22557 1: rep; nop
22558 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
22559 js 1b
22560 LOCK_PREFIX
22561 READ_LOCK_SIZE(dec) (%__lock_ptr)
22562+
22563+#ifdef CONFIG_PAX_REFCOUNT
22564+ jno 1234f
22565+ LOCK_PREFIX
22566+ READ_LOCK_SIZE(inc) (%__lock_ptr)
22567+ int $4
22568+1234:
22569+ _ASM_EXTABLE(1234b, 1234b)
22570+#endif
22571+
22572 js 0b
22573 ENDFRAME
22574+ pax_force_retaddr
22575 ret
22576 CFI_ENDPROC
22577 END(__read_lock_failed)
22578diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
22579index 5dff5f0..cadebf4 100644
22580--- a/arch/x86/lib/rwsem.S
22581+++ b/arch/x86/lib/rwsem.S
22582@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
22583 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22584 CFI_RESTORE __ASM_REG(dx)
22585 restore_common_regs
22586+ pax_force_retaddr
22587 ret
22588 CFI_ENDPROC
22589 ENDPROC(call_rwsem_down_read_failed)
22590@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
22591 movq %rax,%rdi
22592 call rwsem_down_write_failed
22593 restore_common_regs
22594+ pax_force_retaddr
22595 ret
22596 CFI_ENDPROC
22597 ENDPROC(call_rwsem_down_write_failed)
22598@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
22599 movq %rax,%rdi
22600 call rwsem_wake
22601 restore_common_regs
22602-1: ret
22603+1: pax_force_retaddr
22604+ ret
22605 CFI_ENDPROC
22606 ENDPROC(call_rwsem_wake)
22607
22608@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
22609 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22610 CFI_RESTORE __ASM_REG(dx)
22611 restore_common_regs
22612+ pax_force_retaddr
22613 ret
22614 CFI_ENDPROC
22615 ENDPROC(call_rwsem_downgrade_wake)
22616diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
22617index a63efd6..ccecad8 100644
22618--- a/arch/x86/lib/thunk_64.S
22619+++ b/arch/x86/lib/thunk_64.S
22620@@ -8,6 +8,7 @@
22621 #include <linux/linkage.h>
22622 #include <asm/dwarf2.h>
22623 #include <asm/calling.h>
22624+#include <asm/alternative-asm.h>
22625
22626 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
22627 .macro THUNK name, func, put_ret_addr_in_rdi=0
22628@@ -41,5 +42,6 @@
22629 SAVE_ARGS
22630 restore:
22631 RESTORE_ARGS
22632+ pax_force_retaddr
22633 ret
22634 CFI_ENDPROC
22635diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
22636index e218d5d..1e01930 100644
22637--- a/arch/x86/lib/usercopy_32.c
22638+++ b/arch/x86/lib/usercopy_32.c
22639@@ -43,7 +43,7 @@ do { \
22640 __asm__ __volatile__( \
22641 " testl %1,%1\n" \
22642 " jz 2f\n" \
22643- "0: lodsb\n" \
22644+ "0: "__copyuser_seg"lodsb\n" \
22645 " stosb\n" \
22646 " testb %%al,%%al\n" \
22647 " jz 1f\n" \
22648@@ -83,7 +83,7 @@ do { \
22649 * and returns @count.
22650 */
22651 long
22652-__strncpy_from_user(char *dst, const char __user *src, long count)
22653+__strncpy_from_user(char *dst, const char __user *src, unsigned long count)
22654 {
22655 long res;
22656 __do_strncpy_from_user(dst, src, count, res);
22657@@ -110,7 +110,7 @@ EXPORT_SYMBOL(__strncpy_from_user);
22658 * and returns @count.
22659 */
22660 long
22661-strncpy_from_user(char *dst, const char __user *src, long count)
22662+strncpy_from_user(char *dst, const char __user *src, unsigned long count)
22663 {
22664 long res = -EFAULT;
22665 if (access_ok(VERIFY_READ, src, 1))
22666@@ -128,10 +128,12 @@ do { \
22667 int __d0; \
22668 might_fault(); \
22669 __asm__ __volatile__( \
22670+ __COPYUSER_SET_ES \
22671 "0: rep; stosl\n" \
22672 " movl %2,%0\n" \
22673 "1: rep; stosb\n" \
22674 "2:\n" \
22675+ __COPYUSER_RESTORE_ES \
22676 ".section .fixup,\"ax\"\n" \
22677 "3: lea 0(%2,%0,4),%0\n" \
22678 " jmp 2b\n" \
22679@@ -192,7 +194,7 @@ EXPORT_SYMBOL(__clear_user);
22680 * On exception, returns 0.
22681 * If the string is too long, returns a value greater than @n.
22682 */
22683-long strnlen_user(const char __user *s, long n)
22684+long strnlen_user(const char __user *s, unsigned long n)
22685 {
22686 unsigned long mask = -__addr_ok(s);
22687 unsigned long res, tmp;
22688@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n)
22689 might_fault();
22690
22691 __asm__ __volatile__(
22692+ __COPYUSER_SET_ES
22693 " testl %0, %0\n"
22694 " jz 3f\n"
22695 " andl %0,%%ecx\n"
22696@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
22697 " subl %%ecx,%0\n"
22698 " addl %0,%%eax\n"
22699 "1:\n"
22700+ __COPYUSER_RESTORE_ES
22701 ".section .fixup,\"ax\"\n"
22702 "2: xorl %%eax,%%eax\n"
22703 " jmp 1b\n"
22704@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
22705
22706 #ifdef CONFIG_X86_INTEL_USERCOPY
22707 static unsigned long
22708-__copy_user_intel(void __user *to, const void *from, unsigned long size)
22709+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
22710 {
22711 int d0, d1;
22712 __asm__ __volatile__(
22713@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22714 " .align 2,0x90\n"
22715 "3: movl 0(%4), %%eax\n"
22716 "4: movl 4(%4), %%edx\n"
22717- "5: movl %%eax, 0(%3)\n"
22718- "6: movl %%edx, 4(%3)\n"
22719+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
22720+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
22721 "7: movl 8(%4), %%eax\n"
22722 "8: movl 12(%4),%%edx\n"
22723- "9: movl %%eax, 8(%3)\n"
22724- "10: movl %%edx, 12(%3)\n"
22725+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
22726+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
22727 "11: movl 16(%4), %%eax\n"
22728 "12: movl 20(%4), %%edx\n"
22729- "13: movl %%eax, 16(%3)\n"
22730- "14: movl %%edx, 20(%3)\n"
22731+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
22732+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
22733 "15: movl 24(%4), %%eax\n"
22734 "16: movl 28(%4), %%edx\n"
22735- "17: movl %%eax, 24(%3)\n"
22736- "18: movl %%edx, 28(%3)\n"
22737+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
22738+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
22739 "19: movl 32(%4), %%eax\n"
22740 "20: movl 36(%4), %%edx\n"
22741- "21: movl %%eax, 32(%3)\n"
22742- "22: movl %%edx, 36(%3)\n"
22743+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
22744+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
22745 "23: movl 40(%4), %%eax\n"
22746 "24: movl 44(%4), %%edx\n"
22747- "25: movl %%eax, 40(%3)\n"
22748- "26: movl %%edx, 44(%3)\n"
22749+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
22750+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
22751 "27: movl 48(%4), %%eax\n"
22752 "28: movl 52(%4), %%edx\n"
22753- "29: movl %%eax, 48(%3)\n"
22754- "30: movl %%edx, 52(%3)\n"
22755+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
22756+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
22757 "31: movl 56(%4), %%eax\n"
22758 "32: movl 60(%4), %%edx\n"
22759- "33: movl %%eax, 56(%3)\n"
22760- "34: movl %%edx, 60(%3)\n"
22761+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
22762+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
22763 " addl $-64, %0\n"
22764 " addl $64, %4\n"
22765 " addl $64, %3\n"
22766@@ -278,10 +282,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22767 " shrl $2, %0\n"
22768 " andl $3, %%eax\n"
22769 " cld\n"
22770+ __COPYUSER_SET_ES
22771 "99: rep; movsl\n"
22772 "36: movl %%eax, %0\n"
22773 "37: rep; movsb\n"
22774 "100:\n"
22775+ __COPYUSER_RESTORE_ES
22776 ".section .fixup,\"ax\"\n"
22777 "101: lea 0(%%eax,%0,4),%0\n"
22778 " jmp 100b\n"
22779@@ -334,46 +340,155 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22780 }
22781
22782 static unsigned long
22783+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
22784+{
22785+ int d0, d1;
22786+ __asm__ __volatile__(
22787+ " .align 2,0x90\n"
22788+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
22789+ " cmpl $67, %0\n"
22790+ " jbe 3f\n"
22791+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
22792+ " .align 2,0x90\n"
22793+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
22794+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
22795+ "5: movl %%eax, 0(%3)\n"
22796+ "6: movl %%edx, 4(%3)\n"
22797+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
22798+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
22799+ "9: movl %%eax, 8(%3)\n"
22800+ "10: movl %%edx, 12(%3)\n"
22801+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
22802+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
22803+ "13: movl %%eax, 16(%3)\n"
22804+ "14: movl %%edx, 20(%3)\n"
22805+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
22806+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
22807+ "17: movl %%eax, 24(%3)\n"
22808+ "18: movl %%edx, 28(%3)\n"
22809+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
22810+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
22811+ "21: movl %%eax, 32(%3)\n"
22812+ "22: movl %%edx, 36(%3)\n"
22813+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
22814+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
22815+ "25: movl %%eax, 40(%3)\n"
22816+ "26: movl %%edx, 44(%3)\n"
22817+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
22818+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
22819+ "29: movl %%eax, 48(%3)\n"
22820+ "30: movl %%edx, 52(%3)\n"
22821+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
22822+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
22823+ "33: movl %%eax, 56(%3)\n"
22824+ "34: movl %%edx, 60(%3)\n"
22825+ " addl $-64, %0\n"
22826+ " addl $64, %4\n"
22827+ " addl $64, %3\n"
22828+ " cmpl $63, %0\n"
22829+ " ja 1b\n"
22830+ "35: movl %0, %%eax\n"
22831+ " shrl $2, %0\n"
22832+ " andl $3, %%eax\n"
22833+ " cld\n"
22834+ "99: rep; "__copyuser_seg" movsl\n"
22835+ "36: movl %%eax, %0\n"
22836+ "37: rep; "__copyuser_seg" movsb\n"
22837+ "100:\n"
22838+ ".section .fixup,\"ax\"\n"
22839+ "101: lea 0(%%eax,%0,4),%0\n"
22840+ " jmp 100b\n"
22841+ ".previous\n"
22842+ ".section __ex_table,\"a\"\n"
22843+ " .align 4\n"
22844+ " .long 1b,100b\n"
22845+ " .long 2b,100b\n"
22846+ " .long 3b,100b\n"
22847+ " .long 4b,100b\n"
22848+ " .long 5b,100b\n"
22849+ " .long 6b,100b\n"
22850+ " .long 7b,100b\n"
22851+ " .long 8b,100b\n"
22852+ " .long 9b,100b\n"
22853+ " .long 10b,100b\n"
22854+ " .long 11b,100b\n"
22855+ " .long 12b,100b\n"
22856+ " .long 13b,100b\n"
22857+ " .long 14b,100b\n"
22858+ " .long 15b,100b\n"
22859+ " .long 16b,100b\n"
22860+ " .long 17b,100b\n"
22861+ " .long 18b,100b\n"
22862+ " .long 19b,100b\n"
22863+ " .long 20b,100b\n"
22864+ " .long 21b,100b\n"
22865+ " .long 22b,100b\n"
22866+ " .long 23b,100b\n"
22867+ " .long 24b,100b\n"
22868+ " .long 25b,100b\n"
22869+ " .long 26b,100b\n"
22870+ " .long 27b,100b\n"
22871+ " .long 28b,100b\n"
22872+ " .long 29b,100b\n"
22873+ " .long 30b,100b\n"
22874+ " .long 31b,100b\n"
22875+ " .long 32b,100b\n"
22876+ " .long 33b,100b\n"
22877+ " .long 34b,100b\n"
22878+ " .long 35b,100b\n"
22879+ " .long 36b,100b\n"
22880+ " .long 37b,100b\n"
22881+ " .long 99b,101b\n"
22882+ ".previous"
22883+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
22884+ : "1"(to), "2"(from), "0"(size)
22885+ : "eax", "edx", "memory");
22886+ return size;
22887+}
22888+
22889+static unsigned long
22890+__copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size) __size_overflow(3);
22891+static unsigned long
22892 __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22893 {
22894 int d0, d1;
22895 __asm__ __volatile__(
22896 " .align 2,0x90\n"
22897- "0: movl 32(%4), %%eax\n"
22898+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
22899 " cmpl $67, %0\n"
22900 " jbe 2f\n"
22901- "1: movl 64(%4), %%eax\n"
22902+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
22903 " .align 2,0x90\n"
22904- "2: movl 0(%4), %%eax\n"
22905- "21: movl 4(%4), %%edx\n"
22906+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
22907+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
22908 " movl %%eax, 0(%3)\n"
22909 " movl %%edx, 4(%3)\n"
22910- "3: movl 8(%4), %%eax\n"
22911- "31: movl 12(%4),%%edx\n"
22912+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
22913+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
22914 " movl %%eax, 8(%3)\n"
22915 " movl %%edx, 12(%3)\n"
22916- "4: movl 16(%4), %%eax\n"
22917- "41: movl 20(%4), %%edx\n"
22918+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
22919+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
22920 " movl %%eax, 16(%3)\n"
22921 " movl %%edx, 20(%3)\n"
22922- "10: movl 24(%4), %%eax\n"
22923- "51: movl 28(%4), %%edx\n"
22924+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
22925+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
22926 " movl %%eax, 24(%3)\n"
22927 " movl %%edx, 28(%3)\n"
22928- "11: movl 32(%4), %%eax\n"
22929- "61: movl 36(%4), %%edx\n"
22930+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
22931+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
22932 " movl %%eax, 32(%3)\n"
22933 " movl %%edx, 36(%3)\n"
22934- "12: movl 40(%4), %%eax\n"
22935- "71: movl 44(%4), %%edx\n"
22936+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
22937+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
22938 " movl %%eax, 40(%3)\n"
22939 " movl %%edx, 44(%3)\n"
22940- "13: movl 48(%4), %%eax\n"
22941- "81: movl 52(%4), %%edx\n"
22942+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
22943+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
22944 " movl %%eax, 48(%3)\n"
22945 " movl %%edx, 52(%3)\n"
22946- "14: movl 56(%4), %%eax\n"
22947- "91: movl 60(%4), %%edx\n"
22948+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
22949+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
22950 " movl %%eax, 56(%3)\n"
22951 " movl %%edx, 60(%3)\n"
22952 " addl $-64, %0\n"
22953@@ -385,9 +500,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22954 " shrl $2, %0\n"
22955 " andl $3, %%eax\n"
22956 " cld\n"
22957- "6: rep; movsl\n"
22958+ "6: rep; "__copyuser_seg" movsl\n"
22959 " movl %%eax,%0\n"
22960- "7: rep; movsb\n"
22961+ "7: rep; "__copyuser_seg" movsb\n"
22962 "8:\n"
22963 ".section .fixup,\"ax\"\n"
22964 "9: lea 0(%%eax,%0,4),%0\n"
22965@@ -434,47 +549,49 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22966 */
22967
22968 static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22969+ const void __user *from, unsigned long size) __size_overflow(3);
22970+static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22971 const void __user *from, unsigned long size)
22972 {
22973 int d0, d1;
22974
22975 __asm__ __volatile__(
22976 " .align 2,0x90\n"
22977- "0: movl 32(%4), %%eax\n"
22978+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
22979 " cmpl $67, %0\n"
22980 " jbe 2f\n"
22981- "1: movl 64(%4), %%eax\n"
22982+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
22983 " .align 2,0x90\n"
22984- "2: movl 0(%4), %%eax\n"
22985- "21: movl 4(%4), %%edx\n"
22986+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
22987+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
22988 " movnti %%eax, 0(%3)\n"
22989 " movnti %%edx, 4(%3)\n"
22990- "3: movl 8(%4), %%eax\n"
22991- "31: movl 12(%4),%%edx\n"
22992+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
22993+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
22994 " movnti %%eax, 8(%3)\n"
22995 " movnti %%edx, 12(%3)\n"
22996- "4: movl 16(%4), %%eax\n"
22997- "41: movl 20(%4), %%edx\n"
22998+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
22999+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23000 " movnti %%eax, 16(%3)\n"
23001 " movnti %%edx, 20(%3)\n"
23002- "10: movl 24(%4), %%eax\n"
23003- "51: movl 28(%4), %%edx\n"
23004+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23005+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23006 " movnti %%eax, 24(%3)\n"
23007 " movnti %%edx, 28(%3)\n"
23008- "11: movl 32(%4), %%eax\n"
23009- "61: movl 36(%4), %%edx\n"
23010+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23011+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23012 " movnti %%eax, 32(%3)\n"
23013 " movnti %%edx, 36(%3)\n"
23014- "12: movl 40(%4), %%eax\n"
23015- "71: movl 44(%4), %%edx\n"
23016+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23017+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23018 " movnti %%eax, 40(%3)\n"
23019 " movnti %%edx, 44(%3)\n"
23020- "13: movl 48(%4), %%eax\n"
23021- "81: movl 52(%4), %%edx\n"
23022+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23023+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23024 " movnti %%eax, 48(%3)\n"
23025 " movnti %%edx, 52(%3)\n"
23026- "14: movl 56(%4), %%eax\n"
23027- "91: movl 60(%4), %%edx\n"
23028+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23029+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23030 " movnti %%eax, 56(%3)\n"
23031 " movnti %%edx, 60(%3)\n"
23032 " addl $-64, %0\n"
23033@@ -487,9 +604,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23034 " shrl $2, %0\n"
23035 " andl $3, %%eax\n"
23036 " cld\n"
23037- "6: rep; movsl\n"
23038+ "6: rep; "__copyuser_seg" movsl\n"
23039 " movl %%eax,%0\n"
23040- "7: rep; movsb\n"
23041+ "7: rep; "__copyuser_seg" movsb\n"
23042 "8:\n"
23043 ".section .fixup,\"ax\"\n"
23044 "9: lea 0(%%eax,%0,4),%0\n"
23045@@ -531,47 +648,49 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23046 }
23047
23048 static unsigned long __copy_user_intel_nocache(void *to,
23049+ const void __user *from, unsigned long size) __size_overflow(3);
23050+static unsigned long __copy_user_intel_nocache(void *to,
23051 const void __user *from, unsigned long size)
23052 {
23053 int d0, d1;
23054
23055 __asm__ __volatile__(
23056 " .align 2,0x90\n"
23057- "0: movl 32(%4), %%eax\n"
23058+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23059 " cmpl $67, %0\n"
23060 " jbe 2f\n"
23061- "1: movl 64(%4), %%eax\n"
23062+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23063 " .align 2,0x90\n"
23064- "2: movl 0(%4), %%eax\n"
23065- "21: movl 4(%4), %%edx\n"
23066+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23067+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23068 " movnti %%eax, 0(%3)\n"
23069 " movnti %%edx, 4(%3)\n"
23070- "3: movl 8(%4), %%eax\n"
23071- "31: movl 12(%4),%%edx\n"
23072+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23073+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23074 " movnti %%eax, 8(%3)\n"
23075 " movnti %%edx, 12(%3)\n"
23076- "4: movl 16(%4), %%eax\n"
23077- "41: movl 20(%4), %%edx\n"
23078+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23079+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23080 " movnti %%eax, 16(%3)\n"
23081 " movnti %%edx, 20(%3)\n"
23082- "10: movl 24(%4), %%eax\n"
23083- "51: movl 28(%4), %%edx\n"
23084+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23085+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23086 " movnti %%eax, 24(%3)\n"
23087 " movnti %%edx, 28(%3)\n"
23088- "11: movl 32(%4), %%eax\n"
23089- "61: movl 36(%4), %%edx\n"
23090+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23091+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23092 " movnti %%eax, 32(%3)\n"
23093 " movnti %%edx, 36(%3)\n"
23094- "12: movl 40(%4), %%eax\n"
23095- "71: movl 44(%4), %%edx\n"
23096+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23097+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23098 " movnti %%eax, 40(%3)\n"
23099 " movnti %%edx, 44(%3)\n"
23100- "13: movl 48(%4), %%eax\n"
23101- "81: movl 52(%4), %%edx\n"
23102+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23103+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23104 " movnti %%eax, 48(%3)\n"
23105 " movnti %%edx, 52(%3)\n"
23106- "14: movl 56(%4), %%eax\n"
23107- "91: movl 60(%4), %%edx\n"
23108+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23109+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23110 " movnti %%eax, 56(%3)\n"
23111 " movnti %%edx, 60(%3)\n"
23112 " addl $-64, %0\n"
23113@@ -584,9 +703,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
23114 " shrl $2, %0\n"
23115 " andl $3, %%eax\n"
23116 " cld\n"
23117- "6: rep; movsl\n"
23118+ "6: rep; "__copyuser_seg" movsl\n"
23119 " movl %%eax,%0\n"
23120- "7: rep; movsb\n"
23121+ "7: rep; "__copyuser_seg" movsb\n"
23122 "8:\n"
23123 ".section .fixup,\"ax\"\n"
23124 "9: lea 0(%%eax,%0,4),%0\n"
23125@@ -629,32 +748,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
23126 */
23127 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
23128 unsigned long size);
23129-unsigned long __copy_user_intel(void __user *to, const void *from,
23130+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
23131+ unsigned long size);
23132+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
23133 unsigned long size);
23134 unsigned long __copy_user_zeroing_intel_nocache(void *to,
23135 const void __user *from, unsigned long size);
23136 #endif /* CONFIG_X86_INTEL_USERCOPY */
23137
23138 /* Generic arbitrary sized copy. */
23139-#define __copy_user(to, from, size) \
23140+#define __copy_user(to, from, size, prefix, set, restore) \
23141 do { \
23142 int __d0, __d1, __d2; \
23143 __asm__ __volatile__( \
23144+ set \
23145 " cmp $7,%0\n" \
23146 " jbe 1f\n" \
23147 " movl %1,%0\n" \
23148 " negl %0\n" \
23149 " andl $7,%0\n" \
23150 " subl %0,%3\n" \
23151- "4: rep; movsb\n" \
23152+ "4: rep; "prefix"movsb\n" \
23153 " movl %3,%0\n" \
23154 " shrl $2,%0\n" \
23155 " andl $3,%3\n" \
23156 " .align 2,0x90\n" \
23157- "0: rep; movsl\n" \
23158+ "0: rep; "prefix"movsl\n" \
23159 " movl %3,%0\n" \
23160- "1: rep; movsb\n" \
23161+ "1: rep; "prefix"movsb\n" \
23162 "2:\n" \
23163+ restore \
23164 ".section .fixup,\"ax\"\n" \
23165 "5: addl %3,%0\n" \
23166 " jmp 2b\n" \
23167@@ -682,14 +805,14 @@ do { \
23168 " negl %0\n" \
23169 " andl $7,%0\n" \
23170 " subl %0,%3\n" \
23171- "4: rep; movsb\n" \
23172+ "4: rep; "__copyuser_seg"movsb\n" \
23173 " movl %3,%0\n" \
23174 " shrl $2,%0\n" \
23175 " andl $3,%3\n" \
23176 " .align 2,0x90\n" \
23177- "0: rep; movsl\n" \
23178+ "0: rep; "__copyuser_seg"movsl\n" \
23179 " movl %3,%0\n" \
23180- "1: rep; movsb\n" \
23181+ "1: rep; "__copyuser_seg"movsb\n" \
23182 "2:\n" \
23183 ".section .fixup,\"ax\"\n" \
23184 "5: addl %3,%0\n" \
23185@@ -775,9 +898,9 @@ survive:
23186 }
23187 #endif
23188 if (movsl_is_ok(to, from, n))
23189- __copy_user(to, from, n);
23190+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
23191 else
23192- n = __copy_user_intel(to, from, n);
23193+ n = __generic_copy_to_user_intel(to, from, n);
23194 return n;
23195 }
23196 EXPORT_SYMBOL(__copy_to_user_ll);
23197@@ -797,10 +920,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
23198 unsigned long n)
23199 {
23200 if (movsl_is_ok(to, from, n))
23201- __copy_user(to, from, n);
23202+ __copy_user(to, from, n, __copyuser_seg, "", "");
23203 else
23204- n = __copy_user_intel((void __user *)to,
23205- (const void *)from, n);
23206+ n = __generic_copy_from_user_intel(to, from, n);
23207 return n;
23208 }
23209 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
23210@@ -827,65 +949,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
23211 if (n > 64 && cpu_has_xmm2)
23212 n = __copy_user_intel_nocache(to, from, n);
23213 else
23214- __copy_user(to, from, n);
23215+ __copy_user(to, from, n, __copyuser_seg, "", "");
23216 #else
23217- __copy_user(to, from, n);
23218+ __copy_user(to, from, n, __copyuser_seg, "", "");
23219 #endif
23220 return n;
23221 }
23222 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
23223
23224-/**
23225- * copy_to_user: - Copy a block of data into user space.
23226- * @to: Destination address, in user space.
23227- * @from: Source address, in kernel space.
23228- * @n: Number of bytes to copy.
23229- *
23230- * Context: User context only. This function may sleep.
23231- *
23232- * Copy data from kernel space to user space.
23233- *
23234- * Returns number of bytes that could not be copied.
23235- * On success, this will be zero.
23236- */
23237-unsigned long
23238-copy_to_user(void __user *to, const void *from, unsigned long n)
23239-{
23240- if (access_ok(VERIFY_WRITE, to, n))
23241- n = __copy_to_user(to, from, n);
23242- return n;
23243-}
23244-EXPORT_SYMBOL(copy_to_user);
23245-
23246-/**
23247- * copy_from_user: - Copy a block of data from user space.
23248- * @to: Destination address, in kernel space.
23249- * @from: Source address, in user space.
23250- * @n: Number of bytes to copy.
23251- *
23252- * Context: User context only. This function may sleep.
23253- *
23254- * Copy data from user space to kernel space.
23255- *
23256- * Returns number of bytes that could not be copied.
23257- * On success, this will be zero.
23258- *
23259- * If some data could not be copied, this function will pad the copied
23260- * data to the requested size using zero bytes.
23261- */
23262-unsigned long
23263-_copy_from_user(void *to, const void __user *from, unsigned long n)
23264-{
23265- if (access_ok(VERIFY_READ, from, n))
23266- n = __copy_from_user(to, from, n);
23267- else
23268- memset(to, 0, n);
23269- return n;
23270-}
23271-EXPORT_SYMBOL(_copy_from_user);
23272-
23273 void copy_from_user_overflow(void)
23274 {
23275 WARN(1, "Buffer overflow detected!\n");
23276 }
23277 EXPORT_SYMBOL(copy_from_user_overflow);
23278+
23279+void copy_to_user_overflow(void)
23280+{
23281+ WARN(1, "Buffer overflow detected!\n");
23282+}
23283+EXPORT_SYMBOL(copy_to_user_overflow);
23284+
23285+#ifdef CONFIG_PAX_MEMORY_UDEREF
23286+void __set_fs(mm_segment_t x)
23287+{
23288+ switch (x.seg) {
23289+ case 0:
23290+ loadsegment(gs, 0);
23291+ break;
23292+ case TASK_SIZE_MAX:
23293+ loadsegment(gs, __USER_DS);
23294+ break;
23295+ case -1UL:
23296+ loadsegment(gs, __KERNEL_DS);
23297+ break;
23298+ default:
23299+ BUG();
23300+ }
23301+ return;
23302+}
23303+EXPORT_SYMBOL(__set_fs);
23304+
23305+void set_fs(mm_segment_t x)
23306+{
23307+ current_thread_info()->addr_limit = x;
23308+ __set_fs(x);
23309+}
23310+EXPORT_SYMBOL(set_fs);
23311+#endif
23312diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
23313index b7c2849..bab76d3 100644
23314--- a/arch/x86/lib/usercopy_64.c
23315+++ b/arch/x86/lib/usercopy_64.c
23316@@ -39,16 +39,22 @@ do { \
23317 } while (0)
23318
23319 long
23320-__strncpy_from_user(char *dst, const char __user *src, long count)
23321+__strncpy_from_user(char *dst, const char __user *src, unsigned long count)
23322 {
23323 long res;
23324+
23325+#ifdef CONFIG_PAX_MEMORY_UDEREF
23326+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
23327+ src += PAX_USER_SHADOW_BASE;
23328+#endif
23329+
23330 __do_strncpy_from_user(dst, src, count, res);
23331 return res;
23332 }
23333 EXPORT_SYMBOL(__strncpy_from_user);
23334
23335 long
23336-strncpy_from_user(char *dst, const char __user *src, long count)
23337+strncpy_from_user(char *dst, const char __user *src, unsigned long count)
23338 {
23339 long res = -EFAULT;
23340 if (access_ok(VERIFY_READ, src, 1))
23341@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
23342 {
23343 long __d0;
23344 might_fault();
23345+
23346+#ifdef CONFIG_PAX_MEMORY_UDEREF
23347+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
23348+ addr += PAX_USER_SHADOW_BASE;
23349+#endif
23350+
23351 /* no memory constraint because it doesn't change any memory gcc knows
23352 about */
23353 asm volatile(
23354@@ -107,7 +119,7 @@ EXPORT_SYMBOL(clear_user);
23355 * Return 0 on exception, a value greater than N if too long
23356 */
23357
23358-long __strnlen_user(const char __user *s, long n)
23359+long __strnlen_user(const char __user *s, unsigned long n)
23360 {
23361 long res = 0;
23362 char c;
23363@@ -125,7 +137,7 @@ long __strnlen_user(const char __user *s, long n)
23364 }
23365 EXPORT_SYMBOL(__strnlen_user);
23366
23367-long strnlen_user(const char __user *s, long n)
23368+long strnlen_user(const char __user *s, unsigned long n)
23369 {
23370 if (!access_ok(VERIFY_READ, s, 1))
23371 return 0;
23372@@ -149,12 +161,20 @@ long strlen_user(const char __user *s)
23373 }
23374 EXPORT_SYMBOL(strlen_user);
23375
23376-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
23377+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
23378 {
23379- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23380- return copy_user_generic((__force void *)to, (__force void *)from, len);
23381- }
23382- return len;
23383+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23384+
23385+#ifdef CONFIG_PAX_MEMORY_UDEREF
23386+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
23387+ to += PAX_USER_SHADOW_BASE;
23388+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
23389+ from += PAX_USER_SHADOW_BASE;
23390+#endif
23391+
23392+ return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
23393+ }
23394+ return len;
23395 }
23396 EXPORT_SYMBOL(copy_in_user);
23397
23398@@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
23399 * it is not necessary to optimize tail handling.
23400 */
23401 unsigned long
23402-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23403+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
23404 {
23405 char c;
23406 unsigned zero_len;
23407diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
23408index d0474ad..36e9257 100644
23409--- a/arch/x86/mm/extable.c
23410+++ b/arch/x86/mm/extable.c
23411@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs)
23412 const struct exception_table_entry *fixup;
23413
23414 #ifdef CONFIG_PNPBIOS
23415- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
23416+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
23417 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
23418 extern u32 pnp_bios_is_utter_crap;
23419 pnp_bios_is_utter_crap = 1;
23420diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
23421index 5db0490..2ddce45 100644
23422--- a/arch/x86/mm/fault.c
23423+++ b/arch/x86/mm/fault.c
23424@@ -13,11 +13,18 @@
23425 #include <linux/perf_event.h> /* perf_sw_event */
23426 #include <linux/hugetlb.h> /* hstate_index_to_shift */
23427 #include <linux/prefetch.h> /* prefetchw */
23428+#include <linux/unistd.h>
23429+#include <linux/compiler.h>
23430
23431 #include <asm/traps.h> /* dotraplinkage, ... */
23432 #include <asm/pgalloc.h> /* pgd_*(), ... */
23433 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
23434 #include <asm/fixmap.h> /* VSYSCALL_START */
23435+#include <asm/tlbflush.h>
23436+
23437+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23438+#include <asm/stacktrace.h>
23439+#endif
23440
23441 /*
23442 * Page fault error code bits:
23443@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
23444 int ret = 0;
23445
23446 /* kprobe_running() needs smp_processor_id() */
23447- if (kprobes_built_in() && !user_mode_vm(regs)) {
23448+ if (kprobes_built_in() && !user_mode(regs)) {
23449 preempt_disable();
23450 if (kprobe_running() && kprobe_fault_handler(regs, 14))
23451 ret = 1;
23452@@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
23453 return !instr_lo || (instr_lo>>1) == 1;
23454 case 0x00:
23455 /* Prefetch instruction is 0x0F0D or 0x0F18 */
23456- if (probe_kernel_address(instr, opcode))
23457+ if (user_mode(regs)) {
23458+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23459+ return 0;
23460+ } else if (probe_kernel_address(instr, opcode))
23461 return 0;
23462
23463 *prefetch = (instr_lo == 0xF) &&
23464@@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
23465 while (instr < max_instr) {
23466 unsigned char opcode;
23467
23468- if (probe_kernel_address(instr, opcode))
23469+ if (user_mode(regs)) {
23470+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23471+ break;
23472+ } else if (probe_kernel_address(instr, opcode))
23473 break;
23474
23475 instr++;
23476@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
23477 force_sig_info(si_signo, &info, tsk);
23478 }
23479
23480+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23481+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
23482+#endif
23483+
23484+#ifdef CONFIG_PAX_EMUTRAMP
23485+static int pax_handle_fetch_fault(struct pt_regs *regs);
23486+#endif
23487+
23488+#ifdef CONFIG_PAX_PAGEEXEC
23489+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
23490+{
23491+ pgd_t *pgd;
23492+ pud_t *pud;
23493+ pmd_t *pmd;
23494+
23495+ pgd = pgd_offset(mm, address);
23496+ if (!pgd_present(*pgd))
23497+ return NULL;
23498+ pud = pud_offset(pgd, address);
23499+ if (!pud_present(*pud))
23500+ return NULL;
23501+ pmd = pmd_offset(pud, address);
23502+ if (!pmd_present(*pmd))
23503+ return NULL;
23504+ return pmd;
23505+}
23506+#endif
23507+
23508 DEFINE_SPINLOCK(pgd_lock);
23509 LIST_HEAD(pgd_list);
23510
23511@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
23512 for (address = VMALLOC_START & PMD_MASK;
23513 address >= TASK_SIZE && address < FIXADDR_TOP;
23514 address += PMD_SIZE) {
23515+
23516+#ifdef CONFIG_PAX_PER_CPU_PGD
23517+ unsigned long cpu;
23518+#else
23519 struct page *page;
23520+#endif
23521
23522 spin_lock(&pgd_lock);
23523+
23524+#ifdef CONFIG_PAX_PER_CPU_PGD
23525+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
23526+ pgd_t *pgd = get_cpu_pgd(cpu);
23527+ pmd_t *ret;
23528+#else
23529 list_for_each_entry(page, &pgd_list, lru) {
23530+ pgd_t *pgd = page_address(page);
23531 spinlock_t *pgt_lock;
23532 pmd_t *ret;
23533
23534@@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
23535 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
23536
23537 spin_lock(pgt_lock);
23538- ret = vmalloc_sync_one(page_address(page), address);
23539+#endif
23540+
23541+ ret = vmalloc_sync_one(pgd, address);
23542+
23543+#ifndef CONFIG_PAX_PER_CPU_PGD
23544 spin_unlock(pgt_lock);
23545+#endif
23546
23547 if (!ret)
23548 break;
23549@@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23550 * an interrupt in the middle of a task switch..
23551 */
23552 pgd_paddr = read_cr3();
23553+
23554+#ifdef CONFIG_PAX_PER_CPU_PGD
23555+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
23556+#endif
23557+
23558 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
23559 if (!pmd_k)
23560 return -1;
23561@@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23562 * happen within a race in page table update. In the later
23563 * case just flush:
23564 */
23565+
23566+#ifdef CONFIG_PAX_PER_CPU_PGD
23567+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
23568+ pgd = pgd_offset_cpu(smp_processor_id(), address);
23569+#else
23570 pgd = pgd_offset(current->active_mm, address);
23571+#endif
23572+
23573 pgd_ref = pgd_offset_k(address);
23574 if (pgd_none(*pgd_ref))
23575 return -1;
23576@@ -540,7 +610,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
23577 static int is_errata100(struct pt_regs *regs, unsigned long address)
23578 {
23579 #ifdef CONFIG_X86_64
23580- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
23581+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
23582 return 1;
23583 #endif
23584 return 0;
23585@@ -567,7 +637,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
23586 }
23587
23588 static const char nx_warning[] = KERN_CRIT
23589-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
23590+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
23591
23592 static void
23593 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23594@@ -576,15 +646,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23595 if (!oops_may_print())
23596 return;
23597
23598- if (error_code & PF_INSTR) {
23599+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
23600 unsigned int level;
23601
23602 pte_t *pte = lookup_address(address, &level);
23603
23604 if (pte && pte_present(*pte) && !pte_exec(*pte))
23605- printk(nx_warning, current_uid());
23606+ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
23607 }
23608
23609+#ifdef CONFIG_PAX_KERNEXEC
23610+ if (init_mm.start_code <= address && address < init_mm.end_code) {
23611+ if (current->signal->curr_ip)
23612+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23613+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
23614+ else
23615+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23616+ current->comm, task_pid_nr(current), current_uid(), current_euid());
23617+ }
23618+#endif
23619+
23620 printk(KERN_ALERT "BUG: unable to handle kernel ");
23621 if (address < PAGE_SIZE)
23622 printk(KERN_CONT "NULL pointer dereference");
23623@@ -739,6 +820,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
23624 }
23625 #endif
23626
23627+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23628+ if (pax_is_fetch_fault(regs, error_code, address)) {
23629+
23630+#ifdef CONFIG_PAX_EMUTRAMP
23631+ switch (pax_handle_fetch_fault(regs)) {
23632+ case 2:
23633+ return;
23634+ }
23635+#endif
23636+
23637+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23638+ do_group_exit(SIGKILL);
23639+ }
23640+#endif
23641+
23642 if (unlikely(show_unhandled_signals))
23643 show_signal_msg(regs, error_code, address, tsk);
23644
23645@@ -835,7 +931,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
23646 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
23647 printk(KERN_ERR
23648 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
23649- tsk->comm, tsk->pid, address);
23650+ tsk->comm, task_pid_nr(tsk), address);
23651 code = BUS_MCEERR_AR;
23652 }
23653 #endif
23654@@ -890,6 +986,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
23655 return 1;
23656 }
23657
23658+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23659+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
23660+{
23661+ pte_t *pte;
23662+ pmd_t *pmd;
23663+ spinlock_t *ptl;
23664+ unsigned char pte_mask;
23665+
23666+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
23667+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
23668+ return 0;
23669+
23670+ /* PaX: it's our fault, let's handle it if we can */
23671+
23672+ /* PaX: take a look at read faults before acquiring any locks */
23673+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
23674+ /* instruction fetch attempt from a protected page in user mode */
23675+ up_read(&mm->mmap_sem);
23676+
23677+#ifdef CONFIG_PAX_EMUTRAMP
23678+ switch (pax_handle_fetch_fault(regs)) {
23679+ case 2:
23680+ return 1;
23681+ }
23682+#endif
23683+
23684+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23685+ do_group_exit(SIGKILL);
23686+ }
23687+
23688+ pmd = pax_get_pmd(mm, address);
23689+ if (unlikely(!pmd))
23690+ return 0;
23691+
23692+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
23693+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
23694+ pte_unmap_unlock(pte, ptl);
23695+ return 0;
23696+ }
23697+
23698+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
23699+ /* write attempt to a protected page in user mode */
23700+ pte_unmap_unlock(pte, ptl);
23701+ return 0;
23702+ }
23703+
23704+#ifdef CONFIG_SMP
23705+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
23706+#else
23707+ if (likely(address > get_limit(regs->cs)))
23708+#endif
23709+ {
23710+ set_pte(pte, pte_mkread(*pte));
23711+ __flush_tlb_one(address);
23712+ pte_unmap_unlock(pte, ptl);
23713+ up_read(&mm->mmap_sem);
23714+ return 1;
23715+ }
23716+
23717+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
23718+
23719+ /*
23720+ * PaX: fill DTLB with user rights and retry
23721+ */
23722+ __asm__ __volatile__ (
23723+ "orb %2,(%1)\n"
23724+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
23725+/*
23726+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
23727+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
23728+ * page fault when examined during a TLB load attempt. this is true not only
23729+ * for PTEs holding a non-present entry but also present entries that will
23730+ * raise a page fault (such as those set up by PaX, or the copy-on-write
23731+ * mechanism). in effect it means that we do *not* need to flush the TLBs
23732+ * for our target pages since their PTEs are simply not in the TLBs at all.
23733+
23734+ * the best thing in omitting it is that we gain around 15-20% speed in the
23735+ * fast path of the page fault handler and can get rid of tracing since we
23736+ * can no longer flush unintended entries.
23737+ */
23738+ "invlpg (%0)\n"
23739+#endif
23740+ __copyuser_seg"testb $0,(%0)\n"
23741+ "xorb %3,(%1)\n"
23742+ :
23743+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
23744+ : "memory", "cc");
23745+ pte_unmap_unlock(pte, ptl);
23746+ up_read(&mm->mmap_sem);
23747+ return 1;
23748+}
23749+#endif
23750+
23751 /*
23752 * Handle a spurious fault caused by a stale TLB entry.
23753 *
23754@@ -962,6 +1151,9 @@ int show_unhandled_signals = 1;
23755 static inline int
23756 access_error(unsigned long error_code, struct vm_area_struct *vma)
23757 {
23758+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
23759+ return 1;
23760+
23761 if (error_code & PF_WRITE) {
23762 /* write, present and write, not present: */
23763 if (unlikely(!(vma->vm_flags & VM_WRITE)))
23764@@ -995,18 +1187,32 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23765 {
23766 struct vm_area_struct *vma;
23767 struct task_struct *tsk;
23768- unsigned long address;
23769 struct mm_struct *mm;
23770 int fault;
23771 int write = error_code & PF_WRITE;
23772 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
23773 (write ? FAULT_FLAG_WRITE : 0);
23774
23775- tsk = current;
23776- mm = tsk->mm;
23777-
23778 /* Get the faulting address: */
23779- address = read_cr2();
23780+ unsigned long address = read_cr2();
23781+
23782+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23783+ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
23784+ if (!search_exception_tables(regs->ip)) {
23785+ bad_area_nosemaphore(regs, error_code, address);
23786+ return;
23787+ }
23788+ if (address < PAX_USER_SHADOW_BASE) {
23789+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
23790+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
23791+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
23792+ } else
23793+ address -= PAX_USER_SHADOW_BASE;
23794+ }
23795+#endif
23796+
23797+ tsk = current;
23798+ mm = tsk->mm;
23799
23800 /*
23801 * Detect and handle instructions that would cause a page fault for
23802@@ -1067,7 +1273,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23803 * User-mode registers count as a user access even for any
23804 * potential system fault or CPU buglet:
23805 */
23806- if (user_mode_vm(regs)) {
23807+ if (user_mode(regs)) {
23808 local_irq_enable();
23809 error_code |= PF_USER;
23810 } else {
23811@@ -1122,6 +1328,11 @@ retry:
23812 might_sleep();
23813 }
23814
23815+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23816+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
23817+ return;
23818+#endif
23819+
23820 vma = find_vma(mm, address);
23821 if (unlikely(!vma)) {
23822 bad_area(regs, error_code, address);
23823@@ -1133,18 +1344,24 @@ retry:
23824 bad_area(regs, error_code, address);
23825 return;
23826 }
23827- if (error_code & PF_USER) {
23828- /*
23829- * Accessing the stack below %sp is always a bug.
23830- * The large cushion allows instructions like enter
23831- * and pusha to work. ("enter $65535, $31" pushes
23832- * 32 pointers and then decrements %sp by 65535.)
23833- */
23834- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
23835- bad_area(regs, error_code, address);
23836- return;
23837- }
23838+ /*
23839+ * Accessing the stack below %sp is always a bug.
23840+ * The large cushion allows instructions like enter
23841+ * and pusha to work. ("enter $65535, $31" pushes
23842+ * 32 pointers and then decrements %sp by 65535.)
23843+ */
23844+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
23845+ bad_area(regs, error_code, address);
23846+ return;
23847 }
23848+
23849+#ifdef CONFIG_PAX_SEGMEXEC
23850+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
23851+ bad_area(regs, error_code, address);
23852+ return;
23853+ }
23854+#endif
23855+
23856 if (unlikely(expand_stack(vma, address))) {
23857 bad_area(regs, error_code, address);
23858 return;
23859@@ -1199,3 +1416,292 @@ good_area:
23860
23861 up_read(&mm->mmap_sem);
23862 }
23863+
23864+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23865+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
23866+{
23867+ struct mm_struct *mm = current->mm;
23868+ unsigned long ip = regs->ip;
23869+
23870+ if (v8086_mode(regs))
23871+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
23872+
23873+#ifdef CONFIG_PAX_PAGEEXEC
23874+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
23875+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
23876+ return true;
23877+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
23878+ return true;
23879+ return false;
23880+ }
23881+#endif
23882+
23883+#ifdef CONFIG_PAX_SEGMEXEC
23884+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
23885+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
23886+ return true;
23887+ return false;
23888+ }
23889+#endif
23890+
23891+ return false;
23892+}
23893+#endif
23894+
23895+#ifdef CONFIG_PAX_EMUTRAMP
23896+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
23897+{
23898+ int err;
23899+
23900+ do { /* PaX: libffi trampoline emulation */
23901+ unsigned char mov, jmp;
23902+ unsigned int addr1, addr2;
23903+
23904+#ifdef CONFIG_X86_64
23905+ if ((regs->ip + 9) >> 32)
23906+ break;
23907+#endif
23908+
23909+ err = get_user(mov, (unsigned char __user *)regs->ip);
23910+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23911+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
23912+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23913+
23914+ if (err)
23915+ break;
23916+
23917+ if (mov == 0xB8 && jmp == 0xE9) {
23918+ regs->ax = addr1;
23919+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
23920+ return 2;
23921+ }
23922+ } while (0);
23923+
23924+ do { /* PaX: gcc trampoline emulation #1 */
23925+ unsigned char mov1, mov2;
23926+ unsigned short jmp;
23927+ unsigned int addr1, addr2;
23928+
23929+#ifdef CONFIG_X86_64
23930+ if ((regs->ip + 11) >> 32)
23931+ break;
23932+#endif
23933+
23934+ err = get_user(mov1, (unsigned char __user *)regs->ip);
23935+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23936+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
23937+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23938+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
23939+
23940+ if (err)
23941+ break;
23942+
23943+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
23944+ regs->cx = addr1;
23945+ regs->ax = addr2;
23946+ regs->ip = addr2;
23947+ return 2;
23948+ }
23949+ } while (0);
23950+
23951+ do { /* PaX: gcc trampoline emulation #2 */
23952+ unsigned char mov, jmp;
23953+ unsigned int addr1, addr2;
23954+
23955+#ifdef CONFIG_X86_64
23956+ if ((regs->ip + 9) >> 32)
23957+ break;
23958+#endif
23959+
23960+ err = get_user(mov, (unsigned char __user *)regs->ip);
23961+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23962+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
23963+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23964+
23965+ if (err)
23966+ break;
23967+
23968+ if (mov == 0xB9 && jmp == 0xE9) {
23969+ regs->cx = addr1;
23970+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
23971+ return 2;
23972+ }
23973+ } while (0);
23974+
23975+ return 1; /* PaX in action */
23976+}
23977+
23978+#ifdef CONFIG_X86_64
23979+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
23980+{
23981+ int err;
23982+
23983+ do { /* PaX: libffi trampoline emulation */
23984+ unsigned short mov1, mov2, jmp1;
23985+ unsigned char stcclc, jmp2;
23986+ unsigned long addr1, addr2;
23987+
23988+ err = get_user(mov1, (unsigned short __user *)regs->ip);
23989+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
23990+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
23991+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
23992+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
23993+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
23994+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
23995+
23996+ if (err)
23997+ break;
23998+
23999+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24000+ regs->r11 = addr1;
24001+ regs->r10 = addr2;
24002+ if (stcclc == 0xF8)
24003+ regs->flags &= ~X86_EFLAGS_CF;
24004+ else
24005+ regs->flags |= X86_EFLAGS_CF;
24006+ regs->ip = addr1;
24007+ return 2;
24008+ }
24009+ } while (0);
24010+
24011+ do { /* PaX: gcc trampoline emulation #1 */
24012+ unsigned short mov1, mov2, jmp1;
24013+ unsigned char jmp2;
24014+ unsigned int addr1;
24015+ unsigned long addr2;
24016+
24017+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24018+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
24019+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
24020+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
24021+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
24022+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
24023+
24024+ if (err)
24025+ break;
24026+
24027+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24028+ regs->r11 = addr1;
24029+ regs->r10 = addr2;
24030+ regs->ip = addr1;
24031+ return 2;
24032+ }
24033+ } while (0);
24034+
24035+ do { /* PaX: gcc trampoline emulation #2 */
24036+ unsigned short mov1, mov2, jmp1;
24037+ unsigned char jmp2;
24038+ unsigned long addr1, addr2;
24039+
24040+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24041+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24042+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24043+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24044+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
24045+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
24046+
24047+ if (err)
24048+ break;
24049+
24050+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24051+ regs->r11 = addr1;
24052+ regs->r10 = addr2;
24053+ regs->ip = addr1;
24054+ return 2;
24055+ }
24056+ } while (0);
24057+
24058+ return 1; /* PaX in action */
24059+}
24060+#endif
24061+
24062+/*
24063+ * PaX: decide what to do with offenders (regs->ip = fault address)
24064+ *
24065+ * returns 1 when task should be killed
24066+ * 2 when gcc trampoline was detected
24067+ */
24068+static int pax_handle_fetch_fault(struct pt_regs *regs)
24069+{
24070+ if (v8086_mode(regs))
24071+ return 1;
24072+
24073+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
24074+ return 1;
24075+
24076+#ifdef CONFIG_X86_32
24077+ return pax_handle_fetch_fault_32(regs);
24078+#else
24079+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
24080+ return pax_handle_fetch_fault_32(regs);
24081+ else
24082+ return pax_handle_fetch_fault_64(regs);
24083+#endif
24084+}
24085+#endif
24086+
24087+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24088+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
24089+{
24090+ long i;
24091+
24092+ printk(KERN_ERR "PAX: bytes at PC: ");
24093+ for (i = 0; i < 20; i++) {
24094+ unsigned char c;
24095+ if (get_user(c, (unsigned char __force_user *)pc+i))
24096+ printk(KERN_CONT "?? ");
24097+ else
24098+ printk(KERN_CONT "%02x ", c);
24099+ }
24100+ printk("\n");
24101+
24102+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
24103+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
24104+ unsigned long c;
24105+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
24106+#ifdef CONFIG_X86_32
24107+ printk(KERN_CONT "???????? ");
24108+#else
24109+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
24110+ printk(KERN_CONT "???????? ???????? ");
24111+ else
24112+ printk(KERN_CONT "???????????????? ");
24113+#endif
24114+ } else {
24115+#ifdef CONFIG_X86_64
24116+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
24117+ printk(KERN_CONT "%08x ", (unsigned int)c);
24118+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
24119+ } else
24120+#endif
24121+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
24122+ }
24123+ }
24124+ printk("\n");
24125+}
24126+#endif
24127+
24128+/**
24129+ * probe_kernel_write(): safely attempt to write to a location
24130+ * @dst: address to write to
24131+ * @src: pointer to the data that shall be written
24132+ * @size: size of the data chunk
24133+ *
24134+ * Safely write to address @dst from the buffer at @src. If a kernel fault
24135+ * happens, handle that and return -EFAULT.
24136+ */
24137+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
24138+{
24139+ long ret;
24140+ mm_segment_t old_fs = get_fs();
24141+
24142+ set_fs(KERNEL_DS);
24143+ pagefault_disable();
24144+ pax_open_kernel();
24145+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
24146+ pax_close_kernel();
24147+ pagefault_enable();
24148+ set_fs(old_fs);
24149+
24150+ return ret ? -EFAULT : 0;
24151+}
24152diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
24153index dd74e46..7d26398 100644
24154--- a/arch/x86/mm/gup.c
24155+++ b/arch/x86/mm/gup.c
24156@@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
24157 addr = start;
24158 len = (unsigned long) nr_pages << PAGE_SHIFT;
24159 end = start + len;
24160- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24161+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24162 (void __user *)start, len)))
24163 return 0;
24164
24165diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
24166index f4f29b1..5cac4fb 100644
24167--- a/arch/x86/mm/highmem_32.c
24168+++ b/arch/x86/mm/highmem_32.c
24169@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
24170 idx = type + KM_TYPE_NR*smp_processor_id();
24171 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24172 BUG_ON(!pte_none(*(kmap_pte-idx)));
24173+
24174+ pax_open_kernel();
24175 set_pte(kmap_pte-idx, mk_pte(page, prot));
24176+ pax_close_kernel();
24177+
24178 arch_flush_lazy_mmu_mode();
24179
24180 return (void *)vaddr;
24181diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
24182index f581a18..29efd37 100644
24183--- a/arch/x86/mm/hugetlbpage.c
24184+++ b/arch/x86/mm/hugetlbpage.c
24185@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
24186 struct hstate *h = hstate_file(file);
24187 struct mm_struct *mm = current->mm;
24188 struct vm_area_struct *vma;
24189- unsigned long start_addr;
24190+ unsigned long start_addr, pax_task_size = TASK_SIZE;
24191+
24192+#ifdef CONFIG_PAX_SEGMEXEC
24193+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24194+ pax_task_size = SEGMEXEC_TASK_SIZE;
24195+#endif
24196+
24197+ pax_task_size -= PAGE_SIZE;
24198
24199 if (len > mm->cached_hole_size) {
24200- start_addr = mm->free_area_cache;
24201+ start_addr = mm->free_area_cache;
24202 } else {
24203- start_addr = TASK_UNMAPPED_BASE;
24204- mm->cached_hole_size = 0;
24205+ start_addr = mm->mmap_base;
24206+ mm->cached_hole_size = 0;
24207 }
24208
24209 full_search:
24210@@ -280,26 +287,27 @@ full_search:
24211
24212 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
24213 /* At this point: (!vma || addr < vma->vm_end). */
24214- if (TASK_SIZE - len < addr) {
24215+ if (pax_task_size - len < addr) {
24216 /*
24217 * Start a new search - just in case we missed
24218 * some holes.
24219 */
24220- if (start_addr != TASK_UNMAPPED_BASE) {
24221- start_addr = TASK_UNMAPPED_BASE;
24222+ if (start_addr != mm->mmap_base) {
24223+ start_addr = mm->mmap_base;
24224 mm->cached_hole_size = 0;
24225 goto full_search;
24226 }
24227 return -ENOMEM;
24228 }
24229- if (!vma || addr + len <= vma->vm_start) {
24230- mm->free_area_cache = addr + len;
24231- return addr;
24232- }
24233+ if (check_heap_stack_gap(vma, addr, len))
24234+ break;
24235 if (addr + mm->cached_hole_size < vma->vm_start)
24236 mm->cached_hole_size = vma->vm_start - addr;
24237 addr = ALIGN(vma->vm_end, huge_page_size(h));
24238 }
24239+
24240+ mm->free_area_cache = addr + len;
24241+ return addr;
24242 }
24243
24244 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24245@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24246 {
24247 struct hstate *h = hstate_file(file);
24248 struct mm_struct *mm = current->mm;
24249- struct vm_area_struct *vma, *prev_vma;
24250- unsigned long base = mm->mmap_base, addr = addr0;
24251+ struct vm_area_struct *vma;
24252+ unsigned long base = mm->mmap_base, addr;
24253 unsigned long largest_hole = mm->cached_hole_size;
24254- int first_time = 1;
24255
24256 /* don't allow allocations above current base */
24257 if (mm->free_area_cache > base)
24258@@ -321,64 +328,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24259 largest_hole = 0;
24260 mm->free_area_cache = base;
24261 }
24262-try_again:
24263+
24264 /* make sure it can fit in the remaining address space */
24265 if (mm->free_area_cache < len)
24266 goto fail;
24267
24268 /* either no address requested or can't fit in requested address hole */
24269- addr = (mm->free_area_cache - len) & huge_page_mask(h);
24270+ addr = (mm->free_area_cache - len);
24271 do {
24272+ addr &= huge_page_mask(h);
24273+ vma = find_vma(mm, addr);
24274 /*
24275 * Lookup failure means no vma is above this address,
24276 * i.e. return with success:
24277- */
24278- if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
24279- return addr;
24280-
24281- /*
24282 * new region fits between prev_vma->vm_end and
24283 * vma->vm_start, use it:
24284 */
24285- if (addr + len <= vma->vm_start &&
24286- (!prev_vma || (addr >= prev_vma->vm_end))) {
24287+ if (check_heap_stack_gap(vma, addr, len)) {
24288 /* remember the address as a hint for next time */
24289- mm->cached_hole_size = largest_hole;
24290- return (mm->free_area_cache = addr);
24291- } else {
24292- /* pull free_area_cache down to the first hole */
24293- if (mm->free_area_cache == vma->vm_end) {
24294- mm->free_area_cache = vma->vm_start;
24295- mm->cached_hole_size = largest_hole;
24296- }
24297+ mm->cached_hole_size = largest_hole;
24298+ return (mm->free_area_cache = addr);
24299+ }
24300+ /* pull free_area_cache down to the first hole */
24301+ if (mm->free_area_cache == vma->vm_end) {
24302+ mm->free_area_cache = vma->vm_start;
24303+ mm->cached_hole_size = largest_hole;
24304 }
24305
24306 /* remember the largest hole we saw so far */
24307 if (addr + largest_hole < vma->vm_start)
24308- largest_hole = vma->vm_start - addr;
24309+ largest_hole = vma->vm_start - addr;
24310
24311 /* try just below the current vma->vm_start */
24312- addr = (vma->vm_start - len) & huge_page_mask(h);
24313- } while (len <= vma->vm_start);
24314+ addr = skip_heap_stack_gap(vma, len);
24315+ } while (!IS_ERR_VALUE(addr));
24316
24317 fail:
24318 /*
24319- * if hint left us with no space for the requested
24320- * mapping then try again:
24321- */
24322- if (first_time) {
24323- mm->free_area_cache = base;
24324- largest_hole = 0;
24325- first_time = 0;
24326- goto try_again;
24327- }
24328- /*
24329 * A failed mmap() very likely causes application failure,
24330 * so fall back to the bottom-up function here. This scenario
24331 * can happen with large stack limits and large mmap()
24332 * allocations.
24333 */
24334- mm->free_area_cache = TASK_UNMAPPED_BASE;
24335+
24336+#ifdef CONFIG_PAX_SEGMEXEC
24337+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24338+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
24339+ else
24340+#endif
24341+
24342+ mm->mmap_base = TASK_UNMAPPED_BASE;
24343+
24344+#ifdef CONFIG_PAX_RANDMMAP
24345+ if (mm->pax_flags & MF_PAX_RANDMMAP)
24346+ mm->mmap_base += mm->delta_mmap;
24347+#endif
24348+
24349+ mm->free_area_cache = mm->mmap_base;
24350 mm->cached_hole_size = ~0UL;
24351 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
24352 len, pgoff, flags);
24353@@ -386,6 +392,7 @@ fail:
24354 /*
24355 * Restore the topdown base:
24356 */
24357+ mm->mmap_base = base;
24358 mm->free_area_cache = base;
24359 mm->cached_hole_size = ~0UL;
24360
24361@@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24362 struct hstate *h = hstate_file(file);
24363 struct mm_struct *mm = current->mm;
24364 struct vm_area_struct *vma;
24365+ unsigned long pax_task_size = TASK_SIZE;
24366
24367 if (len & ~huge_page_mask(h))
24368 return -EINVAL;
24369- if (len > TASK_SIZE)
24370+
24371+#ifdef CONFIG_PAX_SEGMEXEC
24372+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24373+ pax_task_size = SEGMEXEC_TASK_SIZE;
24374+#endif
24375+
24376+ pax_task_size -= PAGE_SIZE;
24377+
24378+ if (len > pax_task_size)
24379 return -ENOMEM;
24380
24381 if (flags & MAP_FIXED) {
24382@@ -414,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24383 if (addr) {
24384 addr = ALIGN(addr, huge_page_size(h));
24385 vma = find_vma(mm, addr);
24386- if (TASK_SIZE - len >= addr &&
24387- (!vma || addr + len <= vma->vm_start))
24388+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
24389 return addr;
24390 }
24391 if (mm->get_unmapped_area == arch_get_unmapped_area)
24392diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
24393index 87488b9..399f416 100644
24394--- a/arch/x86/mm/init.c
24395+++ b/arch/x86/mm/init.c
24396@@ -15,6 +15,7 @@
24397 #include <asm/tlbflush.h>
24398 #include <asm/tlb.h>
24399 #include <asm/proto.h>
24400+#include <asm/desc.h>
24401
24402 unsigned long __initdata pgt_buf_start;
24403 unsigned long __meminitdata pgt_buf_end;
24404@@ -31,7 +32,7 @@ int direct_gbpages
24405 static void __init find_early_table_space(unsigned long end, int use_pse,
24406 int use_gbpages)
24407 {
24408- unsigned long puds, pmds, ptes, tables, start = 0, good_end = end;
24409+ unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end;
24410 phys_addr_t base;
24411
24412 puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
24413@@ -312,8 +313,29 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24414 */
24415 int devmem_is_allowed(unsigned long pagenr)
24416 {
24417+#ifdef CONFIG_GRKERNSEC_KMEM
24418+ /* allow BDA */
24419+ if (!pagenr)
24420+ return 1;
24421+ /* allow EBDA */
24422+ if ((0x9f000 >> PAGE_SHIFT) == pagenr)
24423+ return 1;
24424+#else
24425+ if (!pagenr)
24426+ return 1;
24427+#ifdef CONFIG_VM86
24428+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
24429+ return 1;
24430+#endif
24431+#endif
24432+
24433+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
24434+ return 1;
24435+#ifdef CONFIG_GRKERNSEC_KMEM
24436+ /* throw out everything else below 1MB */
24437 if (pagenr <= 256)
24438- return 1;
24439+ return 0;
24440+#endif
24441 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
24442 return 0;
24443 if (!page_is_ram(pagenr))
24444@@ -372,6 +394,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
24445
24446 void free_initmem(void)
24447 {
24448+
24449+#ifdef CONFIG_PAX_KERNEXEC
24450+#ifdef CONFIG_X86_32
24451+ /* PaX: limit KERNEL_CS to actual size */
24452+ unsigned long addr, limit;
24453+ struct desc_struct d;
24454+ int cpu;
24455+
24456+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
24457+ limit = (limit - 1UL) >> PAGE_SHIFT;
24458+
24459+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
24460+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
24461+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
24462+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
24463+ }
24464+
24465+ /* PaX: make KERNEL_CS read-only */
24466+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
24467+ if (!paravirt_enabled())
24468+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
24469+/*
24470+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
24471+ pgd = pgd_offset_k(addr);
24472+ pud = pud_offset(pgd, addr);
24473+ pmd = pmd_offset(pud, addr);
24474+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24475+ }
24476+*/
24477+#ifdef CONFIG_X86_PAE
24478+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
24479+/*
24480+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
24481+ pgd = pgd_offset_k(addr);
24482+ pud = pud_offset(pgd, addr);
24483+ pmd = pmd_offset(pud, addr);
24484+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24485+ }
24486+*/
24487+#endif
24488+
24489+#ifdef CONFIG_MODULES
24490+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
24491+#endif
24492+
24493+#else
24494+ pgd_t *pgd;
24495+ pud_t *pud;
24496+ pmd_t *pmd;
24497+ unsigned long addr, end;
24498+
24499+ /* PaX: make kernel code/rodata read-only, rest non-executable */
24500+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
24501+ pgd = pgd_offset_k(addr);
24502+ pud = pud_offset(pgd, addr);
24503+ pmd = pmd_offset(pud, addr);
24504+ if (!pmd_present(*pmd))
24505+ continue;
24506+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
24507+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24508+ else
24509+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24510+ }
24511+
24512+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
24513+ end = addr + KERNEL_IMAGE_SIZE;
24514+ for (; addr < end; addr += PMD_SIZE) {
24515+ pgd = pgd_offset_k(addr);
24516+ pud = pud_offset(pgd, addr);
24517+ pmd = pmd_offset(pud, addr);
24518+ if (!pmd_present(*pmd))
24519+ continue;
24520+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
24521+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24522+ }
24523+#endif
24524+
24525+ flush_tlb_all();
24526+#endif
24527+
24528 free_init_pages("unused kernel memory",
24529 (unsigned long)(&__init_begin),
24530 (unsigned long)(&__init_end));
24531diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
24532index 29f7c6d..b46b35b 100644
24533--- a/arch/x86/mm/init_32.c
24534+++ b/arch/x86/mm/init_32.c
24535@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
24536 }
24537
24538 /*
24539- * Creates a middle page table and puts a pointer to it in the
24540- * given global directory entry. This only returns the gd entry
24541- * in non-PAE compilation mode, since the middle layer is folded.
24542- */
24543-static pmd_t * __init one_md_table_init(pgd_t *pgd)
24544-{
24545- pud_t *pud;
24546- pmd_t *pmd_table;
24547-
24548-#ifdef CONFIG_X86_PAE
24549- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
24550- if (after_bootmem)
24551- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
24552- else
24553- pmd_table = (pmd_t *)alloc_low_page();
24554- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
24555- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
24556- pud = pud_offset(pgd, 0);
24557- BUG_ON(pmd_table != pmd_offset(pud, 0));
24558-
24559- return pmd_table;
24560- }
24561-#endif
24562- pud = pud_offset(pgd, 0);
24563- pmd_table = pmd_offset(pud, 0);
24564-
24565- return pmd_table;
24566-}
24567-
24568-/*
24569 * Create a page table and place a pointer to it in a middle page
24570 * directory entry:
24571 */
24572@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
24573 page_table = (pte_t *)alloc_low_page();
24574
24575 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
24576+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24577+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
24578+#else
24579 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
24580+#endif
24581 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
24582 }
24583
24584 return pte_offset_kernel(pmd, 0);
24585 }
24586
24587+static pmd_t * __init one_md_table_init(pgd_t *pgd)
24588+{
24589+ pud_t *pud;
24590+ pmd_t *pmd_table;
24591+
24592+ pud = pud_offset(pgd, 0);
24593+ pmd_table = pmd_offset(pud, 0);
24594+
24595+ return pmd_table;
24596+}
24597+
24598 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
24599 {
24600 int pgd_idx = pgd_index(vaddr);
24601@@ -203,6 +188,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24602 int pgd_idx, pmd_idx;
24603 unsigned long vaddr;
24604 pgd_t *pgd;
24605+ pud_t *pud;
24606 pmd_t *pmd;
24607 pte_t *pte = NULL;
24608
24609@@ -212,8 +198,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24610 pgd = pgd_base + pgd_idx;
24611
24612 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
24613- pmd = one_md_table_init(pgd);
24614- pmd = pmd + pmd_index(vaddr);
24615+ pud = pud_offset(pgd, vaddr);
24616+ pmd = pmd_offset(pud, vaddr);
24617+
24618+#ifdef CONFIG_X86_PAE
24619+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24620+#endif
24621+
24622 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
24623 pmd++, pmd_idx++) {
24624 pte = page_table_kmap_check(one_page_table_init(pmd),
24625@@ -225,11 +216,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24626 }
24627 }
24628
24629-static inline int is_kernel_text(unsigned long addr)
24630+static inline int is_kernel_text(unsigned long start, unsigned long end)
24631 {
24632- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
24633- return 1;
24634- return 0;
24635+ if ((start > ktla_ktva((unsigned long)_etext) ||
24636+ end <= ktla_ktva((unsigned long)_stext)) &&
24637+ (start > ktla_ktva((unsigned long)_einittext) ||
24638+ end <= ktla_ktva((unsigned long)_sinittext)) &&
24639+
24640+#ifdef CONFIG_ACPI_SLEEP
24641+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
24642+#endif
24643+
24644+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
24645+ return 0;
24646+ return 1;
24647 }
24648
24649 /*
24650@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned long start,
24651 unsigned long last_map_addr = end;
24652 unsigned long start_pfn, end_pfn;
24653 pgd_t *pgd_base = swapper_pg_dir;
24654- int pgd_idx, pmd_idx, pte_ofs;
24655+ unsigned int pgd_idx, pmd_idx, pte_ofs;
24656 unsigned long pfn;
24657 pgd_t *pgd;
24658+ pud_t *pud;
24659 pmd_t *pmd;
24660 pte_t *pte;
24661 unsigned pages_2m, pages_4k;
24662@@ -281,8 +282,13 @@ repeat:
24663 pfn = start_pfn;
24664 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24665 pgd = pgd_base + pgd_idx;
24666- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
24667- pmd = one_md_table_init(pgd);
24668+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
24669+ pud = pud_offset(pgd, 0);
24670+ pmd = pmd_offset(pud, 0);
24671+
24672+#ifdef CONFIG_X86_PAE
24673+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24674+#endif
24675
24676 if (pfn >= end_pfn)
24677 continue;
24678@@ -294,14 +300,13 @@ repeat:
24679 #endif
24680 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
24681 pmd++, pmd_idx++) {
24682- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
24683+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
24684
24685 /*
24686 * Map with big pages if possible, otherwise
24687 * create normal page tables:
24688 */
24689 if (use_pse) {
24690- unsigned int addr2;
24691 pgprot_t prot = PAGE_KERNEL_LARGE;
24692 /*
24693 * first pass will use the same initial
24694@@ -311,11 +316,7 @@ repeat:
24695 __pgprot(PTE_IDENT_ATTR |
24696 _PAGE_PSE);
24697
24698- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
24699- PAGE_OFFSET + PAGE_SIZE-1;
24700-
24701- if (is_kernel_text(addr) ||
24702- is_kernel_text(addr2))
24703+ if (is_kernel_text(address, address + PMD_SIZE))
24704 prot = PAGE_KERNEL_LARGE_EXEC;
24705
24706 pages_2m++;
24707@@ -332,7 +333,7 @@ repeat:
24708 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24709 pte += pte_ofs;
24710 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
24711- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
24712+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
24713 pgprot_t prot = PAGE_KERNEL;
24714 /*
24715 * first pass will use the same initial
24716@@ -340,7 +341,7 @@ repeat:
24717 */
24718 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
24719
24720- if (is_kernel_text(addr))
24721+ if (is_kernel_text(address, address + PAGE_SIZE))
24722 prot = PAGE_KERNEL_EXEC;
24723
24724 pages_4k++;
24725@@ -472,7 +473,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
24726
24727 pud = pud_offset(pgd, va);
24728 pmd = pmd_offset(pud, va);
24729- if (!pmd_present(*pmd))
24730+ if (!pmd_present(*pmd) || pmd_huge(*pmd))
24731 break;
24732
24733 pte = pte_offset_kernel(pmd, va);
24734@@ -524,12 +525,10 @@ void __init early_ioremap_page_table_range_init(void)
24735
24736 static void __init pagetable_init(void)
24737 {
24738- pgd_t *pgd_base = swapper_pg_dir;
24739-
24740- permanent_kmaps_init(pgd_base);
24741+ permanent_kmaps_init(swapper_pg_dir);
24742 }
24743
24744-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24745+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24746 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24747
24748 /* user-defined highmem size */
24749@@ -757,6 +756,12 @@ void __init mem_init(void)
24750
24751 pci_iommu_alloc();
24752
24753+#ifdef CONFIG_PAX_PER_CPU_PGD
24754+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
24755+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24756+ KERNEL_PGD_PTRS);
24757+#endif
24758+
24759 #ifdef CONFIG_FLATMEM
24760 BUG_ON(!mem_map);
24761 #endif
24762@@ -774,7 +779,7 @@ void __init mem_init(void)
24763 set_highmem_pages_init();
24764
24765 codesize = (unsigned long) &_etext - (unsigned long) &_text;
24766- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
24767+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
24768 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
24769
24770 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
24771@@ -815,10 +820,10 @@ void __init mem_init(void)
24772 ((unsigned long)&__init_end -
24773 (unsigned long)&__init_begin) >> 10,
24774
24775- (unsigned long)&_etext, (unsigned long)&_edata,
24776- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
24777+ (unsigned long)&_sdata, (unsigned long)&_edata,
24778+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
24779
24780- (unsigned long)&_text, (unsigned long)&_etext,
24781+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
24782 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
24783
24784 /*
24785@@ -896,6 +901,7 @@ void set_kernel_text_rw(void)
24786 if (!kernel_set_to_readonly)
24787 return;
24788
24789+ start = ktla_ktva(start);
24790 pr_debug("Set kernel text: %lx - %lx for read write\n",
24791 start, start+size);
24792
24793@@ -910,6 +916,7 @@ void set_kernel_text_ro(void)
24794 if (!kernel_set_to_readonly)
24795 return;
24796
24797+ start = ktla_ktva(start);
24798 pr_debug("Set kernel text: %lx - %lx for read only\n",
24799 start, start+size);
24800
24801@@ -938,6 +945,7 @@ void mark_rodata_ro(void)
24802 unsigned long start = PFN_ALIGN(_text);
24803 unsigned long size = PFN_ALIGN(_etext) - start;
24804
24805+ start = ktla_ktva(start);
24806 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
24807 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
24808 size >> 10);
24809diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
24810index bbaaa00..796fa65 100644
24811--- a/arch/x86/mm/init_64.c
24812+++ b/arch/x86/mm/init_64.c
24813@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpages_on);
24814 * around without checking the pgd every time.
24815 */
24816
24817-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
24818+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
24819 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24820
24821 int force_personality32;
24822@@ -108,12 +108,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24823
24824 for (address = start; address <= end; address += PGDIR_SIZE) {
24825 const pgd_t *pgd_ref = pgd_offset_k(address);
24826+
24827+#ifdef CONFIG_PAX_PER_CPU_PGD
24828+ unsigned long cpu;
24829+#else
24830 struct page *page;
24831+#endif
24832
24833 if (pgd_none(*pgd_ref))
24834 continue;
24835
24836 spin_lock(&pgd_lock);
24837+
24838+#ifdef CONFIG_PAX_PER_CPU_PGD
24839+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
24840+ pgd_t *pgd = pgd_offset_cpu(cpu, address);
24841+#else
24842 list_for_each_entry(page, &pgd_list, lru) {
24843 pgd_t *pgd;
24844 spinlock_t *pgt_lock;
24845@@ -122,6 +132,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24846 /* the pgt_lock only for Xen */
24847 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
24848 spin_lock(pgt_lock);
24849+#endif
24850
24851 if (pgd_none(*pgd))
24852 set_pgd(pgd, *pgd_ref);
24853@@ -129,7 +140,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24854 BUG_ON(pgd_page_vaddr(*pgd)
24855 != pgd_page_vaddr(*pgd_ref));
24856
24857+#ifndef CONFIG_PAX_PER_CPU_PGD
24858 spin_unlock(pgt_lock);
24859+#endif
24860+
24861 }
24862 spin_unlock(&pgd_lock);
24863 }
24864@@ -203,7 +217,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
24865 pmd = fill_pmd(pud, vaddr);
24866 pte = fill_pte(pmd, vaddr);
24867
24868+ pax_open_kernel();
24869 set_pte(pte, new_pte);
24870+ pax_close_kernel();
24871
24872 /*
24873 * It's enough to flush this one mapping.
24874@@ -262,14 +278,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
24875 pgd = pgd_offset_k((unsigned long)__va(phys));
24876 if (pgd_none(*pgd)) {
24877 pud = (pud_t *) spp_getpage();
24878- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
24879- _PAGE_USER));
24880+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
24881 }
24882 pud = pud_offset(pgd, (unsigned long)__va(phys));
24883 if (pud_none(*pud)) {
24884 pmd = (pmd_t *) spp_getpage();
24885- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
24886- _PAGE_USER));
24887+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
24888 }
24889 pmd = pmd_offset(pud, phys);
24890 BUG_ON(!pmd_none(*pmd));
24891@@ -330,7 +344,7 @@ static __ref void *alloc_low_page(unsigned long *phys)
24892 if (pfn >= pgt_buf_top)
24893 panic("alloc_low_page: ran out of memory");
24894
24895- adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
24896+ adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
24897 clear_page(adr);
24898 *phys = pfn * PAGE_SIZE;
24899 return adr;
24900@@ -346,7 +360,7 @@ static __ref void *map_low_page(void *virt)
24901
24902 phys = __pa(virt);
24903 left = phys & (PAGE_SIZE - 1);
24904- adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
24905+ adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
24906 adr = (void *)(((unsigned long)adr) | left);
24907
24908 return adr;
24909@@ -693,6 +707,12 @@ void __init mem_init(void)
24910
24911 pci_iommu_alloc();
24912
24913+#ifdef CONFIG_PAX_PER_CPU_PGD
24914+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
24915+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24916+ KERNEL_PGD_PTRS);
24917+#endif
24918+
24919 /* clear_bss() already clear the empty_zero_page */
24920
24921 reservedpages = 0;
24922@@ -853,8 +873,8 @@ int kern_addr_valid(unsigned long addr)
24923 static struct vm_area_struct gate_vma = {
24924 .vm_start = VSYSCALL_START,
24925 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
24926- .vm_page_prot = PAGE_READONLY_EXEC,
24927- .vm_flags = VM_READ | VM_EXEC
24928+ .vm_page_prot = PAGE_READONLY,
24929+ .vm_flags = VM_READ
24930 };
24931
24932 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
24933@@ -888,7 +908,7 @@ int in_gate_area_no_mm(unsigned long addr)
24934
24935 const char *arch_vma_name(struct vm_area_struct *vma)
24936 {
24937- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
24938+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
24939 return "[vdso]";
24940 if (vma == &gate_vma)
24941 return "[vsyscall]";
24942diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
24943index 7b179b4..6bd1777 100644
24944--- a/arch/x86/mm/iomap_32.c
24945+++ b/arch/x86/mm/iomap_32.c
24946@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
24947 type = kmap_atomic_idx_push();
24948 idx = type + KM_TYPE_NR * smp_processor_id();
24949 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24950+
24951+ pax_open_kernel();
24952 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
24953+ pax_close_kernel();
24954+
24955 arch_flush_lazy_mmu_mode();
24956
24957 return (void *)vaddr;
24958diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
24959index be1ef57..55f0160 100644
24960--- a/arch/x86/mm/ioremap.c
24961+++ b/arch/x86/mm/ioremap.c
24962@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
24963 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
24964 int is_ram = page_is_ram(pfn);
24965
24966- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
24967+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
24968 return NULL;
24969 WARN_ON_ONCE(is_ram);
24970 }
24971@@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
24972
24973 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
24974 if (page_is_ram(start >> PAGE_SHIFT))
24975+#ifdef CONFIG_HIGHMEM
24976+ if ((start >> PAGE_SHIFT) < max_low_pfn)
24977+#endif
24978 return __va(phys);
24979
24980 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
24981@@ -344,7 +347,7 @@ static int __init early_ioremap_debug_setup(char *str)
24982 early_param("early_ioremap_debug", early_ioremap_debug_setup);
24983
24984 static __initdata int after_paging_init;
24985-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
24986+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
24987
24988 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
24989 {
24990@@ -381,8 +384,7 @@ void __init early_ioremap_init(void)
24991 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
24992
24993 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
24994- memset(bm_pte, 0, sizeof(bm_pte));
24995- pmd_populate_kernel(&init_mm, pmd, bm_pte);
24996+ pmd_populate_user(&init_mm, pmd, bm_pte);
24997
24998 /*
24999 * The boot-ioremap range spans multiple pmds, for which
25000diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
25001index d87dd6d..bf3fa66 100644
25002--- a/arch/x86/mm/kmemcheck/kmemcheck.c
25003+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
25004@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
25005 * memory (e.g. tracked pages)? For now, we need this to avoid
25006 * invoking kmemcheck for PnP BIOS calls.
25007 */
25008- if (regs->flags & X86_VM_MASK)
25009+ if (v8086_mode(regs))
25010 return false;
25011- if (regs->cs != __KERNEL_CS)
25012+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
25013 return false;
25014
25015 pte = kmemcheck_pte_lookup(address);
25016diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
25017index 845df68..1d8d29f 100644
25018--- a/arch/x86/mm/mmap.c
25019+++ b/arch/x86/mm/mmap.c
25020@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
25021 * Leave an at least ~128 MB hole with possible stack randomization.
25022 */
25023 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
25024-#define MAX_GAP (TASK_SIZE/6*5)
25025+#define MAX_GAP (pax_task_size/6*5)
25026
25027 static int mmap_is_legacy(void)
25028 {
25029@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
25030 return rnd << PAGE_SHIFT;
25031 }
25032
25033-static unsigned long mmap_base(void)
25034+static unsigned long mmap_base(struct mm_struct *mm)
25035 {
25036 unsigned long gap = rlimit(RLIMIT_STACK);
25037+ unsigned long pax_task_size = TASK_SIZE;
25038+
25039+#ifdef CONFIG_PAX_SEGMEXEC
25040+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
25041+ pax_task_size = SEGMEXEC_TASK_SIZE;
25042+#endif
25043
25044 if (gap < MIN_GAP)
25045 gap = MIN_GAP;
25046 else if (gap > MAX_GAP)
25047 gap = MAX_GAP;
25048
25049- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
25050+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
25051 }
25052
25053 /*
25054 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
25055 * does, but not when emulating X86_32
25056 */
25057-static unsigned long mmap_legacy_base(void)
25058+static unsigned long mmap_legacy_base(struct mm_struct *mm)
25059 {
25060- if (mmap_is_ia32())
25061+ if (mmap_is_ia32()) {
25062+
25063+#ifdef CONFIG_PAX_SEGMEXEC
25064+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
25065+ return SEGMEXEC_TASK_UNMAPPED_BASE;
25066+ else
25067+#endif
25068+
25069 return TASK_UNMAPPED_BASE;
25070- else
25071+ } else
25072 return TASK_UNMAPPED_BASE + mmap_rnd();
25073 }
25074
25075@@ -113,11 +126,23 @@ static unsigned long mmap_legacy_base(void)
25076 void arch_pick_mmap_layout(struct mm_struct *mm)
25077 {
25078 if (mmap_is_legacy()) {
25079- mm->mmap_base = mmap_legacy_base();
25080+ mm->mmap_base = mmap_legacy_base(mm);
25081+
25082+#ifdef CONFIG_PAX_RANDMMAP
25083+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25084+ mm->mmap_base += mm->delta_mmap;
25085+#endif
25086+
25087 mm->get_unmapped_area = arch_get_unmapped_area;
25088 mm->unmap_area = arch_unmap_area;
25089 } else {
25090- mm->mmap_base = mmap_base();
25091+ mm->mmap_base = mmap_base(mm);
25092+
25093+#ifdef CONFIG_PAX_RANDMMAP
25094+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25095+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
25096+#endif
25097+
25098 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
25099 mm->unmap_area = arch_unmap_area_topdown;
25100 }
25101diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
25102index de54b9b..799051e 100644
25103--- a/arch/x86/mm/mmio-mod.c
25104+++ b/arch/x86/mm/mmio-mod.c
25105@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
25106 break;
25107 default:
25108 {
25109- unsigned char *ip = (unsigned char *)instptr;
25110+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
25111 my_trace->opcode = MMIO_UNKNOWN_OP;
25112 my_trace->width = 0;
25113 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
25114@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
25115 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25116 void __iomem *addr)
25117 {
25118- static atomic_t next_id;
25119+ static atomic_unchecked_t next_id;
25120 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
25121 /* These are page-unaligned. */
25122 struct mmiotrace_map map = {
25123@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25124 .private = trace
25125 },
25126 .phys = offset,
25127- .id = atomic_inc_return(&next_id)
25128+ .id = atomic_inc_return_unchecked(&next_id)
25129 };
25130 map.map_id = trace->id;
25131
25132diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
25133index b008656..773eac2 100644
25134--- a/arch/x86/mm/pageattr-test.c
25135+++ b/arch/x86/mm/pageattr-test.c
25136@@ -36,7 +36,7 @@ enum {
25137
25138 static int pte_testbit(pte_t pte)
25139 {
25140- return pte_flags(pte) & _PAGE_UNUSED1;
25141+ return pte_flags(pte) & _PAGE_CPA_TEST;
25142 }
25143
25144 struct split_state {
25145diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
25146index f9e5267..77b1a40 100644
25147--- a/arch/x86/mm/pageattr.c
25148+++ b/arch/x86/mm/pageattr.c
25149@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25150 */
25151 #ifdef CONFIG_PCI_BIOS
25152 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
25153- pgprot_val(forbidden) |= _PAGE_NX;
25154+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25155 #endif
25156
25157 /*
25158@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25159 * Does not cover __inittext since that is gone later on. On
25160 * 64bit we do not enforce !NX on the low mapping
25161 */
25162- if (within(address, (unsigned long)_text, (unsigned long)_etext))
25163- pgprot_val(forbidden) |= _PAGE_NX;
25164+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
25165+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25166
25167+#ifdef CONFIG_DEBUG_RODATA
25168 /*
25169 * The .rodata section needs to be read-only. Using the pfn
25170 * catches all aliases.
25171@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25172 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
25173 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
25174 pgprot_val(forbidden) |= _PAGE_RW;
25175+#endif
25176
25177 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
25178 /*
25179@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25180 }
25181 #endif
25182
25183+#ifdef CONFIG_PAX_KERNEXEC
25184+ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
25185+ pgprot_val(forbidden) |= _PAGE_RW;
25186+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25187+ }
25188+#endif
25189+
25190 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
25191
25192 return prot;
25193@@ -369,23 +378,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
25194 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
25195 {
25196 /* change init_mm */
25197+ pax_open_kernel();
25198 set_pte_atomic(kpte, pte);
25199+
25200 #ifdef CONFIG_X86_32
25201 if (!SHARED_KERNEL_PMD) {
25202+
25203+#ifdef CONFIG_PAX_PER_CPU_PGD
25204+ unsigned long cpu;
25205+#else
25206 struct page *page;
25207+#endif
25208
25209+#ifdef CONFIG_PAX_PER_CPU_PGD
25210+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
25211+ pgd_t *pgd = get_cpu_pgd(cpu);
25212+#else
25213 list_for_each_entry(page, &pgd_list, lru) {
25214- pgd_t *pgd;
25215+ pgd_t *pgd = (pgd_t *)page_address(page);
25216+#endif
25217+
25218 pud_t *pud;
25219 pmd_t *pmd;
25220
25221- pgd = (pgd_t *)page_address(page) + pgd_index(address);
25222+ pgd += pgd_index(address);
25223 pud = pud_offset(pgd, address);
25224 pmd = pmd_offset(pud, address);
25225 set_pte_atomic((pte_t *)pmd, pte);
25226 }
25227 }
25228 #endif
25229+ pax_close_kernel();
25230 }
25231
25232 static int
25233diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
25234index f6ff57b..481690f 100644
25235--- a/arch/x86/mm/pat.c
25236+++ b/arch/x86/mm/pat.c
25237@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
25238
25239 if (!entry) {
25240 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
25241- current->comm, current->pid, start, end);
25242+ current->comm, task_pid_nr(current), start, end);
25243 return -EINVAL;
25244 }
25245
25246@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
25247 while (cursor < to) {
25248 if (!devmem_is_allowed(pfn)) {
25249 printk(KERN_INFO
25250- "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
25251- current->comm, from, to);
25252+ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
25253+ current->comm, from, to, cursor);
25254 return 0;
25255 }
25256 cursor += PAGE_SIZE;
25257@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
25258 printk(KERN_INFO
25259 "%s:%d ioremap_change_attr failed %s "
25260 "for %Lx-%Lx\n",
25261- current->comm, current->pid,
25262+ current->comm, task_pid_nr(current),
25263 cattr_name(flags),
25264 base, (unsigned long long)(base + size));
25265 return -EINVAL;
25266@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25267 if (want_flags != flags) {
25268 printk(KERN_WARNING
25269 "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
25270- current->comm, current->pid,
25271+ current->comm, task_pid_nr(current),
25272 cattr_name(want_flags),
25273 (unsigned long long)paddr,
25274 (unsigned long long)(paddr + size),
25275@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25276 free_memtype(paddr, paddr + size);
25277 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
25278 " for %Lx-%Lx, got %s\n",
25279- current->comm, current->pid,
25280+ current->comm, task_pid_nr(current),
25281 cattr_name(want_flags),
25282 (unsigned long long)paddr,
25283 (unsigned long long)(paddr + size),
25284diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
25285index 9f0614d..92ae64a 100644
25286--- a/arch/x86/mm/pf_in.c
25287+++ b/arch/x86/mm/pf_in.c
25288@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
25289 int i;
25290 enum reason_type rv = OTHERS;
25291
25292- p = (unsigned char *)ins_addr;
25293+ p = (unsigned char *)ktla_ktva(ins_addr);
25294 p += skip_prefix(p, &prf);
25295 p += get_opcode(p, &opcode);
25296
25297@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
25298 struct prefix_bits prf;
25299 int i;
25300
25301- p = (unsigned char *)ins_addr;
25302+ p = (unsigned char *)ktla_ktva(ins_addr);
25303 p += skip_prefix(p, &prf);
25304 p += get_opcode(p, &opcode);
25305
25306@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
25307 struct prefix_bits prf;
25308 int i;
25309
25310- p = (unsigned char *)ins_addr;
25311+ p = (unsigned char *)ktla_ktva(ins_addr);
25312 p += skip_prefix(p, &prf);
25313 p += get_opcode(p, &opcode);
25314
25315@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
25316 struct prefix_bits prf;
25317 int i;
25318
25319- p = (unsigned char *)ins_addr;
25320+ p = (unsigned char *)ktla_ktva(ins_addr);
25321 p += skip_prefix(p, &prf);
25322 p += get_opcode(p, &opcode);
25323 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
25324@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
25325 struct prefix_bits prf;
25326 int i;
25327
25328- p = (unsigned char *)ins_addr;
25329+ p = (unsigned char *)ktla_ktva(ins_addr);
25330 p += skip_prefix(p, &prf);
25331 p += get_opcode(p, &opcode);
25332 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
25333diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
25334index 8573b83..c3b1a30 100644
25335--- a/arch/x86/mm/pgtable.c
25336+++ b/arch/x86/mm/pgtable.c
25337@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *pgd)
25338 list_del(&page->lru);
25339 }
25340
25341-#define UNSHARED_PTRS_PER_PGD \
25342- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25343+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25344+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
25345
25346+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25347+{
25348+ while (count--)
25349+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
25350+}
25351+#endif
25352
25353+#ifdef CONFIG_PAX_PER_CPU_PGD
25354+void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25355+{
25356+ while (count--)
25357+
25358+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25359+ *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask);
25360+#else
25361+ *dst++ = *src++;
25362+#endif
25363+
25364+}
25365+#endif
25366+
25367+#ifdef CONFIG_X86_64
25368+#define pxd_t pud_t
25369+#define pyd_t pgd_t
25370+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
25371+#define pxd_free(mm, pud) pud_free((mm), (pud))
25372+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
25373+#define pyd_offset(mm, address) pgd_offset((mm), (address))
25374+#define PYD_SIZE PGDIR_SIZE
25375+#else
25376+#define pxd_t pmd_t
25377+#define pyd_t pud_t
25378+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
25379+#define pxd_free(mm, pud) pmd_free((mm), (pud))
25380+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
25381+#define pyd_offset(mm, address) pud_offset((mm), (address))
25382+#define PYD_SIZE PUD_SIZE
25383+#endif
25384+
25385+#ifdef CONFIG_PAX_PER_CPU_PGD
25386+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
25387+static inline void pgd_dtor(pgd_t *pgd) {}
25388+#else
25389 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
25390 {
25391 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
25392@@ -128,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd)
25393 pgd_list_del(pgd);
25394 spin_unlock(&pgd_lock);
25395 }
25396+#endif
25397
25398 /*
25399 * List of all pgd's needed for non-PAE so it can invalidate entries
25400@@ -140,7 +183,7 @@ static void pgd_dtor(pgd_t *pgd)
25401 * -- wli
25402 */
25403
25404-#ifdef CONFIG_X86_PAE
25405+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25406 /*
25407 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
25408 * updating the top-level pagetable entries to guarantee the
25409@@ -152,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
25410 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
25411 * and initialize the kernel pmds here.
25412 */
25413-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
25414+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25415
25416 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25417 {
25418@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25419 */
25420 flush_tlb_mm(mm);
25421 }
25422+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
25423+#define PREALLOCATED_PXDS USER_PGD_PTRS
25424 #else /* !CONFIG_X86_PAE */
25425
25426 /* No need to prepopulate any pagetable entries in non-PAE modes. */
25427-#define PREALLOCATED_PMDS 0
25428+#define PREALLOCATED_PXDS 0
25429
25430 #endif /* CONFIG_X86_PAE */
25431
25432-static void free_pmds(pmd_t *pmds[])
25433+static void free_pxds(pxd_t *pxds[])
25434 {
25435 int i;
25436
25437- for(i = 0; i < PREALLOCATED_PMDS; i++)
25438- if (pmds[i])
25439- free_page((unsigned long)pmds[i]);
25440+ for(i = 0; i < PREALLOCATED_PXDS; i++)
25441+ if (pxds[i])
25442+ free_page((unsigned long)pxds[i]);
25443 }
25444
25445-static int preallocate_pmds(pmd_t *pmds[])
25446+static int preallocate_pxds(pxd_t *pxds[])
25447 {
25448 int i;
25449 bool failed = false;
25450
25451- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25452- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
25453- if (pmd == NULL)
25454+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25455+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
25456+ if (pxd == NULL)
25457 failed = true;
25458- pmds[i] = pmd;
25459+ pxds[i] = pxd;
25460 }
25461
25462 if (failed) {
25463- free_pmds(pmds);
25464+ free_pxds(pxds);
25465 return -ENOMEM;
25466 }
25467
25468@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[])
25469 * preallocate which never got a corresponding vma will need to be
25470 * freed manually.
25471 */
25472-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
25473+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
25474 {
25475 int i;
25476
25477- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25478+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25479 pgd_t pgd = pgdp[i];
25480
25481 if (pgd_val(pgd) != 0) {
25482- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
25483+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
25484
25485- pgdp[i] = native_make_pgd(0);
25486+ set_pgd(pgdp + i, native_make_pgd(0));
25487
25488- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
25489- pmd_free(mm, pmd);
25490+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
25491+ pxd_free(mm, pxd);
25492 }
25493 }
25494 }
25495
25496-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
25497+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
25498 {
25499- pud_t *pud;
25500+ pyd_t *pyd;
25501 unsigned long addr;
25502 int i;
25503
25504- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
25505+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
25506 return;
25507
25508- pud = pud_offset(pgd, 0);
25509+#ifdef CONFIG_X86_64
25510+ pyd = pyd_offset(mm, 0L);
25511+#else
25512+ pyd = pyd_offset(pgd, 0L);
25513+#endif
25514
25515- for (addr = i = 0; i < PREALLOCATED_PMDS;
25516- i++, pud++, addr += PUD_SIZE) {
25517- pmd_t *pmd = pmds[i];
25518+ for (addr = i = 0; i < PREALLOCATED_PXDS;
25519+ i++, pyd++, addr += PYD_SIZE) {
25520+ pxd_t *pxd = pxds[i];
25521
25522 if (i >= KERNEL_PGD_BOUNDARY)
25523- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25524- sizeof(pmd_t) * PTRS_PER_PMD);
25525+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25526+ sizeof(pxd_t) * PTRS_PER_PMD);
25527
25528- pud_populate(mm, pud, pmd);
25529+ pyd_populate(mm, pyd, pxd);
25530 }
25531 }
25532
25533 pgd_t *pgd_alloc(struct mm_struct *mm)
25534 {
25535 pgd_t *pgd;
25536- pmd_t *pmds[PREALLOCATED_PMDS];
25537+ pxd_t *pxds[PREALLOCATED_PXDS];
25538
25539 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
25540
25541@@ -265,11 +314,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25542
25543 mm->pgd = pgd;
25544
25545- if (preallocate_pmds(pmds) != 0)
25546+ if (preallocate_pxds(pxds) != 0)
25547 goto out_free_pgd;
25548
25549 if (paravirt_pgd_alloc(mm) != 0)
25550- goto out_free_pmds;
25551+ goto out_free_pxds;
25552
25553 /*
25554 * Make sure that pre-populating the pmds is atomic with
25555@@ -279,14 +328,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25556 spin_lock(&pgd_lock);
25557
25558 pgd_ctor(mm, pgd);
25559- pgd_prepopulate_pmd(mm, pgd, pmds);
25560+ pgd_prepopulate_pxd(mm, pgd, pxds);
25561
25562 spin_unlock(&pgd_lock);
25563
25564 return pgd;
25565
25566-out_free_pmds:
25567- free_pmds(pmds);
25568+out_free_pxds:
25569+ free_pxds(pxds);
25570 out_free_pgd:
25571 free_page((unsigned long)pgd);
25572 out:
25573@@ -295,7 +344,7 @@ out:
25574
25575 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
25576 {
25577- pgd_mop_up_pmds(mm, pgd);
25578+ pgd_mop_up_pxds(mm, pgd);
25579 pgd_dtor(pgd);
25580 paravirt_pgd_free(mm, pgd);
25581 free_page((unsigned long)pgd);
25582diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
25583index cac7184..09a39fa 100644
25584--- a/arch/x86/mm/pgtable_32.c
25585+++ b/arch/x86/mm/pgtable_32.c
25586@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
25587 return;
25588 }
25589 pte = pte_offset_kernel(pmd, vaddr);
25590+
25591+ pax_open_kernel();
25592 if (pte_val(pteval))
25593 set_pte_at(&init_mm, vaddr, pte, pteval);
25594 else
25595 pte_clear(&init_mm, vaddr, pte);
25596+ pax_close_kernel();
25597
25598 /*
25599 * It's enough to flush this one mapping.
25600diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
25601index 410531d..0f16030 100644
25602--- a/arch/x86/mm/setup_nx.c
25603+++ b/arch/x86/mm/setup_nx.c
25604@@ -5,8 +5,10 @@
25605 #include <asm/pgtable.h>
25606 #include <asm/proto.h>
25607
25608+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25609 static int disable_nx __cpuinitdata;
25610
25611+#ifndef CONFIG_PAX_PAGEEXEC
25612 /*
25613 * noexec = on|off
25614 *
25615@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
25616 return 0;
25617 }
25618 early_param("noexec", noexec_setup);
25619+#endif
25620+
25621+#endif
25622
25623 void __cpuinit x86_configure_nx(void)
25624 {
25625+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25626 if (cpu_has_nx && !disable_nx)
25627 __supported_pte_mask |= _PAGE_NX;
25628 else
25629+#endif
25630 __supported_pte_mask &= ~_PAGE_NX;
25631 }
25632
25633diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
25634index d6c0418..06a0ad5 100644
25635--- a/arch/x86/mm/tlb.c
25636+++ b/arch/x86/mm/tlb.c
25637@@ -65,7 +65,11 @@ void leave_mm(int cpu)
25638 BUG();
25639 cpumask_clear_cpu(cpu,
25640 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
25641+
25642+#ifndef CONFIG_PAX_PER_CPU_PGD
25643 load_cr3(swapper_pg_dir);
25644+#endif
25645+
25646 }
25647 EXPORT_SYMBOL_GPL(leave_mm);
25648
25649diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
25650index 6687022..ceabcfa 100644
25651--- a/arch/x86/net/bpf_jit.S
25652+++ b/arch/x86/net/bpf_jit.S
25653@@ -9,6 +9,7 @@
25654 */
25655 #include <linux/linkage.h>
25656 #include <asm/dwarf2.h>
25657+#include <asm/alternative-asm.h>
25658
25659 /*
25660 * Calling convention :
25661@@ -35,6 +36,7 @@ sk_load_word:
25662 jle bpf_slow_path_word
25663 mov (SKBDATA,%rsi),%eax
25664 bswap %eax /* ntohl() */
25665+ pax_force_retaddr
25666 ret
25667
25668
25669@@ -53,6 +55,7 @@ sk_load_half:
25670 jle bpf_slow_path_half
25671 movzwl (SKBDATA,%rsi),%eax
25672 rol $8,%ax # ntohs()
25673+ pax_force_retaddr
25674 ret
25675
25676 sk_load_byte_ind:
25677@@ -66,6 +69,7 @@ sk_load_byte:
25678 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
25679 jle bpf_slow_path_byte
25680 movzbl (SKBDATA,%rsi),%eax
25681+ pax_force_retaddr
25682 ret
25683
25684 /**
25685@@ -82,6 +86,7 @@ ENTRY(sk_load_byte_msh)
25686 movzbl (SKBDATA,%rsi),%ebx
25687 and $15,%bl
25688 shl $2,%bl
25689+ pax_force_retaddr
25690 ret
25691 CFI_ENDPROC
25692 ENDPROC(sk_load_byte_msh)
25693@@ -91,6 +96,7 @@ bpf_error:
25694 xor %eax,%eax
25695 mov -8(%rbp),%rbx
25696 leaveq
25697+ pax_force_retaddr
25698 ret
25699
25700 /* rsi contains offset and can be scratched */
25701@@ -113,6 +119,7 @@ bpf_slow_path_word:
25702 js bpf_error
25703 mov -12(%rbp),%eax
25704 bswap %eax
25705+ pax_force_retaddr
25706 ret
25707
25708 bpf_slow_path_half:
25709@@ -121,12 +128,14 @@ bpf_slow_path_half:
25710 mov -12(%rbp),%ax
25711 rol $8,%ax
25712 movzwl %ax,%eax
25713+ pax_force_retaddr
25714 ret
25715
25716 bpf_slow_path_byte:
25717 bpf_slow_path_common(1)
25718 js bpf_error
25719 movzbl -12(%rbp),%eax
25720+ pax_force_retaddr
25721 ret
25722
25723 bpf_slow_path_byte_msh:
25724@@ -137,4 +146,5 @@ bpf_slow_path_byte_msh:
25725 and $15,%al
25726 shl $2,%al
25727 xchg %eax,%ebx
25728+ pax_force_retaddr
25729 ret
25730diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
25731index 7c1b765..8c072c6 100644
25732--- a/arch/x86/net/bpf_jit_comp.c
25733+++ b/arch/x86/net/bpf_jit_comp.c
25734@@ -117,6 +117,10 @@ static inline void bpf_flush_icache(void *start, void *end)
25735 set_fs(old_fs);
25736 }
25737
25738+struct bpf_jit_work {
25739+ struct work_struct work;
25740+ void *image;
25741+};
25742
25743 void bpf_jit_compile(struct sk_filter *fp)
25744 {
25745@@ -141,6 +145,10 @@ void bpf_jit_compile(struct sk_filter *fp)
25746 if (addrs == NULL)
25747 return;
25748
25749+ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
25750+ if (!fp->work)
25751+ goto out;
25752+
25753 /* Before first pass, make a rough estimation of addrs[]
25754 * each bpf instruction is translated to less than 64 bytes
25755 */
25756@@ -476,7 +484,7 @@ void bpf_jit_compile(struct sk_filter *fp)
25757 func = sk_load_word;
25758 common_load: seen |= SEEN_DATAREF;
25759 if ((int)K < 0)
25760- goto out;
25761+ goto error;
25762 t_offset = func - (image + addrs[i]);
25763 EMIT1_off32(0xbe, K); /* mov imm32,%esi */
25764 EMIT1_off32(0xe8, t_offset); /* call */
25765@@ -586,17 +594,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25766 break;
25767 default:
25768 /* hmm, too complex filter, give up with jit compiler */
25769- goto out;
25770+ goto error;
25771 }
25772 ilen = prog - temp;
25773 if (image) {
25774 if (unlikely(proglen + ilen > oldproglen)) {
25775 pr_err("bpb_jit_compile fatal error\n");
25776- kfree(addrs);
25777- module_free(NULL, image);
25778- return;
25779+ module_free_exec(NULL, image);
25780+ goto error;
25781 }
25782+ pax_open_kernel();
25783 memcpy(image + proglen, temp, ilen);
25784+ pax_close_kernel();
25785 }
25786 proglen += ilen;
25787 addrs[i] = proglen;
25788@@ -617,11 +626,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25789 break;
25790 }
25791 if (proglen == oldproglen) {
25792- image = module_alloc(max_t(unsigned int,
25793- proglen,
25794- sizeof(struct work_struct)));
25795+ image = module_alloc_exec(proglen);
25796 if (!image)
25797- goto out;
25798+ goto error;
25799 }
25800 oldproglen = proglen;
25801 }
25802@@ -637,7 +644,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25803 bpf_flush_icache(image, image + proglen);
25804
25805 fp->bpf_func = (void *)image;
25806- }
25807+ } else
25808+error:
25809+ kfree(fp->work);
25810+
25811 out:
25812 kfree(addrs);
25813 return;
25814@@ -645,18 +655,20 @@ out:
25815
25816 static void jit_free_defer(struct work_struct *arg)
25817 {
25818- module_free(NULL, arg);
25819+ module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
25820+ kfree(arg);
25821 }
25822
25823 /* run from softirq, we must use a work_struct to call
25824- * module_free() from process context
25825+ * module_free_exec() from process context
25826 */
25827 void bpf_jit_free(struct sk_filter *fp)
25828 {
25829 if (fp->bpf_func != sk_run_filter) {
25830- struct work_struct *work = (struct work_struct *)fp->bpf_func;
25831+ struct work_struct *work = &fp->work->work;
25832
25833 INIT_WORK(work, jit_free_defer);
25834+ fp->work->image = fp->bpf_func;
25835 schedule_work(work);
25836 }
25837 }
25838diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
25839index bff89df..377758a 100644
25840--- a/arch/x86/oprofile/backtrace.c
25841+++ b/arch/x86/oprofile/backtrace.c
25842@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
25843 struct stack_frame_ia32 *fp;
25844 unsigned long bytes;
25845
25846- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
25847+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
25848 if (bytes != sizeof(bufhead))
25849 return NULL;
25850
25851- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
25852+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
25853
25854 oprofile_add_trace(bufhead[0].return_address);
25855
25856@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
25857 struct stack_frame bufhead[2];
25858 unsigned long bytes;
25859
25860- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
25861+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
25862 if (bytes != sizeof(bufhead))
25863 return NULL;
25864
25865@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
25866 {
25867 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
25868
25869- if (!user_mode_vm(regs)) {
25870+ if (!user_mode(regs)) {
25871 unsigned long stack = kernel_stack_pointer(regs);
25872 if (depth)
25873 dump_trace(NULL, regs, (unsigned long *)stack, 0,
25874diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
25875index cb29191..036766d 100644
25876--- a/arch/x86/pci/mrst.c
25877+++ b/arch/x86/pci/mrst.c
25878@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
25879 printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
25880 pci_mmcfg_late_init();
25881 pcibios_enable_irq = mrst_pci_irq_enable;
25882- pci_root_ops = pci_mrst_ops;
25883+ pax_open_kernel();
25884+ memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
25885+ pax_close_kernel();
25886 /* Continue with standard init */
25887 return 1;
25888 }
25889diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
25890index db0e9a5..0372c14 100644
25891--- a/arch/x86/pci/pcbios.c
25892+++ b/arch/x86/pci/pcbios.c
25893@@ -79,50 +79,93 @@ union bios32 {
25894 static struct {
25895 unsigned long address;
25896 unsigned short segment;
25897-} bios32_indirect = { 0, __KERNEL_CS };
25898+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
25899
25900 /*
25901 * Returns the entry point for the given service, NULL on error
25902 */
25903
25904-static unsigned long bios32_service(unsigned long service)
25905+static unsigned long __devinit bios32_service(unsigned long service)
25906 {
25907 unsigned char return_code; /* %al */
25908 unsigned long address; /* %ebx */
25909 unsigned long length; /* %ecx */
25910 unsigned long entry; /* %edx */
25911 unsigned long flags;
25912+ struct desc_struct d, *gdt;
25913
25914 local_irq_save(flags);
25915- __asm__("lcall *(%%edi); cld"
25916+
25917+ gdt = get_cpu_gdt_table(smp_processor_id());
25918+
25919+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
25920+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
25921+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
25922+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
25923+
25924+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
25925 : "=a" (return_code),
25926 "=b" (address),
25927 "=c" (length),
25928 "=d" (entry)
25929 : "0" (service),
25930 "1" (0),
25931- "D" (&bios32_indirect));
25932+ "D" (&bios32_indirect),
25933+ "r"(__PCIBIOS_DS)
25934+ : "memory");
25935+
25936+ pax_open_kernel();
25937+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
25938+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
25939+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
25940+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
25941+ pax_close_kernel();
25942+
25943 local_irq_restore(flags);
25944
25945 switch (return_code) {
25946- case 0:
25947- return address + entry;
25948- case 0x80: /* Not present */
25949- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
25950- return 0;
25951- default: /* Shouldn't happen */
25952- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
25953- service, return_code);
25954+ case 0: {
25955+ int cpu;
25956+ unsigned char flags;
25957+
25958+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
25959+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
25960+ printk(KERN_WARNING "bios32_service: not valid\n");
25961 return 0;
25962+ }
25963+ address = address + PAGE_OFFSET;
25964+ length += 16UL; /* some BIOSs underreport this... */
25965+ flags = 4;
25966+ if (length >= 64*1024*1024) {
25967+ length >>= PAGE_SHIFT;
25968+ flags |= 8;
25969+ }
25970+
25971+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
25972+ gdt = get_cpu_gdt_table(cpu);
25973+ pack_descriptor(&d, address, length, 0x9b, flags);
25974+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
25975+ pack_descriptor(&d, address, length, 0x93, flags);
25976+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
25977+ }
25978+ return entry;
25979+ }
25980+ case 0x80: /* Not present */
25981+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
25982+ return 0;
25983+ default: /* Shouldn't happen */
25984+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
25985+ service, return_code);
25986+ return 0;
25987 }
25988 }
25989
25990 static struct {
25991 unsigned long address;
25992 unsigned short segment;
25993-} pci_indirect = { 0, __KERNEL_CS };
25994+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
25995
25996-static int pci_bios_present;
25997+static int pci_bios_present __read_only;
25998
25999 static int __devinit check_pcibios(void)
26000 {
26001@@ -131,11 +174,13 @@ static int __devinit check_pcibios(void)
26002 unsigned long flags, pcibios_entry;
26003
26004 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
26005- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
26006+ pci_indirect.address = pcibios_entry;
26007
26008 local_irq_save(flags);
26009- __asm__(
26010- "lcall *(%%edi); cld\n\t"
26011+ __asm__("movw %w6, %%ds\n\t"
26012+ "lcall *%%ss:(%%edi); cld\n\t"
26013+ "push %%ss\n\t"
26014+ "pop %%ds\n\t"
26015 "jc 1f\n\t"
26016 "xor %%ah, %%ah\n"
26017 "1:"
26018@@ -144,7 +189,8 @@ static int __devinit check_pcibios(void)
26019 "=b" (ebx),
26020 "=c" (ecx)
26021 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
26022- "D" (&pci_indirect)
26023+ "D" (&pci_indirect),
26024+ "r" (__PCIBIOS_DS)
26025 : "memory");
26026 local_irq_restore(flags);
26027
26028@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26029
26030 switch (len) {
26031 case 1:
26032- __asm__("lcall *(%%esi); cld\n\t"
26033+ __asm__("movw %w6, %%ds\n\t"
26034+ "lcall *%%ss:(%%esi); cld\n\t"
26035+ "push %%ss\n\t"
26036+ "pop %%ds\n\t"
26037 "jc 1f\n\t"
26038 "xor %%ah, %%ah\n"
26039 "1:"
26040@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26041 : "1" (PCIBIOS_READ_CONFIG_BYTE),
26042 "b" (bx),
26043 "D" ((long)reg),
26044- "S" (&pci_indirect));
26045+ "S" (&pci_indirect),
26046+ "r" (__PCIBIOS_DS));
26047 /*
26048 * Zero-extend the result beyond 8 bits, do not trust the
26049 * BIOS having done it:
26050@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26051 *value &= 0xff;
26052 break;
26053 case 2:
26054- __asm__("lcall *(%%esi); cld\n\t"
26055+ __asm__("movw %w6, %%ds\n\t"
26056+ "lcall *%%ss:(%%esi); cld\n\t"
26057+ "push %%ss\n\t"
26058+ "pop %%ds\n\t"
26059 "jc 1f\n\t"
26060 "xor %%ah, %%ah\n"
26061 "1:"
26062@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26063 : "1" (PCIBIOS_READ_CONFIG_WORD),
26064 "b" (bx),
26065 "D" ((long)reg),
26066- "S" (&pci_indirect));
26067+ "S" (&pci_indirect),
26068+ "r" (__PCIBIOS_DS));
26069 /*
26070 * Zero-extend the result beyond 16 bits, do not trust the
26071 * BIOS having done it:
26072@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26073 *value &= 0xffff;
26074 break;
26075 case 4:
26076- __asm__("lcall *(%%esi); cld\n\t"
26077+ __asm__("movw %w6, %%ds\n\t"
26078+ "lcall *%%ss:(%%esi); cld\n\t"
26079+ "push %%ss\n\t"
26080+ "pop %%ds\n\t"
26081 "jc 1f\n\t"
26082 "xor %%ah, %%ah\n"
26083 "1:"
26084@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26085 : "1" (PCIBIOS_READ_CONFIG_DWORD),
26086 "b" (bx),
26087 "D" ((long)reg),
26088- "S" (&pci_indirect));
26089+ "S" (&pci_indirect),
26090+ "r" (__PCIBIOS_DS));
26091 break;
26092 }
26093
26094@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26095
26096 switch (len) {
26097 case 1:
26098- __asm__("lcall *(%%esi); cld\n\t"
26099+ __asm__("movw %w6, %%ds\n\t"
26100+ "lcall *%%ss:(%%esi); cld\n\t"
26101+ "push %%ss\n\t"
26102+ "pop %%ds\n\t"
26103 "jc 1f\n\t"
26104 "xor %%ah, %%ah\n"
26105 "1:"
26106@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26107 "c" (value),
26108 "b" (bx),
26109 "D" ((long)reg),
26110- "S" (&pci_indirect));
26111+ "S" (&pci_indirect),
26112+ "r" (__PCIBIOS_DS));
26113 break;
26114 case 2:
26115- __asm__("lcall *(%%esi); cld\n\t"
26116+ __asm__("movw %w6, %%ds\n\t"
26117+ "lcall *%%ss:(%%esi); cld\n\t"
26118+ "push %%ss\n\t"
26119+ "pop %%ds\n\t"
26120 "jc 1f\n\t"
26121 "xor %%ah, %%ah\n"
26122 "1:"
26123@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26124 "c" (value),
26125 "b" (bx),
26126 "D" ((long)reg),
26127- "S" (&pci_indirect));
26128+ "S" (&pci_indirect),
26129+ "r" (__PCIBIOS_DS));
26130 break;
26131 case 4:
26132- __asm__("lcall *(%%esi); cld\n\t"
26133+ __asm__("movw %w6, %%ds\n\t"
26134+ "lcall *%%ss:(%%esi); cld\n\t"
26135+ "push %%ss\n\t"
26136+ "pop %%ds\n\t"
26137 "jc 1f\n\t"
26138 "xor %%ah, %%ah\n"
26139 "1:"
26140@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26141 "c" (value),
26142 "b" (bx),
26143 "D" ((long)reg),
26144- "S" (&pci_indirect));
26145+ "S" (&pci_indirect),
26146+ "r" (__PCIBIOS_DS));
26147 break;
26148 }
26149
26150@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26151
26152 DBG("PCI: Fetching IRQ routing table... ");
26153 __asm__("push %%es\n\t"
26154+ "movw %w8, %%ds\n\t"
26155 "push %%ds\n\t"
26156 "pop %%es\n\t"
26157- "lcall *(%%esi); cld\n\t"
26158+ "lcall *%%ss:(%%esi); cld\n\t"
26159 "pop %%es\n\t"
26160+ "push %%ss\n\t"
26161+ "pop %%ds\n"
26162 "jc 1f\n\t"
26163 "xor %%ah, %%ah\n"
26164 "1:"
26165@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26166 "1" (0),
26167 "D" ((long) &opt),
26168 "S" (&pci_indirect),
26169- "m" (opt)
26170+ "m" (opt),
26171+ "r" (__PCIBIOS_DS)
26172 : "memory");
26173 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
26174 if (ret & 0xff00)
26175@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26176 {
26177 int ret;
26178
26179- __asm__("lcall *(%%esi); cld\n\t"
26180+ __asm__("movw %w5, %%ds\n\t"
26181+ "lcall *%%ss:(%%esi); cld\n\t"
26182+ "push %%ss\n\t"
26183+ "pop %%ds\n"
26184 "jc 1f\n\t"
26185 "xor %%ah, %%ah\n"
26186 "1:"
26187@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26188 : "0" (PCIBIOS_SET_PCI_HW_INT),
26189 "b" ((dev->bus->number << 8) | dev->devfn),
26190 "c" ((irq << 8) | (pin + 10)),
26191- "S" (&pci_indirect));
26192+ "S" (&pci_indirect),
26193+ "r" (__PCIBIOS_DS));
26194 return !(ret & 0xff00);
26195 }
26196 EXPORT_SYMBOL(pcibios_set_irq_routing);
26197diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
26198index 40e4469..1ab536e 100644
26199--- a/arch/x86/platform/efi/efi_32.c
26200+++ b/arch/x86/platform/efi/efi_32.c
26201@@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
26202 {
26203 struct desc_ptr gdt_descr;
26204
26205+#ifdef CONFIG_PAX_KERNEXEC
26206+ struct desc_struct d;
26207+#endif
26208+
26209 local_irq_save(efi_rt_eflags);
26210
26211 load_cr3(initial_page_table);
26212 __flush_tlb_all();
26213
26214+#ifdef CONFIG_PAX_KERNEXEC
26215+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
26216+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26217+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
26218+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26219+#endif
26220+
26221 gdt_descr.address = __pa(get_cpu_gdt_table(0));
26222 gdt_descr.size = GDT_SIZE - 1;
26223 load_gdt(&gdt_descr);
26224@@ -58,6 +69,14 @@ void efi_call_phys_epilog(void)
26225 {
26226 struct desc_ptr gdt_descr;
26227
26228+#ifdef CONFIG_PAX_KERNEXEC
26229+ struct desc_struct d;
26230+
26231+ memset(&d, 0, sizeof d);
26232+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26233+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26234+#endif
26235+
26236 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
26237 gdt_descr.size = GDT_SIZE - 1;
26238 load_gdt(&gdt_descr);
26239diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
26240index fbe66e6..c5c0dd2 100644
26241--- a/arch/x86/platform/efi/efi_stub_32.S
26242+++ b/arch/x86/platform/efi/efi_stub_32.S
26243@@ -6,7 +6,9 @@
26244 */
26245
26246 #include <linux/linkage.h>
26247+#include <linux/init.h>
26248 #include <asm/page_types.h>
26249+#include <asm/segment.h>
26250
26251 /*
26252 * efi_call_phys(void *, ...) is a function with variable parameters.
26253@@ -20,7 +22,7 @@
26254 * service functions will comply with gcc calling convention, too.
26255 */
26256
26257-.text
26258+__INIT
26259 ENTRY(efi_call_phys)
26260 /*
26261 * 0. The function can only be called in Linux kernel. So CS has been
26262@@ -36,9 +38,11 @@ ENTRY(efi_call_phys)
26263 * The mapping of lower virtual memory has been created in prelog and
26264 * epilog.
26265 */
26266- movl $1f, %edx
26267- subl $__PAGE_OFFSET, %edx
26268- jmp *%edx
26269+ movl $(__KERNEXEC_EFI_DS), %edx
26270+ mov %edx, %ds
26271+ mov %edx, %es
26272+ mov %edx, %ss
26273+ ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
26274 1:
26275
26276 /*
26277@@ -47,14 +51,8 @@ ENTRY(efi_call_phys)
26278 * parameter 2, ..., param n. To make things easy, we save the return
26279 * address of efi_call_phys in a global variable.
26280 */
26281- popl %edx
26282- movl %edx, saved_return_addr
26283- /* get the function pointer into ECX*/
26284- popl %ecx
26285- movl %ecx, efi_rt_function_ptr
26286- movl $2f, %edx
26287- subl $__PAGE_OFFSET, %edx
26288- pushl %edx
26289+ popl (saved_return_addr)
26290+ popl (efi_rt_function_ptr)
26291
26292 /*
26293 * 3. Clear PG bit in %CR0.
26294@@ -73,9 +71,8 @@ ENTRY(efi_call_phys)
26295 /*
26296 * 5. Call the physical function.
26297 */
26298- jmp *%ecx
26299+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
26300
26301-2:
26302 /*
26303 * 6. After EFI runtime service returns, control will return to
26304 * following instruction. We'd better readjust stack pointer first.
26305@@ -88,35 +85,32 @@ ENTRY(efi_call_phys)
26306 movl %cr0, %edx
26307 orl $0x80000000, %edx
26308 movl %edx, %cr0
26309- jmp 1f
26310-1:
26311+
26312 /*
26313 * 8. Now restore the virtual mode from flat mode by
26314 * adding EIP with PAGE_OFFSET.
26315 */
26316- movl $1f, %edx
26317- jmp *%edx
26318+ ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
26319 1:
26320+ movl $(__KERNEL_DS), %edx
26321+ mov %edx, %ds
26322+ mov %edx, %es
26323+ mov %edx, %ss
26324
26325 /*
26326 * 9. Balance the stack. And because EAX contain the return value,
26327 * we'd better not clobber it.
26328 */
26329- leal efi_rt_function_ptr, %edx
26330- movl (%edx), %ecx
26331- pushl %ecx
26332+ pushl (efi_rt_function_ptr)
26333
26334 /*
26335- * 10. Push the saved return address onto the stack and return.
26336+ * 10. Return to the saved return address.
26337 */
26338- leal saved_return_addr, %edx
26339- movl (%edx), %ecx
26340- pushl %ecx
26341- ret
26342+ jmpl *(saved_return_addr)
26343 ENDPROC(efi_call_phys)
26344 .previous
26345
26346-.data
26347+__INITDATA
26348 saved_return_addr:
26349 .long 0
26350 efi_rt_function_ptr:
26351diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
26352index 4c07cca..2c8427d 100644
26353--- a/arch/x86/platform/efi/efi_stub_64.S
26354+++ b/arch/x86/platform/efi/efi_stub_64.S
26355@@ -7,6 +7,7 @@
26356 */
26357
26358 #include <linux/linkage.h>
26359+#include <asm/alternative-asm.h>
26360
26361 #define SAVE_XMM \
26362 mov %rsp, %rax; \
26363@@ -40,6 +41,7 @@ ENTRY(efi_call0)
26364 call *%rdi
26365 addq $32, %rsp
26366 RESTORE_XMM
26367+ pax_force_retaddr 0, 1
26368 ret
26369 ENDPROC(efi_call0)
26370
26371@@ -50,6 +52,7 @@ ENTRY(efi_call1)
26372 call *%rdi
26373 addq $32, %rsp
26374 RESTORE_XMM
26375+ pax_force_retaddr 0, 1
26376 ret
26377 ENDPROC(efi_call1)
26378
26379@@ -60,6 +63,7 @@ ENTRY(efi_call2)
26380 call *%rdi
26381 addq $32, %rsp
26382 RESTORE_XMM
26383+ pax_force_retaddr 0, 1
26384 ret
26385 ENDPROC(efi_call2)
26386
26387@@ -71,6 +75,7 @@ ENTRY(efi_call3)
26388 call *%rdi
26389 addq $32, %rsp
26390 RESTORE_XMM
26391+ pax_force_retaddr 0, 1
26392 ret
26393 ENDPROC(efi_call3)
26394
26395@@ -83,6 +88,7 @@ ENTRY(efi_call4)
26396 call *%rdi
26397 addq $32, %rsp
26398 RESTORE_XMM
26399+ pax_force_retaddr 0, 1
26400 ret
26401 ENDPROC(efi_call4)
26402
26403@@ -96,6 +102,7 @@ ENTRY(efi_call5)
26404 call *%rdi
26405 addq $48, %rsp
26406 RESTORE_XMM
26407+ pax_force_retaddr 0, 1
26408 ret
26409 ENDPROC(efi_call5)
26410
26411@@ -112,5 +119,6 @@ ENTRY(efi_call6)
26412 call *%rdi
26413 addq $48, %rsp
26414 RESTORE_XMM
26415+ pax_force_retaddr 0, 1
26416 ret
26417 ENDPROC(efi_call6)
26418diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
26419index ad4ec1c..686479e 100644
26420--- a/arch/x86/platform/mrst/mrst.c
26421+++ b/arch/x86/platform/mrst/mrst.c
26422@@ -76,18 +76,20 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
26423 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
26424 int sfi_mrtc_num;
26425
26426-static void mrst_power_off(void)
26427+static __noreturn void mrst_power_off(void)
26428 {
26429 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
26430 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 1);
26431+ BUG();
26432 }
26433
26434-static void mrst_reboot(void)
26435+static __noreturn void mrst_reboot(void)
26436 {
26437 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
26438 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0);
26439 else
26440 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
26441+ BUG();
26442 }
26443
26444 /* parse all the mtimer info to a static mtimer array */
26445diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
26446index 81aee5a..9ad9aae 100644
26447--- a/arch/x86/platform/uv/tlb_uv.c
26448+++ b/arch/x86/platform/uv/tlb_uv.c
26449@@ -1433,6 +1433,8 @@ static ssize_t tunables_read(struct file *file, char __user *userbuf,
26450 * 0: display meaning of the statistics
26451 */
26452 static ssize_t ptc_proc_write(struct file *file, const char __user *user,
26453+ size_t count, loff_t *data) __size_overflow(3);
26454+static ssize_t ptc_proc_write(struct file *file, const char __user *user,
26455 size_t count, loff_t *data)
26456 {
26457 int cpu;
26458@@ -1548,6 +1550,8 @@ static int parse_tunables_write(struct bau_control *bcp, char *instr,
26459 * Handle a write to debugfs. (/sys/kernel/debug/sgi_uv/bau_tunables)
26460 */
26461 static ssize_t tunables_write(struct file *file, const char __user *user,
26462+ size_t count, loff_t *data) __size_overflow(3);
26463+static ssize_t tunables_write(struct file *file, const char __user *user,
26464 size_t count, loff_t *data)
26465 {
26466 int cpu;
26467diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
26468index f10c0af..3ec1f95 100644
26469--- a/arch/x86/power/cpu.c
26470+++ b/arch/x86/power/cpu.c
26471@@ -131,7 +131,7 @@ static void do_fpu_end(void)
26472 static void fix_processor_context(void)
26473 {
26474 int cpu = smp_processor_id();
26475- struct tss_struct *t = &per_cpu(init_tss, cpu);
26476+ struct tss_struct *t = init_tss + cpu;
26477
26478 set_tss_desc(cpu, t); /*
26479 * This just modifies memory; should not be
26480@@ -141,7 +141,9 @@ static void fix_processor_context(void)
26481 */
26482
26483 #ifdef CONFIG_X86_64
26484+ pax_open_kernel();
26485 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
26486+ pax_close_kernel();
26487
26488 syscall_init(); /* This sets MSR_*STAR and related */
26489 #endif
26490diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
26491index 5d17950..2253fc9 100644
26492--- a/arch/x86/vdso/Makefile
26493+++ b/arch/x86/vdso/Makefile
26494@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO $@
26495 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
26496 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
26497
26498-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26499+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26500 GCOV_PROFILE := n
26501
26502 #
26503diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
26504index 468d591..8e80a0a 100644
26505--- a/arch/x86/vdso/vdso32-setup.c
26506+++ b/arch/x86/vdso/vdso32-setup.c
26507@@ -25,6 +25,7 @@
26508 #include <asm/tlbflush.h>
26509 #include <asm/vdso.h>
26510 #include <asm/proto.h>
26511+#include <asm/mman.h>
26512
26513 enum {
26514 VDSO_DISABLED = 0,
26515@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
26516 void enable_sep_cpu(void)
26517 {
26518 int cpu = get_cpu();
26519- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26520+ struct tss_struct *tss = init_tss + cpu;
26521
26522 if (!boot_cpu_has(X86_FEATURE_SEP)) {
26523 put_cpu();
26524@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
26525 gate_vma.vm_start = FIXADDR_USER_START;
26526 gate_vma.vm_end = FIXADDR_USER_END;
26527 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
26528- gate_vma.vm_page_prot = __P101;
26529+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
26530 /*
26531 * Make sure the vDSO gets into every core dump.
26532 * Dumping its contents makes post-mortem fully interpretable later
26533@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26534 if (compat)
26535 addr = VDSO_HIGH_BASE;
26536 else {
26537- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
26538+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
26539 if (IS_ERR_VALUE(addr)) {
26540 ret = addr;
26541 goto up_fail;
26542 }
26543 }
26544
26545- current->mm->context.vdso = (void *)addr;
26546+ current->mm->context.vdso = addr;
26547
26548 if (compat_uses_vma || !compat) {
26549 /*
26550@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26551 }
26552
26553 current_thread_info()->sysenter_return =
26554- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26555+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26556
26557 up_fail:
26558 if (ret)
26559- current->mm->context.vdso = NULL;
26560+ current->mm->context.vdso = 0;
26561
26562 up_write(&mm->mmap_sem);
26563
26564@@ -412,8 +413,14 @@ __initcall(ia32_binfmt_init);
26565
26566 const char *arch_vma_name(struct vm_area_struct *vma)
26567 {
26568- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
26569+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
26570 return "[vdso]";
26571+
26572+#ifdef CONFIG_PAX_SEGMEXEC
26573+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
26574+ return "[vdso]";
26575+#endif
26576+
26577 return NULL;
26578 }
26579
26580@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
26581 * Check to see if the corresponding task was created in compat vdso
26582 * mode.
26583 */
26584- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
26585+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
26586 return &gate_vma;
26587 return NULL;
26588 }
26589diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
26590index 153407c..611cba9 100644
26591--- a/arch/x86/vdso/vma.c
26592+++ b/arch/x86/vdso/vma.c
26593@@ -16,8 +16,6 @@
26594 #include <asm/vdso.h>
26595 #include <asm/page.h>
26596
26597-unsigned int __read_mostly vdso_enabled = 1;
26598-
26599 extern char vdso_start[], vdso_end[];
26600 extern unsigned short vdso_sync_cpuid;
26601
26602@@ -96,7 +94,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26603 * unaligned here as a result of stack start randomization.
26604 */
26605 addr = PAGE_ALIGN(addr);
26606- addr = align_addr(addr, NULL, ALIGN_VDSO);
26607
26608 return addr;
26609 }
26610@@ -106,40 +103,35 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26611 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26612 {
26613 struct mm_struct *mm = current->mm;
26614- unsigned long addr;
26615+ unsigned long addr = 0;
26616 int ret;
26617
26618- if (!vdso_enabled)
26619- return 0;
26620-
26621 down_write(&mm->mmap_sem);
26622+
26623+#ifdef CONFIG_PAX_RANDMMAP
26624+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26625+#endif
26626+
26627 addr = vdso_addr(mm->start_stack, vdso_size);
26628+ addr = align_addr(addr, NULL, ALIGN_VDSO);
26629 addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
26630 if (IS_ERR_VALUE(addr)) {
26631 ret = addr;
26632 goto up_fail;
26633 }
26634
26635- current->mm->context.vdso = (void *)addr;
26636+ mm->context.vdso = addr;
26637
26638 ret = install_special_mapping(mm, addr, vdso_size,
26639 VM_READ|VM_EXEC|
26640 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
26641 VM_ALWAYSDUMP,
26642 vdso_pages);
26643- if (ret) {
26644- current->mm->context.vdso = NULL;
26645- goto up_fail;
26646- }
26647+
26648+ if (ret)
26649+ mm->context.vdso = 0;
26650
26651 up_fail:
26652 up_write(&mm->mmap_sem);
26653 return ret;
26654 }
26655-
26656-static __init int vdso_setup(char *s)
26657-{
26658- vdso_enabled = simple_strtoul(s, NULL, 0);
26659- return 0;
26660-}
26661-__setup("vdso=", vdso_setup);
26662diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
26663index 1f92865..c843b20 100644
26664--- a/arch/x86/xen/enlighten.c
26665+++ b/arch/x86/xen/enlighten.c
26666@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
26667
26668 struct shared_info xen_dummy_shared_info;
26669
26670-void *xen_initial_gdt;
26671-
26672 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
26673 __read_mostly int xen_have_vector_callback;
26674 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
26675@@ -1029,7 +1027,7 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
26676 #endif
26677 };
26678
26679-static void xen_reboot(int reason)
26680+static __noreturn void xen_reboot(int reason)
26681 {
26682 struct sched_shutdown r = { .reason = reason };
26683
26684@@ -1037,17 +1035,17 @@ static void xen_reboot(int reason)
26685 BUG();
26686 }
26687
26688-static void xen_restart(char *msg)
26689+static __noreturn void xen_restart(char *msg)
26690 {
26691 xen_reboot(SHUTDOWN_reboot);
26692 }
26693
26694-static void xen_emergency_restart(void)
26695+static __noreturn void xen_emergency_restart(void)
26696 {
26697 xen_reboot(SHUTDOWN_reboot);
26698 }
26699
26700-static void xen_machine_halt(void)
26701+static __noreturn void xen_machine_halt(void)
26702 {
26703 xen_reboot(SHUTDOWN_poweroff);
26704 }
26705@@ -1153,7 +1151,17 @@ asmlinkage void __init xen_start_kernel(void)
26706 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
26707
26708 /* Work out if we support NX */
26709- x86_configure_nx();
26710+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
26711+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
26712+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
26713+ unsigned l, h;
26714+
26715+ __supported_pte_mask |= _PAGE_NX;
26716+ rdmsr(MSR_EFER, l, h);
26717+ l |= EFER_NX;
26718+ wrmsr(MSR_EFER, l, h);
26719+ }
26720+#endif
26721
26722 xen_setup_features();
26723
26724@@ -1184,13 +1192,6 @@ asmlinkage void __init xen_start_kernel(void)
26725
26726 machine_ops = xen_machine_ops;
26727
26728- /*
26729- * The only reliable way to retain the initial address of the
26730- * percpu gdt_page is to remember it here, so we can go and
26731- * mark it RW later, when the initial percpu area is freed.
26732- */
26733- xen_initial_gdt = &per_cpu(gdt_page, 0);
26734-
26735 xen_smp_init();
26736
26737 #ifdef CONFIG_ACPI_NUMA
26738diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
26739index 87f6673..e2555a6 100644
26740--- a/arch/x86/xen/mmu.c
26741+++ b/arch/x86/xen/mmu.c
26742@@ -1733,6 +1733,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
26743 convert_pfn_mfn(init_level4_pgt);
26744 convert_pfn_mfn(level3_ident_pgt);
26745 convert_pfn_mfn(level3_kernel_pgt);
26746+ convert_pfn_mfn(level3_vmalloc_start_pgt);
26747+ convert_pfn_mfn(level3_vmalloc_end_pgt);
26748+ convert_pfn_mfn(level3_vmemmap_pgt);
26749
26750 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
26751 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
26752@@ -1751,7 +1754,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
26753 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
26754 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
26755 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
26756+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
26757+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
26758+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
26759 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
26760+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
26761 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
26762 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
26763
26764@@ -1962,6 +1969,7 @@ static void __init xen_post_allocator_init(void)
26765 pv_mmu_ops.set_pud = xen_set_pud;
26766 #if PAGETABLE_LEVELS == 4
26767 pv_mmu_ops.set_pgd = xen_set_pgd;
26768+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
26769 #endif
26770
26771 /* This will work as long as patching hasn't happened yet
26772@@ -2043,6 +2051,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
26773 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
26774 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
26775 .set_pgd = xen_set_pgd_hyper,
26776+ .set_pgd_batched = xen_set_pgd_hyper,
26777
26778 .alloc_pud = xen_alloc_pmd_init,
26779 .release_pud = xen_release_pmd_init,
26780diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
26781index 041d4fe..7666b7e 100644
26782--- a/arch/x86/xen/smp.c
26783+++ b/arch/x86/xen/smp.c
26784@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
26785 {
26786 BUG_ON(smp_processor_id() != 0);
26787 native_smp_prepare_boot_cpu();
26788-
26789- /* We've switched to the "real" per-cpu gdt, so make sure the
26790- old memory can be recycled */
26791- make_lowmem_page_readwrite(xen_initial_gdt);
26792-
26793 xen_filter_cpu_maps();
26794 xen_setup_vcpu_info_placement();
26795 }
26796@@ -275,12 +270,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
26797 gdt = get_cpu_gdt_table(cpu);
26798
26799 ctxt->flags = VGCF_IN_KERNEL;
26800- ctxt->user_regs.ds = __USER_DS;
26801- ctxt->user_regs.es = __USER_DS;
26802+ ctxt->user_regs.ds = __KERNEL_DS;
26803+ ctxt->user_regs.es = __KERNEL_DS;
26804 ctxt->user_regs.ss = __KERNEL_DS;
26805 #ifdef CONFIG_X86_32
26806 ctxt->user_regs.fs = __KERNEL_PERCPU;
26807- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
26808+ savesegment(gs, ctxt->user_regs.gs);
26809 #else
26810 ctxt->gs_base_kernel = per_cpu_offset(cpu);
26811 #endif
26812@@ -331,13 +326,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
26813 int rc;
26814
26815 per_cpu(current_task, cpu) = idle;
26816+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
26817 #ifdef CONFIG_X86_32
26818 irq_ctx_init(cpu);
26819 #else
26820 clear_tsk_thread_flag(idle, TIF_FORK);
26821- per_cpu(kernel_stack, cpu) =
26822- (unsigned long)task_stack_page(idle) -
26823- KERNEL_STACK_OFFSET + THREAD_SIZE;
26824+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
26825 #endif
26826 xen_setup_runstate_info(cpu);
26827 xen_setup_timer(cpu);
26828diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
26829index b040b0e..8cc4fe0 100644
26830--- a/arch/x86/xen/xen-asm_32.S
26831+++ b/arch/x86/xen/xen-asm_32.S
26832@@ -83,14 +83,14 @@ ENTRY(xen_iret)
26833 ESP_OFFSET=4 # bytes pushed onto stack
26834
26835 /*
26836- * Store vcpu_info pointer for easy access. Do it this way to
26837- * avoid having to reload %fs
26838+ * Store vcpu_info pointer for easy access.
26839 */
26840 #ifdef CONFIG_SMP
26841- GET_THREAD_INFO(%eax)
26842- movl TI_cpu(%eax), %eax
26843- movl __per_cpu_offset(,%eax,4), %eax
26844- mov xen_vcpu(%eax), %eax
26845+ push %fs
26846+ mov $(__KERNEL_PERCPU), %eax
26847+ mov %eax, %fs
26848+ mov PER_CPU_VAR(xen_vcpu), %eax
26849+ pop %fs
26850 #else
26851 movl xen_vcpu, %eax
26852 #endif
26853diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
26854index aaa7291..3f77960 100644
26855--- a/arch/x86/xen/xen-head.S
26856+++ b/arch/x86/xen/xen-head.S
26857@@ -19,6 +19,17 @@ ENTRY(startup_xen)
26858 #ifdef CONFIG_X86_32
26859 mov %esi,xen_start_info
26860 mov $init_thread_union+THREAD_SIZE,%esp
26861+#ifdef CONFIG_SMP
26862+ movl $cpu_gdt_table,%edi
26863+ movl $__per_cpu_load,%eax
26864+ movw %ax,__KERNEL_PERCPU + 2(%edi)
26865+ rorl $16,%eax
26866+ movb %al,__KERNEL_PERCPU + 4(%edi)
26867+ movb %ah,__KERNEL_PERCPU + 7(%edi)
26868+ movl $__per_cpu_end - 1,%eax
26869+ subl $__per_cpu_start,%eax
26870+ movw %ax,__KERNEL_PERCPU + 0(%edi)
26871+#endif
26872 #else
26873 mov %rsi,xen_start_info
26874 mov $init_thread_union+THREAD_SIZE,%rsp
26875diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
26876index b095739..8c17bcd 100644
26877--- a/arch/x86/xen/xen-ops.h
26878+++ b/arch/x86/xen/xen-ops.h
26879@@ -10,8 +10,6 @@
26880 extern const char xen_hypervisor_callback[];
26881 extern const char xen_failsafe_callback[];
26882
26883-extern void *xen_initial_gdt;
26884-
26885 struct trap_info;
26886 void xen_copy_trap_info(struct trap_info *traps);
26887
26888diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
26889index 525bd3d..ef888b1 100644
26890--- a/arch/xtensa/variants/dc232b/include/variant/core.h
26891+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
26892@@ -119,9 +119,9 @@
26893 ----------------------------------------------------------------------*/
26894
26895 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
26896-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
26897 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
26898 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
26899+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26900
26901 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
26902 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
26903diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
26904index 2f33760..835e50a 100644
26905--- a/arch/xtensa/variants/fsf/include/variant/core.h
26906+++ b/arch/xtensa/variants/fsf/include/variant/core.h
26907@@ -11,6 +11,7 @@
26908 #ifndef _XTENSA_CORE_H
26909 #define _XTENSA_CORE_H
26910
26911+#include <linux/const.h>
26912
26913 /****************************************************************************
26914 Parameters Useful for Any Code, USER or PRIVILEGED
26915@@ -112,9 +113,9 @@
26916 ----------------------------------------------------------------------*/
26917
26918 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
26919-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
26920 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
26921 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
26922+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26923
26924 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
26925 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
26926diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
26927index af00795..2bb8105 100644
26928--- a/arch/xtensa/variants/s6000/include/variant/core.h
26929+++ b/arch/xtensa/variants/s6000/include/variant/core.h
26930@@ -11,6 +11,7 @@
26931 #ifndef _XTENSA_CORE_CONFIGURATION_H
26932 #define _XTENSA_CORE_CONFIGURATION_H
26933
26934+#include <linux/const.h>
26935
26936 /****************************************************************************
26937 Parameters Useful for Any Code, USER or PRIVILEGED
26938@@ -118,9 +119,9 @@
26939 ----------------------------------------------------------------------*/
26940
26941 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
26942-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
26943 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
26944 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
26945+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26946
26947 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
26948 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
26949diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
26950index 58916af..9cb880b 100644
26951--- a/block/blk-iopoll.c
26952+++ b/block/blk-iopoll.c
26953@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
26954 }
26955 EXPORT_SYMBOL(blk_iopoll_complete);
26956
26957-static void blk_iopoll_softirq(struct softirq_action *h)
26958+static void blk_iopoll_softirq(void)
26959 {
26960 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
26961 int rearm = 0, budget = blk_iopoll_budget;
26962diff --git a/block/blk-map.c b/block/blk-map.c
26963index 623e1cd..ca1e109 100644
26964--- a/block/blk-map.c
26965+++ b/block/blk-map.c
26966@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
26967 if (!len || !kbuf)
26968 return -EINVAL;
26969
26970- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
26971+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
26972 if (do_copy)
26973 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
26974 else
26975diff --git a/block/blk-softirq.c b/block/blk-softirq.c
26976index 1366a89..e17f54b 100644
26977--- a/block/blk-softirq.c
26978+++ b/block/blk-softirq.c
26979@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
26980 * Softirq action handler - move entries to local list and loop over them
26981 * while passing them to the queue registered handler.
26982 */
26983-static void blk_done_softirq(struct softirq_action *h)
26984+static void blk_done_softirq(void)
26985 {
26986 struct list_head *cpu_list, local_list;
26987
26988diff --git a/block/bsg.c b/block/bsg.c
26989index c0ab25c..9d49f8f 100644
26990--- a/block/bsg.c
26991+++ b/block/bsg.c
26992@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
26993 struct sg_io_v4 *hdr, struct bsg_device *bd,
26994 fmode_t has_write_perm)
26995 {
26996+ unsigned char tmpcmd[sizeof(rq->__cmd)];
26997+ unsigned char *cmdptr;
26998+
26999 if (hdr->request_len > BLK_MAX_CDB) {
27000 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
27001 if (!rq->cmd)
27002 return -ENOMEM;
27003- }
27004+ cmdptr = rq->cmd;
27005+ } else
27006+ cmdptr = tmpcmd;
27007
27008- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
27009+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
27010 hdr->request_len))
27011 return -EFAULT;
27012
27013+ if (cmdptr != rq->cmd)
27014+ memcpy(rq->cmd, cmdptr, hdr->request_len);
27015+
27016 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
27017 if (blk_verify_command(rq->cmd, has_write_perm))
27018 return -EPERM;
27019diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
27020index 7b72502..646105c 100644
27021--- a/block/compat_ioctl.c
27022+++ b/block/compat_ioctl.c
27023@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
27024 err |= __get_user(f->spec1, &uf->spec1);
27025 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
27026 err |= __get_user(name, &uf->name);
27027- f->name = compat_ptr(name);
27028+ f->name = (void __force_kernel *)compat_ptr(name);
27029 if (err) {
27030 err = -EFAULT;
27031 goto out;
27032diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
27033index 688be8a..8a37d98 100644
27034--- a/block/scsi_ioctl.c
27035+++ b/block/scsi_ioctl.c
27036@@ -223,8 +223,20 @@ EXPORT_SYMBOL(blk_verify_command);
27037 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
27038 struct sg_io_hdr *hdr, fmode_t mode)
27039 {
27040- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
27041+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27042+ unsigned char *cmdptr;
27043+
27044+ if (rq->cmd != rq->__cmd)
27045+ cmdptr = rq->cmd;
27046+ else
27047+ cmdptr = tmpcmd;
27048+
27049+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
27050 return -EFAULT;
27051+
27052+ if (cmdptr != rq->cmd)
27053+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
27054+
27055 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
27056 return -EPERM;
27057
27058@@ -433,6 +445,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27059 int err;
27060 unsigned int in_len, out_len, bytes, opcode, cmdlen;
27061 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
27062+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27063+ unsigned char *cmdptr;
27064
27065 if (!sic)
27066 return -EINVAL;
27067@@ -466,9 +480,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27068 */
27069 err = -EFAULT;
27070 rq->cmd_len = cmdlen;
27071- if (copy_from_user(rq->cmd, sic->data, cmdlen))
27072+
27073+ if (rq->cmd != rq->__cmd)
27074+ cmdptr = rq->cmd;
27075+ else
27076+ cmdptr = tmpcmd;
27077+
27078+ if (copy_from_user(cmdptr, sic->data, cmdlen))
27079 goto error;
27080
27081+ if (rq->cmd != cmdptr)
27082+ memcpy(rq->cmd, cmdptr, cmdlen);
27083+
27084 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
27085 goto error;
27086
27087diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
27088index a0f768c..1da9c73 100644
27089--- a/crypto/ablkcipher.c
27090+++ b/crypto/ablkcipher.c
27091@@ -307,6 +307,8 @@ int ablkcipher_walk_phys(struct ablkcipher_request *req,
27092 EXPORT_SYMBOL_GPL(ablkcipher_walk_phys);
27093
27094 static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27095+ unsigned int keylen) __size_overflow(3);
27096+static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27097 unsigned int keylen)
27098 {
27099 struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
27100@@ -329,6 +331,8 @@ static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27101 }
27102
27103 static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
27104+ unsigned int keylen) __size_overflow(3);
27105+static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
27106 unsigned int keylen)
27107 {
27108 struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
27109diff --git a/crypto/aead.c b/crypto/aead.c
27110index 04add3dc..983032f 100644
27111--- a/crypto/aead.c
27112+++ b/crypto/aead.c
27113@@ -27,6 +27,8 @@
27114 #include "internal.h"
27115
27116 static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27117+ unsigned int keylen) __size_overflow(3);
27118+static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27119 unsigned int keylen)
27120 {
27121 struct aead_alg *aead = crypto_aead_alg(tfm);
27122@@ -48,6 +50,7 @@ static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27123 return ret;
27124 }
27125
27126+static int setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27127 static int setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
27128 {
27129 struct aead_alg *aead = crypto_aead_alg(tfm);
27130diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
27131index 1e61d1a..cf06b86 100644
27132--- a/crypto/blkcipher.c
27133+++ b/crypto/blkcipher.c
27134@@ -359,6 +359,8 @@ int blkcipher_walk_virt_block(struct blkcipher_desc *desc,
27135 EXPORT_SYMBOL_GPL(blkcipher_walk_virt_block);
27136
27137 static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27138+ unsigned int keylen) __size_overflow(3);
27139+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27140 unsigned int keylen)
27141 {
27142 struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
27143@@ -380,6 +382,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27144 return ret;
27145 }
27146
27147+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27148 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
27149 {
27150 struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
27151diff --git a/crypto/cipher.c b/crypto/cipher.c
27152index 39541e0..802d956 100644
27153--- a/crypto/cipher.c
27154+++ b/crypto/cipher.c
27155@@ -21,6 +21,8 @@
27156 #include "internal.h"
27157
27158 static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27159+ unsigned int keylen) __size_overflow(3);
27160+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27161 unsigned int keylen)
27162 {
27163 struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
27164@@ -43,6 +45,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27165
27166 }
27167
27168+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27169 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
27170 {
27171 struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
27172diff --git a/crypto/cryptd.c b/crypto/cryptd.c
27173index 671d4d6..5f24030 100644
27174--- a/crypto/cryptd.c
27175+++ b/crypto/cryptd.c
27176@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
27177
27178 struct cryptd_blkcipher_request_ctx {
27179 crypto_completion_t complete;
27180-};
27181+} __no_const;
27182
27183 struct cryptd_hash_ctx {
27184 struct crypto_shash *child;
27185@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
27186
27187 struct cryptd_aead_request_ctx {
27188 crypto_completion_t complete;
27189-};
27190+} __no_const;
27191
27192 static void cryptd_queue_worker(struct work_struct *work);
27193
27194diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
27195index 5d41894..22021e4 100644
27196--- a/drivers/acpi/apei/cper.c
27197+++ b/drivers/acpi/apei/cper.c
27198@@ -38,12 +38,12 @@
27199 */
27200 u64 cper_next_record_id(void)
27201 {
27202- static atomic64_t seq;
27203+ static atomic64_unchecked_t seq;
27204
27205- if (!atomic64_read(&seq))
27206- atomic64_set(&seq, ((u64)get_seconds()) << 32);
27207+ if (!atomic64_read_unchecked(&seq))
27208+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
27209
27210- return atomic64_inc_return(&seq);
27211+ return atomic64_inc_return_unchecked(&seq);
27212 }
27213 EXPORT_SYMBOL_GPL(cper_next_record_id);
27214
27215diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
27216index 7711d94..8622811 100644
27217--- a/drivers/acpi/battery.c
27218+++ b/drivers/acpi/battery.c
27219@@ -787,6 +787,9 @@ static int acpi_battery_print_alarm(struct seq_file *seq, int result)
27220
27221 static ssize_t acpi_battery_write_alarm(struct file *file,
27222 const char __user * buffer,
27223+ size_t count, loff_t * ppos) __size_overflow(3);
27224+static ssize_t acpi_battery_write_alarm(struct file *file,
27225+ const char __user * buffer,
27226 size_t count, loff_t * ppos)
27227 {
27228 int result = 0;
27229diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
27230index 6c47ae9..abfdd63 100644
27231--- a/drivers/acpi/ec_sys.c
27232+++ b/drivers/acpi/ec_sys.c
27233@@ -12,6 +12,7 @@
27234 #include <linux/acpi.h>
27235 #include <linux/debugfs.h>
27236 #include <linux/module.h>
27237+#include <linux/uaccess.h>
27238 #include "internal.h"
27239
27240 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
27241@@ -40,7 +41,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27242 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
27243 */
27244 unsigned int size = EC_SPACE_SIZE;
27245- u8 *data = (u8 *) buf;
27246+ u8 data;
27247 loff_t init_off = *off;
27248 int err = 0;
27249
27250@@ -53,9 +54,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27251 size = count;
27252
27253 while (size) {
27254- err = ec_read(*off, &data[*off - init_off]);
27255+ err = ec_read(*off, &data);
27256 if (err)
27257 return err;
27258+ if (put_user(data, &buf[*off - init_off]))
27259+ return -EFAULT;
27260 *off += 1;
27261 size--;
27262 }
27263@@ -71,7 +74,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27264
27265 unsigned int size = count;
27266 loff_t init_off = *off;
27267- u8 *data = (u8 *) buf;
27268 int err = 0;
27269
27270 if (*off >= EC_SPACE_SIZE)
27271@@ -82,7 +84,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27272 }
27273
27274 while (size) {
27275- u8 byte_write = data[*off - init_off];
27276+ u8 byte_write;
27277+ if (get_user(byte_write, &buf[*off - init_off]))
27278+ return -EFAULT;
27279 err = ec_write(*off, byte_write);
27280 if (err)
27281 return err;
27282diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
27283index 251c7b62..000462d 100644
27284--- a/drivers/acpi/proc.c
27285+++ b/drivers/acpi/proc.c
27286@@ -343,19 +343,13 @@ acpi_system_write_wakeup_device(struct file *file,
27287 size_t count, loff_t * ppos)
27288 {
27289 struct list_head *node, *next;
27290- char strbuf[5];
27291- char str[5] = "";
27292- unsigned int len = count;
27293+ char strbuf[5] = {0};
27294
27295- if (len > 4)
27296- len = 4;
27297- if (len < 0)
27298+ if (count > 4)
27299+ count = 4;
27300+ if (copy_from_user(strbuf, buffer, count))
27301 return -EFAULT;
27302-
27303- if (copy_from_user(strbuf, buffer, len))
27304- return -EFAULT;
27305- strbuf[len] = '\0';
27306- sscanf(strbuf, "%s", str);
27307+ strbuf[count] = '\0';
27308
27309 mutex_lock(&acpi_device_lock);
27310 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
27311@@ -364,7 +358,7 @@ acpi_system_write_wakeup_device(struct file *file,
27312 if (!dev->wakeup.flags.valid)
27313 continue;
27314
27315- if (!strncmp(dev->pnp.bus_id, str, 4)) {
27316+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
27317 if (device_can_wakeup(&dev->dev)) {
27318 bool enable = !device_may_wakeup(&dev->dev);
27319 device_set_wakeup_enable(&dev->dev, enable);
27320diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
27321index 9d7bc9f..a6fc091 100644
27322--- a/drivers/acpi/processor_driver.c
27323+++ b/drivers/acpi/processor_driver.c
27324@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
27325 return 0;
27326 #endif
27327
27328- BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
27329+ BUG_ON(pr->id >= nr_cpu_ids);
27330
27331 /*
27332 * Buggy BIOS check
27333diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
27334index 6e36d0c..f319944 100644
27335--- a/drivers/acpi/sbs.c
27336+++ b/drivers/acpi/sbs.c
27337@@ -655,6 +655,9 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
27338
27339 static ssize_t
27340 acpi_battery_write_alarm(struct file *file, const char __user * buffer,
27341+ size_t count, loff_t * ppos) __size_overflow(3);
27342+static ssize_t
27343+acpi_battery_write_alarm(struct file *file, const char __user * buffer,
27344 size_t count, loff_t * ppos)
27345 {
27346 struct seq_file *seq = file->private_data;
27347diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
27348index c04ad68..0b99473 100644
27349--- a/drivers/ata/libata-core.c
27350+++ b/drivers/ata/libata-core.c
27351@@ -4733,7 +4733,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
27352 struct ata_port *ap;
27353 unsigned int tag;
27354
27355- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27356+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27357 ap = qc->ap;
27358
27359 qc->flags = 0;
27360@@ -4749,7 +4749,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
27361 struct ata_port *ap;
27362 struct ata_link *link;
27363
27364- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27365+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27366 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
27367 ap = qc->ap;
27368 link = qc->dev->link;
27369@@ -5754,6 +5754,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27370 return;
27371
27372 spin_lock(&lock);
27373+ pax_open_kernel();
27374
27375 for (cur = ops->inherits; cur; cur = cur->inherits) {
27376 void **inherit = (void **)cur;
27377@@ -5767,8 +5768,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27378 if (IS_ERR(*pp))
27379 *pp = NULL;
27380
27381- ops->inherits = NULL;
27382+ *(struct ata_port_operations **)&ops->inherits = NULL;
27383
27384+ pax_close_kernel();
27385 spin_unlock(&lock);
27386 }
27387
27388diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
27389index e8574bb..f9f6a72 100644
27390--- a/drivers/ata/pata_arasan_cf.c
27391+++ b/drivers/ata/pata_arasan_cf.c
27392@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
27393 /* Handle platform specific quirks */
27394 if (pdata->quirk) {
27395 if (pdata->quirk & CF_BROKEN_PIO) {
27396- ap->ops->set_piomode = NULL;
27397+ pax_open_kernel();
27398+ *(void **)&ap->ops->set_piomode = NULL;
27399+ pax_close_kernel();
27400 ap->pio_mask = 0;
27401 }
27402 if (pdata->quirk & CF_BROKEN_MWDMA)
27403diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
27404index f9b983a..887b9d8 100644
27405--- a/drivers/atm/adummy.c
27406+++ b/drivers/atm/adummy.c
27407@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
27408 vcc->pop(vcc, skb);
27409 else
27410 dev_kfree_skb_any(skb);
27411- atomic_inc(&vcc->stats->tx);
27412+ atomic_inc_unchecked(&vcc->stats->tx);
27413
27414 return 0;
27415 }
27416diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
27417index f8f41e0..1f987dd 100644
27418--- a/drivers/atm/ambassador.c
27419+++ b/drivers/atm/ambassador.c
27420@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
27421 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
27422
27423 // VC layer stats
27424- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27425+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27426
27427 // free the descriptor
27428 kfree (tx_descr);
27429@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27430 dump_skb ("<<<", vc, skb);
27431
27432 // VC layer stats
27433- atomic_inc(&atm_vcc->stats->rx);
27434+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27435 __net_timestamp(skb);
27436 // end of our responsibility
27437 atm_vcc->push (atm_vcc, skb);
27438@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27439 } else {
27440 PRINTK (KERN_INFO, "dropped over-size frame");
27441 // should we count this?
27442- atomic_inc(&atm_vcc->stats->rx_drop);
27443+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27444 }
27445
27446 } else {
27447@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
27448 }
27449
27450 if (check_area (skb->data, skb->len)) {
27451- atomic_inc(&atm_vcc->stats->tx_err);
27452+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
27453 return -ENOMEM; // ?
27454 }
27455
27456diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
27457index b22d71c..d6e1049 100644
27458--- a/drivers/atm/atmtcp.c
27459+++ b/drivers/atm/atmtcp.c
27460@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27461 if (vcc->pop) vcc->pop(vcc,skb);
27462 else dev_kfree_skb(skb);
27463 if (dev_data) return 0;
27464- atomic_inc(&vcc->stats->tx_err);
27465+ atomic_inc_unchecked(&vcc->stats->tx_err);
27466 return -ENOLINK;
27467 }
27468 size = skb->len+sizeof(struct atmtcp_hdr);
27469@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27470 if (!new_skb) {
27471 if (vcc->pop) vcc->pop(vcc,skb);
27472 else dev_kfree_skb(skb);
27473- atomic_inc(&vcc->stats->tx_err);
27474+ atomic_inc_unchecked(&vcc->stats->tx_err);
27475 return -ENOBUFS;
27476 }
27477 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
27478@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27479 if (vcc->pop) vcc->pop(vcc,skb);
27480 else dev_kfree_skb(skb);
27481 out_vcc->push(out_vcc,new_skb);
27482- atomic_inc(&vcc->stats->tx);
27483- atomic_inc(&out_vcc->stats->rx);
27484+ atomic_inc_unchecked(&vcc->stats->tx);
27485+ atomic_inc_unchecked(&out_vcc->stats->rx);
27486 return 0;
27487 }
27488
27489@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27490 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
27491 read_unlock(&vcc_sklist_lock);
27492 if (!out_vcc) {
27493- atomic_inc(&vcc->stats->tx_err);
27494+ atomic_inc_unchecked(&vcc->stats->tx_err);
27495 goto done;
27496 }
27497 skb_pull(skb,sizeof(struct atmtcp_hdr));
27498@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27499 __net_timestamp(new_skb);
27500 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
27501 out_vcc->push(out_vcc,new_skb);
27502- atomic_inc(&vcc->stats->tx);
27503- atomic_inc(&out_vcc->stats->rx);
27504+ atomic_inc_unchecked(&vcc->stats->tx);
27505+ atomic_inc_unchecked(&out_vcc->stats->rx);
27506 done:
27507 if (vcc->pop) vcc->pop(vcc,skb);
27508 else dev_kfree_skb(skb);
27509diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
27510index 956e9ac..133516d 100644
27511--- a/drivers/atm/eni.c
27512+++ b/drivers/atm/eni.c
27513@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
27514 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
27515 vcc->dev->number);
27516 length = 0;
27517- atomic_inc(&vcc->stats->rx_err);
27518+ atomic_inc_unchecked(&vcc->stats->rx_err);
27519 }
27520 else {
27521 length = ATM_CELL_SIZE-1; /* no HEC */
27522@@ -581,7 +581,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27523 size);
27524 }
27525 eff = length = 0;
27526- atomic_inc(&vcc->stats->rx_err);
27527+ atomic_inc_unchecked(&vcc->stats->rx_err);
27528 }
27529 else {
27530 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
27531@@ -598,7 +598,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27532 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
27533 vcc->dev->number,vcc->vci,length,size << 2,descr);
27534 length = eff = 0;
27535- atomic_inc(&vcc->stats->rx_err);
27536+ atomic_inc_unchecked(&vcc->stats->rx_err);
27537 }
27538 }
27539 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
27540@@ -771,7 +771,7 @@ rx_dequeued++;
27541 vcc->push(vcc,skb);
27542 pushed++;
27543 }
27544- atomic_inc(&vcc->stats->rx);
27545+ atomic_inc_unchecked(&vcc->stats->rx);
27546 }
27547 wake_up(&eni_dev->rx_wait);
27548 }
27549@@ -1229,7 +1229,7 @@ static void dequeue_tx(struct atm_dev *dev)
27550 PCI_DMA_TODEVICE);
27551 if (vcc->pop) vcc->pop(vcc,skb);
27552 else dev_kfree_skb_irq(skb);
27553- atomic_inc(&vcc->stats->tx);
27554+ atomic_inc_unchecked(&vcc->stats->tx);
27555 wake_up(&eni_dev->tx_wait);
27556 dma_complete++;
27557 }
27558@@ -1569,7 +1569,7 @@ tx_complete++;
27559 /*--------------------------------- entries ---------------------------------*/
27560
27561
27562-static const char *media_name[] __devinitdata = {
27563+static const char *media_name[] __devinitconst = {
27564 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
27565 "UTP", "05?", "06?", "07?", /* 4- 7 */
27566 "TAXI","09?", "10?", "11?", /* 8-11 */
27567diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
27568index 5072f8a..fa52520d 100644
27569--- a/drivers/atm/firestream.c
27570+++ b/drivers/atm/firestream.c
27571@@ -750,7 +750,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
27572 }
27573 }
27574
27575- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27576+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27577
27578 fs_dprintk (FS_DEBUG_TXMEM, "i");
27579 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
27580@@ -817,7 +817,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27581 #endif
27582 skb_put (skb, qe->p1 & 0xffff);
27583 ATM_SKB(skb)->vcc = atm_vcc;
27584- atomic_inc(&atm_vcc->stats->rx);
27585+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27586 __net_timestamp(skb);
27587 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
27588 atm_vcc->push (atm_vcc, skb);
27589@@ -838,12 +838,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27590 kfree (pe);
27591 }
27592 if (atm_vcc)
27593- atomic_inc(&atm_vcc->stats->rx_drop);
27594+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27595 break;
27596 case 0x1f: /* Reassembly abort: no buffers. */
27597 /* Silently increment error counter. */
27598 if (atm_vcc)
27599- atomic_inc(&atm_vcc->stats->rx_drop);
27600+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27601 break;
27602 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
27603 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
27604diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
27605index 361f5ae..7fc552d 100644
27606--- a/drivers/atm/fore200e.c
27607+++ b/drivers/atm/fore200e.c
27608@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
27609 #endif
27610 /* check error condition */
27611 if (*entry->status & STATUS_ERROR)
27612- atomic_inc(&vcc->stats->tx_err);
27613+ atomic_inc_unchecked(&vcc->stats->tx_err);
27614 else
27615- atomic_inc(&vcc->stats->tx);
27616+ atomic_inc_unchecked(&vcc->stats->tx);
27617 }
27618 }
27619
27620@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27621 if (skb == NULL) {
27622 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
27623
27624- atomic_inc(&vcc->stats->rx_drop);
27625+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27626 return -ENOMEM;
27627 }
27628
27629@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27630
27631 dev_kfree_skb_any(skb);
27632
27633- atomic_inc(&vcc->stats->rx_drop);
27634+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27635 return -ENOMEM;
27636 }
27637
27638 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27639
27640 vcc->push(vcc, skb);
27641- atomic_inc(&vcc->stats->rx);
27642+ atomic_inc_unchecked(&vcc->stats->rx);
27643
27644 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27645
27646@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
27647 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
27648 fore200e->atm_dev->number,
27649 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
27650- atomic_inc(&vcc->stats->rx_err);
27651+ atomic_inc_unchecked(&vcc->stats->rx_err);
27652 }
27653 }
27654
27655@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
27656 goto retry_here;
27657 }
27658
27659- atomic_inc(&vcc->stats->tx_err);
27660+ atomic_inc_unchecked(&vcc->stats->tx_err);
27661
27662 fore200e->tx_sat++;
27663 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
27664diff --git a/drivers/atm/he.c b/drivers/atm/he.c
27665index 9a51df4..f3bb5f8 100644
27666--- a/drivers/atm/he.c
27667+++ b/drivers/atm/he.c
27668@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27669
27670 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
27671 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
27672- atomic_inc(&vcc->stats->rx_drop);
27673+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27674 goto return_host_buffers;
27675 }
27676
27677@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27678 RBRQ_LEN_ERR(he_dev->rbrq_head)
27679 ? "LEN_ERR" : "",
27680 vcc->vpi, vcc->vci);
27681- atomic_inc(&vcc->stats->rx_err);
27682+ atomic_inc_unchecked(&vcc->stats->rx_err);
27683 goto return_host_buffers;
27684 }
27685
27686@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27687 vcc->push(vcc, skb);
27688 spin_lock(&he_dev->global_lock);
27689
27690- atomic_inc(&vcc->stats->rx);
27691+ atomic_inc_unchecked(&vcc->stats->rx);
27692
27693 return_host_buffers:
27694 ++pdus_assembled;
27695@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
27696 tpd->vcc->pop(tpd->vcc, tpd->skb);
27697 else
27698 dev_kfree_skb_any(tpd->skb);
27699- atomic_inc(&tpd->vcc->stats->tx_err);
27700+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
27701 }
27702 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
27703 return;
27704@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27705 vcc->pop(vcc, skb);
27706 else
27707 dev_kfree_skb_any(skb);
27708- atomic_inc(&vcc->stats->tx_err);
27709+ atomic_inc_unchecked(&vcc->stats->tx_err);
27710 return -EINVAL;
27711 }
27712
27713@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27714 vcc->pop(vcc, skb);
27715 else
27716 dev_kfree_skb_any(skb);
27717- atomic_inc(&vcc->stats->tx_err);
27718+ atomic_inc_unchecked(&vcc->stats->tx_err);
27719 return -EINVAL;
27720 }
27721 #endif
27722@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27723 vcc->pop(vcc, skb);
27724 else
27725 dev_kfree_skb_any(skb);
27726- atomic_inc(&vcc->stats->tx_err);
27727+ atomic_inc_unchecked(&vcc->stats->tx_err);
27728 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27729 return -ENOMEM;
27730 }
27731@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27732 vcc->pop(vcc, skb);
27733 else
27734 dev_kfree_skb_any(skb);
27735- atomic_inc(&vcc->stats->tx_err);
27736+ atomic_inc_unchecked(&vcc->stats->tx_err);
27737 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27738 return -ENOMEM;
27739 }
27740@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27741 __enqueue_tpd(he_dev, tpd, cid);
27742 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27743
27744- atomic_inc(&vcc->stats->tx);
27745+ atomic_inc_unchecked(&vcc->stats->tx);
27746
27747 return 0;
27748 }
27749diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
27750index b812103..e391a49 100644
27751--- a/drivers/atm/horizon.c
27752+++ b/drivers/atm/horizon.c
27753@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
27754 {
27755 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
27756 // VC layer stats
27757- atomic_inc(&vcc->stats->rx);
27758+ atomic_inc_unchecked(&vcc->stats->rx);
27759 __net_timestamp(skb);
27760 // end of our responsibility
27761 vcc->push (vcc, skb);
27762@@ -1187,7 +1187,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
27763 dev->tx_iovec = NULL;
27764
27765 // VC layer stats
27766- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27767+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27768
27769 // free the skb
27770 hrz_kfree_skb (skb);
27771diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
27772index 1c05212..c28e200 100644
27773--- a/drivers/atm/idt77252.c
27774+++ b/drivers/atm/idt77252.c
27775@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
27776 else
27777 dev_kfree_skb(skb);
27778
27779- atomic_inc(&vcc->stats->tx);
27780+ atomic_inc_unchecked(&vcc->stats->tx);
27781 }
27782
27783 atomic_dec(&scq->used);
27784@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27785 if ((sb = dev_alloc_skb(64)) == NULL) {
27786 printk("%s: Can't allocate buffers for aal0.\n",
27787 card->name);
27788- atomic_add(i, &vcc->stats->rx_drop);
27789+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
27790 break;
27791 }
27792 if (!atm_charge(vcc, sb->truesize)) {
27793 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
27794 card->name);
27795- atomic_add(i - 1, &vcc->stats->rx_drop);
27796+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
27797 dev_kfree_skb(sb);
27798 break;
27799 }
27800@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27801 ATM_SKB(sb)->vcc = vcc;
27802 __net_timestamp(sb);
27803 vcc->push(vcc, sb);
27804- atomic_inc(&vcc->stats->rx);
27805+ atomic_inc_unchecked(&vcc->stats->rx);
27806
27807 cell += ATM_CELL_PAYLOAD;
27808 }
27809@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27810 "(CDC: %08x)\n",
27811 card->name, len, rpp->len, readl(SAR_REG_CDC));
27812 recycle_rx_pool_skb(card, rpp);
27813- atomic_inc(&vcc->stats->rx_err);
27814+ atomic_inc_unchecked(&vcc->stats->rx_err);
27815 return;
27816 }
27817 if (stat & SAR_RSQE_CRC) {
27818 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
27819 recycle_rx_pool_skb(card, rpp);
27820- atomic_inc(&vcc->stats->rx_err);
27821+ atomic_inc_unchecked(&vcc->stats->rx_err);
27822 return;
27823 }
27824 if (skb_queue_len(&rpp->queue) > 1) {
27825@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27826 RXPRINTK("%s: Can't alloc RX skb.\n",
27827 card->name);
27828 recycle_rx_pool_skb(card, rpp);
27829- atomic_inc(&vcc->stats->rx_err);
27830+ atomic_inc_unchecked(&vcc->stats->rx_err);
27831 return;
27832 }
27833 if (!atm_charge(vcc, skb->truesize)) {
27834@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27835 __net_timestamp(skb);
27836
27837 vcc->push(vcc, skb);
27838- atomic_inc(&vcc->stats->rx);
27839+ atomic_inc_unchecked(&vcc->stats->rx);
27840
27841 return;
27842 }
27843@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27844 __net_timestamp(skb);
27845
27846 vcc->push(vcc, skb);
27847- atomic_inc(&vcc->stats->rx);
27848+ atomic_inc_unchecked(&vcc->stats->rx);
27849
27850 if (skb->truesize > SAR_FB_SIZE_3)
27851 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
27852@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
27853 if (vcc->qos.aal != ATM_AAL0) {
27854 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
27855 card->name, vpi, vci);
27856- atomic_inc(&vcc->stats->rx_drop);
27857+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27858 goto drop;
27859 }
27860
27861 if ((sb = dev_alloc_skb(64)) == NULL) {
27862 printk("%s: Can't allocate buffers for AAL0.\n",
27863 card->name);
27864- atomic_inc(&vcc->stats->rx_err);
27865+ atomic_inc_unchecked(&vcc->stats->rx_err);
27866 goto drop;
27867 }
27868
27869@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
27870 ATM_SKB(sb)->vcc = vcc;
27871 __net_timestamp(sb);
27872 vcc->push(vcc, sb);
27873- atomic_inc(&vcc->stats->rx);
27874+ atomic_inc_unchecked(&vcc->stats->rx);
27875
27876 drop:
27877 skb_pull(queue, 64);
27878@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27879
27880 if (vc == NULL) {
27881 printk("%s: NULL connection in send().\n", card->name);
27882- atomic_inc(&vcc->stats->tx_err);
27883+ atomic_inc_unchecked(&vcc->stats->tx_err);
27884 dev_kfree_skb(skb);
27885 return -EINVAL;
27886 }
27887 if (!test_bit(VCF_TX, &vc->flags)) {
27888 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
27889- atomic_inc(&vcc->stats->tx_err);
27890+ atomic_inc_unchecked(&vcc->stats->tx_err);
27891 dev_kfree_skb(skb);
27892 return -EINVAL;
27893 }
27894@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27895 break;
27896 default:
27897 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
27898- atomic_inc(&vcc->stats->tx_err);
27899+ atomic_inc_unchecked(&vcc->stats->tx_err);
27900 dev_kfree_skb(skb);
27901 return -EINVAL;
27902 }
27903
27904 if (skb_shinfo(skb)->nr_frags != 0) {
27905 printk("%s: No scatter-gather yet.\n", card->name);
27906- atomic_inc(&vcc->stats->tx_err);
27907+ atomic_inc_unchecked(&vcc->stats->tx_err);
27908 dev_kfree_skb(skb);
27909 return -EINVAL;
27910 }
27911@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27912
27913 err = queue_skb(card, vc, skb, oam);
27914 if (err) {
27915- atomic_inc(&vcc->stats->tx_err);
27916+ atomic_inc_unchecked(&vcc->stats->tx_err);
27917 dev_kfree_skb(skb);
27918 return err;
27919 }
27920@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
27921 skb = dev_alloc_skb(64);
27922 if (!skb) {
27923 printk("%s: Out of memory in send_oam().\n", card->name);
27924- atomic_inc(&vcc->stats->tx_err);
27925+ atomic_inc_unchecked(&vcc->stats->tx_err);
27926 return -ENOMEM;
27927 }
27928 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
27929diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
27930index 3d0c2b0..45441fa 100644
27931--- a/drivers/atm/iphase.c
27932+++ b/drivers/atm/iphase.c
27933@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
27934 status = (u_short) (buf_desc_ptr->desc_mode);
27935 if (status & (RX_CER | RX_PTE | RX_OFL))
27936 {
27937- atomic_inc(&vcc->stats->rx_err);
27938+ atomic_inc_unchecked(&vcc->stats->rx_err);
27939 IF_ERR(printk("IA: bad packet, dropping it");)
27940 if (status & RX_CER) {
27941 IF_ERR(printk(" cause: packet CRC error\n");)
27942@@ -1169,7 +1169,7 @@ static int rx_pkt(struct atm_dev *dev)
27943 len = dma_addr - buf_addr;
27944 if (len > iadev->rx_buf_sz) {
27945 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
27946- atomic_inc(&vcc->stats->rx_err);
27947+ atomic_inc_unchecked(&vcc->stats->rx_err);
27948 goto out_free_desc;
27949 }
27950
27951@@ -1319,7 +1319,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27952 ia_vcc = INPH_IA_VCC(vcc);
27953 if (ia_vcc == NULL)
27954 {
27955- atomic_inc(&vcc->stats->rx_err);
27956+ atomic_inc_unchecked(&vcc->stats->rx_err);
27957 dev_kfree_skb_any(skb);
27958 atm_return(vcc, atm_guess_pdu2truesize(len));
27959 goto INCR_DLE;
27960@@ -1331,7 +1331,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27961 if ((length > iadev->rx_buf_sz) || (length >
27962 (skb->len - sizeof(struct cpcs_trailer))))
27963 {
27964- atomic_inc(&vcc->stats->rx_err);
27965+ atomic_inc_unchecked(&vcc->stats->rx_err);
27966 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
27967 length, skb->len);)
27968 dev_kfree_skb_any(skb);
27969@@ -1347,7 +1347,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27970
27971 IF_RX(printk("rx_dle_intr: skb push");)
27972 vcc->push(vcc,skb);
27973- atomic_inc(&vcc->stats->rx);
27974+ atomic_inc_unchecked(&vcc->stats->rx);
27975 iadev->rx_pkt_cnt++;
27976 }
27977 INCR_DLE:
27978@@ -2827,15 +2827,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
27979 {
27980 struct k_sonet_stats *stats;
27981 stats = &PRIV(_ia_dev[board])->sonet_stats;
27982- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
27983- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
27984- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
27985- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
27986- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
27987- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
27988- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
27989- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
27990- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
27991+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
27992+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
27993+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
27994+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
27995+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
27996+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
27997+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
27998+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
27999+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
28000 }
28001 ia_cmds.status = 0;
28002 break;
28003@@ -2940,7 +2940,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28004 if ((desc == 0) || (desc > iadev->num_tx_desc))
28005 {
28006 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
28007- atomic_inc(&vcc->stats->tx);
28008+ atomic_inc_unchecked(&vcc->stats->tx);
28009 if (vcc->pop)
28010 vcc->pop(vcc, skb);
28011 else
28012@@ -3045,14 +3045,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28013 ATM_DESC(skb) = vcc->vci;
28014 skb_queue_tail(&iadev->tx_dma_q, skb);
28015
28016- atomic_inc(&vcc->stats->tx);
28017+ atomic_inc_unchecked(&vcc->stats->tx);
28018 iadev->tx_pkt_cnt++;
28019 /* Increment transaction counter */
28020 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
28021
28022 #if 0
28023 /* add flow control logic */
28024- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
28025+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
28026 if (iavcc->vc_desc_cnt > 10) {
28027 vcc->tx_quota = vcc->tx_quota * 3 / 4;
28028 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
28029diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
28030index f556969..0da15eb 100644
28031--- a/drivers/atm/lanai.c
28032+++ b/drivers/atm/lanai.c
28033@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
28034 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
28035 lanai_endtx(lanai, lvcc);
28036 lanai_free_skb(lvcc->tx.atmvcc, skb);
28037- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
28038+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
28039 }
28040
28041 /* Try to fill the buffer - don't call unless there is backlog */
28042@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
28043 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
28044 __net_timestamp(skb);
28045 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
28046- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
28047+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
28048 out:
28049 lvcc->rx.buf.ptr = end;
28050 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
28051@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28052 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
28053 "vcc %d\n", lanai->number, (unsigned int) s, vci);
28054 lanai->stats.service_rxnotaal5++;
28055- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28056+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28057 return 0;
28058 }
28059 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
28060@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28061 int bytes;
28062 read_unlock(&vcc_sklist_lock);
28063 DPRINTK("got trashed rx pdu on vci %d\n", vci);
28064- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28065+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28066 lvcc->stats.x.aal5.service_trash++;
28067 bytes = (SERVICE_GET_END(s) * 16) -
28068 (((unsigned long) lvcc->rx.buf.ptr) -
28069@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28070 }
28071 if (s & SERVICE_STREAM) {
28072 read_unlock(&vcc_sklist_lock);
28073- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28074+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28075 lvcc->stats.x.aal5.service_stream++;
28076 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
28077 "PDU on VCI %d!\n", lanai->number, vci);
28078@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28079 return 0;
28080 }
28081 DPRINTK("got rx crc error on vci %d\n", vci);
28082- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28083+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28084 lvcc->stats.x.aal5.service_rxcrc++;
28085 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
28086 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
28087diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
28088index 1c70c45..300718d 100644
28089--- a/drivers/atm/nicstar.c
28090+++ b/drivers/atm/nicstar.c
28091@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28092 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
28093 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
28094 card->index);
28095- atomic_inc(&vcc->stats->tx_err);
28096+ atomic_inc_unchecked(&vcc->stats->tx_err);
28097 dev_kfree_skb_any(skb);
28098 return -EINVAL;
28099 }
28100@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28101 if (!vc->tx) {
28102 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
28103 card->index);
28104- atomic_inc(&vcc->stats->tx_err);
28105+ atomic_inc_unchecked(&vcc->stats->tx_err);
28106 dev_kfree_skb_any(skb);
28107 return -EINVAL;
28108 }
28109@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28110 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
28111 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
28112 card->index);
28113- atomic_inc(&vcc->stats->tx_err);
28114+ atomic_inc_unchecked(&vcc->stats->tx_err);
28115 dev_kfree_skb_any(skb);
28116 return -EINVAL;
28117 }
28118
28119 if (skb_shinfo(skb)->nr_frags != 0) {
28120 printk("nicstar%d: No scatter-gather yet.\n", card->index);
28121- atomic_inc(&vcc->stats->tx_err);
28122+ atomic_inc_unchecked(&vcc->stats->tx_err);
28123 dev_kfree_skb_any(skb);
28124 return -EINVAL;
28125 }
28126@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28127 }
28128
28129 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
28130- atomic_inc(&vcc->stats->tx_err);
28131+ atomic_inc_unchecked(&vcc->stats->tx_err);
28132 dev_kfree_skb_any(skb);
28133 return -EIO;
28134 }
28135- atomic_inc(&vcc->stats->tx);
28136+ atomic_inc_unchecked(&vcc->stats->tx);
28137
28138 return 0;
28139 }
28140@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28141 printk
28142 ("nicstar%d: Can't allocate buffers for aal0.\n",
28143 card->index);
28144- atomic_add(i, &vcc->stats->rx_drop);
28145+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
28146 break;
28147 }
28148 if (!atm_charge(vcc, sb->truesize)) {
28149 RXPRINTK
28150 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
28151 card->index);
28152- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28153+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28154 dev_kfree_skb_any(sb);
28155 break;
28156 }
28157@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28158 ATM_SKB(sb)->vcc = vcc;
28159 __net_timestamp(sb);
28160 vcc->push(vcc, sb);
28161- atomic_inc(&vcc->stats->rx);
28162+ atomic_inc_unchecked(&vcc->stats->rx);
28163 cell += ATM_CELL_PAYLOAD;
28164 }
28165
28166@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28167 if (iovb == NULL) {
28168 printk("nicstar%d: Out of iovec buffers.\n",
28169 card->index);
28170- atomic_inc(&vcc->stats->rx_drop);
28171+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28172 recycle_rx_buf(card, skb);
28173 return;
28174 }
28175@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28176 small or large buffer itself. */
28177 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
28178 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
28179- atomic_inc(&vcc->stats->rx_err);
28180+ atomic_inc_unchecked(&vcc->stats->rx_err);
28181 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28182 NS_MAX_IOVECS);
28183 NS_PRV_IOVCNT(iovb) = 0;
28184@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28185 ("nicstar%d: Expected a small buffer, and this is not one.\n",
28186 card->index);
28187 which_list(card, skb);
28188- atomic_inc(&vcc->stats->rx_err);
28189+ atomic_inc_unchecked(&vcc->stats->rx_err);
28190 recycle_rx_buf(card, skb);
28191 vc->rx_iov = NULL;
28192 recycle_iov_buf(card, iovb);
28193@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28194 ("nicstar%d: Expected a large buffer, and this is not one.\n",
28195 card->index);
28196 which_list(card, skb);
28197- atomic_inc(&vcc->stats->rx_err);
28198+ atomic_inc_unchecked(&vcc->stats->rx_err);
28199 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28200 NS_PRV_IOVCNT(iovb));
28201 vc->rx_iov = NULL;
28202@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28203 printk(" - PDU size mismatch.\n");
28204 else
28205 printk(".\n");
28206- atomic_inc(&vcc->stats->rx_err);
28207+ atomic_inc_unchecked(&vcc->stats->rx_err);
28208 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28209 NS_PRV_IOVCNT(iovb));
28210 vc->rx_iov = NULL;
28211@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28212 /* skb points to a small buffer */
28213 if (!atm_charge(vcc, skb->truesize)) {
28214 push_rxbufs(card, skb);
28215- atomic_inc(&vcc->stats->rx_drop);
28216+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28217 } else {
28218 skb_put(skb, len);
28219 dequeue_sm_buf(card, skb);
28220@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28221 ATM_SKB(skb)->vcc = vcc;
28222 __net_timestamp(skb);
28223 vcc->push(vcc, skb);
28224- atomic_inc(&vcc->stats->rx);
28225+ atomic_inc_unchecked(&vcc->stats->rx);
28226 }
28227 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
28228 struct sk_buff *sb;
28229@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28230 if (len <= NS_SMBUFSIZE) {
28231 if (!atm_charge(vcc, sb->truesize)) {
28232 push_rxbufs(card, sb);
28233- atomic_inc(&vcc->stats->rx_drop);
28234+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28235 } else {
28236 skb_put(sb, len);
28237 dequeue_sm_buf(card, sb);
28238@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28239 ATM_SKB(sb)->vcc = vcc;
28240 __net_timestamp(sb);
28241 vcc->push(vcc, sb);
28242- atomic_inc(&vcc->stats->rx);
28243+ atomic_inc_unchecked(&vcc->stats->rx);
28244 }
28245
28246 push_rxbufs(card, skb);
28247@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28248
28249 if (!atm_charge(vcc, skb->truesize)) {
28250 push_rxbufs(card, skb);
28251- atomic_inc(&vcc->stats->rx_drop);
28252+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28253 } else {
28254 dequeue_lg_buf(card, skb);
28255 #ifdef NS_USE_DESTRUCTORS
28256@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28257 ATM_SKB(skb)->vcc = vcc;
28258 __net_timestamp(skb);
28259 vcc->push(vcc, skb);
28260- atomic_inc(&vcc->stats->rx);
28261+ atomic_inc_unchecked(&vcc->stats->rx);
28262 }
28263
28264 push_rxbufs(card, sb);
28265@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28266 printk
28267 ("nicstar%d: Out of huge buffers.\n",
28268 card->index);
28269- atomic_inc(&vcc->stats->rx_drop);
28270+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28271 recycle_iovec_rx_bufs(card,
28272 (struct iovec *)
28273 iovb->data,
28274@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28275 card->hbpool.count++;
28276 } else
28277 dev_kfree_skb_any(hb);
28278- atomic_inc(&vcc->stats->rx_drop);
28279+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28280 } else {
28281 /* Copy the small buffer to the huge buffer */
28282 sb = (struct sk_buff *)iov->iov_base;
28283@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28284 #endif /* NS_USE_DESTRUCTORS */
28285 __net_timestamp(hb);
28286 vcc->push(vcc, hb);
28287- atomic_inc(&vcc->stats->rx);
28288+ atomic_inc_unchecked(&vcc->stats->rx);
28289 }
28290 }
28291
28292diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
28293index 5d1d076..12fbca4 100644
28294--- a/drivers/atm/solos-pci.c
28295+++ b/drivers/atm/solos-pci.c
28296@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
28297 }
28298 atm_charge(vcc, skb->truesize);
28299 vcc->push(vcc, skb);
28300- atomic_inc(&vcc->stats->rx);
28301+ atomic_inc_unchecked(&vcc->stats->rx);
28302 break;
28303
28304 case PKT_STATUS:
28305@@ -1008,7 +1008,7 @@ static uint32_t fpga_tx(struct solos_card *card)
28306 vcc = SKB_CB(oldskb)->vcc;
28307
28308 if (vcc) {
28309- atomic_inc(&vcc->stats->tx);
28310+ atomic_inc_unchecked(&vcc->stats->tx);
28311 solos_pop(vcc, oldskb);
28312 } else
28313 dev_kfree_skb_irq(oldskb);
28314diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
28315index 90f1ccc..04c4a1e 100644
28316--- a/drivers/atm/suni.c
28317+++ b/drivers/atm/suni.c
28318@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
28319
28320
28321 #define ADD_LIMITED(s,v) \
28322- atomic_add((v),&stats->s); \
28323- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
28324+ atomic_add_unchecked((v),&stats->s); \
28325+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
28326
28327
28328 static void suni_hz(unsigned long from_timer)
28329diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
28330index 5120a96..e2572bd 100644
28331--- a/drivers/atm/uPD98402.c
28332+++ b/drivers/atm/uPD98402.c
28333@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
28334 struct sonet_stats tmp;
28335 int error = 0;
28336
28337- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28338+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28339 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
28340 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
28341 if (zero && !error) {
28342@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
28343
28344
28345 #define ADD_LIMITED(s,v) \
28346- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
28347- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
28348- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28349+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
28350+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
28351+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28352
28353
28354 static void stat_event(struct atm_dev *dev)
28355@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
28356 if (reason & uPD98402_INT_PFM) stat_event(dev);
28357 if (reason & uPD98402_INT_PCO) {
28358 (void) GET(PCOCR); /* clear interrupt cause */
28359- atomic_add(GET(HECCT),
28360+ atomic_add_unchecked(GET(HECCT),
28361 &PRIV(dev)->sonet_stats.uncorr_hcs);
28362 }
28363 if ((reason & uPD98402_INT_RFO) &&
28364@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
28365 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
28366 uPD98402_INT_LOS),PIMR); /* enable them */
28367 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
28368- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28369- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
28370- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
28371+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28372+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
28373+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
28374 return 0;
28375 }
28376
28377diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
28378index d889f56..17eb71e 100644
28379--- a/drivers/atm/zatm.c
28380+++ b/drivers/atm/zatm.c
28381@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28382 }
28383 if (!size) {
28384 dev_kfree_skb_irq(skb);
28385- if (vcc) atomic_inc(&vcc->stats->rx_err);
28386+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
28387 continue;
28388 }
28389 if (!atm_charge(vcc,skb->truesize)) {
28390@@ -470,7 +470,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28391 skb->len = size;
28392 ATM_SKB(skb)->vcc = vcc;
28393 vcc->push(vcc,skb);
28394- atomic_inc(&vcc->stats->rx);
28395+ atomic_inc_unchecked(&vcc->stats->rx);
28396 }
28397 zout(pos & 0xffff,MTA(mbx));
28398 #if 0 /* probably a stupid idea */
28399@@ -734,7 +734,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
28400 skb_queue_head(&zatm_vcc->backlog,skb);
28401 break;
28402 }
28403- atomic_inc(&vcc->stats->tx);
28404+ atomic_inc_unchecked(&vcc->stats->tx);
28405 wake_up(&zatm_vcc->tx_wait);
28406 }
28407
28408diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
28409index a4760e0..51283cf 100644
28410--- a/drivers/base/devtmpfs.c
28411+++ b/drivers/base/devtmpfs.c
28412@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
28413 if (!thread)
28414 return 0;
28415
28416- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
28417+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
28418 if (err)
28419 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
28420 else
28421diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
28422index caf995f..6f76697 100644
28423--- a/drivers/base/power/wakeup.c
28424+++ b/drivers/base/power/wakeup.c
28425@@ -30,14 +30,14 @@ bool events_check_enabled;
28426 * They need to be modified together atomically, so it's better to use one
28427 * atomic variable to hold them both.
28428 */
28429-static atomic_t combined_event_count = ATOMIC_INIT(0);
28430+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
28431
28432 #define IN_PROGRESS_BITS (sizeof(int) * 4)
28433 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
28434
28435 static void split_counters(unsigned int *cnt, unsigned int *inpr)
28436 {
28437- unsigned int comb = atomic_read(&combined_event_count);
28438+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
28439
28440 *cnt = (comb >> IN_PROGRESS_BITS);
28441 *inpr = comb & MAX_IN_PROGRESS;
28442@@ -353,7 +353,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
28443 ws->last_time = ktime_get();
28444
28445 /* Increment the counter of events in progress. */
28446- atomic_inc(&combined_event_count);
28447+ atomic_inc_unchecked(&combined_event_count);
28448 }
28449
28450 /**
28451@@ -443,7 +443,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
28452 * Increment the counter of registered wakeup events and decrement the
28453 * couter of wakeup events in progress simultaneously.
28454 */
28455- atomic_add(MAX_IN_PROGRESS, &combined_event_count);
28456+ atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count);
28457 }
28458
28459 /**
28460diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
28461index b0f553b..77b928b 100644
28462--- a/drivers/block/cciss.c
28463+++ b/drivers/block/cciss.c
28464@@ -1198,6 +1198,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
28465 int err;
28466 u32 cp;
28467
28468+ memset(&arg64, 0, sizeof(arg64));
28469+
28470 err = 0;
28471 err |=
28472 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
28473@@ -3007,7 +3009,7 @@ static void start_io(ctlr_info_t *h)
28474 while (!list_empty(&h->reqQ)) {
28475 c = list_entry(h->reqQ.next, CommandList_struct, list);
28476 /* can't do anything if fifo is full */
28477- if ((h->access.fifo_full(h))) {
28478+ if ((h->access->fifo_full(h))) {
28479 dev_warn(&h->pdev->dev, "fifo full\n");
28480 break;
28481 }
28482@@ -3017,7 +3019,7 @@ static void start_io(ctlr_info_t *h)
28483 h->Qdepth--;
28484
28485 /* Tell the controller execute command */
28486- h->access.submit_command(h, c);
28487+ h->access->submit_command(h, c);
28488
28489 /* Put job onto the completed Q */
28490 addQ(&h->cmpQ, c);
28491@@ -3443,17 +3445,17 @@ startio:
28492
28493 static inline unsigned long get_next_completion(ctlr_info_t *h)
28494 {
28495- return h->access.command_completed(h);
28496+ return h->access->command_completed(h);
28497 }
28498
28499 static inline int interrupt_pending(ctlr_info_t *h)
28500 {
28501- return h->access.intr_pending(h);
28502+ return h->access->intr_pending(h);
28503 }
28504
28505 static inline long interrupt_not_for_us(ctlr_info_t *h)
28506 {
28507- return ((h->access.intr_pending(h) == 0) ||
28508+ return ((h->access->intr_pending(h) == 0) ||
28509 (h->interrupts_enabled == 0));
28510 }
28511
28512@@ -3486,7 +3488,7 @@ static inline u32 next_command(ctlr_info_t *h)
28513 u32 a;
28514
28515 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
28516- return h->access.command_completed(h);
28517+ return h->access->command_completed(h);
28518
28519 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
28520 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
28521@@ -4044,7 +4046,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
28522 trans_support & CFGTBL_Trans_use_short_tags);
28523
28524 /* Change the access methods to the performant access methods */
28525- h->access = SA5_performant_access;
28526+ h->access = &SA5_performant_access;
28527 h->transMethod = CFGTBL_Trans_Performant;
28528
28529 return;
28530@@ -4316,7 +4318,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
28531 if (prod_index < 0)
28532 return -ENODEV;
28533 h->product_name = products[prod_index].product_name;
28534- h->access = *(products[prod_index].access);
28535+ h->access = products[prod_index].access;
28536
28537 if (cciss_board_disabled(h)) {
28538 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
28539@@ -5041,7 +5043,7 @@ reinit_after_soft_reset:
28540 }
28541
28542 /* make sure the board interrupts are off */
28543- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28544+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28545 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
28546 if (rc)
28547 goto clean2;
28548@@ -5093,7 +5095,7 @@ reinit_after_soft_reset:
28549 * fake ones to scoop up any residual completions.
28550 */
28551 spin_lock_irqsave(&h->lock, flags);
28552- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28553+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28554 spin_unlock_irqrestore(&h->lock, flags);
28555 free_irq(h->intr[h->intr_mode], h);
28556 rc = cciss_request_irq(h, cciss_msix_discard_completions,
28557@@ -5113,9 +5115,9 @@ reinit_after_soft_reset:
28558 dev_info(&h->pdev->dev, "Board READY.\n");
28559 dev_info(&h->pdev->dev,
28560 "Waiting for stale completions to drain.\n");
28561- h->access.set_intr_mask(h, CCISS_INTR_ON);
28562+ h->access->set_intr_mask(h, CCISS_INTR_ON);
28563 msleep(10000);
28564- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28565+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28566
28567 rc = controller_reset_failed(h->cfgtable);
28568 if (rc)
28569@@ -5138,7 +5140,7 @@ reinit_after_soft_reset:
28570 cciss_scsi_setup(h);
28571
28572 /* Turn the interrupts on so we can service requests */
28573- h->access.set_intr_mask(h, CCISS_INTR_ON);
28574+ h->access->set_intr_mask(h, CCISS_INTR_ON);
28575
28576 /* Get the firmware version */
28577 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
28578@@ -5211,7 +5213,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
28579 kfree(flush_buf);
28580 if (return_code != IO_OK)
28581 dev_warn(&h->pdev->dev, "Error flushing cache\n");
28582- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28583+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28584 free_irq(h->intr[h->intr_mode], h);
28585 }
28586
28587diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
28588index 7fda30e..eb5dfe0 100644
28589--- a/drivers/block/cciss.h
28590+++ b/drivers/block/cciss.h
28591@@ -101,7 +101,7 @@ struct ctlr_info
28592 /* information about each logical volume */
28593 drive_info_struct *drv[CISS_MAX_LUN];
28594
28595- struct access_method access;
28596+ struct access_method *access;
28597
28598 /* queue and queue Info */
28599 struct list_head reqQ;
28600diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
28601index 9125bbe..eede5c8 100644
28602--- a/drivers/block/cpqarray.c
28603+++ b/drivers/block/cpqarray.c
28604@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28605 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
28606 goto Enomem4;
28607 }
28608- hba[i]->access.set_intr_mask(hba[i], 0);
28609+ hba[i]->access->set_intr_mask(hba[i], 0);
28610 if (request_irq(hba[i]->intr, do_ida_intr,
28611 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
28612 {
28613@@ -459,7 +459,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28614 add_timer(&hba[i]->timer);
28615
28616 /* Enable IRQ now that spinlock and rate limit timer are set up */
28617- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28618+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28619
28620 for(j=0; j<NWD; j++) {
28621 struct gendisk *disk = ida_gendisk[i][j];
28622@@ -694,7 +694,7 @@ DBGINFO(
28623 for(i=0; i<NR_PRODUCTS; i++) {
28624 if (board_id == products[i].board_id) {
28625 c->product_name = products[i].product_name;
28626- c->access = *(products[i].access);
28627+ c->access = products[i].access;
28628 break;
28629 }
28630 }
28631@@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detect(void)
28632 hba[ctlr]->intr = intr;
28633 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
28634 hba[ctlr]->product_name = products[j].product_name;
28635- hba[ctlr]->access = *(products[j].access);
28636+ hba[ctlr]->access = products[j].access;
28637 hba[ctlr]->ctlr = ctlr;
28638 hba[ctlr]->board_id = board_id;
28639 hba[ctlr]->pci_dev = NULL; /* not PCI */
28640@@ -980,7 +980,7 @@ static void start_io(ctlr_info_t *h)
28641
28642 while((c = h->reqQ) != NULL) {
28643 /* Can't do anything if we're busy */
28644- if (h->access.fifo_full(h) == 0)
28645+ if (h->access->fifo_full(h) == 0)
28646 return;
28647
28648 /* Get the first entry from the request Q */
28649@@ -988,7 +988,7 @@ static void start_io(ctlr_info_t *h)
28650 h->Qdepth--;
28651
28652 /* Tell the controller to do our bidding */
28653- h->access.submit_command(h, c);
28654+ h->access->submit_command(h, c);
28655
28656 /* Get onto the completion Q */
28657 addQ(&h->cmpQ, c);
28658@@ -1050,7 +1050,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28659 unsigned long flags;
28660 __u32 a,a1;
28661
28662- istat = h->access.intr_pending(h);
28663+ istat = h->access->intr_pending(h);
28664 /* Is this interrupt for us? */
28665 if (istat == 0)
28666 return IRQ_NONE;
28667@@ -1061,7 +1061,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28668 */
28669 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
28670 if (istat & FIFO_NOT_EMPTY) {
28671- while((a = h->access.command_completed(h))) {
28672+ while((a = h->access->command_completed(h))) {
28673 a1 = a; a &= ~3;
28674 if ((c = h->cmpQ) == NULL)
28675 {
28676@@ -1449,11 +1449,11 @@ static int sendcmd(
28677 /*
28678 * Disable interrupt
28679 */
28680- info_p->access.set_intr_mask(info_p, 0);
28681+ info_p->access->set_intr_mask(info_p, 0);
28682 /* Make sure there is room in the command FIFO */
28683 /* Actually it should be completely empty at this time. */
28684 for (i = 200000; i > 0; i--) {
28685- temp = info_p->access.fifo_full(info_p);
28686+ temp = info_p->access->fifo_full(info_p);
28687 if (temp != 0) {
28688 break;
28689 }
28690@@ -1466,7 +1466,7 @@ DBG(
28691 /*
28692 * Send the cmd
28693 */
28694- info_p->access.submit_command(info_p, c);
28695+ info_p->access->submit_command(info_p, c);
28696 complete = pollcomplete(ctlr);
28697
28698 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
28699@@ -1549,9 +1549,9 @@ static int revalidate_allvol(ctlr_info_t *host)
28700 * we check the new geometry. Then turn interrupts back on when
28701 * we're done.
28702 */
28703- host->access.set_intr_mask(host, 0);
28704+ host->access->set_intr_mask(host, 0);
28705 getgeometry(ctlr);
28706- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
28707+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
28708
28709 for(i=0; i<NWD; i++) {
28710 struct gendisk *disk = ida_gendisk[ctlr][i];
28711@@ -1591,7 +1591,7 @@ static int pollcomplete(int ctlr)
28712 /* Wait (up to 2 seconds) for a command to complete */
28713
28714 for (i = 200000; i > 0; i--) {
28715- done = hba[ctlr]->access.command_completed(hba[ctlr]);
28716+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
28717 if (done == 0) {
28718 udelay(10); /* a short fixed delay */
28719 } else
28720diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
28721index be73e9d..7fbf140 100644
28722--- a/drivers/block/cpqarray.h
28723+++ b/drivers/block/cpqarray.h
28724@@ -99,7 +99,7 @@ struct ctlr_info {
28725 drv_info_t drv[NWD];
28726 struct proc_dir_entry *proc;
28727
28728- struct access_method access;
28729+ struct access_method *access;
28730
28731 cmdlist_t *reqQ;
28732 cmdlist_t *cmpQ;
28733diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
28734index 9cf2035..bffca95 100644
28735--- a/drivers/block/drbd/drbd_int.h
28736+++ b/drivers/block/drbd/drbd_int.h
28737@@ -736,7 +736,7 @@ struct drbd_request;
28738 struct drbd_epoch {
28739 struct list_head list;
28740 unsigned int barrier_nr;
28741- atomic_t epoch_size; /* increased on every request added. */
28742+ atomic_unchecked_t epoch_size; /* increased on every request added. */
28743 atomic_t active; /* increased on every req. added, and dec on every finished. */
28744 unsigned long flags;
28745 };
28746@@ -1108,7 +1108,7 @@ struct drbd_conf {
28747 void *int_dig_in;
28748 void *int_dig_vv;
28749 wait_queue_head_t seq_wait;
28750- atomic_t packet_seq;
28751+ atomic_unchecked_t packet_seq;
28752 unsigned int peer_seq;
28753 spinlock_t peer_seq_lock;
28754 unsigned int minor;
28755@@ -1617,30 +1617,30 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
28756
28757 static inline void drbd_tcp_cork(struct socket *sock)
28758 {
28759- int __user val = 1;
28760+ int val = 1;
28761 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
28762- (char __user *)&val, sizeof(val));
28763+ (char __force_user *)&val, sizeof(val));
28764 }
28765
28766 static inline void drbd_tcp_uncork(struct socket *sock)
28767 {
28768- int __user val = 0;
28769+ int val = 0;
28770 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
28771- (char __user *)&val, sizeof(val));
28772+ (char __force_user *)&val, sizeof(val));
28773 }
28774
28775 static inline void drbd_tcp_nodelay(struct socket *sock)
28776 {
28777- int __user val = 1;
28778+ int val = 1;
28779 (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
28780- (char __user *)&val, sizeof(val));
28781+ (char __force_user *)&val, sizeof(val));
28782 }
28783
28784 static inline void drbd_tcp_quickack(struct socket *sock)
28785 {
28786- int __user val = 2;
28787+ int val = 2;
28788 (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
28789- (char __user *)&val, sizeof(val));
28790+ (char __force_user *)&val, sizeof(val));
28791 }
28792
28793 void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
28794diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
28795index 0358e55..bc33689 100644
28796--- a/drivers/block/drbd/drbd_main.c
28797+++ b/drivers/block/drbd/drbd_main.c
28798@@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
28799 p.sector = sector;
28800 p.block_id = block_id;
28801 p.blksize = blksize;
28802- p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
28803+ p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
28804
28805 if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
28806 return false;
28807@@ -2696,7 +2696,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
28808 p.sector = cpu_to_be64(req->sector);
28809 p.block_id = (unsigned long)req;
28810 p.seq_num = cpu_to_be32(req->seq_num =
28811- atomic_add_return(1, &mdev->packet_seq));
28812+ atomic_add_return_unchecked(1, &mdev->packet_seq));
28813
28814 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
28815
28816@@ -2981,7 +2981,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
28817 atomic_set(&mdev->unacked_cnt, 0);
28818 atomic_set(&mdev->local_cnt, 0);
28819 atomic_set(&mdev->net_cnt, 0);
28820- atomic_set(&mdev->packet_seq, 0);
28821+ atomic_set_unchecked(&mdev->packet_seq, 0);
28822 atomic_set(&mdev->pp_in_use, 0);
28823 atomic_set(&mdev->pp_in_use_by_net, 0);
28824 atomic_set(&mdev->rs_sect_in, 0);
28825@@ -3063,8 +3063,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
28826 mdev->receiver.t_state);
28827
28828 /* no need to lock it, I'm the only thread alive */
28829- if (atomic_read(&mdev->current_epoch->epoch_size) != 0)
28830- dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size));
28831+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0)
28832+ dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size));
28833 mdev->al_writ_cnt =
28834 mdev->bm_writ_cnt =
28835 mdev->read_cnt =
28836diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
28837index af2a250..219c74b 100644
28838--- a/drivers/block/drbd/drbd_nl.c
28839+++ b/drivers/block/drbd/drbd_nl.c
28840@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
28841 module_put(THIS_MODULE);
28842 }
28843
28844-static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
28845+static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
28846
28847 static unsigned short *
28848 __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
28849@@ -2430,7 +2430,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
28850 cn_reply->id.idx = CN_IDX_DRBD;
28851 cn_reply->id.val = CN_VAL_DRBD;
28852
28853- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28854+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28855 cn_reply->ack = 0; /* not used here. */
28856 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28857 (int)((char *)tl - (char *)reply->tag_list);
28858@@ -2462,7 +2462,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
28859 cn_reply->id.idx = CN_IDX_DRBD;
28860 cn_reply->id.val = CN_VAL_DRBD;
28861
28862- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28863+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28864 cn_reply->ack = 0; /* not used here. */
28865 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28866 (int)((char *)tl - (char *)reply->tag_list);
28867@@ -2540,7 +2540,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
28868 cn_reply->id.idx = CN_IDX_DRBD;
28869 cn_reply->id.val = CN_VAL_DRBD;
28870
28871- cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
28872+ cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq);
28873 cn_reply->ack = 0; // not used here.
28874 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28875 (int)((char*)tl - (char*)reply->tag_list);
28876@@ -2579,7 +2579,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
28877 cn_reply->id.idx = CN_IDX_DRBD;
28878 cn_reply->id.val = CN_VAL_DRBD;
28879
28880- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28881+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28882 cn_reply->ack = 0; /* not used here. */
28883 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28884 (int)((char *)tl - (char *)reply->tag_list);
28885diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
28886index 43beaca..4a5b1dd 100644
28887--- a/drivers/block/drbd/drbd_receiver.c
28888+++ b/drivers/block/drbd/drbd_receiver.c
28889@@ -894,7 +894,7 @@ retry:
28890 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
28891 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
28892
28893- atomic_set(&mdev->packet_seq, 0);
28894+ atomic_set_unchecked(&mdev->packet_seq, 0);
28895 mdev->peer_seq = 0;
28896
28897 drbd_thread_start(&mdev->asender);
28898@@ -985,7 +985,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
28899 do {
28900 next_epoch = NULL;
28901
28902- epoch_size = atomic_read(&epoch->epoch_size);
28903+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
28904
28905 switch (ev & ~EV_CLEANUP) {
28906 case EV_PUT:
28907@@ -1020,7 +1020,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
28908 rv = FE_DESTROYED;
28909 } else {
28910 epoch->flags = 0;
28911- atomic_set(&epoch->epoch_size, 0);
28912+ atomic_set_unchecked(&epoch->epoch_size, 0);
28913 /* atomic_set(&epoch->active, 0); is already zero */
28914 if (rv == FE_STILL_LIVE)
28915 rv = FE_RECYCLED;
28916@@ -1191,14 +1191,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
28917 drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
28918 drbd_flush(mdev);
28919
28920- if (atomic_read(&mdev->current_epoch->epoch_size)) {
28921+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
28922 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
28923 if (epoch)
28924 break;
28925 }
28926
28927 epoch = mdev->current_epoch;
28928- wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0);
28929+ wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0);
28930
28931 D_ASSERT(atomic_read(&epoch->active) == 0);
28932 D_ASSERT(epoch->flags == 0);
28933@@ -1210,11 +1210,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
28934 }
28935
28936 epoch->flags = 0;
28937- atomic_set(&epoch->epoch_size, 0);
28938+ atomic_set_unchecked(&epoch->epoch_size, 0);
28939 atomic_set(&epoch->active, 0);
28940
28941 spin_lock(&mdev->epoch_lock);
28942- if (atomic_read(&mdev->current_epoch->epoch_size)) {
28943+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
28944 list_add(&epoch->list, &mdev->current_epoch->list);
28945 mdev->current_epoch = epoch;
28946 mdev->epochs++;
28947@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
28948 spin_unlock(&mdev->peer_seq_lock);
28949
28950 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
28951- atomic_inc(&mdev->current_epoch->epoch_size);
28952+ atomic_inc_unchecked(&mdev->current_epoch->epoch_size);
28953 return drbd_drain_block(mdev, data_size);
28954 }
28955
28956@@ -1689,7 +1689,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
28957
28958 spin_lock(&mdev->epoch_lock);
28959 e->epoch = mdev->current_epoch;
28960- atomic_inc(&e->epoch->epoch_size);
28961+ atomic_inc_unchecked(&e->epoch->epoch_size);
28962 atomic_inc(&e->epoch->active);
28963 spin_unlock(&mdev->epoch_lock);
28964
28965@@ -3885,7 +3885,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
28966 D_ASSERT(list_empty(&mdev->done_ee));
28967
28968 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
28969- atomic_set(&mdev->current_epoch->epoch_size, 0);
28970+ atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0);
28971 D_ASSERT(list_empty(&mdev->current_epoch->list));
28972 }
28973
28974diff --git a/drivers/block/loop.c b/drivers/block/loop.c
28975index 1e888c9..05cf1b0 100644
28976--- a/drivers/block/loop.c
28977+++ b/drivers/block/loop.c
28978@@ -227,7 +227,7 @@ static int __do_lo_send_write(struct file *file,
28979 mm_segment_t old_fs = get_fs();
28980
28981 set_fs(get_ds());
28982- bw = file->f_op->write(file, buf, len, &pos);
28983+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
28984 set_fs(old_fs);
28985 if (likely(bw == len))
28986 return 0;
28987diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
28988index 4364303..9adf4ee 100644
28989--- a/drivers/char/Kconfig
28990+++ b/drivers/char/Kconfig
28991@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
28992
28993 config DEVKMEM
28994 bool "/dev/kmem virtual device support"
28995- default y
28996+ default n
28997+ depends on !GRKERNSEC_KMEM
28998 help
28999 Say Y here if you want to support the /dev/kmem device. The
29000 /dev/kmem device is rarely used, but can be used for certain
29001@@ -596,6 +597,7 @@ config DEVPORT
29002 bool
29003 depends on !M68K
29004 depends on ISA || PCI
29005+ depends on !GRKERNSEC_KMEM
29006 default y
29007
29008 source "drivers/s390/char/Kconfig"
29009diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
29010index 2e04433..22afc64 100644
29011--- a/drivers/char/agp/frontend.c
29012+++ b/drivers/char/agp/frontend.c
29013@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
29014 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
29015 return -EFAULT;
29016
29017- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
29018+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
29019 return -EFAULT;
29020
29021 client = agp_find_client_by_pid(reserve.pid);
29022diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
29023index 095ab90..afad0a4 100644
29024--- a/drivers/char/briq_panel.c
29025+++ b/drivers/char/briq_panel.c
29026@@ -9,6 +9,7 @@
29027 #include <linux/types.h>
29028 #include <linux/errno.h>
29029 #include <linux/tty.h>
29030+#include <linux/mutex.h>
29031 #include <linux/timer.h>
29032 #include <linux/kernel.h>
29033 #include <linux/wait.h>
29034@@ -34,6 +35,7 @@ static int vfd_is_open;
29035 static unsigned char vfd[40];
29036 static int vfd_cursor;
29037 static unsigned char ledpb, led;
29038+static DEFINE_MUTEX(vfd_mutex);
29039
29040 static void update_vfd(void)
29041 {
29042@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
29043 if (!vfd_is_open)
29044 return -EBUSY;
29045
29046+ mutex_lock(&vfd_mutex);
29047 for (;;) {
29048 char c;
29049 if (!indx)
29050 break;
29051- if (get_user(c, buf))
29052+ if (get_user(c, buf)) {
29053+ mutex_unlock(&vfd_mutex);
29054 return -EFAULT;
29055+ }
29056 if (esc) {
29057 set_led(c);
29058 esc = 0;
29059@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
29060 buf++;
29061 }
29062 update_vfd();
29063+ mutex_unlock(&vfd_mutex);
29064
29065 return len;
29066 }
29067diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
29068index f773a9d..65cd683 100644
29069--- a/drivers/char/genrtc.c
29070+++ b/drivers/char/genrtc.c
29071@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
29072 switch (cmd) {
29073
29074 case RTC_PLL_GET:
29075+ memset(&pll, 0, sizeof(pll));
29076 if (get_rtc_pll(&pll))
29077 return -EINVAL;
29078 else
29079diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
29080index 0833896..cccce52 100644
29081--- a/drivers/char/hpet.c
29082+++ b/drivers/char/hpet.c
29083@@ -572,7 +572,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
29084 }
29085
29086 static int
29087-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
29088+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
29089 struct hpet_info *info)
29090 {
29091 struct hpet_timer __iomem *timer;
29092diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
29093index 58c0e63..46c16bf 100644
29094--- a/drivers/char/ipmi/ipmi_msghandler.c
29095+++ b/drivers/char/ipmi/ipmi_msghandler.c
29096@@ -415,7 +415,7 @@ struct ipmi_smi {
29097 struct proc_dir_entry *proc_dir;
29098 char proc_dir_name[10];
29099
29100- atomic_t stats[IPMI_NUM_STATS];
29101+ atomic_unchecked_t stats[IPMI_NUM_STATS];
29102
29103 /*
29104 * run_to_completion duplicate of smb_info, smi_info
29105@@ -448,9 +448,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
29106
29107
29108 #define ipmi_inc_stat(intf, stat) \
29109- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
29110+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
29111 #define ipmi_get_stat(intf, stat) \
29112- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
29113+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
29114
29115 static int is_lan_addr(struct ipmi_addr *addr)
29116 {
29117@@ -2868,7 +2868,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
29118 INIT_LIST_HEAD(&intf->cmd_rcvrs);
29119 init_waitqueue_head(&intf->waitq);
29120 for (i = 0; i < IPMI_NUM_STATS; i++)
29121- atomic_set(&intf->stats[i], 0);
29122+ atomic_set_unchecked(&intf->stats[i], 0);
29123
29124 intf->proc_dir = NULL;
29125
29126diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
29127index 9397ab4..d01bee1 100644
29128--- a/drivers/char/ipmi/ipmi_si_intf.c
29129+++ b/drivers/char/ipmi/ipmi_si_intf.c
29130@@ -277,7 +277,7 @@ struct smi_info {
29131 unsigned char slave_addr;
29132
29133 /* Counters and things for the proc filesystem. */
29134- atomic_t stats[SI_NUM_STATS];
29135+ atomic_unchecked_t stats[SI_NUM_STATS];
29136
29137 struct task_struct *thread;
29138
29139@@ -286,9 +286,9 @@ struct smi_info {
29140 };
29141
29142 #define smi_inc_stat(smi, stat) \
29143- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
29144+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
29145 #define smi_get_stat(smi, stat) \
29146- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
29147+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
29148
29149 #define SI_MAX_PARMS 4
29150
29151@@ -3230,7 +3230,7 @@ static int try_smi_init(struct smi_info *new_smi)
29152 atomic_set(&new_smi->req_events, 0);
29153 new_smi->run_to_completion = 0;
29154 for (i = 0; i < SI_NUM_STATS; i++)
29155- atomic_set(&new_smi->stats[i], 0);
29156+ atomic_set_unchecked(&new_smi->stats[i], 0);
29157
29158 new_smi->interrupt_disabled = 1;
29159 atomic_set(&new_smi->stop_operation, 0);
29160diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
29161index 1aeaaba..e018570 100644
29162--- a/drivers/char/mbcs.c
29163+++ b/drivers/char/mbcs.c
29164@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *dev)
29165 return 0;
29166 }
29167
29168-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
29169+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
29170 {
29171 .part_num = MBCS_PART_NUM,
29172 .mfg_num = MBCS_MFG_NUM,
29173diff --git a/drivers/char/mem.c b/drivers/char/mem.c
29174index 1451790..f705c30 100644
29175--- a/drivers/char/mem.c
29176+++ b/drivers/char/mem.c
29177@@ -18,6 +18,7 @@
29178 #include <linux/raw.h>
29179 #include <linux/tty.h>
29180 #include <linux/capability.h>
29181+#include <linux/security.h>
29182 #include <linux/ptrace.h>
29183 #include <linux/device.h>
29184 #include <linux/highmem.h>
29185@@ -35,6 +36,10 @@
29186 # include <linux/efi.h>
29187 #endif
29188
29189+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29190+extern const struct file_operations grsec_fops;
29191+#endif
29192+
29193 static inline unsigned long size_inside_page(unsigned long start,
29194 unsigned long size)
29195 {
29196@@ -66,9 +71,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29197
29198 while (cursor < to) {
29199 if (!devmem_is_allowed(pfn)) {
29200+#ifdef CONFIG_GRKERNSEC_KMEM
29201+ gr_handle_mem_readwrite(from, to);
29202+#else
29203 printk(KERN_INFO
29204 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
29205 current->comm, from, to);
29206+#endif
29207 return 0;
29208 }
29209 cursor += PAGE_SIZE;
29210@@ -76,6 +85,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29211 }
29212 return 1;
29213 }
29214+#elif defined(CONFIG_GRKERNSEC_KMEM)
29215+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29216+{
29217+ return 0;
29218+}
29219 #else
29220 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29221 {
29222@@ -118,6 +132,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29223
29224 while (count > 0) {
29225 unsigned long remaining;
29226+ char *temp;
29227
29228 sz = size_inside_page(p, count);
29229
29230@@ -133,7 +148,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29231 if (!ptr)
29232 return -EFAULT;
29233
29234- remaining = copy_to_user(buf, ptr, sz);
29235+#ifdef CONFIG_PAX_USERCOPY
29236+ temp = kmalloc(sz, GFP_KERNEL);
29237+ if (!temp) {
29238+ unxlate_dev_mem_ptr(p, ptr);
29239+ return -ENOMEM;
29240+ }
29241+ memcpy(temp, ptr, sz);
29242+#else
29243+ temp = ptr;
29244+#endif
29245+
29246+ remaining = copy_to_user(buf, temp, sz);
29247+
29248+#ifdef CONFIG_PAX_USERCOPY
29249+ kfree(temp);
29250+#endif
29251+
29252 unxlate_dev_mem_ptr(p, ptr);
29253 if (remaining)
29254 return -EFAULT;
29255@@ -396,9 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29256 size_t count, loff_t *ppos)
29257 {
29258 unsigned long p = *ppos;
29259- ssize_t low_count, read, sz;
29260+ ssize_t low_count, read, sz, err = 0;
29261 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
29262- int err = 0;
29263
29264 read = 0;
29265 if (p < (unsigned long) high_memory) {
29266@@ -420,6 +450,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29267 }
29268 #endif
29269 while (low_count > 0) {
29270+ char *temp;
29271+
29272 sz = size_inside_page(p, low_count);
29273
29274 /*
29275@@ -429,7 +461,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29276 */
29277 kbuf = xlate_dev_kmem_ptr((char *)p);
29278
29279- if (copy_to_user(buf, kbuf, sz))
29280+#ifdef CONFIG_PAX_USERCOPY
29281+ temp = kmalloc(sz, GFP_KERNEL);
29282+ if (!temp)
29283+ return -ENOMEM;
29284+ memcpy(temp, kbuf, sz);
29285+#else
29286+ temp = kbuf;
29287+#endif
29288+
29289+ err = copy_to_user(buf, temp, sz);
29290+
29291+#ifdef CONFIG_PAX_USERCOPY
29292+ kfree(temp);
29293+#endif
29294+
29295+ if (err)
29296 return -EFAULT;
29297 buf += sz;
29298 p += sz;
29299@@ -867,6 +914,9 @@ static const struct memdev {
29300 #ifdef CONFIG_CRASH_DUMP
29301 [12] = { "oldmem", 0, &oldmem_fops, NULL },
29302 #endif
29303+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29304+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
29305+#endif
29306 };
29307
29308 static int memory_open(struct inode *inode, struct file *filp)
29309diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
29310index da3cfee..a5a6606 100644
29311--- a/drivers/char/nvram.c
29312+++ b/drivers/char/nvram.c
29313@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
29314
29315 spin_unlock_irq(&rtc_lock);
29316
29317- if (copy_to_user(buf, contents, tmp - contents))
29318+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
29319 return -EFAULT;
29320
29321 *ppos = i;
29322diff --git a/drivers/char/random.c b/drivers/char/random.c
29323index 6035ab8..bdfe4fd 100644
29324--- a/drivers/char/random.c
29325+++ b/drivers/char/random.c
29326@@ -261,8 +261,13 @@
29327 /*
29328 * Configuration information
29329 */
29330+#ifdef CONFIG_GRKERNSEC_RANDNET
29331+#define INPUT_POOL_WORDS 512
29332+#define OUTPUT_POOL_WORDS 128
29333+#else
29334 #define INPUT_POOL_WORDS 128
29335 #define OUTPUT_POOL_WORDS 32
29336+#endif
29337 #define SEC_XFER_SIZE 512
29338 #define EXTRACT_SIZE 10
29339
29340@@ -300,10 +305,17 @@ static struct poolinfo {
29341 int poolwords;
29342 int tap1, tap2, tap3, tap4, tap5;
29343 } poolinfo_table[] = {
29344+#ifdef CONFIG_GRKERNSEC_RANDNET
29345+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
29346+ { 512, 411, 308, 208, 104, 1 },
29347+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
29348+ { 128, 103, 76, 51, 25, 1 },
29349+#else
29350 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
29351 { 128, 103, 76, 51, 25, 1 },
29352 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
29353 { 32, 26, 20, 14, 7, 1 },
29354+#endif
29355 #if 0
29356 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
29357 { 2048, 1638, 1231, 819, 411, 1 },
29358@@ -909,7 +921,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
29359
29360 extract_buf(r, tmp);
29361 i = min_t(int, nbytes, EXTRACT_SIZE);
29362- if (copy_to_user(buf, tmp, i)) {
29363+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
29364 ret = -EFAULT;
29365 break;
29366 }
29367@@ -1228,7 +1240,7 @@ EXPORT_SYMBOL(generate_random_uuid);
29368 #include <linux/sysctl.h>
29369
29370 static int min_read_thresh = 8, min_write_thresh;
29371-static int max_read_thresh = INPUT_POOL_WORDS * 32;
29372+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
29373 static int max_write_thresh = INPUT_POOL_WORDS * 32;
29374 static char sysctl_bootid[16];
29375
29376diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
29377index 1ee8ce7..b778bef 100644
29378--- a/drivers/char/sonypi.c
29379+++ b/drivers/char/sonypi.c
29380@@ -55,6 +55,7 @@
29381 #include <asm/uaccess.h>
29382 #include <asm/io.h>
29383 #include <asm/system.h>
29384+#include <asm/local.h>
29385
29386 #include <linux/sonypi.h>
29387
29388@@ -491,7 +492,7 @@ static struct sonypi_device {
29389 spinlock_t fifo_lock;
29390 wait_queue_head_t fifo_proc_list;
29391 struct fasync_struct *fifo_async;
29392- int open_count;
29393+ local_t open_count;
29394 int model;
29395 struct input_dev *input_jog_dev;
29396 struct input_dev *input_key_dev;
29397@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
29398 static int sonypi_misc_release(struct inode *inode, struct file *file)
29399 {
29400 mutex_lock(&sonypi_device.lock);
29401- sonypi_device.open_count--;
29402+ local_dec(&sonypi_device.open_count);
29403 mutex_unlock(&sonypi_device.lock);
29404 return 0;
29405 }
29406@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
29407 {
29408 mutex_lock(&sonypi_device.lock);
29409 /* Flush input queue on first open */
29410- if (!sonypi_device.open_count)
29411+ if (!local_read(&sonypi_device.open_count))
29412 kfifo_reset(&sonypi_device.fifo);
29413- sonypi_device.open_count++;
29414+ local_inc(&sonypi_device.open_count);
29415 mutex_unlock(&sonypi_device.lock);
29416
29417 return 0;
29418diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
29419index 361a1df..2471eee 100644
29420--- a/drivers/char/tpm/tpm.c
29421+++ b/drivers/char/tpm/tpm.c
29422@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
29423 chip->vendor.req_complete_val)
29424 goto out_recv;
29425
29426- if ((status == chip->vendor.req_canceled)) {
29427+ if (status == chip->vendor.req_canceled) {
29428 dev_err(chip->dev, "Operation Canceled\n");
29429 rc = -ECANCELED;
29430 goto out;
29431diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
29432index 0636520..169c1d0 100644
29433--- a/drivers/char/tpm/tpm_bios.c
29434+++ b/drivers/char/tpm/tpm_bios.c
29435@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
29436 event = addr;
29437
29438 if ((event->event_type == 0 && event->event_size == 0) ||
29439- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
29440+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
29441 return NULL;
29442
29443 return addr;
29444@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
29445 return NULL;
29446
29447 if ((event->event_type == 0 && event->event_size == 0) ||
29448- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
29449+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
29450 return NULL;
29451
29452 (*pos)++;
29453@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
29454 int i;
29455
29456 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
29457- seq_putc(m, data[i]);
29458+ if (!seq_putc(m, data[i]))
29459+ return -EFAULT;
29460
29461 return 0;
29462 }
29463@@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log *log)
29464 log->bios_event_log_end = log->bios_event_log + len;
29465
29466 virt = acpi_os_map_memory(start, len);
29467+ if (!virt) {
29468+ kfree(log->bios_event_log);
29469+ log->bios_event_log = NULL;
29470+ return -EFAULT;
29471+ }
29472
29473- memcpy(log->bios_event_log, virt, len);
29474+ memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
29475
29476 acpi_os_unmap_memory(virt, len);
29477 return 0;
29478diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
29479index 8e3c46d..c139b99 100644
29480--- a/drivers/char/virtio_console.c
29481+++ b/drivers/char/virtio_console.c
29482@@ -563,7 +563,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
29483 if (to_user) {
29484 ssize_t ret;
29485
29486- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
29487+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
29488 if (ret)
29489 return -EFAULT;
29490 } else {
29491@@ -662,7 +662,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
29492 if (!port_has_data(port) && !port->host_connected)
29493 return 0;
29494
29495- return fill_readbuf(port, ubuf, count, true);
29496+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
29497 }
29498
29499 static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
29500diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
29501index eb1d864..39ee5a7 100644
29502--- a/drivers/dma/dmatest.c
29503+++ b/drivers/dma/dmatest.c
29504@@ -591,7 +591,7 @@ static int dmatest_add_channel(struct dma_chan *chan)
29505 }
29506 if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
29507 cnt = dmatest_add_threads(dtc, DMA_PQ);
29508- thread_count += cnt > 0 ?: 0;
29509+ thread_count += cnt > 0 ? cnt : 0;
29510 }
29511
29512 pr_info("dmatest: Started %u threads using %s\n",
29513diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
29514index c9eee6d..f9d5280 100644
29515--- a/drivers/edac/amd64_edac.c
29516+++ b/drivers/edac/amd64_edac.c
29517@@ -2685,7 +2685,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
29518 * PCI core identifies what devices are on a system during boot, and then
29519 * inquiry this table to see if this driver is for a given device found.
29520 */
29521-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
29522+static const struct pci_device_id amd64_pci_table[] __devinitconst = {
29523 {
29524 .vendor = PCI_VENDOR_ID_AMD,
29525 .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
29526diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
29527index e47e73b..348e0bd 100644
29528--- a/drivers/edac/amd76x_edac.c
29529+++ b/drivers/edac/amd76x_edac.c
29530@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
29531 edac_mc_free(mci);
29532 }
29533
29534-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
29535+static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
29536 {
29537 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29538 AMD762},
29539diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
29540index 1af531a..3a8ff27 100644
29541--- a/drivers/edac/e752x_edac.c
29542+++ b/drivers/edac/e752x_edac.c
29543@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
29544 edac_mc_free(mci);
29545 }
29546
29547-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
29548+static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
29549 {
29550 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29551 E7520},
29552diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
29553index 6ffb6d2..383d8d7 100644
29554--- a/drivers/edac/e7xxx_edac.c
29555+++ b/drivers/edac/e7xxx_edac.c
29556@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
29557 edac_mc_free(mci);
29558 }
29559
29560-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
29561+static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
29562 {
29563 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29564 E7205},
29565diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
29566index 495198a..ac08c85 100644
29567--- a/drivers/edac/edac_pci_sysfs.c
29568+++ b/drivers/edac/edac_pci_sysfs.c
29569@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
29570 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
29571 static int edac_pci_poll_msec = 1000; /* one second workq period */
29572
29573-static atomic_t pci_parity_count = ATOMIC_INIT(0);
29574-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
29575+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
29576+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
29577
29578 static struct kobject *edac_pci_top_main_kobj;
29579 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
29580@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29581 edac_printk(KERN_CRIT, EDAC_PCI,
29582 "Signaled System Error on %s\n",
29583 pci_name(dev));
29584- atomic_inc(&pci_nonparity_count);
29585+ atomic_inc_unchecked(&pci_nonparity_count);
29586 }
29587
29588 if (status & (PCI_STATUS_PARITY)) {
29589@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29590 "Master Data Parity Error on %s\n",
29591 pci_name(dev));
29592
29593- atomic_inc(&pci_parity_count);
29594+ atomic_inc_unchecked(&pci_parity_count);
29595 }
29596
29597 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29598@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29599 "Detected Parity Error on %s\n",
29600 pci_name(dev));
29601
29602- atomic_inc(&pci_parity_count);
29603+ atomic_inc_unchecked(&pci_parity_count);
29604 }
29605 }
29606
29607@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29608 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
29609 "Signaled System Error on %s\n",
29610 pci_name(dev));
29611- atomic_inc(&pci_nonparity_count);
29612+ atomic_inc_unchecked(&pci_nonparity_count);
29613 }
29614
29615 if (status & (PCI_STATUS_PARITY)) {
29616@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29617 "Master Data Parity Error on "
29618 "%s\n", pci_name(dev));
29619
29620- atomic_inc(&pci_parity_count);
29621+ atomic_inc_unchecked(&pci_parity_count);
29622 }
29623
29624 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29625@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29626 "Detected Parity Error on %s\n",
29627 pci_name(dev));
29628
29629- atomic_inc(&pci_parity_count);
29630+ atomic_inc_unchecked(&pci_parity_count);
29631 }
29632 }
29633 }
29634@@ -677,7 +677,7 @@ void edac_pci_do_parity_check(void)
29635 if (!check_pci_errors)
29636 return;
29637
29638- before_count = atomic_read(&pci_parity_count);
29639+ before_count = atomic_read_unchecked(&pci_parity_count);
29640
29641 /* scan all PCI devices looking for a Parity Error on devices and
29642 * bridges.
29643@@ -689,7 +689,7 @@ void edac_pci_do_parity_check(void)
29644 /* Only if operator has selected panic on PCI Error */
29645 if (edac_pci_get_panic_on_pe()) {
29646 /* If the count is different 'after' from 'before' */
29647- if (before_count != atomic_read(&pci_parity_count))
29648+ if (before_count != atomic_read_unchecked(&pci_parity_count))
29649 panic("EDAC: PCI Parity Error");
29650 }
29651 }
29652diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
29653index c0510b3..6e2a954 100644
29654--- a/drivers/edac/i3000_edac.c
29655+++ b/drivers/edac/i3000_edac.c
29656@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
29657 edac_mc_free(mci);
29658 }
29659
29660-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
29661+static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
29662 {
29663 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29664 I3000},
29665diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
29666index aa08497..7e6822a 100644
29667--- a/drivers/edac/i3200_edac.c
29668+++ b/drivers/edac/i3200_edac.c
29669@@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
29670 edac_mc_free(mci);
29671 }
29672
29673-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
29674+static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
29675 {
29676 PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29677 I3200},
29678diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
29679index 4dc3ac2..67d05a6 100644
29680--- a/drivers/edac/i5000_edac.c
29681+++ b/drivers/edac/i5000_edac.c
29682@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
29683 *
29684 * The "E500P" device is the first device supported.
29685 */
29686-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
29687+static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
29688 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
29689 .driver_data = I5000P},
29690
29691diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
29692index bcbdeec..9886d16 100644
29693--- a/drivers/edac/i5100_edac.c
29694+++ b/drivers/edac/i5100_edac.c
29695@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
29696 edac_mc_free(mci);
29697 }
29698
29699-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
29700+static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
29701 /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
29702 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
29703 { 0, }
29704diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
29705index 74d6ec34..baff517 100644
29706--- a/drivers/edac/i5400_edac.c
29707+++ b/drivers/edac/i5400_edac.c
29708@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
29709 *
29710 * The "E500P" device is the first device supported.
29711 */
29712-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
29713+static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
29714 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
29715 {0,} /* 0 terminated list. */
29716 };
29717diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
29718index 6104dba..e7ea8e1 100644
29719--- a/drivers/edac/i7300_edac.c
29720+++ b/drivers/edac/i7300_edac.c
29721@@ -1192,7 +1192,7 @@ static void __devexit i7300_remove_one(struct pci_dev *pdev)
29722 *
29723 * Has only 8086:360c PCI ID
29724 */
29725-static const struct pci_device_id i7300_pci_tbl[] __devinitdata = {
29726+static const struct pci_device_id i7300_pci_tbl[] __devinitconst = {
29727 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
29728 {0,} /* 0 terminated list. */
29729 };
29730diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
29731index 70ad892..178943c 100644
29732--- a/drivers/edac/i7core_edac.c
29733+++ b/drivers/edac/i7core_edac.c
29734@@ -391,7 +391,7 @@ static const struct pci_id_table pci_dev_table[] = {
29735 /*
29736 * pci_device_id table for which devices we are looking for
29737 */
29738-static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
29739+static const struct pci_device_id i7core_pci_tbl[] __devinitconst = {
29740 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
29741 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
29742 {0,} /* 0 terminated list. */
29743diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
29744index 4329d39..f3022ef 100644
29745--- a/drivers/edac/i82443bxgx_edac.c
29746+++ b/drivers/edac/i82443bxgx_edac.c
29747@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
29748
29749 EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
29750
29751-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
29752+static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
29753 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
29754 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
29755 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
29756diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
29757index 931a057..fd28340 100644
29758--- a/drivers/edac/i82860_edac.c
29759+++ b/drivers/edac/i82860_edac.c
29760@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
29761 edac_mc_free(mci);
29762 }
29763
29764-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
29765+static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
29766 {
29767 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29768 I82860},
29769diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
29770index 33864c6..01edc61 100644
29771--- a/drivers/edac/i82875p_edac.c
29772+++ b/drivers/edac/i82875p_edac.c
29773@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
29774 edac_mc_free(mci);
29775 }
29776
29777-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
29778+static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
29779 {
29780 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29781 I82875P},
29782diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
29783index a5da732..983363b 100644
29784--- a/drivers/edac/i82975x_edac.c
29785+++ b/drivers/edac/i82975x_edac.c
29786@@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
29787 edac_mc_free(mci);
29788 }
29789
29790-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
29791+static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
29792 {
29793 PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29794 I82975X
29795diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
29796index 0106747..0b40417 100644
29797--- a/drivers/edac/mce_amd.h
29798+++ b/drivers/edac/mce_amd.h
29799@@ -83,7 +83,7 @@ struct amd_decoder_ops {
29800 bool (*dc_mce)(u16, u8);
29801 bool (*ic_mce)(u16, u8);
29802 bool (*nb_mce)(u16, u8);
29803-};
29804+} __no_const;
29805
29806 void amd_report_gart_errors(bool);
29807 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
29808diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
29809index b153674..ad2ba9b 100644
29810--- a/drivers/edac/r82600_edac.c
29811+++ b/drivers/edac/r82600_edac.c
29812@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
29813 edac_mc_free(mci);
29814 }
29815
29816-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
29817+static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
29818 {
29819 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
29820 },
29821diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
29822index 7a402bf..af0b211 100644
29823--- a/drivers/edac/sb_edac.c
29824+++ b/drivers/edac/sb_edac.c
29825@@ -367,7 +367,7 @@ static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
29826 /*
29827 * pci_device_id table for which devices we are looking for
29828 */
29829-static const struct pci_device_id sbridge_pci_tbl[] __devinitdata = {
29830+static const struct pci_device_id sbridge_pci_tbl[] __devinitconst = {
29831 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
29832 {0,} /* 0 terminated list. */
29833 };
29834diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
29835index b6f47de..c5acf3a 100644
29836--- a/drivers/edac/x38_edac.c
29837+++ b/drivers/edac/x38_edac.c
29838@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
29839 edac_mc_free(mci);
29840 }
29841
29842-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
29843+static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
29844 {
29845 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29846 X38},
29847diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
29848index 85661b0..c784559a 100644
29849--- a/drivers/firewire/core-card.c
29850+++ b/drivers/firewire/core-card.c
29851@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
29852
29853 void fw_core_remove_card(struct fw_card *card)
29854 {
29855- struct fw_card_driver dummy_driver = dummy_driver_template;
29856+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
29857
29858 card->driver->update_phy_reg(card, 4,
29859 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
29860diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
29861index 4799393..37bd3ab 100644
29862--- a/drivers/firewire/core-cdev.c
29863+++ b/drivers/firewire/core-cdev.c
29864@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct client *client,
29865 int ret;
29866
29867 if ((request->channels == 0 && request->bandwidth == 0) ||
29868- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
29869- request->bandwidth < 0)
29870+ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
29871 return -EINVAL;
29872
29873 r = kmalloc(sizeof(*r), GFP_KERNEL);
29874diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
29875index 855ab3f..11f4bbd 100644
29876--- a/drivers/firewire/core-transaction.c
29877+++ b/drivers/firewire/core-transaction.c
29878@@ -37,6 +37,7 @@
29879 #include <linux/timer.h>
29880 #include <linux/types.h>
29881 #include <linux/workqueue.h>
29882+#include <linux/sched.h>
29883
29884 #include <asm/byteorder.h>
29885
29886diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
29887index b45be57..5fad18b 100644
29888--- a/drivers/firewire/core.h
29889+++ b/drivers/firewire/core.h
29890@@ -101,6 +101,7 @@ struct fw_card_driver {
29891
29892 int (*stop_iso)(struct fw_iso_context *ctx);
29893 };
29894+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
29895
29896 void fw_card_initialize(struct fw_card *card,
29897 const struct fw_card_driver *driver, struct device *device);
29898diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
29899index 153980b..4b4d046 100644
29900--- a/drivers/firmware/dmi_scan.c
29901+++ b/drivers/firmware/dmi_scan.c
29902@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
29903 }
29904 }
29905 else {
29906- /*
29907- * no iounmap() for that ioremap(); it would be a no-op, but
29908- * it's so early in setup that sucker gets confused into doing
29909- * what it shouldn't if we actually call it.
29910- */
29911 p = dmi_ioremap(0xF0000, 0x10000);
29912 if (p == NULL)
29913 goto error;
29914@@ -723,7 +718,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
29915 if (buf == NULL)
29916 return -1;
29917
29918- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
29919+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
29920
29921 iounmap(buf);
29922 return 0;
29923diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
29924index 98723cb..10ca85b 100644
29925--- a/drivers/gpio/gpio-vr41xx.c
29926+++ b/drivers/gpio/gpio-vr41xx.c
29927@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
29928 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
29929 maskl, pendl, maskh, pendh);
29930
29931- atomic_inc(&irq_err_count);
29932+ atomic_inc_unchecked(&irq_err_count);
29933
29934 return -EINVAL;
29935 }
29936diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
29937index 8323fc3..5c1d755 100644
29938--- a/drivers/gpu/drm/drm_crtc.c
29939+++ b/drivers/gpu/drm/drm_crtc.c
29940@@ -1379,7 +1379,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
29941 */
29942 if ((out_resp->count_modes >= mode_count) && mode_count) {
29943 copied = 0;
29944- mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp->modes_ptr;
29945+ mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
29946 list_for_each_entry(mode, &connector->modes, head) {
29947 drm_crtc_convert_to_umode(&u_mode, mode);
29948 if (copy_to_user(mode_ptr + copied,
29949@@ -1394,8 +1394,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
29950
29951 if ((out_resp->count_props >= props_count) && props_count) {
29952 copied = 0;
29953- prop_ptr = (uint32_t *)(unsigned long)(out_resp->props_ptr);
29954- prop_values = (uint64_t *)(unsigned long)(out_resp->prop_values_ptr);
29955+ prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
29956+ prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
29957 for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
29958 if (connector->property_ids[i] != 0) {
29959 if (put_user(connector->property_ids[i],
29960@@ -1417,7 +1417,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
29961
29962 if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
29963 copied = 0;
29964- encoder_ptr = (uint32_t *)(unsigned long)(out_resp->encoders_ptr);
29965+ encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
29966 for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
29967 if (connector->encoder_ids[i] != 0) {
29968 if (put_user(connector->encoder_ids[i],
29969@@ -1576,7 +1576,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
29970 }
29971
29972 for (i = 0; i < crtc_req->count_connectors; i++) {
29973- set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req->set_connectors_ptr;
29974+ set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
29975 if (get_user(out_id, &set_connectors_ptr[i])) {
29976 ret = -EFAULT;
29977 goto out;
29978@@ -1857,7 +1857,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
29979 fb = obj_to_fb(obj);
29980
29981 num_clips = r->num_clips;
29982- clips_ptr = (struct drm_clip_rect *)(unsigned long)r->clips_ptr;
29983+ clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr;
29984
29985 if (!num_clips != !clips_ptr) {
29986 ret = -EINVAL;
29987@@ -2283,7 +2283,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
29988 out_resp->flags = property->flags;
29989
29990 if ((out_resp->count_values >= value_count) && value_count) {
29991- values_ptr = (uint64_t *)(unsigned long)out_resp->values_ptr;
29992+ values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
29993 for (i = 0; i < value_count; i++) {
29994 if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
29995 ret = -EFAULT;
29996@@ -2296,7 +2296,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
29997 if (property->flags & DRM_MODE_PROP_ENUM) {
29998 if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
29999 copied = 0;
30000- enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp->enum_blob_ptr;
30001+ enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
30002 list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
30003
30004 if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
30005@@ -2319,7 +2319,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
30006 if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
30007 copied = 0;
30008 blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
30009- blob_length_ptr = (uint32_t *)(unsigned long)out_resp->values_ptr;
30010+ blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
30011
30012 list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
30013 if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
30014@@ -2380,7 +2380,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
30015 struct drm_mode_get_blob *out_resp = data;
30016 struct drm_property_blob *blob;
30017 int ret = 0;
30018- void *blob_ptr;
30019+ void __user *blob_ptr;
30020
30021 if (!drm_core_check_feature(dev, DRIVER_MODESET))
30022 return -EINVAL;
30023@@ -2394,7 +2394,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
30024 blob = obj_to_blob(obj);
30025
30026 if (out_resp->length == blob->length) {
30027- blob_ptr = (void *)(unsigned long)out_resp->data;
30028+ blob_ptr = (void __user *)(unsigned long)out_resp->data;
30029 if (copy_to_user(blob_ptr, blob->data, blob->length)){
30030 ret = -EFAULT;
30031 goto done;
30032diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
30033index d2619d7..bd6bd00 100644
30034--- a/drivers/gpu/drm/drm_crtc_helper.c
30035+++ b/drivers/gpu/drm/drm_crtc_helper.c
30036@@ -279,7 +279,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
30037 struct drm_crtc *tmp;
30038 int crtc_mask = 1;
30039
30040- WARN(!crtc, "checking null crtc?\n");
30041+ BUG_ON(!crtc);
30042
30043 dev = crtc->dev;
30044
30045diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
30046index 40c187c..5746164 100644
30047--- a/drivers/gpu/drm/drm_drv.c
30048+++ b/drivers/gpu/drm/drm_drv.c
30049@@ -308,7 +308,7 @@ module_exit(drm_core_exit);
30050 /**
30051 * Copy and IOCTL return string to user space
30052 */
30053-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
30054+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
30055 {
30056 int len;
30057
30058@@ -387,7 +387,7 @@ long drm_ioctl(struct file *filp,
30059
30060 dev = file_priv->minor->dev;
30061 atomic_inc(&dev->ioctl_count);
30062- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
30063+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
30064 ++file_priv->ioctl_count;
30065
30066 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
30067diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
30068index 828bf65..cdaa0e9 100644
30069--- a/drivers/gpu/drm/drm_fops.c
30070+++ b/drivers/gpu/drm/drm_fops.c
30071@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
30072 }
30073
30074 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
30075- atomic_set(&dev->counts[i], 0);
30076+ atomic_set_unchecked(&dev->counts[i], 0);
30077
30078 dev->sigdata.lock = NULL;
30079
30080@@ -135,8 +135,8 @@ int drm_open(struct inode *inode, struct file *filp)
30081
30082 retcode = drm_open_helper(inode, filp, dev);
30083 if (!retcode) {
30084- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
30085- if (!dev->open_count++)
30086+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
30087+ if (local_inc_return(&dev->open_count) == 1)
30088 retcode = drm_setup(dev);
30089 }
30090 if (!retcode) {
30091@@ -473,7 +473,7 @@ int drm_release(struct inode *inode, struct file *filp)
30092
30093 mutex_lock(&drm_global_mutex);
30094
30095- DRM_DEBUG("open_count = %d\n", dev->open_count);
30096+ DRM_DEBUG("open_count = %d\n", local_read(&dev->open_count));
30097
30098 if (dev->driver->preclose)
30099 dev->driver->preclose(dev, file_priv);
30100@@ -485,7 +485,7 @@ int drm_release(struct inode *inode, struct file *filp)
30101 DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
30102 task_pid_nr(current),
30103 (long)old_encode_dev(file_priv->minor->device),
30104- dev->open_count);
30105+ local_read(&dev->open_count));
30106
30107 /* Release any auth tokens that might point to this file_priv,
30108 (do that under the drm_global_mutex) */
30109@@ -571,8 +571,8 @@ int drm_release(struct inode *inode, struct file *filp)
30110 * End inline drm_release
30111 */
30112
30113- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
30114- if (!--dev->open_count) {
30115+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
30116+ if (local_dec_and_test(&dev->open_count)) {
30117 if (atomic_read(&dev->ioctl_count)) {
30118 DRM_ERROR("Device busy: %d\n",
30119 atomic_read(&dev->ioctl_count));
30120diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
30121index c87dc96..326055d 100644
30122--- a/drivers/gpu/drm/drm_global.c
30123+++ b/drivers/gpu/drm/drm_global.c
30124@@ -36,7 +36,7 @@
30125 struct drm_global_item {
30126 struct mutex mutex;
30127 void *object;
30128- int refcount;
30129+ atomic_t refcount;
30130 };
30131
30132 static struct drm_global_item glob[DRM_GLOBAL_NUM];
30133@@ -49,7 +49,7 @@ void drm_global_init(void)
30134 struct drm_global_item *item = &glob[i];
30135 mutex_init(&item->mutex);
30136 item->object = NULL;
30137- item->refcount = 0;
30138+ atomic_set(&item->refcount, 0);
30139 }
30140 }
30141
30142@@ -59,7 +59,7 @@ void drm_global_release(void)
30143 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
30144 struct drm_global_item *item = &glob[i];
30145 BUG_ON(item->object != NULL);
30146- BUG_ON(item->refcount != 0);
30147+ BUG_ON(atomic_read(&item->refcount) != 0);
30148 }
30149 }
30150
30151@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30152 void *object;
30153
30154 mutex_lock(&item->mutex);
30155- if (item->refcount == 0) {
30156+ if (atomic_read(&item->refcount) == 0) {
30157 item->object = kzalloc(ref->size, GFP_KERNEL);
30158 if (unlikely(item->object == NULL)) {
30159 ret = -ENOMEM;
30160@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30161 goto out_err;
30162
30163 }
30164- ++item->refcount;
30165+ atomic_inc(&item->refcount);
30166 ref->object = item->object;
30167 object = item->object;
30168 mutex_unlock(&item->mutex);
30169@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
30170 struct drm_global_item *item = &glob[ref->global_type];
30171
30172 mutex_lock(&item->mutex);
30173- BUG_ON(item->refcount == 0);
30174+ BUG_ON(atomic_read(&item->refcount) == 0);
30175 BUG_ON(ref->object != item->object);
30176- if (--item->refcount == 0) {
30177+ if (atomic_dec_and_test(&item->refcount)) {
30178 ref->release(ref);
30179 item->object = NULL;
30180 }
30181diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
30182index ab1162d..42587b2 100644
30183--- a/drivers/gpu/drm/drm_info.c
30184+++ b/drivers/gpu/drm/drm_info.c
30185@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
30186 struct drm_local_map *map;
30187 struct drm_map_list *r_list;
30188
30189- /* Hardcoded from _DRM_FRAME_BUFFER,
30190- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
30191- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
30192- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
30193+ static const char * const types[] = {
30194+ [_DRM_FRAME_BUFFER] = "FB",
30195+ [_DRM_REGISTERS] = "REG",
30196+ [_DRM_SHM] = "SHM",
30197+ [_DRM_AGP] = "AGP",
30198+ [_DRM_SCATTER_GATHER] = "SG",
30199+ [_DRM_CONSISTENT] = "PCI",
30200+ [_DRM_GEM] = "GEM" };
30201 const char *type;
30202 int i;
30203
30204@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
30205 map = r_list->map;
30206 if (!map)
30207 continue;
30208- if (map->type < 0 || map->type > 5)
30209+ if (map->type >= ARRAY_SIZE(types))
30210 type = "??";
30211 else
30212 type = types[map->type];
30213@@ -290,7 +294,11 @@ int drm_vma_info(struct seq_file *m, void *data)
30214 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
30215 vma->vm_flags & VM_LOCKED ? 'l' : '-',
30216 vma->vm_flags & VM_IO ? 'i' : '-',
30217+#ifdef CONFIG_GRKERNSEC_HIDESYM
30218+ 0);
30219+#else
30220 vma->vm_pgoff);
30221+#endif
30222
30223 #if defined(__i386__)
30224 pgprot = pgprot_val(vma->vm_page_prot);
30225diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
30226index ddd70db..40321e6 100644
30227--- a/drivers/gpu/drm/drm_ioc32.c
30228+++ b/drivers/gpu/drm/drm_ioc32.c
30229@@ -456,7 +456,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
30230 request = compat_alloc_user_space(nbytes);
30231 if (!access_ok(VERIFY_WRITE, request, nbytes))
30232 return -EFAULT;
30233- list = (struct drm_buf_desc *) (request + 1);
30234+ list = (struct drm_buf_desc __user *) (request + 1);
30235
30236 if (__put_user(count, &request->count)
30237 || __put_user(list, &request->list))
30238@@ -517,7 +517,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
30239 request = compat_alloc_user_space(nbytes);
30240 if (!access_ok(VERIFY_WRITE, request, nbytes))
30241 return -EFAULT;
30242- list = (struct drm_buf_pub *) (request + 1);
30243+ list = (struct drm_buf_pub __user *) (request + 1);
30244
30245 if (__put_user(count, &request->count)
30246 || __put_user(list, &request->list))
30247diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
30248index 904d7e9..ab88581 100644
30249--- a/drivers/gpu/drm/drm_ioctl.c
30250+++ b/drivers/gpu/drm/drm_ioctl.c
30251@@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev, void *data,
30252 stats->data[i].value =
30253 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
30254 else
30255- stats->data[i].value = atomic_read(&dev->counts[i]);
30256+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
30257 stats->data[i].type = dev->types[i];
30258 }
30259
30260diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
30261index 632ae24..244cf4a 100644
30262--- a/drivers/gpu/drm/drm_lock.c
30263+++ b/drivers/gpu/drm/drm_lock.c
30264@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30265 if (drm_lock_take(&master->lock, lock->context)) {
30266 master->lock.file_priv = file_priv;
30267 master->lock.lock_time = jiffies;
30268- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
30269+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
30270 break; /* Got lock */
30271 }
30272
30273@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30274 return -EINVAL;
30275 }
30276
30277- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
30278+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
30279
30280 if (drm_lock_free(&master->lock, lock->context)) {
30281 /* FIXME: Should really bail out here. */
30282diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
30283index 8f371e8..9f85d52 100644
30284--- a/drivers/gpu/drm/i810/i810_dma.c
30285+++ b/drivers/gpu/drm/i810/i810_dma.c
30286@@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
30287 dma->buflist[vertex->idx],
30288 vertex->discard, vertex->used);
30289
30290- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30291- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30292+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30293+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30294 sarea_priv->last_enqueue = dev_priv->counter - 1;
30295 sarea_priv->last_dispatch = (int)hw_status[5];
30296
30297@@ -1111,8 +1111,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
30298 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
30299 mc->last_render);
30300
30301- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30302- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30303+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30304+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30305 sarea_priv->last_enqueue = dev_priv->counter - 1;
30306 sarea_priv->last_dispatch = (int)hw_status[5];
30307
30308diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
30309index c9339f4..f5e1b9d 100644
30310--- a/drivers/gpu/drm/i810/i810_drv.h
30311+++ b/drivers/gpu/drm/i810/i810_drv.h
30312@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
30313 int page_flipping;
30314
30315 wait_queue_head_t irq_queue;
30316- atomic_t irq_received;
30317- atomic_t irq_emitted;
30318+ atomic_unchecked_t irq_received;
30319+ atomic_unchecked_t irq_emitted;
30320
30321 int front_offset;
30322 } drm_i810_private_t;
30323diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
30324index b2e3c97..58cf079 100644
30325--- a/drivers/gpu/drm/i915/i915_debugfs.c
30326+++ b/drivers/gpu/drm/i915/i915_debugfs.c
30327@@ -499,7 +499,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
30328 I915_READ(GTIMR));
30329 }
30330 seq_printf(m, "Interrupts received: %d\n",
30331- atomic_read(&dev_priv->irq_received));
30332+ atomic_read_unchecked(&dev_priv->irq_received));
30333 for (i = 0; i < I915_NUM_RINGS; i++) {
30334 if (IS_GEN6(dev) || IS_GEN7(dev)) {
30335 seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
30336@@ -1232,7 +1232,7 @@ static int i915_opregion(struct seq_file *m, void *unused)
30337 return ret;
30338
30339 if (opregion->header)
30340- seq_write(m, opregion->header, OPREGION_SIZE);
30341+ seq_write(m, (const void __force_kernel *)opregion->header, OPREGION_SIZE);
30342
30343 mutex_unlock(&dev->struct_mutex);
30344
30345diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
30346index c4da951..3c59c5c 100644
30347--- a/drivers/gpu/drm/i915/i915_dma.c
30348+++ b/drivers/gpu/drm/i915/i915_dma.c
30349@@ -1172,7 +1172,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
30350 bool can_switch;
30351
30352 spin_lock(&dev->count_lock);
30353- can_switch = (dev->open_count == 0);
30354+ can_switch = (local_read(&dev->open_count) == 0);
30355 spin_unlock(&dev->count_lock);
30356 return can_switch;
30357 }
30358diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
30359index ae294a0..1755461 100644
30360--- a/drivers/gpu/drm/i915/i915_drv.h
30361+++ b/drivers/gpu/drm/i915/i915_drv.h
30362@@ -229,7 +229,7 @@ struct drm_i915_display_funcs {
30363 /* render clock increase/decrease */
30364 /* display clock increase/decrease */
30365 /* pll clock increase/decrease */
30366-};
30367+} __no_const;
30368
30369 struct intel_device_info {
30370 u8 gen;
30371@@ -318,7 +318,7 @@ typedef struct drm_i915_private {
30372 int current_page;
30373 int page_flipping;
30374
30375- atomic_t irq_received;
30376+ atomic_unchecked_t irq_received;
30377
30378 /* protects the irq masks */
30379 spinlock_t irq_lock;
30380@@ -893,7 +893,7 @@ struct drm_i915_gem_object {
30381 * will be page flipped away on the next vblank. When it
30382 * reaches 0, dev_priv->pending_flip_queue will be woken up.
30383 */
30384- atomic_t pending_flip;
30385+ atomic_unchecked_t pending_flip;
30386 };
30387
30388 #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
30389@@ -1273,7 +1273,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
30390 extern void intel_teardown_gmbus(struct drm_device *dev);
30391 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
30392 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
30393-extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30394+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30395 {
30396 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
30397 }
30398diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30399index b9da890..cad1d98 100644
30400--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30401+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30402@@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
30403 i915_gem_clflush_object(obj);
30404
30405 if (obj->base.pending_write_domain)
30406- cd->flips |= atomic_read(&obj->pending_flip);
30407+ cd->flips |= atomic_read_unchecked(&obj->pending_flip);
30408
30409 /* The actual obj->write_domain will be updated with
30410 * pending_write_domain after we emit the accumulated flush for all
30411@@ -882,9 +882,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
30412
30413 static int
30414 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
30415- int count)
30416+ unsigned int count)
30417 {
30418- int i;
30419+ unsigned int i;
30420
30421 for (i = 0; i < count; i++) {
30422 char __user *ptr = (char __user *)(uintptr_t)exec[i].relocs_ptr;
30423diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
30424index d47a53b..61154c2 100644
30425--- a/drivers/gpu/drm/i915/i915_irq.c
30426+++ b/drivers/gpu/drm/i915/i915_irq.c
30427@@ -475,7 +475,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
30428 u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
30429 struct drm_i915_master_private *master_priv;
30430
30431- atomic_inc(&dev_priv->irq_received);
30432+ atomic_inc_unchecked(&dev_priv->irq_received);
30433
30434 /* disable master interrupt before clearing iir */
30435 de_ier = I915_READ(DEIER);
30436@@ -566,7 +566,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
30437 struct drm_i915_master_private *master_priv;
30438 u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
30439
30440- atomic_inc(&dev_priv->irq_received);
30441+ atomic_inc_unchecked(&dev_priv->irq_received);
30442
30443 if (IS_GEN6(dev))
30444 bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
30445@@ -1231,7 +1231,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
30446 int ret = IRQ_NONE, pipe;
30447 bool blc_event = false;
30448
30449- atomic_inc(&dev_priv->irq_received);
30450+ atomic_inc_unchecked(&dev_priv->irq_received);
30451
30452 iir = I915_READ(IIR);
30453
30454@@ -1750,7 +1750,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
30455 {
30456 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30457
30458- atomic_set(&dev_priv->irq_received, 0);
30459+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30460
30461 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30462 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30463@@ -1938,7 +1938,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
30464 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30465 int pipe;
30466
30467- atomic_set(&dev_priv->irq_received, 0);
30468+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30469
30470 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30471 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30472diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
30473index 9ec9755..6d1cf2d 100644
30474--- a/drivers/gpu/drm/i915/intel_display.c
30475+++ b/drivers/gpu/drm/i915/intel_display.c
30476@@ -2230,7 +2230,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
30477
30478 wait_event(dev_priv->pending_flip_queue,
30479 atomic_read(&dev_priv->mm.wedged) ||
30480- atomic_read(&obj->pending_flip) == 0);
30481+ atomic_read_unchecked(&obj->pending_flip) == 0);
30482
30483 /* Big Hammer, we also need to ensure that any pending
30484 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
30485@@ -2851,7 +2851,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
30486 obj = to_intel_framebuffer(crtc->fb)->obj;
30487 dev_priv = crtc->dev->dev_private;
30488 wait_event(dev_priv->pending_flip_queue,
30489- atomic_read(&obj->pending_flip) == 0);
30490+ atomic_read_unchecked(&obj->pending_flip) == 0);
30491 }
30492
30493 static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
30494@@ -6952,7 +6952,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
30495
30496 atomic_clear_mask(1 << intel_crtc->plane,
30497 &obj->pending_flip.counter);
30498- if (atomic_read(&obj->pending_flip) == 0)
30499+ if (atomic_read_unchecked(&obj->pending_flip) == 0)
30500 wake_up(&dev_priv->pending_flip_queue);
30501
30502 schedule_work(&work->work);
30503@@ -7242,7 +7242,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30504 /* Block clients from rendering to the new back buffer until
30505 * the flip occurs and the object is no longer visible.
30506 */
30507- atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30508+ atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30509
30510 ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
30511 if (ret)
30512@@ -7256,7 +7256,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30513 return 0;
30514
30515 cleanup_pending:
30516- atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30517+ atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30518 drm_gem_object_unreference(&work->old_fb_obj->base);
30519 drm_gem_object_unreference(&obj->base);
30520 mutex_unlock(&dev->struct_mutex);
30521diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
30522index 54558a0..2d97005 100644
30523--- a/drivers/gpu/drm/mga/mga_drv.h
30524+++ b/drivers/gpu/drm/mga/mga_drv.h
30525@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
30526 u32 clear_cmd;
30527 u32 maccess;
30528
30529- atomic_t vbl_received; /**< Number of vblanks received. */
30530+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
30531 wait_queue_head_t fence_queue;
30532- atomic_t last_fence_retired;
30533+ atomic_unchecked_t last_fence_retired;
30534 u32 next_fence_to_post;
30535
30536 unsigned int fb_cpp;
30537diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
30538index 2581202..f230a8d9 100644
30539--- a/drivers/gpu/drm/mga/mga_irq.c
30540+++ b/drivers/gpu/drm/mga/mga_irq.c
30541@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
30542 if (crtc != 0)
30543 return 0;
30544
30545- return atomic_read(&dev_priv->vbl_received);
30546+ return atomic_read_unchecked(&dev_priv->vbl_received);
30547 }
30548
30549
30550@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30551 /* VBLANK interrupt */
30552 if (status & MGA_VLINEPEN) {
30553 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
30554- atomic_inc(&dev_priv->vbl_received);
30555+ atomic_inc_unchecked(&dev_priv->vbl_received);
30556 drm_handle_vblank(dev, 0);
30557 handled = 1;
30558 }
30559@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30560 if ((prim_start & ~0x03) != (prim_end & ~0x03))
30561 MGA_WRITE(MGA_PRIMEND, prim_end);
30562
30563- atomic_inc(&dev_priv->last_fence_retired);
30564+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
30565 DRM_WAKEUP(&dev_priv->fence_queue);
30566 handled = 1;
30567 }
30568@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
30569 * using fences.
30570 */
30571 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
30572- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
30573+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
30574 - *sequence) <= (1 << 23)));
30575
30576 *sequence = cur_fence;
30577diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
30578index 5fc201b..7b032b9 100644
30579--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
30580+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
30581@@ -201,7 +201,7 @@ struct methods {
30582 const char desc[8];
30583 void (*loadbios)(struct drm_device *, uint8_t *);
30584 const bool rw;
30585-};
30586+} __do_const;
30587
30588 static struct methods shadow_methods[] = {
30589 { "PRAMIN", load_vbios_pramin, true },
30590@@ -5474,7 +5474,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
30591 struct bit_table {
30592 const char id;
30593 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
30594-};
30595+} __no_const;
30596
30597 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
30598
30599diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
30600index 4c0be3a..5757582 100644
30601--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
30602+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
30603@@ -238,7 +238,7 @@ struct nouveau_channel {
30604 struct list_head pending;
30605 uint32_t sequence;
30606 uint32_t sequence_ack;
30607- atomic_t last_sequence_irq;
30608+ atomic_unchecked_t last_sequence_irq;
30609 struct nouveau_vma vma;
30610 } fence;
30611
30612@@ -319,7 +319,7 @@ struct nouveau_exec_engine {
30613 u32 handle, u16 class);
30614 void (*set_tile_region)(struct drm_device *dev, int i);
30615 void (*tlb_flush)(struct drm_device *, int engine);
30616-};
30617+} __no_const;
30618
30619 struct nouveau_instmem_engine {
30620 void *priv;
30621@@ -341,13 +341,13 @@ struct nouveau_instmem_engine {
30622 struct nouveau_mc_engine {
30623 int (*init)(struct drm_device *dev);
30624 void (*takedown)(struct drm_device *dev);
30625-};
30626+} __no_const;
30627
30628 struct nouveau_timer_engine {
30629 int (*init)(struct drm_device *dev);
30630 void (*takedown)(struct drm_device *dev);
30631 uint64_t (*read)(struct drm_device *dev);
30632-};
30633+} __no_const;
30634
30635 struct nouveau_fb_engine {
30636 int num_tiles;
30637@@ -558,7 +558,7 @@ struct nouveau_vram_engine {
30638 void (*put)(struct drm_device *, struct nouveau_mem **);
30639
30640 bool (*flags_valid)(struct drm_device *, u32 tile_flags);
30641-};
30642+} __no_const;
30643
30644 struct nouveau_engine {
30645 struct nouveau_instmem_engine instmem;
30646@@ -706,7 +706,7 @@ struct drm_nouveau_private {
30647 struct drm_global_reference mem_global_ref;
30648 struct ttm_bo_global_ref bo_global_ref;
30649 struct ttm_bo_device bdev;
30650- atomic_t validate_sequence;
30651+ atomic_unchecked_t validate_sequence;
30652 } ttm;
30653
30654 struct {
30655diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
30656index 2f6daae..c9d7b9e 100644
30657--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
30658+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
30659@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_channel *chan)
30660 if (USE_REFCNT(dev))
30661 sequence = nvchan_rd32(chan, 0x48);
30662 else
30663- sequence = atomic_read(&chan->fence.last_sequence_irq);
30664+ sequence = atomic_read_unchecked(&chan->fence.last_sequence_irq);
30665
30666 if (chan->fence.sequence_ack == sequence)
30667 goto out;
30668@@ -539,7 +539,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)
30669 return ret;
30670 }
30671
30672- atomic_set(&chan->fence.last_sequence_irq, 0);
30673+ atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
30674 return 0;
30675 }
30676
30677diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
30678index 7ce3fde..cb3ea04 100644
30679--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
30680+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
30681@@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
30682 int trycnt = 0;
30683 int ret, i;
30684
30685- sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
30686+ sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence);
30687 retry:
30688 if (++trycnt > 100000) {
30689 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
30690diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
30691index d8831ab..0ba8356 100644
30692--- a/drivers/gpu/drm/nouveau/nouveau_state.c
30693+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
30694@@ -542,7 +542,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
30695 bool can_switch;
30696
30697 spin_lock(&dev->count_lock);
30698- can_switch = (dev->open_count == 0);
30699+ can_switch = (local_read(&dev->open_count) == 0);
30700 spin_unlock(&dev->count_lock);
30701 return can_switch;
30702 }
30703diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
30704index dbdea8e..cd6eeeb 100644
30705--- a/drivers/gpu/drm/nouveau/nv04_graph.c
30706+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
30707@@ -554,7 +554,7 @@ static int
30708 nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
30709 u32 class, u32 mthd, u32 data)
30710 {
30711- atomic_set(&chan->fence.last_sequence_irq, data);
30712+ atomic_set_unchecked(&chan->fence.last_sequence_irq, data);
30713 return 0;
30714 }
30715
30716diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
30717index bcac90b..53bfc76 100644
30718--- a/drivers/gpu/drm/r128/r128_cce.c
30719+++ b/drivers/gpu/drm/r128/r128_cce.c
30720@@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
30721
30722 /* GH: Simple idle check.
30723 */
30724- atomic_set(&dev_priv->idle_count, 0);
30725+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30726
30727 /* We don't support anything other than bus-mastering ring mode,
30728 * but the ring can be in either AGP or PCI space for the ring
30729diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
30730index 930c71b..499aded 100644
30731--- a/drivers/gpu/drm/r128/r128_drv.h
30732+++ b/drivers/gpu/drm/r128/r128_drv.h
30733@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
30734 int is_pci;
30735 unsigned long cce_buffers_offset;
30736
30737- atomic_t idle_count;
30738+ atomic_unchecked_t idle_count;
30739
30740 int page_flipping;
30741 int current_page;
30742 u32 crtc_offset;
30743 u32 crtc_offset_cntl;
30744
30745- atomic_t vbl_received;
30746+ atomic_unchecked_t vbl_received;
30747
30748 u32 color_fmt;
30749 unsigned int front_offset;
30750diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
30751index 429d5a0..7e899ed 100644
30752--- a/drivers/gpu/drm/r128/r128_irq.c
30753+++ b/drivers/gpu/drm/r128/r128_irq.c
30754@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
30755 if (crtc != 0)
30756 return 0;
30757
30758- return atomic_read(&dev_priv->vbl_received);
30759+ return atomic_read_unchecked(&dev_priv->vbl_received);
30760 }
30761
30762 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30763@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30764 /* VBLANK interrupt */
30765 if (status & R128_CRTC_VBLANK_INT) {
30766 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
30767- atomic_inc(&dev_priv->vbl_received);
30768+ atomic_inc_unchecked(&dev_priv->vbl_received);
30769 drm_handle_vblank(dev, 0);
30770 return IRQ_HANDLED;
30771 }
30772diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
30773index a9e33ce..09edd4b 100644
30774--- a/drivers/gpu/drm/r128/r128_state.c
30775+++ b/drivers/gpu/drm/r128/r128_state.c
30776@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
30777
30778 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
30779 {
30780- if (atomic_read(&dev_priv->idle_count) == 0)
30781+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
30782 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
30783 else
30784- atomic_set(&dev_priv->idle_count, 0);
30785+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30786 }
30787
30788 #endif
30789diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
30790index 5a82b6b..9e69c73 100644
30791--- a/drivers/gpu/drm/radeon/mkregtable.c
30792+++ b/drivers/gpu/drm/radeon/mkregtable.c
30793@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
30794 regex_t mask_rex;
30795 regmatch_t match[4];
30796 char buf[1024];
30797- size_t end;
30798+ long end;
30799 int len;
30800 int done = 0;
30801 int r;
30802 unsigned o;
30803 struct offset *offset;
30804 char last_reg_s[10];
30805- int last_reg;
30806+ unsigned long last_reg;
30807
30808 if (regcomp
30809 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
30810diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
30811index cb1acff..8861bc5 100644
30812--- a/drivers/gpu/drm/radeon/r600_cs.c
30813+++ b/drivers/gpu/drm/radeon/r600_cs.c
30814@@ -1304,6 +1304,7 @@ static int r600_check_texture_resource(struct radeon_cs_parser *p, u32 idx,
30815 h0 = G_038004_TEX_HEIGHT(word1) + 1;
30816 d0 = G_038004_TEX_DEPTH(word1);
30817 nfaces = 1;
30818+ array = 0;
30819 switch (G_038000_DIM(word0)) {
30820 case V_038000_SQ_TEX_DIM_1D:
30821 case V_038000_SQ_TEX_DIM_2D:
30822diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
30823index 8227e76..ce0b195 100644
30824--- a/drivers/gpu/drm/radeon/radeon.h
30825+++ b/drivers/gpu/drm/radeon/radeon.h
30826@@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_device *rdev);
30827 */
30828 struct radeon_fence_driver {
30829 uint32_t scratch_reg;
30830- atomic_t seq;
30831+ atomic_unchecked_t seq;
30832 uint32_t last_seq;
30833 unsigned long last_jiffies;
30834 unsigned long last_timeout;
30835@@ -530,7 +530,7 @@ struct r600_blit_cp_primitives {
30836 int x2, int y2);
30837 void (*draw_auto)(struct radeon_device *rdev);
30838 void (*set_default_state)(struct radeon_device *rdev);
30839-};
30840+} __no_const;
30841
30842 struct r600_blit {
30843 struct mutex mutex;
30844@@ -954,7 +954,7 @@ struct radeon_asic {
30845 void (*pre_page_flip)(struct radeon_device *rdev, int crtc);
30846 u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
30847 void (*post_page_flip)(struct radeon_device *rdev, int crtc);
30848-};
30849+} __no_const;
30850
30851 /*
30852 * Asic structures
30853diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
30854index 9231564..78b00fd 100644
30855--- a/drivers/gpu/drm/radeon/radeon_device.c
30856+++ b/drivers/gpu/drm/radeon/radeon_device.c
30857@@ -687,7 +687,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
30858 bool can_switch;
30859
30860 spin_lock(&dev->count_lock);
30861- can_switch = (dev->open_count == 0);
30862+ can_switch = (local_read(&dev->open_count) == 0);
30863 spin_unlock(&dev->count_lock);
30864 return can_switch;
30865 }
30866diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
30867index a1b59ca..86f2d44 100644
30868--- a/drivers/gpu/drm/radeon/radeon_drv.h
30869+++ b/drivers/gpu/drm/radeon/radeon_drv.h
30870@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
30871
30872 /* SW interrupt */
30873 wait_queue_head_t swi_queue;
30874- atomic_t swi_emitted;
30875+ atomic_unchecked_t swi_emitted;
30876 int vblank_crtc;
30877 uint32_t irq_enable_reg;
30878 uint32_t r500_disp_irq_reg;
30879diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
30880index 76ec0e9..6feb1a3 100644
30881--- a/drivers/gpu/drm/radeon/radeon_fence.c
30882+++ b/drivers/gpu/drm/radeon/radeon_fence.c
30883@@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
30884 write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
30885 return 0;
30886 }
30887- fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
30888+ fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
30889 if (!rdev->cp.ready)
30890 /* FIXME: cp is not running assume everythings is done right
30891 * away
30892@@ -373,7 +373,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
30893 return r;
30894 }
30895 radeon_fence_write(rdev, 0);
30896- atomic_set(&rdev->fence_drv.seq, 0);
30897+ atomic_set_unchecked(&rdev->fence_drv.seq, 0);
30898 INIT_LIST_HEAD(&rdev->fence_drv.created);
30899 INIT_LIST_HEAD(&rdev->fence_drv.emited);
30900 INIT_LIST_HEAD(&rdev->fence_drv.signaled);
30901diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
30902index 48b7cea..342236f 100644
30903--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
30904+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
30905@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
30906 request = compat_alloc_user_space(sizeof(*request));
30907 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
30908 || __put_user(req32.param, &request->param)
30909- || __put_user((void __user *)(unsigned long)req32.value,
30910+ || __put_user((unsigned long)req32.value,
30911 &request->value))
30912 return -EFAULT;
30913
30914diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
30915index 00da384..32f972d 100644
30916--- a/drivers/gpu/drm/radeon/radeon_irq.c
30917+++ b/drivers/gpu/drm/radeon/radeon_irq.c
30918@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
30919 unsigned int ret;
30920 RING_LOCALS;
30921
30922- atomic_inc(&dev_priv->swi_emitted);
30923- ret = atomic_read(&dev_priv->swi_emitted);
30924+ atomic_inc_unchecked(&dev_priv->swi_emitted);
30925+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
30926
30927 BEGIN_RING(4);
30928 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
30929@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
30930 drm_radeon_private_t *dev_priv =
30931 (drm_radeon_private_t *) dev->dev_private;
30932
30933- atomic_set(&dev_priv->swi_emitted, 0);
30934+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
30935 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
30936
30937 dev->max_vblank_count = 0x001fffff;
30938diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
30939index e8422ae..d22d4a8 100644
30940--- a/drivers/gpu/drm/radeon/radeon_state.c
30941+++ b/drivers/gpu/drm/radeon/radeon_state.c
30942@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
30943 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
30944 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
30945
30946- if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
30947+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
30948 sarea_priv->nbox * sizeof(depth_boxes[0])))
30949 return -EFAULT;
30950
30951@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
30952 {
30953 drm_radeon_private_t *dev_priv = dev->dev_private;
30954 drm_radeon_getparam_t *param = data;
30955- int value;
30956+ int value = 0;
30957
30958 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
30959
30960diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
30961index 0b5468b..9c4b308 100644
30962--- a/drivers/gpu/drm/radeon/radeon_ttm.c
30963+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
30964@@ -672,8 +672,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
30965 }
30966 if (unlikely(ttm_vm_ops == NULL)) {
30967 ttm_vm_ops = vma->vm_ops;
30968- radeon_ttm_vm_ops = *ttm_vm_ops;
30969- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
30970+ pax_open_kernel();
30971+ memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
30972+ *(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
30973+ pax_close_kernel();
30974 }
30975 vma->vm_ops = &radeon_ttm_vm_ops;
30976 return 0;
30977diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
30978index a9049ed..501f284 100644
30979--- a/drivers/gpu/drm/radeon/rs690.c
30980+++ b/drivers/gpu/drm/radeon/rs690.c
30981@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
30982 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
30983 rdev->pm.sideport_bandwidth.full)
30984 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
30985- read_delay_latency.full = dfixed_const(370 * 800 * 1000);
30986+ read_delay_latency.full = dfixed_const(800 * 1000);
30987 read_delay_latency.full = dfixed_div(read_delay_latency,
30988 rdev->pm.igp_sideport_mclk);
30989+ a.full = dfixed_const(370);
30990+ read_delay_latency.full = dfixed_mul(read_delay_latency, a);
30991 } else {
30992 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
30993 rdev->pm.k8_bandwidth.full)
30994diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
30995index 727e93d..1565650 100644
30996--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
30997+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
30998@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages(void)
30999 static int ttm_pool_mm_shrink(struct shrinker *shrink,
31000 struct shrink_control *sc)
31001 {
31002- static atomic_t start_pool = ATOMIC_INIT(0);
31003+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
31004 unsigned i;
31005- unsigned pool_offset = atomic_add_return(1, &start_pool);
31006+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
31007 struct ttm_page_pool *pool;
31008 int shrink_pages = sc->nr_to_scan;
31009
31010diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
31011index 9cf87d9..2000b7d 100644
31012--- a/drivers/gpu/drm/via/via_drv.h
31013+++ b/drivers/gpu/drm/via/via_drv.h
31014@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
31015 typedef uint32_t maskarray_t[5];
31016
31017 typedef struct drm_via_irq {
31018- atomic_t irq_received;
31019+ atomic_unchecked_t irq_received;
31020 uint32_t pending_mask;
31021 uint32_t enable_mask;
31022 wait_queue_head_t irq_queue;
31023@@ -75,7 +75,7 @@ typedef struct drm_via_private {
31024 struct timeval last_vblank;
31025 int last_vblank_valid;
31026 unsigned usec_per_vblank;
31027- atomic_t vbl_received;
31028+ atomic_unchecked_t vbl_received;
31029 drm_via_state_t hc_state;
31030 char pci_buf[VIA_PCI_BUF_SIZE];
31031 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
31032diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
31033index d391f48..10c8ca3 100644
31034--- a/drivers/gpu/drm/via/via_irq.c
31035+++ b/drivers/gpu/drm/via/via_irq.c
31036@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
31037 if (crtc != 0)
31038 return 0;
31039
31040- return atomic_read(&dev_priv->vbl_received);
31041+ return atomic_read_unchecked(&dev_priv->vbl_received);
31042 }
31043
31044 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31045@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31046
31047 status = VIA_READ(VIA_REG_INTERRUPT);
31048 if (status & VIA_IRQ_VBLANK_PENDING) {
31049- atomic_inc(&dev_priv->vbl_received);
31050- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
31051+ atomic_inc_unchecked(&dev_priv->vbl_received);
31052+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
31053 do_gettimeofday(&cur_vblank);
31054 if (dev_priv->last_vblank_valid) {
31055 dev_priv->usec_per_vblank =
31056@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31057 dev_priv->last_vblank = cur_vblank;
31058 dev_priv->last_vblank_valid = 1;
31059 }
31060- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
31061+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
31062 DRM_DEBUG("US per vblank is: %u\n",
31063 dev_priv->usec_per_vblank);
31064 }
31065@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31066
31067 for (i = 0; i < dev_priv->num_irqs; ++i) {
31068 if (status & cur_irq->pending_mask) {
31069- atomic_inc(&cur_irq->irq_received);
31070+ atomic_inc_unchecked(&cur_irq->irq_received);
31071 DRM_WAKEUP(&cur_irq->irq_queue);
31072 handled = 1;
31073 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
31074@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
31075 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31076 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
31077 masks[irq][4]));
31078- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
31079+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
31080 } else {
31081 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31082 (((cur_irq_sequence =
31083- atomic_read(&cur_irq->irq_received)) -
31084+ atomic_read_unchecked(&cur_irq->irq_received)) -
31085 *sequence) <= (1 << 23)));
31086 }
31087 *sequence = cur_irq_sequence;
31088@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
31089 }
31090
31091 for (i = 0; i < dev_priv->num_irqs; ++i) {
31092- atomic_set(&cur_irq->irq_received, 0);
31093+ atomic_set_unchecked(&cur_irq->irq_received, 0);
31094 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
31095 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
31096 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
31097@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
31098 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
31099 case VIA_IRQ_RELATIVE:
31100 irqwait->request.sequence +=
31101- atomic_read(&cur_irq->irq_received);
31102+ atomic_read_unchecked(&cur_irq->irq_received);
31103 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
31104 case VIA_IRQ_ABSOLUTE:
31105 break;
31106diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31107index dc27970..f18b008 100644
31108--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31109+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31110@@ -260,7 +260,7 @@ struct vmw_private {
31111 * Fencing and IRQs.
31112 */
31113
31114- atomic_t marker_seq;
31115+ atomic_unchecked_t marker_seq;
31116 wait_queue_head_t fence_queue;
31117 wait_queue_head_t fifo_queue;
31118 int fence_queue_waiters; /* Protected by hw_mutex */
31119diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31120index a0c2f12..68ae6cb 100644
31121--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31122+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31123@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
31124 (unsigned int) min,
31125 (unsigned int) fifo->capabilities);
31126
31127- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31128+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31129 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
31130 vmw_marker_queue_init(&fifo->marker_queue);
31131 return vmw_fifo_send_fence(dev_priv, &dummy);
31132@@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
31133 if (reserveable)
31134 iowrite32(bytes, fifo_mem +
31135 SVGA_FIFO_RESERVED);
31136- return fifo_mem + (next_cmd >> 2);
31137+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
31138 } else {
31139 need_bounce = true;
31140 }
31141@@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31142
31143 fm = vmw_fifo_reserve(dev_priv, bytes);
31144 if (unlikely(fm == NULL)) {
31145- *seqno = atomic_read(&dev_priv->marker_seq);
31146+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31147 ret = -ENOMEM;
31148 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
31149 false, 3*HZ);
31150@@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31151 }
31152
31153 do {
31154- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
31155+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
31156 } while (*seqno == 0);
31157
31158 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
31159diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31160index cabc95f..14b3d77 100644
31161--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31162+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31163@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
31164 * emitted. Then the fence is stale and signaled.
31165 */
31166
31167- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
31168+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
31169 > VMW_FENCE_WRAP);
31170
31171 return ret;
31172@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
31173
31174 if (fifo_idle)
31175 down_read(&fifo_state->rwsem);
31176- signal_seq = atomic_read(&dev_priv->marker_seq);
31177+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
31178 ret = 0;
31179
31180 for (;;) {
31181diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31182index 8a8725c..afed796 100644
31183--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31184+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31185@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
31186 while (!vmw_lag_lt(queue, us)) {
31187 spin_lock(&queue->lock);
31188 if (list_empty(&queue->head))
31189- seqno = atomic_read(&dev_priv->marker_seq);
31190+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31191 else {
31192 marker = list_first_entry(&queue->head,
31193 struct vmw_marker, head);
31194diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
31195index bb656d8..4169fca 100644
31196--- a/drivers/hid/hid-core.c
31197+++ b/drivers/hid/hid-core.c
31198@@ -2012,7 +2012,7 @@ static bool hid_ignore(struct hid_device *hdev)
31199
31200 int hid_add_device(struct hid_device *hdev)
31201 {
31202- static atomic_t id = ATOMIC_INIT(0);
31203+ static atomic_unchecked_t id = ATOMIC_INIT(0);
31204 int ret;
31205
31206 if (WARN_ON(hdev->status & HID_STAT_ADDED))
31207@@ -2027,7 +2027,7 @@ int hid_add_device(struct hid_device *hdev)
31208 /* XXX hack, any other cleaner solution after the driver core
31209 * is converted to allow more than 20 bytes as the device name? */
31210 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
31211- hdev->vendor, hdev->product, atomic_inc_return(&id));
31212+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
31213
31214 hid_debug_register(hdev, dev_name(&hdev->dev));
31215 ret = device_add(&hdev->dev);
31216diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
31217index 4ef02b2..8a96831 100644
31218--- a/drivers/hid/usbhid/hiddev.c
31219+++ b/drivers/hid/usbhid/hiddev.c
31220@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
31221 break;
31222
31223 case HIDIOCAPPLICATION:
31224- if (arg < 0 || arg >= hid->maxapplication)
31225+ if (arg >= hid->maxapplication)
31226 break;
31227
31228 for (i = 0; i < hid->maxcollection; i++)
31229diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
31230index 4065374..10ed7dc 100644
31231--- a/drivers/hv/channel.c
31232+++ b/drivers/hv/channel.c
31233@@ -400,8 +400,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
31234 int ret = 0;
31235 int t;
31236
31237- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
31238- atomic_inc(&vmbus_connection.next_gpadl_handle);
31239+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
31240+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
31241
31242 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
31243 if (ret)
31244diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
31245index 0fb100e..baf87e5 100644
31246--- a/drivers/hv/hv.c
31247+++ b/drivers/hv/hv.c
31248@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
31249 u64 output_address = (output) ? virt_to_phys(output) : 0;
31250 u32 output_address_hi = output_address >> 32;
31251 u32 output_address_lo = output_address & 0xFFFFFFFF;
31252- void *hypercall_page = hv_context.hypercall_page;
31253+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
31254
31255 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
31256 "=a"(hv_status_lo) : "d" (control_hi),
31257diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
31258index 0aee112..b72d21f 100644
31259--- a/drivers/hv/hyperv_vmbus.h
31260+++ b/drivers/hv/hyperv_vmbus.h
31261@@ -556,7 +556,7 @@ enum vmbus_connect_state {
31262 struct vmbus_connection {
31263 enum vmbus_connect_state conn_state;
31264
31265- atomic_t next_gpadl_handle;
31266+ atomic_unchecked_t next_gpadl_handle;
31267
31268 /*
31269 * Represents channel interrupts. Each bit position represents a
31270diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
31271index d2d0a2a..90b8f4d 100644
31272--- a/drivers/hv/vmbus_drv.c
31273+++ b/drivers/hv/vmbus_drv.c
31274@@ -663,10 +663,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
31275 {
31276 int ret = 0;
31277
31278- static atomic_t device_num = ATOMIC_INIT(0);
31279+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
31280
31281 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
31282- atomic_inc_return(&device_num));
31283+ atomic_inc_return_unchecked(&device_num));
31284
31285 child_device_obj->device.bus = &hv_bus;
31286 child_device_obj->device.parent = &hv_acpi_dev->dev;
31287diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
31288index 66f6729..2d6de0a 100644
31289--- a/drivers/hwmon/acpi_power_meter.c
31290+++ b/drivers/hwmon/acpi_power_meter.c
31291@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
31292 return res;
31293
31294 temp /= 1000;
31295- if (temp < 0)
31296- return -EINVAL;
31297
31298 mutex_lock(&resource->lock);
31299 resource->trip[attr->index - 7] = temp;
31300diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
31301index 5357925..6cf0418 100644
31302--- a/drivers/hwmon/sht15.c
31303+++ b/drivers/hwmon/sht15.c
31304@@ -166,7 +166,7 @@ struct sht15_data {
31305 int supply_uV;
31306 bool supply_uV_valid;
31307 struct work_struct update_supply_work;
31308- atomic_t interrupt_handled;
31309+ atomic_unchecked_t interrupt_handled;
31310 };
31311
31312 /**
31313@@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
31314 return ret;
31315
31316 gpio_direction_input(data->pdata->gpio_data);
31317- atomic_set(&data->interrupt_handled, 0);
31318+ atomic_set_unchecked(&data->interrupt_handled, 0);
31319
31320 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31321 if (gpio_get_value(data->pdata->gpio_data) == 0) {
31322 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
31323 /* Only relevant if the interrupt hasn't occurred. */
31324- if (!atomic_read(&data->interrupt_handled))
31325+ if (!atomic_read_unchecked(&data->interrupt_handled))
31326 schedule_work(&data->read_work);
31327 }
31328 ret = wait_event_timeout(data->wait_queue,
31329@@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
31330
31331 /* First disable the interrupt */
31332 disable_irq_nosync(irq);
31333- atomic_inc(&data->interrupt_handled);
31334+ atomic_inc_unchecked(&data->interrupt_handled);
31335 /* Then schedule a reading work struct */
31336 if (data->state != SHT15_READING_NOTHING)
31337 schedule_work(&data->read_work);
31338@@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
31339 * If not, then start the interrupt again - care here as could
31340 * have gone low in meantime so verify it hasn't!
31341 */
31342- atomic_set(&data->interrupt_handled, 0);
31343+ atomic_set_unchecked(&data->interrupt_handled, 0);
31344 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31345 /* If still not occurred or another handler has been scheduled */
31346 if (gpio_get_value(data->pdata->gpio_data)
31347- || atomic_read(&data->interrupt_handled))
31348+ || atomic_read_unchecked(&data->interrupt_handled))
31349 return;
31350 }
31351
31352diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
31353index 378fcb5..5e91fa8 100644
31354--- a/drivers/i2c/busses/i2c-amd756-s4882.c
31355+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
31356@@ -43,7 +43,7 @@
31357 extern struct i2c_adapter amd756_smbus;
31358
31359 static struct i2c_adapter *s4882_adapter;
31360-static struct i2c_algorithm *s4882_algo;
31361+static i2c_algorithm_no_const *s4882_algo;
31362
31363 /* Wrapper access functions for multiplexed SMBus */
31364 static DEFINE_MUTEX(amd756_lock);
31365diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
31366index 29015eb..af2d8e9 100644
31367--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
31368+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
31369@@ -41,7 +41,7 @@
31370 extern struct i2c_adapter *nforce2_smbus;
31371
31372 static struct i2c_adapter *s4985_adapter;
31373-static struct i2c_algorithm *s4985_algo;
31374+static i2c_algorithm_no_const *s4985_algo;
31375
31376 /* Wrapper access functions for multiplexed SMBus */
31377 static DEFINE_MUTEX(nforce2_lock);
31378diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
31379index d7a4833..7fae376 100644
31380--- a/drivers/i2c/i2c-mux.c
31381+++ b/drivers/i2c/i2c-mux.c
31382@@ -28,7 +28,7 @@
31383 /* multiplexer per channel data */
31384 struct i2c_mux_priv {
31385 struct i2c_adapter adap;
31386- struct i2c_algorithm algo;
31387+ i2c_algorithm_no_const algo;
31388
31389 struct i2c_adapter *parent;
31390 void *mux_dev; /* the mux chip/device */
31391diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
31392index 57d00ca..0145194 100644
31393--- a/drivers/ide/aec62xx.c
31394+++ b/drivers/ide/aec62xx.c
31395@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
31396 .cable_detect = atp86x_cable_detect,
31397 };
31398
31399-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
31400+static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
31401 { /* 0: AEC6210 */
31402 .name = DRV_NAME,
31403 .init_chipset = init_chipset_aec62xx,
31404diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
31405index 2c8016a..911a27c 100644
31406--- a/drivers/ide/alim15x3.c
31407+++ b/drivers/ide/alim15x3.c
31408@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
31409 .dma_sff_read_status = ide_dma_sff_read_status,
31410 };
31411
31412-static const struct ide_port_info ali15x3_chipset __devinitdata = {
31413+static const struct ide_port_info ali15x3_chipset __devinitconst = {
31414 .name = DRV_NAME,
31415 .init_chipset = init_chipset_ali15x3,
31416 .init_hwif = init_hwif_ali15x3,
31417diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
31418index 3747b25..56fc995 100644
31419--- a/drivers/ide/amd74xx.c
31420+++ b/drivers/ide/amd74xx.c
31421@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
31422 .udma_mask = udma, \
31423 }
31424
31425-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
31426+static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
31427 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
31428 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
31429 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
31430diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
31431index 15f0ead..cb43480 100644
31432--- a/drivers/ide/atiixp.c
31433+++ b/drivers/ide/atiixp.c
31434@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
31435 .cable_detect = atiixp_cable_detect,
31436 };
31437
31438-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
31439+static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
31440 { /* 0: IXP200/300/400/700 */
31441 .name = DRV_NAME,
31442 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
31443diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
31444index 5f80312..d1fc438 100644
31445--- a/drivers/ide/cmd64x.c
31446+++ b/drivers/ide/cmd64x.c
31447@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
31448 .dma_sff_read_status = ide_dma_sff_read_status,
31449 };
31450
31451-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
31452+static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
31453 { /* 0: CMD643 */
31454 .name = DRV_NAME,
31455 .init_chipset = init_chipset_cmd64x,
31456diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
31457index 2c1e5f7..1444762 100644
31458--- a/drivers/ide/cs5520.c
31459+++ b/drivers/ide/cs5520.c
31460@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
31461 .set_dma_mode = cs5520_set_dma_mode,
31462 };
31463
31464-static const struct ide_port_info cyrix_chipset __devinitdata = {
31465+static const struct ide_port_info cyrix_chipset __devinitconst = {
31466 .name = DRV_NAME,
31467 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
31468 .port_ops = &cs5520_port_ops,
31469diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
31470index 4dc4eb9..49b40ad 100644
31471--- a/drivers/ide/cs5530.c
31472+++ b/drivers/ide/cs5530.c
31473@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
31474 .udma_filter = cs5530_udma_filter,
31475 };
31476
31477-static const struct ide_port_info cs5530_chipset __devinitdata = {
31478+static const struct ide_port_info cs5530_chipset __devinitconst = {
31479 .name = DRV_NAME,
31480 .init_chipset = init_chipset_cs5530,
31481 .init_hwif = init_hwif_cs5530,
31482diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
31483index 5059faf..18d4c85 100644
31484--- a/drivers/ide/cs5535.c
31485+++ b/drivers/ide/cs5535.c
31486@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
31487 .cable_detect = cs5535_cable_detect,
31488 };
31489
31490-static const struct ide_port_info cs5535_chipset __devinitdata = {
31491+static const struct ide_port_info cs5535_chipset __devinitconst = {
31492 .name = DRV_NAME,
31493 .port_ops = &cs5535_port_ops,
31494 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
31495diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
31496index 847553f..3ffb49d 100644
31497--- a/drivers/ide/cy82c693.c
31498+++ b/drivers/ide/cy82c693.c
31499@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
31500 .set_dma_mode = cy82c693_set_dma_mode,
31501 };
31502
31503-static const struct ide_port_info cy82c693_chipset __devinitdata = {
31504+static const struct ide_port_info cy82c693_chipset __devinitconst = {
31505 .name = DRV_NAME,
31506 .init_iops = init_iops_cy82c693,
31507 .port_ops = &cy82c693_port_ops,
31508diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
31509index 58c51cd..4aec3b8 100644
31510--- a/drivers/ide/hpt366.c
31511+++ b/drivers/ide/hpt366.c
31512@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
31513 }
31514 };
31515
31516-static const struct hpt_info hpt36x __devinitdata = {
31517+static const struct hpt_info hpt36x __devinitconst = {
31518 .chip_name = "HPT36x",
31519 .chip_type = HPT36x,
31520 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
31521@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
31522 .timings = &hpt36x_timings
31523 };
31524
31525-static const struct hpt_info hpt370 __devinitdata = {
31526+static const struct hpt_info hpt370 __devinitconst = {
31527 .chip_name = "HPT370",
31528 .chip_type = HPT370,
31529 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31530@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
31531 .timings = &hpt37x_timings
31532 };
31533
31534-static const struct hpt_info hpt370a __devinitdata = {
31535+static const struct hpt_info hpt370a __devinitconst = {
31536 .chip_name = "HPT370A",
31537 .chip_type = HPT370A,
31538 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31539@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
31540 .timings = &hpt37x_timings
31541 };
31542
31543-static const struct hpt_info hpt374 __devinitdata = {
31544+static const struct hpt_info hpt374 __devinitconst = {
31545 .chip_name = "HPT374",
31546 .chip_type = HPT374,
31547 .udma_mask = ATA_UDMA5,
31548@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
31549 .timings = &hpt37x_timings
31550 };
31551
31552-static const struct hpt_info hpt372 __devinitdata = {
31553+static const struct hpt_info hpt372 __devinitconst = {
31554 .chip_name = "HPT372",
31555 .chip_type = HPT372,
31556 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31557@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
31558 .timings = &hpt37x_timings
31559 };
31560
31561-static const struct hpt_info hpt372a __devinitdata = {
31562+static const struct hpt_info hpt372a __devinitconst = {
31563 .chip_name = "HPT372A",
31564 .chip_type = HPT372A,
31565 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31566@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
31567 .timings = &hpt37x_timings
31568 };
31569
31570-static const struct hpt_info hpt302 __devinitdata = {
31571+static const struct hpt_info hpt302 __devinitconst = {
31572 .chip_name = "HPT302",
31573 .chip_type = HPT302,
31574 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31575@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
31576 .timings = &hpt37x_timings
31577 };
31578
31579-static const struct hpt_info hpt371 __devinitdata = {
31580+static const struct hpt_info hpt371 __devinitconst = {
31581 .chip_name = "HPT371",
31582 .chip_type = HPT371,
31583 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31584@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
31585 .timings = &hpt37x_timings
31586 };
31587
31588-static const struct hpt_info hpt372n __devinitdata = {
31589+static const struct hpt_info hpt372n __devinitconst = {
31590 .chip_name = "HPT372N",
31591 .chip_type = HPT372N,
31592 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31593@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
31594 .timings = &hpt37x_timings
31595 };
31596
31597-static const struct hpt_info hpt302n __devinitdata = {
31598+static const struct hpt_info hpt302n __devinitconst = {
31599 .chip_name = "HPT302N",
31600 .chip_type = HPT302N,
31601 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31602@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
31603 .timings = &hpt37x_timings
31604 };
31605
31606-static const struct hpt_info hpt371n __devinitdata = {
31607+static const struct hpt_info hpt371n __devinitconst = {
31608 .chip_name = "HPT371N",
31609 .chip_type = HPT371N,
31610 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31611@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
31612 .dma_sff_read_status = ide_dma_sff_read_status,
31613 };
31614
31615-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
31616+static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
31617 { /* 0: HPT36x */
31618 .name = DRV_NAME,
31619 .init_chipset = init_chipset_hpt366,
31620diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
31621index 8126824..55a2798 100644
31622--- a/drivers/ide/ide-cd.c
31623+++ b/drivers/ide/ide-cd.c
31624@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
31625 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
31626 if ((unsigned long)buf & alignment
31627 || blk_rq_bytes(rq) & q->dma_pad_mask
31628- || object_is_on_stack(buf))
31629+ || object_starts_on_stack(buf))
31630 drive->dma = 0;
31631 }
31632 }
31633diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
31634index a743e68..1cfd674 100644
31635--- a/drivers/ide/ide-pci-generic.c
31636+++ b/drivers/ide/ide-pci-generic.c
31637@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
31638 .udma_mask = ATA_UDMA6, \
31639 }
31640
31641-static const struct ide_port_info generic_chipsets[] __devinitdata = {
31642+static const struct ide_port_info generic_chipsets[] __devinitconst = {
31643 /* 0: Unknown */
31644 DECLARE_GENERIC_PCI_DEV(0),
31645
31646diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
31647index 560e66d..d5dd180 100644
31648--- a/drivers/ide/it8172.c
31649+++ b/drivers/ide/it8172.c
31650@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
31651 .set_dma_mode = it8172_set_dma_mode,
31652 };
31653
31654-static const struct ide_port_info it8172_port_info __devinitdata = {
31655+static const struct ide_port_info it8172_port_info __devinitconst = {
31656 .name = DRV_NAME,
31657 .port_ops = &it8172_port_ops,
31658 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
31659diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
31660index 46816ba..1847aeb 100644
31661--- a/drivers/ide/it8213.c
31662+++ b/drivers/ide/it8213.c
31663@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
31664 .cable_detect = it8213_cable_detect,
31665 };
31666
31667-static const struct ide_port_info it8213_chipset __devinitdata = {
31668+static const struct ide_port_info it8213_chipset __devinitconst = {
31669 .name = DRV_NAME,
31670 .enablebits = { {0x41, 0x80, 0x80} },
31671 .port_ops = &it8213_port_ops,
31672diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
31673index 2e3169f..c5611db 100644
31674--- a/drivers/ide/it821x.c
31675+++ b/drivers/ide/it821x.c
31676@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
31677 .cable_detect = it821x_cable_detect,
31678 };
31679
31680-static const struct ide_port_info it821x_chipset __devinitdata = {
31681+static const struct ide_port_info it821x_chipset __devinitconst = {
31682 .name = DRV_NAME,
31683 .init_chipset = init_chipset_it821x,
31684 .init_hwif = init_hwif_it821x,
31685diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
31686index 74c2c4a..efddd7d 100644
31687--- a/drivers/ide/jmicron.c
31688+++ b/drivers/ide/jmicron.c
31689@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
31690 .cable_detect = jmicron_cable_detect,
31691 };
31692
31693-static const struct ide_port_info jmicron_chipset __devinitdata = {
31694+static const struct ide_port_info jmicron_chipset __devinitconst = {
31695 .name = DRV_NAME,
31696 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
31697 .port_ops = &jmicron_port_ops,
31698diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
31699index 95327a2..73f78d8 100644
31700--- a/drivers/ide/ns87415.c
31701+++ b/drivers/ide/ns87415.c
31702@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
31703 .dma_sff_read_status = superio_dma_sff_read_status,
31704 };
31705
31706-static const struct ide_port_info ns87415_chipset __devinitdata = {
31707+static const struct ide_port_info ns87415_chipset __devinitconst = {
31708 .name = DRV_NAME,
31709 .init_hwif = init_hwif_ns87415,
31710 .tp_ops = &ns87415_tp_ops,
31711diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
31712index 1a53a4c..39edc66 100644
31713--- a/drivers/ide/opti621.c
31714+++ b/drivers/ide/opti621.c
31715@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
31716 .set_pio_mode = opti621_set_pio_mode,
31717 };
31718
31719-static const struct ide_port_info opti621_chipset __devinitdata = {
31720+static const struct ide_port_info opti621_chipset __devinitconst = {
31721 .name = DRV_NAME,
31722 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
31723 .port_ops = &opti621_port_ops,
31724diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
31725index 9546fe2..2e5ceb6 100644
31726--- a/drivers/ide/pdc202xx_new.c
31727+++ b/drivers/ide/pdc202xx_new.c
31728@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
31729 .udma_mask = udma, \
31730 }
31731
31732-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
31733+static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
31734 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
31735 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
31736 };
31737diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
31738index 3a35ec6..5634510 100644
31739--- a/drivers/ide/pdc202xx_old.c
31740+++ b/drivers/ide/pdc202xx_old.c
31741@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
31742 .max_sectors = sectors, \
31743 }
31744
31745-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
31746+static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
31747 { /* 0: PDC20246 */
31748 .name = DRV_NAME,
31749 .init_chipset = init_chipset_pdc202xx,
31750diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
31751index 1892e81..fe0fd60 100644
31752--- a/drivers/ide/piix.c
31753+++ b/drivers/ide/piix.c
31754@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
31755 .udma_mask = udma, \
31756 }
31757
31758-static const struct ide_port_info piix_pci_info[] __devinitdata = {
31759+static const struct ide_port_info piix_pci_info[] __devinitconst = {
31760 /* 0: MPIIX */
31761 { /*
31762 * MPIIX actually has only a single IDE channel mapped to
31763diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
31764index a6414a8..c04173e 100644
31765--- a/drivers/ide/rz1000.c
31766+++ b/drivers/ide/rz1000.c
31767@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
31768 }
31769 }
31770
31771-static const struct ide_port_info rz1000_chipset __devinitdata = {
31772+static const struct ide_port_info rz1000_chipset __devinitconst = {
31773 .name = DRV_NAME,
31774 .host_flags = IDE_HFLAG_NO_DMA,
31775 };
31776diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
31777index 356b9b5..d4758eb 100644
31778--- a/drivers/ide/sc1200.c
31779+++ b/drivers/ide/sc1200.c
31780@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
31781 .dma_sff_read_status = ide_dma_sff_read_status,
31782 };
31783
31784-static const struct ide_port_info sc1200_chipset __devinitdata = {
31785+static const struct ide_port_info sc1200_chipset __devinitconst = {
31786 .name = DRV_NAME,
31787 .port_ops = &sc1200_port_ops,
31788 .dma_ops = &sc1200_dma_ops,
31789diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
31790index b7f5b0c..9701038 100644
31791--- a/drivers/ide/scc_pata.c
31792+++ b/drivers/ide/scc_pata.c
31793@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
31794 .dma_sff_read_status = scc_dma_sff_read_status,
31795 };
31796
31797-static const struct ide_port_info scc_chipset __devinitdata = {
31798+static const struct ide_port_info scc_chipset __devinitconst = {
31799 .name = "sccIDE",
31800 .init_iops = init_iops_scc,
31801 .init_dma = scc_init_dma,
31802diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
31803index 35fb8da..24d72ef 100644
31804--- a/drivers/ide/serverworks.c
31805+++ b/drivers/ide/serverworks.c
31806@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
31807 .cable_detect = svwks_cable_detect,
31808 };
31809
31810-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
31811+static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
31812 { /* 0: OSB4 */
31813 .name = DRV_NAME,
31814 .init_chipset = init_chipset_svwks,
31815diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
31816index ddeda44..46f7e30 100644
31817--- a/drivers/ide/siimage.c
31818+++ b/drivers/ide/siimage.c
31819@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
31820 .udma_mask = ATA_UDMA6, \
31821 }
31822
31823-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
31824+static const struct ide_port_info siimage_chipsets[] __devinitconst = {
31825 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
31826 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
31827 };
31828diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
31829index 4a00225..09e61b4 100644
31830--- a/drivers/ide/sis5513.c
31831+++ b/drivers/ide/sis5513.c
31832@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
31833 .cable_detect = sis_cable_detect,
31834 };
31835
31836-static const struct ide_port_info sis5513_chipset __devinitdata = {
31837+static const struct ide_port_info sis5513_chipset __devinitconst = {
31838 .name = DRV_NAME,
31839 .init_chipset = init_chipset_sis5513,
31840 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
31841diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
31842index f21dc2a..d051cd2 100644
31843--- a/drivers/ide/sl82c105.c
31844+++ b/drivers/ide/sl82c105.c
31845@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
31846 .dma_sff_read_status = ide_dma_sff_read_status,
31847 };
31848
31849-static const struct ide_port_info sl82c105_chipset __devinitdata = {
31850+static const struct ide_port_info sl82c105_chipset __devinitconst = {
31851 .name = DRV_NAME,
31852 .init_chipset = init_chipset_sl82c105,
31853 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
31854diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
31855index 864ffe0..863a5e9 100644
31856--- a/drivers/ide/slc90e66.c
31857+++ b/drivers/ide/slc90e66.c
31858@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
31859 .cable_detect = slc90e66_cable_detect,
31860 };
31861
31862-static const struct ide_port_info slc90e66_chipset __devinitdata = {
31863+static const struct ide_port_info slc90e66_chipset __devinitconst = {
31864 .name = DRV_NAME,
31865 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
31866 .port_ops = &slc90e66_port_ops,
31867diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
31868index 4799d5c..1794678 100644
31869--- a/drivers/ide/tc86c001.c
31870+++ b/drivers/ide/tc86c001.c
31871@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
31872 .dma_sff_read_status = ide_dma_sff_read_status,
31873 };
31874
31875-static const struct ide_port_info tc86c001_chipset __devinitdata = {
31876+static const struct ide_port_info tc86c001_chipset __devinitconst = {
31877 .name = DRV_NAME,
31878 .init_hwif = init_hwif_tc86c001,
31879 .port_ops = &tc86c001_port_ops,
31880diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
31881index 281c914..55ce1b8 100644
31882--- a/drivers/ide/triflex.c
31883+++ b/drivers/ide/triflex.c
31884@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
31885 .set_dma_mode = triflex_set_mode,
31886 };
31887
31888-static const struct ide_port_info triflex_device __devinitdata = {
31889+static const struct ide_port_info triflex_device __devinitconst = {
31890 .name = DRV_NAME,
31891 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
31892 .port_ops = &triflex_port_ops,
31893diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
31894index 4b42ca0..e494a98 100644
31895--- a/drivers/ide/trm290.c
31896+++ b/drivers/ide/trm290.c
31897@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
31898 .dma_check = trm290_dma_check,
31899 };
31900
31901-static const struct ide_port_info trm290_chipset __devinitdata = {
31902+static const struct ide_port_info trm290_chipset __devinitconst = {
31903 .name = DRV_NAME,
31904 .init_hwif = init_hwif_trm290,
31905 .tp_ops = &trm290_tp_ops,
31906diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
31907index f46f49c..eb77678 100644
31908--- a/drivers/ide/via82cxxx.c
31909+++ b/drivers/ide/via82cxxx.c
31910@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
31911 .cable_detect = via82cxxx_cable_detect,
31912 };
31913
31914-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
31915+static const struct ide_port_info via82cxxx_chipset __devinitconst = {
31916 .name = DRV_NAME,
31917 .init_chipset = init_chipset_via82cxxx,
31918 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
31919diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
31920index eb0e2cc..14241c7 100644
31921--- a/drivers/ieee802154/fakehard.c
31922+++ b/drivers/ieee802154/fakehard.c
31923@@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
31924 phy->transmit_power = 0xbf;
31925
31926 dev->netdev_ops = &fake_ops;
31927- dev->ml_priv = &fake_mlme;
31928+ dev->ml_priv = (void *)&fake_mlme;
31929
31930 priv = netdev_priv(dev);
31931 priv->phy = phy;
31932diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
31933index 8b72f39..55df4c8 100644
31934--- a/drivers/infiniband/core/cm.c
31935+++ b/drivers/infiniband/core/cm.c
31936@@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
31937
31938 struct cm_counter_group {
31939 struct kobject obj;
31940- atomic_long_t counter[CM_ATTR_COUNT];
31941+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
31942 };
31943
31944 struct cm_counter_attribute {
31945@@ -1394,7 +1394,7 @@ static void cm_dup_req_handler(struct cm_work *work,
31946 struct ib_mad_send_buf *msg = NULL;
31947 int ret;
31948
31949- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31950+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31951 counter[CM_REQ_COUNTER]);
31952
31953 /* Quick state check to discard duplicate REQs. */
31954@@ -1778,7 +1778,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
31955 if (!cm_id_priv)
31956 return;
31957
31958- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31959+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31960 counter[CM_REP_COUNTER]);
31961 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
31962 if (ret)
31963@@ -1945,7 +1945,7 @@ static int cm_rtu_handler(struct cm_work *work)
31964 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
31965 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
31966 spin_unlock_irq(&cm_id_priv->lock);
31967- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31968+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31969 counter[CM_RTU_COUNTER]);
31970 goto out;
31971 }
31972@@ -2128,7 +2128,7 @@ static int cm_dreq_handler(struct cm_work *work)
31973 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
31974 dreq_msg->local_comm_id);
31975 if (!cm_id_priv) {
31976- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31977+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31978 counter[CM_DREQ_COUNTER]);
31979 cm_issue_drep(work->port, work->mad_recv_wc);
31980 return -EINVAL;
31981@@ -2153,7 +2153,7 @@ static int cm_dreq_handler(struct cm_work *work)
31982 case IB_CM_MRA_REP_RCVD:
31983 break;
31984 case IB_CM_TIMEWAIT:
31985- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31986+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31987 counter[CM_DREQ_COUNTER]);
31988 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
31989 goto unlock;
31990@@ -2167,7 +2167,7 @@ static int cm_dreq_handler(struct cm_work *work)
31991 cm_free_msg(msg);
31992 goto deref;
31993 case IB_CM_DREQ_RCVD:
31994- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31995+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31996 counter[CM_DREQ_COUNTER]);
31997 goto unlock;
31998 default:
31999@@ -2534,7 +2534,7 @@ static int cm_mra_handler(struct cm_work *work)
32000 ib_modify_mad(cm_id_priv->av.port->mad_agent,
32001 cm_id_priv->msg, timeout)) {
32002 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
32003- atomic_long_inc(&work->port->
32004+ atomic_long_inc_unchecked(&work->port->
32005 counter_group[CM_RECV_DUPLICATES].
32006 counter[CM_MRA_COUNTER]);
32007 goto out;
32008@@ -2543,7 +2543,7 @@ static int cm_mra_handler(struct cm_work *work)
32009 break;
32010 case IB_CM_MRA_REQ_RCVD:
32011 case IB_CM_MRA_REP_RCVD:
32012- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32013+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32014 counter[CM_MRA_COUNTER]);
32015 /* fall through */
32016 default:
32017@@ -2705,7 +2705,7 @@ static int cm_lap_handler(struct cm_work *work)
32018 case IB_CM_LAP_IDLE:
32019 break;
32020 case IB_CM_MRA_LAP_SENT:
32021- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32022+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32023 counter[CM_LAP_COUNTER]);
32024 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
32025 goto unlock;
32026@@ -2721,7 +2721,7 @@ static int cm_lap_handler(struct cm_work *work)
32027 cm_free_msg(msg);
32028 goto deref;
32029 case IB_CM_LAP_RCVD:
32030- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32031+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32032 counter[CM_LAP_COUNTER]);
32033 goto unlock;
32034 default:
32035@@ -3005,7 +3005,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
32036 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
32037 if (cur_cm_id_priv) {
32038 spin_unlock_irq(&cm.lock);
32039- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32040+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32041 counter[CM_SIDR_REQ_COUNTER]);
32042 goto out; /* Duplicate message. */
32043 }
32044@@ -3217,10 +3217,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
32045 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
32046 msg->retries = 1;
32047
32048- atomic_long_add(1 + msg->retries,
32049+ atomic_long_add_unchecked(1 + msg->retries,
32050 &port->counter_group[CM_XMIT].counter[attr_index]);
32051 if (msg->retries)
32052- atomic_long_add(msg->retries,
32053+ atomic_long_add_unchecked(msg->retries,
32054 &port->counter_group[CM_XMIT_RETRIES].
32055 counter[attr_index]);
32056
32057@@ -3430,7 +3430,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
32058 }
32059
32060 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
32061- atomic_long_inc(&port->counter_group[CM_RECV].
32062+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
32063 counter[attr_id - CM_ATTR_ID_OFFSET]);
32064
32065 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
32066@@ -3635,7 +3635,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
32067 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
32068
32069 return sprintf(buf, "%ld\n",
32070- atomic_long_read(&group->counter[cm_attr->index]));
32071+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
32072 }
32073
32074 static const struct sysfs_ops cm_counter_ops = {
32075diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
32076index 176c8f9..2627b62 100644
32077--- a/drivers/infiniband/core/fmr_pool.c
32078+++ b/drivers/infiniband/core/fmr_pool.c
32079@@ -98,8 +98,8 @@ struct ib_fmr_pool {
32080
32081 struct task_struct *thread;
32082
32083- atomic_t req_ser;
32084- atomic_t flush_ser;
32085+ atomic_unchecked_t req_ser;
32086+ atomic_unchecked_t flush_ser;
32087
32088 wait_queue_head_t force_wait;
32089 };
32090@@ -180,10 +180,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32091 struct ib_fmr_pool *pool = pool_ptr;
32092
32093 do {
32094- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
32095+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
32096 ib_fmr_batch_release(pool);
32097
32098- atomic_inc(&pool->flush_ser);
32099+ atomic_inc_unchecked(&pool->flush_ser);
32100 wake_up_interruptible(&pool->force_wait);
32101
32102 if (pool->flush_function)
32103@@ -191,7 +191,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32104 }
32105
32106 set_current_state(TASK_INTERRUPTIBLE);
32107- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
32108+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
32109 !kthread_should_stop())
32110 schedule();
32111 __set_current_state(TASK_RUNNING);
32112@@ -283,8 +283,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
32113 pool->dirty_watermark = params->dirty_watermark;
32114 pool->dirty_len = 0;
32115 spin_lock_init(&pool->pool_lock);
32116- atomic_set(&pool->req_ser, 0);
32117- atomic_set(&pool->flush_ser, 0);
32118+ atomic_set_unchecked(&pool->req_ser, 0);
32119+ atomic_set_unchecked(&pool->flush_ser, 0);
32120 init_waitqueue_head(&pool->force_wait);
32121
32122 pool->thread = kthread_run(ib_fmr_cleanup_thread,
32123@@ -412,11 +412,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
32124 }
32125 spin_unlock_irq(&pool->pool_lock);
32126
32127- serial = atomic_inc_return(&pool->req_ser);
32128+ serial = atomic_inc_return_unchecked(&pool->req_ser);
32129 wake_up_process(pool->thread);
32130
32131 if (wait_event_interruptible(pool->force_wait,
32132- atomic_read(&pool->flush_ser) - serial >= 0))
32133+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
32134 return -EINTR;
32135
32136 return 0;
32137@@ -526,7 +526,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
32138 } else {
32139 list_add_tail(&fmr->list, &pool->dirty_list);
32140 if (++pool->dirty_len >= pool->dirty_watermark) {
32141- atomic_inc(&pool->req_ser);
32142+ atomic_inc_unchecked(&pool->req_ser);
32143 wake_up_process(pool->thread);
32144 }
32145 }
32146diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
32147index 40c8353..946b0e4 100644
32148--- a/drivers/infiniband/hw/cxgb4/mem.c
32149+++ b/drivers/infiniband/hw/cxgb4/mem.c
32150@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32151 int err;
32152 struct fw_ri_tpte tpt;
32153 u32 stag_idx;
32154- static atomic_t key;
32155+ static atomic_unchecked_t key;
32156
32157 if (c4iw_fatal_error(rdev))
32158 return -EIO;
32159@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32160 &rdev->resource.tpt_fifo_lock);
32161 if (!stag_idx)
32162 return -ENOMEM;
32163- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
32164+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
32165 }
32166 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
32167 __func__, stag_state, type, pdid, stag_idx);
32168diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
32169index 31ae1b1..641d285 100644
32170--- a/drivers/infiniband/hw/ipath/ipath_fs.c
32171+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
32172@@ -126,6 +126,8 @@ static const struct file_operations atomic_counters_ops = {
32173 };
32174
32175 static ssize_t flash_read(struct file *file, char __user *buf,
32176+ size_t count, loff_t *ppos) __size_overflow(3);
32177+static ssize_t flash_read(struct file *file, char __user *buf,
32178 size_t count, loff_t *ppos)
32179 {
32180 struct ipath_devdata *dd;
32181diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
32182index 79b3dbc..96e5fcc 100644
32183--- a/drivers/infiniband/hw/ipath/ipath_rc.c
32184+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
32185@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32186 struct ib_atomic_eth *ateth;
32187 struct ipath_ack_entry *e;
32188 u64 vaddr;
32189- atomic64_t *maddr;
32190+ atomic64_unchecked_t *maddr;
32191 u64 sdata;
32192 u32 rkey;
32193 u8 next;
32194@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32195 IB_ACCESS_REMOTE_ATOMIC)))
32196 goto nack_acc_unlck;
32197 /* Perform atomic OP and save result. */
32198- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32199+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32200 sdata = be64_to_cpu(ateth->swap_data);
32201 e = &qp->s_ack_queue[qp->r_head_ack_queue];
32202 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
32203- (u64) atomic64_add_return(sdata, maddr) - sdata :
32204+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32205 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32206 be64_to_cpu(ateth->compare_data),
32207 sdata);
32208diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
32209index 1f95bba..9530f87 100644
32210--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
32211+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
32212@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
32213 unsigned long flags;
32214 struct ib_wc wc;
32215 u64 sdata;
32216- atomic64_t *maddr;
32217+ atomic64_unchecked_t *maddr;
32218 enum ib_wc_status send_status;
32219
32220 /*
32221@@ -382,11 +382,11 @@ again:
32222 IB_ACCESS_REMOTE_ATOMIC)))
32223 goto acc_err;
32224 /* Perform atomic OP and save result. */
32225- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32226+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32227 sdata = wqe->wr.wr.atomic.compare_add;
32228 *(u64 *) sqp->s_sge.sge.vaddr =
32229 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
32230- (u64) atomic64_add_return(sdata, maddr) - sdata :
32231+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32232 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32233 sdata, wqe->wr.wr.atomic.swap);
32234 goto send_comp;
32235diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
32236index 5965b3d..16817fb 100644
32237--- a/drivers/infiniband/hw/nes/nes.c
32238+++ b/drivers/infiniband/hw/nes/nes.c
32239@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
32240 LIST_HEAD(nes_adapter_list);
32241 static LIST_HEAD(nes_dev_list);
32242
32243-atomic_t qps_destroyed;
32244+atomic_unchecked_t qps_destroyed;
32245
32246 static unsigned int ee_flsh_adapter;
32247 static unsigned int sysfs_nonidx_addr;
32248@@ -272,7 +272,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
32249 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
32250 struct nes_adapter *nesadapter = nesdev->nesadapter;
32251
32252- atomic_inc(&qps_destroyed);
32253+ atomic_inc_unchecked(&qps_destroyed);
32254
32255 /* Free the control structures */
32256
32257diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
32258index 568b4f1..5ea3eff 100644
32259--- a/drivers/infiniband/hw/nes/nes.h
32260+++ b/drivers/infiniband/hw/nes/nes.h
32261@@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
32262 extern unsigned int wqm_quanta;
32263 extern struct list_head nes_adapter_list;
32264
32265-extern atomic_t cm_connects;
32266-extern atomic_t cm_accepts;
32267-extern atomic_t cm_disconnects;
32268-extern atomic_t cm_closes;
32269-extern atomic_t cm_connecteds;
32270-extern atomic_t cm_connect_reqs;
32271-extern atomic_t cm_rejects;
32272-extern atomic_t mod_qp_timouts;
32273-extern atomic_t qps_created;
32274-extern atomic_t qps_destroyed;
32275-extern atomic_t sw_qps_destroyed;
32276+extern atomic_unchecked_t cm_connects;
32277+extern atomic_unchecked_t cm_accepts;
32278+extern atomic_unchecked_t cm_disconnects;
32279+extern atomic_unchecked_t cm_closes;
32280+extern atomic_unchecked_t cm_connecteds;
32281+extern atomic_unchecked_t cm_connect_reqs;
32282+extern atomic_unchecked_t cm_rejects;
32283+extern atomic_unchecked_t mod_qp_timouts;
32284+extern atomic_unchecked_t qps_created;
32285+extern atomic_unchecked_t qps_destroyed;
32286+extern atomic_unchecked_t sw_qps_destroyed;
32287 extern u32 mh_detected;
32288 extern u32 mh_pauses_sent;
32289 extern u32 cm_packets_sent;
32290@@ -197,16 +197,16 @@ extern u32 cm_packets_created;
32291 extern u32 cm_packets_received;
32292 extern u32 cm_packets_dropped;
32293 extern u32 cm_packets_retrans;
32294-extern atomic_t cm_listens_created;
32295-extern atomic_t cm_listens_destroyed;
32296+extern atomic_unchecked_t cm_listens_created;
32297+extern atomic_unchecked_t cm_listens_destroyed;
32298 extern u32 cm_backlog_drops;
32299-extern atomic_t cm_loopbacks;
32300-extern atomic_t cm_nodes_created;
32301-extern atomic_t cm_nodes_destroyed;
32302-extern atomic_t cm_accel_dropped_pkts;
32303-extern atomic_t cm_resets_recvd;
32304-extern atomic_t pau_qps_created;
32305-extern atomic_t pau_qps_destroyed;
32306+extern atomic_unchecked_t cm_loopbacks;
32307+extern atomic_unchecked_t cm_nodes_created;
32308+extern atomic_unchecked_t cm_nodes_destroyed;
32309+extern atomic_unchecked_t cm_accel_dropped_pkts;
32310+extern atomic_unchecked_t cm_resets_recvd;
32311+extern atomic_unchecked_t pau_qps_created;
32312+extern atomic_unchecked_t pau_qps_destroyed;
32313
32314 extern u32 int_mod_timer_init;
32315 extern u32 int_mod_cq_depth_256;
32316diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
32317index 0a52d72..0642f36 100644
32318--- a/drivers/infiniband/hw/nes/nes_cm.c
32319+++ b/drivers/infiniband/hw/nes/nes_cm.c
32320@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
32321 u32 cm_packets_retrans;
32322 u32 cm_packets_created;
32323 u32 cm_packets_received;
32324-atomic_t cm_listens_created;
32325-atomic_t cm_listens_destroyed;
32326+atomic_unchecked_t cm_listens_created;
32327+atomic_unchecked_t cm_listens_destroyed;
32328 u32 cm_backlog_drops;
32329-atomic_t cm_loopbacks;
32330-atomic_t cm_nodes_created;
32331-atomic_t cm_nodes_destroyed;
32332-atomic_t cm_accel_dropped_pkts;
32333-atomic_t cm_resets_recvd;
32334+atomic_unchecked_t cm_loopbacks;
32335+atomic_unchecked_t cm_nodes_created;
32336+atomic_unchecked_t cm_nodes_destroyed;
32337+atomic_unchecked_t cm_accel_dropped_pkts;
32338+atomic_unchecked_t cm_resets_recvd;
32339
32340 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
32341 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
32342@@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
32343
32344 static struct nes_cm_core *g_cm_core;
32345
32346-atomic_t cm_connects;
32347-atomic_t cm_accepts;
32348-atomic_t cm_disconnects;
32349-atomic_t cm_closes;
32350-atomic_t cm_connecteds;
32351-atomic_t cm_connect_reqs;
32352-atomic_t cm_rejects;
32353+atomic_unchecked_t cm_connects;
32354+atomic_unchecked_t cm_accepts;
32355+atomic_unchecked_t cm_disconnects;
32356+atomic_unchecked_t cm_closes;
32357+atomic_unchecked_t cm_connecteds;
32358+atomic_unchecked_t cm_connect_reqs;
32359+atomic_unchecked_t cm_rejects;
32360
32361 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
32362 {
32363@@ -1271,7 +1271,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
32364 kfree(listener);
32365 listener = NULL;
32366 ret = 0;
32367- atomic_inc(&cm_listens_destroyed);
32368+ atomic_inc_unchecked(&cm_listens_destroyed);
32369 } else {
32370 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
32371 }
32372@@ -1473,7 +1473,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
32373 cm_node->rem_mac);
32374
32375 add_hte_node(cm_core, cm_node);
32376- atomic_inc(&cm_nodes_created);
32377+ atomic_inc_unchecked(&cm_nodes_created);
32378
32379 return cm_node;
32380 }
32381@@ -1531,7 +1531,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
32382 }
32383
32384 atomic_dec(&cm_core->node_cnt);
32385- atomic_inc(&cm_nodes_destroyed);
32386+ atomic_inc_unchecked(&cm_nodes_destroyed);
32387 nesqp = cm_node->nesqp;
32388 if (nesqp) {
32389 nesqp->cm_node = NULL;
32390@@ -1595,7 +1595,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
32391
32392 static void drop_packet(struct sk_buff *skb)
32393 {
32394- atomic_inc(&cm_accel_dropped_pkts);
32395+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
32396 dev_kfree_skb_any(skb);
32397 }
32398
32399@@ -1658,7 +1658,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
32400 {
32401
32402 int reset = 0; /* whether to send reset in case of err.. */
32403- atomic_inc(&cm_resets_recvd);
32404+ atomic_inc_unchecked(&cm_resets_recvd);
32405 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
32406 " refcnt=%d\n", cm_node, cm_node->state,
32407 atomic_read(&cm_node->ref_count));
32408@@ -2299,7 +2299,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
32409 rem_ref_cm_node(cm_node->cm_core, cm_node);
32410 return NULL;
32411 }
32412- atomic_inc(&cm_loopbacks);
32413+ atomic_inc_unchecked(&cm_loopbacks);
32414 loopbackremotenode->loopbackpartner = cm_node;
32415 loopbackremotenode->tcp_cntxt.rcv_wscale =
32416 NES_CM_DEFAULT_RCV_WND_SCALE;
32417@@ -2574,7 +2574,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
32418 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
32419 else {
32420 rem_ref_cm_node(cm_core, cm_node);
32421- atomic_inc(&cm_accel_dropped_pkts);
32422+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
32423 dev_kfree_skb_any(skb);
32424 }
32425 break;
32426@@ -2880,7 +2880,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32427
32428 if ((cm_id) && (cm_id->event_handler)) {
32429 if (issue_disconn) {
32430- atomic_inc(&cm_disconnects);
32431+ atomic_inc_unchecked(&cm_disconnects);
32432 cm_event.event = IW_CM_EVENT_DISCONNECT;
32433 cm_event.status = disconn_status;
32434 cm_event.local_addr = cm_id->local_addr;
32435@@ -2902,7 +2902,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32436 }
32437
32438 if (issue_close) {
32439- atomic_inc(&cm_closes);
32440+ atomic_inc_unchecked(&cm_closes);
32441 nes_disconnect(nesqp, 1);
32442
32443 cm_id->provider_data = nesqp;
32444@@ -3038,7 +3038,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32445
32446 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
32447 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
32448- atomic_inc(&cm_accepts);
32449+ atomic_inc_unchecked(&cm_accepts);
32450
32451 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
32452 netdev_refcnt_read(nesvnic->netdev));
32453@@ -3240,7 +3240,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
32454 struct nes_cm_core *cm_core;
32455 u8 *start_buff;
32456
32457- atomic_inc(&cm_rejects);
32458+ atomic_inc_unchecked(&cm_rejects);
32459 cm_node = (struct nes_cm_node *)cm_id->provider_data;
32460 loopback = cm_node->loopbackpartner;
32461 cm_core = cm_node->cm_core;
32462@@ -3300,7 +3300,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32463 ntohl(cm_id->local_addr.sin_addr.s_addr),
32464 ntohs(cm_id->local_addr.sin_port));
32465
32466- atomic_inc(&cm_connects);
32467+ atomic_inc_unchecked(&cm_connects);
32468 nesqp->active_conn = 1;
32469
32470 /* cache the cm_id in the qp */
32471@@ -3406,7 +3406,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
32472 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
32473 return err;
32474 }
32475- atomic_inc(&cm_listens_created);
32476+ atomic_inc_unchecked(&cm_listens_created);
32477 }
32478
32479 cm_id->add_ref(cm_id);
32480@@ -3507,7 +3507,7 @@ static void cm_event_connected(struct nes_cm_event *event)
32481
32482 if (nesqp->destroyed)
32483 return;
32484- atomic_inc(&cm_connecteds);
32485+ atomic_inc_unchecked(&cm_connecteds);
32486 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
32487 " local port 0x%04X. jiffies = %lu.\n",
32488 nesqp->hwqp.qp_id,
32489@@ -3694,7 +3694,7 @@ static void cm_event_reset(struct nes_cm_event *event)
32490
32491 cm_id->add_ref(cm_id);
32492 ret = cm_id->event_handler(cm_id, &cm_event);
32493- atomic_inc(&cm_closes);
32494+ atomic_inc_unchecked(&cm_closes);
32495 cm_event.event = IW_CM_EVENT_CLOSE;
32496 cm_event.status = 0;
32497 cm_event.provider_data = cm_id->provider_data;
32498@@ -3730,7 +3730,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
32499 return;
32500 cm_id = cm_node->cm_id;
32501
32502- atomic_inc(&cm_connect_reqs);
32503+ atomic_inc_unchecked(&cm_connect_reqs);
32504 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32505 cm_node, cm_id, jiffies);
32506
32507@@ -3770,7 +3770,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
32508 return;
32509 cm_id = cm_node->cm_id;
32510
32511- atomic_inc(&cm_connect_reqs);
32512+ atomic_inc_unchecked(&cm_connect_reqs);
32513 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32514 cm_node, cm_id, jiffies);
32515
32516diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
32517index b3b2a24..7bfaf1e 100644
32518--- a/drivers/infiniband/hw/nes/nes_mgt.c
32519+++ b/drivers/infiniband/hw/nes/nes_mgt.c
32520@@ -40,8 +40,8 @@
32521 #include "nes.h"
32522 #include "nes_mgt.h"
32523
32524-atomic_t pau_qps_created;
32525-atomic_t pau_qps_destroyed;
32526+atomic_unchecked_t pau_qps_created;
32527+atomic_unchecked_t pau_qps_destroyed;
32528
32529 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
32530 {
32531@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
32532 {
32533 struct sk_buff *skb;
32534 unsigned long flags;
32535- atomic_inc(&pau_qps_destroyed);
32536+ atomic_inc_unchecked(&pau_qps_destroyed);
32537
32538 /* Free packets that have not yet been forwarded */
32539 /* Lock is acquired by skb_dequeue when removing the skb */
32540@@ -812,7 +812,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
32541 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
32542 skb_queue_head_init(&nesqp->pau_list);
32543 spin_lock_init(&nesqp->pau_lock);
32544- atomic_inc(&pau_qps_created);
32545+ atomic_inc_unchecked(&pau_qps_created);
32546 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
32547 }
32548
32549diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
32550index c00d2f3..8834298 100644
32551--- a/drivers/infiniband/hw/nes/nes_nic.c
32552+++ b/drivers/infiniband/hw/nes/nes_nic.c
32553@@ -1277,39 +1277,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
32554 target_stat_values[++index] = mh_detected;
32555 target_stat_values[++index] = mh_pauses_sent;
32556 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
32557- target_stat_values[++index] = atomic_read(&cm_connects);
32558- target_stat_values[++index] = atomic_read(&cm_accepts);
32559- target_stat_values[++index] = atomic_read(&cm_disconnects);
32560- target_stat_values[++index] = atomic_read(&cm_connecteds);
32561- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
32562- target_stat_values[++index] = atomic_read(&cm_rejects);
32563- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
32564- target_stat_values[++index] = atomic_read(&qps_created);
32565- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
32566- target_stat_values[++index] = atomic_read(&qps_destroyed);
32567- target_stat_values[++index] = atomic_read(&cm_closes);
32568+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
32569+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
32570+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
32571+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
32572+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
32573+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
32574+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
32575+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
32576+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
32577+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
32578+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
32579 target_stat_values[++index] = cm_packets_sent;
32580 target_stat_values[++index] = cm_packets_bounced;
32581 target_stat_values[++index] = cm_packets_created;
32582 target_stat_values[++index] = cm_packets_received;
32583 target_stat_values[++index] = cm_packets_dropped;
32584 target_stat_values[++index] = cm_packets_retrans;
32585- target_stat_values[++index] = atomic_read(&cm_listens_created);
32586- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
32587+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
32588+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
32589 target_stat_values[++index] = cm_backlog_drops;
32590- target_stat_values[++index] = atomic_read(&cm_loopbacks);
32591- target_stat_values[++index] = atomic_read(&cm_nodes_created);
32592- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
32593- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
32594- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
32595+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
32596+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
32597+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
32598+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
32599+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
32600 target_stat_values[++index] = nesadapter->free_4kpbl;
32601 target_stat_values[++index] = nesadapter->free_256pbl;
32602 target_stat_values[++index] = int_mod_timer_init;
32603 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
32604 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
32605 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
32606- target_stat_values[++index] = atomic_read(&pau_qps_created);
32607- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
32608+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
32609+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
32610 }
32611
32612 /**
32613diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
32614index 5095bc4..41e8fff 100644
32615--- a/drivers/infiniband/hw/nes/nes_verbs.c
32616+++ b/drivers/infiniband/hw/nes/nes_verbs.c
32617@@ -46,9 +46,9 @@
32618
32619 #include <rdma/ib_umem.h>
32620
32621-atomic_t mod_qp_timouts;
32622-atomic_t qps_created;
32623-atomic_t sw_qps_destroyed;
32624+atomic_unchecked_t mod_qp_timouts;
32625+atomic_unchecked_t qps_created;
32626+atomic_unchecked_t sw_qps_destroyed;
32627
32628 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
32629
32630@@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
32631 if (init_attr->create_flags)
32632 return ERR_PTR(-EINVAL);
32633
32634- atomic_inc(&qps_created);
32635+ atomic_inc_unchecked(&qps_created);
32636 switch (init_attr->qp_type) {
32637 case IB_QPT_RC:
32638 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
32639@@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
32640 struct iw_cm_event cm_event;
32641 int ret = 0;
32642
32643- atomic_inc(&sw_qps_destroyed);
32644+ atomic_inc_unchecked(&sw_qps_destroyed);
32645 nesqp->destroyed = 1;
32646
32647 /* Blow away the connection if it exists. */
32648diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
32649index b881bdc..c2e360c 100644
32650--- a/drivers/infiniband/hw/qib/qib.h
32651+++ b/drivers/infiniband/hw/qib/qib.h
32652@@ -51,6 +51,7 @@
32653 #include <linux/completion.h>
32654 #include <linux/kref.h>
32655 #include <linux/sched.h>
32656+#include <linux/slab.h>
32657
32658 #include "qib_common.h"
32659 #include "qib_verbs.h"
32660diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
32661index df7fa25..0c854f0 100644
32662--- a/drivers/infiniband/hw/qib/qib_fs.c
32663+++ b/drivers/infiniband/hw/qib/qib_fs.c
32664@@ -267,6 +267,8 @@ static const struct file_operations qsfp_ops[] = {
32665 };
32666
32667 static ssize_t flash_read(struct file *file, char __user *buf,
32668+ size_t count, loff_t *ppos) __size_overflow(3);
32669+static ssize_t flash_read(struct file *file, char __user *buf,
32670 size_t count, loff_t *ppos)
32671 {
32672 struct qib_devdata *dd;
32673diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
32674index c351aa4..e6967c2 100644
32675--- a/drivers/input/gameport/gameport.c
32676+++ b/drivers/input/gameport/gameport.c
32677@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
32678 */
32679 static void gameport_init_port(struct gameport *gameport)
32680 {
32681- static atomic_t gameport_no = ATOMIC_INIT(0);
32682+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
32683
32684 __module_get(THIS_MODULE);
32685
32686 mutex_init(&gameport->drv_mutex);
32687 device_initialize(&gameport->dev);
32688 dev_set_name(&gameport->dev, "gameport%lu",
32689- (unsigned long)atomic_inc_return(&gameport_no) - 1);
32690+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
32691 gameport->dev.bus = &gameport_bus;
32692 gameport->dev.release = gameport_release_port;
32693 if (gameport->parent)
32694diff --git a/drivers/input/input.c b/drivers/input/input.c
32695index da38d97..2aa0b79 100644
32696--- a/drivers/input/input.c
32697+++ b/drivers/input/input.c
32698@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
32699 */
32700 int input_register_device(struct input_dev *dev)
32701 {
32702- static atomic_t input_no = ATOMIC_INIT(0);
32703+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
32704 struct input_handler *handler;
32705 const char *path;
32706 int error;
32707@@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
32708 dev->setkeycode = input_default_setkeycode;
32709
32710 dev_set_name(&dev->dev, "input%ld",
32711- (unsigned long) atomic_inc_return(&input_no) - 1);
32712+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
32713
32714 error = device_add(&dev->dev);
32715 if (error)
32716diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
32717index b8d8611..7a4a04b 100644
32718--- a/drivers/input/joystick/sidewinder.c
32719+++ b/drivers/input/joystick/sidewinder.c
32720@@ -30,6 +30,7 @@
32721 #include <linux/kernel.h>
32722 #include <linux/module.h>
32723 #include <linux/slab.h>
32724+#include <linux/sched.h>
32725 #include <linux/init.h>
32726 #include <linux/input.h>
32727 #include <linux/gameport.h>
32728diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
32729index d728875..844c89b 100644
32730--- a/drivers/input/joystick/xpad.c
32731+++ b/drivers/input/joystick/xpad.c
32732@@ -710,7 +710,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
32733
32734 static int xpad_led_probe(struct usb_xpad *xpad)
32735 {
32736- static atomic_t led_seq = ATOMIC_INIT(0);
32737+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
32738 long led_no;
32739 struct xpad_led *led;
32740 struct led_classdev *led_cdev;
32741@@ -723,7 +723,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
32742 if (!led)
32743 return -ENOMEM;
32744
32745- led_no = (long)atomic_inc_return(&led_seq) - 1;
32746+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
32747
32748 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
32749 led->xpad = xpad;
32750diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
32751index 0110b5a..d3ad144 100644
32752--- a/drivers/input/mousedev.c
32753+++ b/drivers/input/mousedev.c
32754@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
32755
32756 spin_unlock_irq(&client->packet_lock);
32757
32758- if (copy_to_user(buffer, data, count))
32759+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
32760 return -EFAULT;
32761
32762 return count;
32763diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
32764index ba70058..571d25d 100644
32765--- a/drivers/input/serio/serio.c
32766+++ b/drivers/input/serio/serio.c
32767@@ -497,7 +497,7 @@ static void serio_release_port(struct device *dev)
32768 */
32769 static void serio_init_port(struct serio *serio)
32770 {
32771- static atomic_t serio_no = ATOMIC_INIT(0);
32772+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
32773
32774 __module_get(THIS_MODULE);
32775
32776@@ -508,7 +508,7 @@ static void serio_init_port(struct serio *serio)
32777 mutex_init(&serio->drv_mutex);
32778 device_initialize(&serio->dev);
32779 dev_set_name(&serio->dev, "serio%ld",
32780- (long)atomic_inc_return(&serio_no) - 1);
32781+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
32782 serio->dev.bus = &serio_bus;
32783 serio->dev.release = serio_release_port;
32784 serio->dev.groups = serio_device_attr_groups;
32785diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
32786index e44933d..9ba484a 100644
32787--- a/drivers/isdn/capi/capi.c
32788+++ b/drivers/isdn/capi/capi.c
32789@@ -83,8 +83,8 @@ struct capiminor {
32790
32791 struct capi20_appl *ap;
32792 u32 ncci;
32793- atomic_t datahandle;
32794- atomic_t msgid;
32795+ atomic_unchecked_t datahandle;
32796+ atomic_unchecked_t msgid;
32797
32798 struct tty_port port;
32799 int ttyinstop;
32800@@ -397,7 +397,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
32801 capimsg_setu16(s, 2, mp->ap->applid);
32802 capimsg_setu8 (s, 4, CAPI_DATA_B3);
32803 capimsg_setu8 (s, 5, CAPI_RESP);
32804- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
32805+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
32806 capimsg_setu32(s, 8, mp->ncci);
32807 capimsg_setu16(s, 12, datahandle);
32808 }
32809@@ -518,14 +518,14 @@ static void handle_minor_send(struct capiminor *mp)
32810 mp->outbytes -= len;
32811 spin_unlock_bh(&mp->outlock);
32812
32813- datahandle = atomic_inc_return(&mp->datahandle);
32814+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
32815 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
32816 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32817 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32818 capimsg_setu16(skb->data, 2, mp->ap->applid);
32819 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
32820 capimsg_setu8 (skb->data, 5, CAPI_REQ);
32821- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
32822+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
32823 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
32824 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
32825 capimsg_setu16(skb->data, 16, len); /* Data length */
32826diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
32827index db621db..825ea1a 100644
32828--- a/drivers/isdn/gigaset/common.c
32829+++ b/drivers/isdn/gigaset/common.c
32830@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
32831 cs->commands_pending = 0;
32832 cs->cur_at_seq = 0;
32833 cs->gotfwver = -1;
32834- cs->open_count = 0;
32835+ local_set(&cs->open_count, 0);
32836 cs->dev = NULL;
32837 cs->tty = NULL;
32838 cs->tty_dev = NULL;
32839diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
32840index 212efaf..f187c6b 100644
32841--- a/drivers/isdn/gigaset/gigaset.h
32842+++ b/drivers/isdn/gigaset/gigaset.h
32843@@ -35,6 +35,7 @@
32844 #include <linux/tty_driver.h>
32845 #include <linux/list.h>
32846 #include <linux/atomic.h>
32847+#include <asm/local.h>
32848
32849 #define GIG_VERSION {0, 5, 0, 0}
32850 #define GIG_COMPAT {0, 4, 0, 0}
32851@@ -433,7 +434,7 @@ struct cardstate {
32852 spinlock_t cmdlock;
32853 unsigned curlen, cmdbytes;
32854
32855- unsigned open_count;
32856+ local_t open_count;
32857 struct tty_struct *tty;
32858 struct tasklet_struct if_wake_tasklet;
32859 unsigned control_state;
32860diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
32861index ee0a549..a7c9798 100644
32862--- a/drivers/isdn/gigaset/interface.c
32863+++ b/drivers/isdn/gigaset/interface.c
32864@@ -163,9 +163,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
32865 }
32866 tty->driver_data = cs;
32867
32868- ++cs->open_count;
32869-
32870- if (cs->open_count == 1) {
32871+ if (local_inc_return(&cs->open_count) == 1) {
32872 spin_lock_irqsave(&cs->lock, flags);
32873 cs->tty = tty;
32874 spin_unlock_irqrestore(&cs->lock, flags);
32875@@ -193,10 +191,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
32876
32877 if (!cs->connected)
32878 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32879- else if (!cs->open_count)
32880+ else if (!local_read(&cs->open_count))
32881 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32882 else {
32883- if (!--cs->open_count) {
32884+ if (!local_dec_return(&cs->open_count)) {
32885 spin_lock_irqsave(&cs->lock, flags);
32886 cs->tty = NULL;
32887 spin_unlock_irqrestore(&cs->lock, flags);
32888@@ -231,7 +229,7 @@ static int if_ioctl(struct tty_struct *tty,
32889 if (!cs->connected) {
32890 gig_dbg(DEBUG_IF, "not connected");
32891 retval = -ENODEV;
32892- } else if (!cs->open_count)
32893+ } else if (!local_read(&cs->open_count))
32894 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32895 else {
32896 retval = 0;
32897@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
32898 retval = -ENODEV;
32899 goto done;
32900 }
32901- if (!cs->open_count) {
32902+ if (!local_read(&cs->open_count)) {
32903 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32904 retval = -ENODEV;
32905 goto done;
32906@@ -414,7 +412,7 @@ static int if_write_room(struct tty_struct *tty)
32907 if (!cs->connected) {
32908 gig_dbg(DEBUG_IF, "not connected");
32909 retval = -ENODEV;
32910- } else if (!cs->open_count)
32911+ } else if (!local_read(&cs->open_count))
32912 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32913 else if (cs->mstate != MS_LOCKED) {
32914 dev_warn(cs->dev, "can't write to unlocked device\n");
32915@@ -444,7 +442,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
32916
32917 if (!cs->connected)
32918 gig_dbg(DEBUG_IF, "not connected");
32919- else if (!cs->open_count)
32920+ else if (!local_read(&cs->open_count))
32921 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32922 else if (cs->mstate != MS_LOCKED)
32923 dev_warn(cs->dev, "can't write to unlocked device\n");
32924@@ -472,7 +470,7 @@ static void if_throttle(struct tty_struct *tty)
32925
32926 if (!cs->connected)
32927 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32928- else if (!cs->open_count)
32929+ else if (!local_read(&cs->open_count))
32930 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32931 else
32932 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
32933@@ -496,7 +494,7 @@ static void if_unthrottle(struct tty_struct *tty)
32934
32935 if (!cs->connected)
32936 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32937- else if (!cs->open_count)
32938+ else if (!local_read(&cs->open_count))
32939 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32940 else
32941 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
32942@@ -527,7 +525,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
32943 goto out;
32944 }
32945
32946- if (!cs->open_count) {
32947+ if (!local_read(&cs->open_count)) {
32948 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32949 goto out;
32950 }
32951diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
32952index 2a57da59..e7a12ed 100644
32953--- a/drivers/isdn/hardware/avm/b1.c
32954+++ b/drivers/isdn/hardware/avm/b1.c
32955@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
32956 }
32957 if (left) {
32958 if (t4file->user) {
32959- if (copy_from_user(buf, dp, left))
32960+ if (left > sizeof buf || copy_from_user(buf, dp, left))
32961 return -EFAULT;
32962 } else {
32963 memcpy(buf, dp, left);
32964@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
32965 }
32966 if (left) {
32967 if (config->user) {
32968- if (copy_from_user(buf, dp, left))
32969+ if (left > sizeof buf || copy_from_user(buf, dp, left))
32970 return -EFAULT;
32971 } else {
32972 memcpy(buf, dp, left);
32973diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
32974index 85784a7..a19ca98 100644
32975--- a/drivers/isdn/hardware/eicon/divasync.h
32976+++ b/drivers/isdn/hardware/eicon/divasync.h
32977@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
32978 } diva_didd_add_adapter_t;
32979 typedef struct _diva_didd_remove_adapter {
32980 IDI_CALL p_request;
32981-} diva_didd_remove_adapter_t;
32982+} __no_const diva_didd_remove_adapter_t;
32983 typedef struct _diva_didd_read_adapter_array {
32984 void * buffer;
32985 dword length;
32986diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
32987index a3bd163..8956575 100644
32988--- a/drivers/isdn/hardware/eicon/xdi_adapter.h
32989+++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
32990@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
32991 typedef struct _diva_os_idi_adapter_interface {
32992 diva_init_card_proc_t cleanup_adapter_proc;
32993 diva_cmd_card_proc_t cmd_proc;
32994-} diva_os_idi_adapter_interface_t;
32995+} __no_const diva_os_idi_adapter_interface_t;
32996
32997 typedef struct _diva_os_xdi_adapter {
32998 struct list_head link;
32999diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
33000index 2339d73..802ab87 100644
33001--- a/drivers/isdn/i4l/isdn_net.c
33002+++ b/drivers/isdn/i4l/isdn_net.c
33003@@ -1901,7 +1901,7 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev,
33004 {
33005 isdn_net_local *lp = netdev_priv(dev);
33006 unsigned char *p;
33007- ushort len = 0;
33008+ int len = 0;
33009
33010 switch (lp->p_encap) {
33011 case ISDN_NET_ENCAP_ETHER:
33012diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
33013index 1f355bb..43f1fea 100644
33014--- a/drivers/isdn/icn/icn.c
33015+++ b/drivers/isdn/icn/icn.c
33016@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
33017 if (count > len)
33018 count = len;
33019 if (user) {
33020- if (copy_from_user(msg, buf, count))
33021+ if (count > sizeof msg || copy_from_user(msg, buf, count))
33022 return -EFAULT;
33023 } else
33024 memcpy(msg, buf, count);
33025diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
33026index b5fdcb7..5b6c59f 100644
33027--- a/drivers/lguest/core.c
33028+++ b/drivers/lguest/core.c
33029@@ -92,9 +92,17 @@ static __init int map_switcher(void)
33030 * it's worked so far. The end address needs +1 because __get_vm_area
33031 * allocates an extra guard page, so we need space for that.
33032 */
33033+
33034+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
33035+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
33036+ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
33037+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
33038+#else
33039 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
33040 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
33041 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
33042+#endif
33043+
33044 if (!switcher_vma) {
33045 err = -ENOMEM;
33046 printk("lguest: could not map switcher pages high\n");
33047@@ -119,7 +127,7 @@ static __init int map_switcher(void)
33048 * Now the Switcher is mapped at the right address, we can't fail!
33049 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
33050 */
33051- memcpy(switcher_vma->addr, start_switcher_text,
33052+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
33053 end_switcher_text - start_switcher_text);
33054
33055 printk(KERN_INFO "lguest: mapped switcher at %p\n",
33056diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
33057index ff4a0bc..f5fdd9c 100644
33058--- a/drivers/lguest/lguest_user.c
33059+++ b/drivers/lguest/lguest_user.c
33060@@ -198,6 +198,7 @@ static int user_send_irq(struct lg_cpu *cpu, const unsigned long __user *input)
33061 * Once our Guest is initialized, the Launcher makes it run by reading
33062 * from /dev/lguest.
33063 */
33064+static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o) __size_overflow(3);
33065 static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
33066 {
33067 struct lguest *lg = file->private_data;
33068diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
33069index 65af42f..530c87a 100644
33070--- a/drivers/lguest/x86/core.c
33071+++ b/drivers/lguest/x86/core.c
33072@@ -59,7 +59,7 @@ static struct {
33073 /* Offset from where switcher.S was compiled to where we've copied it */
33074 static unsigned long switcher_offset(void)
33075 {
33076- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
33077+ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
33078 }
33079
33080 /* This cpu's struct lguest_pages. */
33081@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
33082 * These copies are pretty cheap, so we do them unconditionally: */
33083 /* Save the current Host top-level page directory.
33084 */
33085+
33086+#ifdef CONFIG_PAX_PER_CPU_PGD
33087+ pages->state.host_cr3 = read_cr3();
33088+#else
33089 pages->state.host_cr3 = __pa(current->mm->pgd);
33090+#endif
33091+
33092 /*
33093 * Set up the Guest's page tables to see this CPU's pages (and no
33094 * other CPU's pages).
33095@@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
33096 * compiled-in switcher code and the high-mapped copy we just made.
33097 */
33098 for (i = 0; i < IDT_ENTRIES; i++)
33099- default_idt_entries[i] += switcher_offset();
33100+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
33101
33102 /*
33103 * Set up the Switcher's per-cpu areas.
33104@@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
33105 * it will be undisturbed when we switch. To change %cs and jump we
33106 * need this structure to feed to Intel's "lcall" instruction.
33107 */
33108- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
33109+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
33110 lguest_entry.segment = LGUEST_CS;
33111
33112 /*
33113diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
33114index 40634b0..4f5855e 100644
33115--- a/drivers/lguest/x86/switcher_32.S
33116+++ b/drivers/lguest/x86/switcher_32.S
33117@@ -87,6 +87,7 @@
33118 #include <asm/page.h>
33119 #include <asm/segment.h>
33120 #include <asm/lguest.h>
33121+#include <asm/processor-flags.h>
33122
33123 // We mark the start of the code to copy
33124 // It's placed in .text tho it's never run here
33125@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
33126 // Changes type when we load it: damn Intel!
33127 // For after we switch over our page tables
33128 // That entry will be read-only: we'd crash.
33129+
33130+#ifdef CONFIG_PAX_KERNEXEC
33131+ mov %cr0, %edx
33132+ xor $X86_CR0_WP, %edx
33133+ mov %edx, %cr0
33134+#endif
33135+
33136 movl $(GDT_ENTRY_TSS*8), %edx
33137 ltr %dx
33138
33139@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
33140 // Let's clear it again for our return.
33141 // The GDT descriptor of the Host
33142 // Points to the table after two "size" bytes
33143- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
33144+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
33145 // Clear "used" from type field (byte 5, bit 2)
33146- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
33147+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
33148+
33149+#ifdef CONFIG_PAX_KERNEXEC
33150+ mov %cr0, %eax
33151+ xor $X86_CR0_WP, %eax
33152+ mov %eax, %cr0
33153+#endif
33154
33155 // Once our page table's switched, the Guest is live!
33156 // The Host fades as we run this final step.
33157@@ -295,13 +309,12 @@ deliver_to_host:
33158 // I consulted gcc, and it gave
33159 // These instructions, which I gladly credit:
33160 leal (%edx,%ebx,8), %eax
33161- movzwl (%eax),%edx
33162- movl 4(%eax), %eax
33163- xorw %ax, %ax
33164- orl %eax, %edx
33165+ movl 4(%eax), %edx
33166+ movw (%eax), %dx
33167 // Now the address of the handler's in %edx
33168 // We call it now: its "iret" drops us home.
33169- jmp *%edx
33170+ ljmp $__KERNEL_CS, $1f
33171+1: jmp *%edx
33172
33173 // Every interrupt can come to us here
33174 // But we must truly tell each apart.
33175diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
33176index 4daf9e5..b8d1d0f 100644
33177--- a/drivers/macintosh/macio_asic.c
33178+++ b/drivers/macintosh/macio_asic.c
33179@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
33180 * MacIO is matched against any Apple ID, it's probe() function
33181 * will then decide wether it applies or not
33182 */
33183-static const struct pci_device_id __devinitdata pci_ids [] = { {
33184+static const struct pci_device_id __devinitconst pci_ids [] = { {
33185 .vendor = PCI_VENDOR_ID_APPLE,
33186 .device = PCI_ANY_ID,
33187 .subvendor = PCI_ANY_ID,
33188diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
33189index 1ce84ed..0fdd40a 100644
33190--- a/drivers/md/dm-ioctl.c
33191+++ b/drivers/md/dm-ioctl.c
33192@@ -1589,7 +1589,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
33193 cmd == DM_LIST_VERSIONS_CMD)
33194 return 0;
33195
33196- if ((cmd == DM_DEV_CREATE_CMD)) {
33197+ if (cmd == DM_DEV_CREATE_CMD) {
33198 if (!*param->name) {
33199 DMWARN("name not supplied when creating device");
33200 return -EINVAL;
33201diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
33202index 9bfd057..01180bc 100644
33203--- a/drivers/md/dm-raid1.c
33204+++ b/drivers/md/dm-raid1.c
33205@@ -40,7 +40,7 @@ enum dm_raid1_error {
33206
33207 struct mirror {
33208 struct mirror_set *ms;
33209- atomic_t error_count;
33210+ atomic_unchecked_t error_count;
33211 unsigned long error_type;
33212 struct dm_dev *dev;
33213 sector_t offset;
33214@@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
33215 struct mirror *m;
33216
33217 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
33218- if (!atomic_read(&m->error_count))
33219+ if (!atomic_read_unchecked(&m->error_count))
33220 return m;
33221
33222 return NULL;
33223@@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
33224 * simple way to tell if a device has encountered
33225 * errors.
33226 */
33227- atomic_inc(&m->error_count);
33228+ atomic_inc_unchecked(&m->error_count);
33229
33230 if (test_and_set_bit(error_type, &m->error_type))
33231 return;
33232@@ -408,7 +408,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
33233 struct mirror *m = get_default_mirror(ms);
33234
33235 do {
33236- if (likely(!atomic_read(&m->error_count)))
33237+ if (likely(!atomic_read_unchecked(&m->error_count)))
33238 return m;
33239
33240 if (m-- == ms->mirror)
33241@@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
33242 {
33243 struct mirror *default_mirror = get_default_mirror(m->ms);
33244
33245- return !atomic_read(&default_mirror->error_count);
33246+ return !atomic_read_unchecked(&default_mirror->error_count);
33247 }
33248
33249 static int mirror_available(struct mirror_set *ms, struct bio *bio)
33250@@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
33251 */
33252 if (likely(region_in_sync(ms, region, 1)))
33253 m = choose_mirror(ms, bio->bi_sector);
33254- else if (m && atomic_read(&m->error_count))
33255+ else if (m && atomic_read_unchecked(&m->error_count))
33256 m = NULL;
33257
33258 if (likely(m))
33259@@ -937,7 +937,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
33260 }
33261
33262 ms->mirror[mirror].ms = ms;
33263- atomic_set(&(ms->mirror[mirror].error_count), 0);
33264+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
33265 ms->mirror[mirror].error_type = 0;
33266 ms->mirror[mirror].offset = offset;
33267
33268@@ -1347,7 +1347,7 @@ static void mirror_resume(struct dm_target *ti)
33269 */
33270 static char device_status_char(struct mirror *m)
33271 {
33272- if (!atomic_read(&(m->error_count)))
33273+ if (!atomic_read_unchecked(&(m->error_count)))
33274 return 'A';
33275
33276 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
33277diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
33278index 3d80cf0..b77cc47 100644
33279--- a/drivers/md/dm-stripe.c
33280+++ b/drivers/md/dm-stripe.c
33281@@ -20,7 +20,7 @@ struct stripe {
33282 struct dm_dev *dev;
33283 sector_t physical_start;
33284
33285- atomic_t error_count;
33286+ atomic_unchecked_t error_count;
33287 };
33288
33289 struct stripe_c {
33290@@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
33291 kfree(sc);
33292 return r;
33293 }
33294- atomic_set(&(sc->stripe[i].error_count), 0);
33295+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
33296 }
33297
33298 ti->private = sc;
33299@@ -314,7 +314,7 @@ static int stripe_status(struct dm_target *ti,
33300 DMEMIT("%d ", sc->stripes);
33301 for (i = 0; i < sc->stripes; i++) {
33302 DMEMIT("%s ", sc->stripe[i].dev->name);
33303- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
33304+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
33305 'D' : 'A';
33306 }
33307 buffer[i] = '\0';
33308@@ -361,8 +361,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
33309 */
33310 for (i = 0; i < sc->stripes; i++)
33311 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
33312- atomic_inc(&(sc->stripe[i].error_count));
33313- if (atomic_read(&(sc->stripe[i].error_count)) <
33314+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
33315+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
33316 DM_IO_ERROR_THRESHOLD)
33317 schedule_work(&sc->trigger_event);
33318 }
33319diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
33320index 8e91321..fd17aef 100644
33321--- a/drivers/md/dm-table.c
33322+++ b/drivers/md/dm-table.c
33323@@ -391,7 +391,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
33324 if (!dev_size)
33325 return 0;
33326
33327- if ((start >= dev_size) || (start + len > dev_size)) {
33328+ if ((start >= dev_size) || (len > dev_size - start)) {
33329 DMWARN("%s: %s too small for target: "
33330 "start=%llu, len=%llu, dev_size=%llu",
33331 dm_device_name(ti->table->md), bdevname(bdev, b),
33332diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
33333index 237571a..fb6d19b 100644
33334--- a/drivers/md/dm-thin-metadata.c
33335+++ b/drivers/md/dm-thin-metadata.c
33336@@ -432,7 +432,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33337
33338 pmd->info.tm = tm;
33339 pmd->info.levels = 2;
33340- pmd->info.value_type.context = pmd->data_sm;
33341+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33342 pmd->info.value_type.size = sizeof(__le64);
33343 pmd->info.value_type.inc = data_block_inc;
33344 pmd->info.value_type.dec = data_block_dec;
33345@@ -451,7 +451,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33346
33347 pmd->bl_info.tm = tm;
33348 pmd->bl_info.levels = 1;
33349- pmd->bl_info.value_type.context = pmd->data_sm;
33350+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33351 pmd->bl_info.value_type.size = sizeof(__le64);
33352 pmd->bl_info.value_type.inc = data_block_inc;
33353 pmd->bl_info.value_type.dec = data_block_dec;
33354diff --git a/drivers/md/dm.c b/drivers/md/dm.c
33355index 4720f68..78d1df7 100644
33356--- a/drivers/md/dm.c
33357+++ b/drivers/md/dm.c
33358@@ -177,9 +177,9 @@ struct mapped_device {
33359 /*
33360 * Event handling.
33361 */
33362- atomic_t event_nr;
33363+ atomic_unchecked_t event_nr;
33364 wait_queue_head_t eventq;
33365- atomic_t uevent_seq;
33366+ atomic_unchecked_t uevent_seq;
33367 struct list_head uevent_list;
33368 spinlock_t uevent_lock; /* Protect access to uevent_list */
33369
33370@@ -1845,8 +1845,8 @@ static struct mapped_device *alloc_dev(int minor)
33371 rwlock_init(&md->map_lock);
33372 atomic_set(&md->holders, 1);
33373 atomic_set(&md->open_count, 0);
33374- atomic_set(&md->event_nr, 0);
33375- atomic_set(&md->uevent_seq, 0);
33376+ atomic_set_unchecked(&md->event_nr, 0);
33377+ atomic_set_unchecked(&md->uevent_seq, 0);
33378 INIT_LIST_HEAD(&md->uevent_list);
33379 spin_lock_init(&md->uevent_lock);
33380
33381@@ -1980,7 +1980,7 @@ static void event_callback(void *context)
33382
33383 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
33384
33385- atomic_inc(&md->event_nr);
33386+ atomic_inc_unchecked(&md->event_nr);
33387 wake_up(&md->eventq);
33388 }
33389
33390@@ -2622,18 +2622,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
33391
33392 uint32_t dm_next_uevent_seq(struct mapped_device *md)
33393 {
33394- return atomic_add_return(1, &md->uevent_seq);
33395+ return atomic_add_return_unchecked(1, &md->uevent_seq);
33396 }
33397
33398 uint32_t dm_get_event_nr(struct mapped_device *md)
33399 {
33400- return atomic_read(&md->event_nr);
33401+ return atomic_read_unchecked(&md->event_nr);
33402 }
33403
33404 int dm_wait_event(struct mapped_device *md, int event_nr)
33405 {
33406 return wait_event_interruptible(md->eventq,
33407- (event_nr != atomic_read(&md->event_nr)));
33408+ (event_nr != atomic_read_unchecked(&md->event_nr)));
33409 }
33410
33411 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
33412diff --git a/drivers/md/md.c b/drivers/md/md.c
33413index f47f1f8..b7f559e 100644
33414--- a/drivers/md/md.c
33415+++ b/drivers/md/md.c
33416@@ -278,10 +278,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
33417 * start build, activate spare
33418 */
33419 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
33420-static atomic_t md_event_count;
33421+static atomic_unchecked_t md_event_count;
33422 void md_new_event(struct mddev *mddev)
33423 {
33424- atomic_inc(&md_event_count);
33425+ atomic_inc_unchecked(&md_event_count);
33426 wake_up(&md_event_waiters);
33427 }
33428 EXPORT_SYMBOL_GPL(md_new_event);
33429@@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
33430 */
33431 static void md_new_event_inintr(struct mddev *mddev)
33432 {
33433- atomic_inc(&md_event_count);
33434+ atomic_inc_unchecked(&md_event_count);
33435 wake_up(&md_event_waiters);
33436 }
33437
33438@@ -1525,7 +1525,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
33439
33440 rdev->preferred_minor = 0xffff;
33441 rdev->data_offset = le64_to_cpu(sb->data_offset);
33442- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33443+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33444
33445 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
33446 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
33447@@ -1742,7 +1742,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
33448 else
33449 sb->resync_offset = cpu_to_le64(0);
33450
33451- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
33452+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
33453
33454 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
33455 sb->size = cpu_to_le64(mddev->dev_sectors);
33456@@ -2639,7 +2639,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
33457 static ssize_t
33458 errors_show(struct md_rdev *rdev, char *page)
33459 {
33460- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
33461+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
33462 }
33463
33464 static ssize_t
33465@@ -2648,7 +2648,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
33466 char *e;
33467 unsigned long n = simple_strtoul(buf, &e, 10);
33468 if (*buf && (*e == 0 || *e == '\n')) {
33469- atomic_set(&rdev->corrected_errors, n);
33470+ atomic_set_unchecked(&rdev->corrected_errors, n);
33471 return len;
33472 }
33473 return -EINVAL;
33474@@ -3039,8 +3039,8 @@ int md_rdev_init(struct md_rdev *rdev)
33475 rdev->sb_loaded = 0;
33476 rdev->bb_page = NULL;
33477 atomic_set(&rdev->nr_pending, 0);
33478- atomic_set(&rdev->read_errors, 0);
33479- atomic_set(&rdev->corrected_errors, 0);
33480+ atomic_set_unchecked(&rdev->read_errors, 0);
33481+ atomic_set_unchecked(&rdev->corrected_errors, 0);
33482
33483 INIT_LIST_HEAD(&rdev->same_set);
33484 init_waitqueue_head(&rdev->blocked_wait);
33485@@ -6683,7 +6683,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33486
33487 spin_unlock(&pers_lock);
33488 seq_printf(seq, "\n");
33489- seq->poll_event = atomic_read(&md_event_count);
33490+ seq->poll_event = atomic_read_unchecked(&md_event_count);
33491 return 0;
33492 }
33493 if (v == (void*)2) {
33494@@ -6772,7 +6772,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33495 chunk_kb ? "KB" : "B");
33496 if (bitmap->file) {
33497 seq_printf(seq, ", file: ");
33498- seq_path(seq, &bitmap->file->f_path, " \t\n");
33499+ seq_path(seq, &bitmap->file->f_path, " \t\n\\");
33500 }
33501
33502 seq_printf(seq, "\n");
33503@@ -6803,7 +6803,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
33504 return error;
33505
33506 seq = file->private_data;
33507- seq->poll_event = atomic_read(&md_event_count);
33508+ seq->poll_event = atomic_read_unchecked(&md_event_count);
33509 return error;
33510 }
33511
33512@@ -6817,7 +6817,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
33513 /* always allow read */
33514 mask = POLLIN | POLLRDNORM;
33515
33516- if (seq->poll_event != atomic_read(&md_event_count))
33517+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
33518 mask |= POLLERR | POLLPRI;
33519 return mask;
33520 }
33521@@ -6861,7 +6861,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
33522 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
33523 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
33524 (int)part_stat_read(&disk->part0, sectors[1]) -
33525- atomic_read(&disk->sync_io);
33526+ atomic_read_unchecked(&disk->sync_io);
33527 /* sync IO will cause sync_io to increase before the disk_stats
33528 * as sync_io is counted when a request starts, and
33529 * disk_stats is counted when it completes.
33530diff --git a/drivers/md/md.h b/drivers/md/md.h
33531index cf742d9..7c7c745 100644
33532--- a/drivers/md/md.h
33533+++ b/drivers/md/md.h
33534@@ -120,13 +120,13 @@ struct md_rdev {
33535 * only maintained for arrays that
33536 * support hot removal
33537 */
33538- atomic_t read_errors; /* number of consecutive read errors that
33539+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
33540 * we have tried to ignore.
33541 */
33542 struct timespec last_read_error; /* monotonic time since our
33543 * last read error
33544 */
33545- atomic_t corrected_errors; /* number of corrected read errors,
33546+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
33547 * for reporting to userspace and storing
33548 * in superblock.
33549 */
33550@@ -410,7 +410,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
33551
33552 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
33553 {
33554- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33555+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33556 }
33557
33558 struct md_personality
33559diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
33560index 50ed53b..4f29d7d 100644
33561--- a/drivers/md/persistent-data/dm-space-map-checker.c
33562+++ b/drivers/md/persistent-data/dm-space-map-checker.c
33563@@ -159,7 +159,7 @@ static void ca_destroy(struct count_array *ca)
33564 /*----------------------------------------------------------------*/
33565
33566 struct sm_checker {
33567- struct dm_space_map sm;
33568+ dm_space_map_no_const sm;
33569
33570 struct count_array old_counts;
33571 struct count_array counts;
33572diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
33573index fc469ba..2d91555 100644
33574--- a/drivers/md/persistent-data/dm-space-map-disk.c
33575+++ b/drivers/md/persistent-data/dm-space-map-disk.c
33576@@ -23,7 +23,7 @@
33577 * Space map interface.
33578 */
33579 struct sm_disk {
33580- struct dm_space_map sm;
33581+ dm_space_map_no_const sm;
33582
33583 struct ll_disk ll;
33584 struct ll_disk old_ll;
33585diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
33586index e89ae5e..062e4c2 100644
33587--- a/drivers/md/persistent-data/dm-space-map-metadata.c
33588+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
33589@@ -43,7 +43,7 @@ struct block_op {
33590 };
33591
33592 struct sm_metadata {
33593- struct dm_space_map sm;
33594+ dm_space_map_no_const sm;
33595
33596 struct ll_disk ll;
33597 struct ll_disk old_ll;
33598diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
33599index 1cbfc6b..56e1dbb 100644
33600--- a/drivers/md/persistent-data/dm-space-map.h
33601+++ b/drivers/md/persistent-data/dm-space-map.h
33602@@ -60,6 +60,7 @@ struct dm_space_map {
33603 int (*root_size)(struct dm_space_map *sm, size_t *result);
33604 int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
33605 };
33606+typedef struct dm_space_map __no_const dm_space_map_no_const;
33607
33608 /*----------------------------------------------------------------*/
33609
33610diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
33611index 7d9e071..015b1d5 100644
33612--- a/drivers/md/raid1.c
33613+++ b/drivers/md/raid1.c
33614@@ -1568,7 +1568,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
33615 if (r1_sync_page_io(rdev, sect, s,
33616 bio->bi_io_vec[idx].bv_page,
33617 READ) != 0)
33618- atomic_add(s, &rdev->corrected_errors);
33619+ atomic_add_unchecked(s, &rdev->corrected_errors);
33620 }
33621 sectors -= s;
33622 sect += s;
33623@@ -1781,7 +1781,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
33624 test_bit(In_sync, &rdev->flags)) {
33625 if (r1_sync_page_io(rdev, sect, s,
33626 conf->tmppage, READ)) {
33627- atomic_add(s, &rdev->corrected_errors);
33628+ atomic_add_unchecked(s, &rdev->corrected_errors);
33629 printk(KERN_INFO
33630 "md/raid1:%s: read error corrected "
33631 "(%d sectors at %llu on %s)\n",
33632diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
33633index 685ddf3..955b087 100644
33634--- a/drivers/md/raid10.c
33635+++ b/drivers/md/raid10.c
33636@@ -1440,7 +1440,7 @@ static void end_sync_read(struct bio *bio, int error)
33637 /* The write handler will notice the lack of
33638 * R10BIO_Uptodate and record any errors etc
33639 */
33640- atomic_add(r10_bio->sectors,
33641+ atomic_add_unchecked(r10_bio->sectors,
33642 &conf->mirrors[d].rdev->corrected_errors);
33643
33644 /* for reconstruct, we always reschedule after a read.
33645@@ -1740,7 +1740,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33646 {
33647 struct timespec cur_time_mon;
33648 unsigned long hours_since_last;
33649- unsigned int read_errors = atomic_read(&rdev->read_errors);
33650+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
33651
33652 ktime_get_ts(&cur_time_mon);
33653
33654@@ -1762,9 +1762,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33655 * overflowing the shift of read_errors by hours_since_last.
33656 */
33657 if (hours_since_last >= 8 * sizeof(read_errors))
33658- atomic_set(&rdev->read_errors, 0);
33659+ atomic_set_unchecked(&rdev->read_errors, 0);
33660 else
33661- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
33662+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
33663 }
33664
33665 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
33666@@ -1814,8 +1814,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33667 return;
33668
33669 check_decay_read_errors(mddev, rdev);
33670- atomic_inc(&rdev->read_errors);
33671- if (atomic_read(&rdev->read_errors) > max_read_errors) {
33672+ atomic_inc_unchecked(&rdev->read_errors);
33673+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
33674 char b[BDEVNAME_SIZE];
33675 bdevname(rdev->bdev, b);
33676
33677@@ -1823,7 +1823,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33678 "md/raid10:%s: %s: Raid device exceeded "
33679 "read_error threshold [cur %d:max %d]\n",
33680 mdname(mddev), b,
33681- atomic_read(&rdev->read_errors), max_read_errors);
33682+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
33683 printk(KERN_NOTICE
33684 "md/raid10:%s: %s: Failing raid device\n",
33685 mdname(mddev), b);
33686@@ -1968,7 +1968,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33687 (unsigned long long)(
33688 sect + rdev->data_offset),
33689 bdevname(rdev->bdev, b));
33690- atomic_add(s, &rdev->corrected_errors);
33691+ atomic_add_unchecked(s, &rdev->corrected_errors);
33692 }
33693
33694 rdev_dec_pending(rdev, mddev);
33695diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
33696index 858fdbb..b2dac95 100644
33697--- a/drivers/md/raid5.c
33698+++ b/drivers/md/raid5.c
33699@@ -1610,19 +1610,19 @@ static void raid5_end_read_request(struct bio * bi, int error)
33700 (unsigned long long)(sh->sector
33701 + rdev->data_offset),
33702 bdevname(rdev->bdev, b));
33703- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
33704+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
33705 clear_bit(R5_ReadError, &sh->dev[i].flags);
33706 clear_bit(R5_ReWrite, &sh->dev[i].flags);
33707 }
33708- if (atomic_read(&conf->disks[i].rdev->read_errors))
33709- atomic_set(&conf->disks[i].rdev->read_errors, 0);
33710+ if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors))
33711+ atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0);
33712 } else {
33713 const char *bdn = bdevname(conf->disks[i].rdev->bdev, b);
33714 int retry = 0;
33715 rdev = conf->disks[i].rdev;
33716
33717 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
33718- atomic_inc(&rdev->read_errors);
33719+ atomic_inc_unchecked(&rdev->read_errors);
33720 if (conf->mddev->degraded >= conf->max_degraded)
33721 printk_ratelimited(
33722 KERN_WARNING
33723@@ -1642,7 +1642,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
33724 (unsigned long long)(sh->sector
33725 + rdev->data_offset),
33726 bdn);
33727- else if (atomic_read(&rdev->read_errors)
33728+ else if (atomic_read_unchecked(&rdev->read_errors)
33729 > conf->max_nr_stripes)
33730 printk(KERN_WARNING
33731 "md/raid:%s: Too many read errors, failing device %s.\n",
33732diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
33733index ba9a643..e474ab5 100644
33734--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
33735+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
33736@@ -1678,7 +1678,7 @@ static struct ddb_info ddb_v6 = {
33737 .subvendor = _subvend, .subdevice = _subdev, \
33738 .driver_data = (unsigned long)&_driverdata }
33739
33740-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
33741+static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
33742 DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
33743 DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
33744 DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
33745diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
33746index a7d876f..8c21b61 100644
33747--- a/drivers/media/dvb/dvb-core/dvb_demux.h
33748+++ b/drivers/media/dvb/dvb-core/dvb_demux.h
33749@@ -73,7 +73,7 @@ struct dvb_demux_feed {
33750 union {
33751 dmx_ts_cb ts;
33752 dmx_section_cb sec;
33753- } cb;
33754+ } __no_const cb;
33755
33756 struct dvb_demux *demux;
33757 void *priv;
33758diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
33759index f732877..d38c35a 100644
33760--- a/drivers/media/dvb/dvb-core/dvbdev.c
33761+++ b/drivers/media/dvb/dvb-core/dvbdev.c
33762@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
33763 const struct dvb_device *template, void *priv, int type)
33764 {
33765 struct dvb_device *dvbdev;
33766- struct file_operations *dvbdevfops;
33767+ file_operations_no_const *dvbdevfops;
33768 struct device *clsdev;
33769 int minor;
33770 int id;
33771diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
33772index 9f2a02c..5920f88 100644
33773--- a/drivers/media/dvb/dvb-usb/cxusb.c
33774+++ b/drivers/media/dvb/dvb-usb/cxusb.c
33775@@ -1069,7 +1069,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
33776 struct dib0700_adapter_state {
33777 int (*set_param_save) (struct dvb_frontend *,
33778 struct dvb_frontend_parameters *);
33779-};
33780+} __no_const;
33781
33782 static int dib7070_set_param_override(struct dvb_frontend *fe,
33783 struct dvb_frontend_parameters *fep)
33784diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
33785index f103ec1..5e8968b 100644
33786--- a/drivers/media/dvb/dvb-usb/dw2102.c
33787+++ b/drivers/media/dvb/dvb-usb/dw2102.c
33788@@ -95,7 +95,7 @@ struct su3000_state {
33789
33790 struct s6x0_state {
33791 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
33792-};
33793+} __no_const;
33794
33795 /* debug */
33796 static int dvb_usb_dw2102_debug;
33797diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
33798index 404f63a..4796533 100644
33799--- a/drivers/media/dvb/frontends/dib3000.h
33800+++ b/drivers/media/dvb/frontends/dib3000.h
33801@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
33802 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
33803 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
33804 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
33805-};
33806+} __no_const;
33807
33808 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
33809 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
33810diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
33811index 90bf573..e8463da 100644
33812--- a/drivers/media/dvb/frontends/ds3000.c
33813+++ b/drivers/media/dvb/frontends/ds3000.c
33814@@ -1210,7 +1210,7 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,
33815
33816 for (i = 0; i < 30 ; i++) {
33817 ds3000_read_status(fe, &status);
33818- if (status && FE_HAS_LOCK)
33819+ if (status & FE_HAS_LOCK)
33820 break;
33821
33822 msleep(10);
33823diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
33824index 0564192..75b16f5 100644
33825--- a/drivers/media/dvb/ngene/ngene-cards.c
33826+++ b/drivers/media/dvb/ngene/ngene-cards.c
33827@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780 = {
33828
33829 /****************************************************************************/
33830
33831-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
33832+static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
33833 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
33834 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
33835 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
33836diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
33837index 16a089f..ab1667d 100644
33838--- a/drivers/media/radio/radio-cadet.c
33839+++ b/drivers/media/radio/radio-cadet.c
33840@@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
33841 unsigned char readbuf[RDS_BUFFER];
33842 int i = 0;
33843
33844+ if (count > RDS_BUFFER)
33845+ return -EFAULT;
33846 mutex_lock(&dev->lock);
33847 if (dev->rdsstat == 0) {
33848 dev->rdsstat = 1;
33849diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
33850index 61287fc..8b08712 100644
33851--- a/drivers/media/rc/redrat3.c
33852+++ b/drivers/media/rc/redrat3.c
33853@@ -905,7 +905,7 @@ static int redrat3_set_tx_carrier(struct rc_dev *dev, u32 carrier)
33854 return carrier;
33855 }
33856
33857-static int redrat3_transmit_ir(struct rc_dev *rcdev, int *txbuf, u32 n)
33858+static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf, u32 n)
33859 {
33860 struct redrat3_dev *rr3 = rcdev->priv;
33861 struct device *dev = rr3->dev;
33862diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
33863index 9cde353..8c6a1c3 100644
33864--- a/drivers/media/video/au0828/au0828.h
33865+++ b/drivers/media/video/au0828/au0828.h
33866@@ -191,7 +191,7 @@ struct au0828_dev {
33867
33868 /* I2C */
33869 struct i2c_adapter i2c_adap;
33870- struct i2c_algorithm i2c_algo;
33871+ i2c_algorithm_no_const i2c_algo;
33872 struct i2c_client i2c_client;
33873 u32 i2c_rc;
33874
33875diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
33876index 68d1240..46b32eb 100644
33877--- a/drivers/media/video/cx88/cx88-alsa.c
33878+++ b/drivers/media/video/cx88/cx88-alsa.c
33879@@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
33880 * Only boards with eeprom and byte 1 at eeprom=1 have it
33881 */
33882
33883-static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
33884+static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
33885 {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
33886 {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
33887 {0, }
33888diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
33889index ee0d0b3..63f6b78 100644
33890--- a/drivers/media/video/omap/omap_vout.c
33891+++ b/drivers/media/video/omap/omap_vout.c
33892@@ -64,7 +64,6 @@ enum omap_vout_channels {
33893 OMAP_VIDEO2,
33894 };
33895
33896-static struct videobuf_queue_ops video_vbq_ops;
33897 /* Variables configurable through module params*/
33898 static u32 video1_numbuffers = 3;
33899 static u32 video2_numbuffers = 3;
33900@@ -999,6 +998,12 @@ static int omap_vout_open(struct file *file)
33901 {
33902 struct videobuf_queue *q;
33903 struct omap_vout_device *vout = NULL;
33904+ static struct videobuf_queue_ops video_vbq_ops = {
33905+ .buf_setup = omap_vout_buffer_setup,
33906+ .buf_prepare = omap_vout_buffer_prepare,
33907+ .buf_release = omap_vout_buffer_release,
33908+ .buf_queue = omap_vout_buffer_queue,
33909+ };
33910
33911 vout = video_drvdata(file);
33912 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
33913@@ -1016,10 +1021,6 @@ static int omap_vout_open(struct file *file)
33914 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
33915
33916 q = &vout->vbq;
33917- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
33918- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
33919- video_vbq_ops.buf_release = omap_vout_buffer_release;
33920- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
33921 spin_lock_init(&vout->vbq_lock);
33922
33923 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
33924diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33925index 305e6aa..0143317 100644
33926--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33927+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33928@@ -196,7 +196,7 @@ struct pvr2_hdw {
33929
33930 /* I2C stuff */
33931 struct i2c_adapter i2c_adap;
33932- struct i2c_algorithm i2c_algo;
33933+ i2c_algorithm_no_const i2c_algo;
33934 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
33935 int i2c_cx25840_hack_state;
33936 int i2c_linked;
33937diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
33938index 2fd38a0..ddec3c4 100644
33939--- a/drivers/media/video/saa7164/saa7164-encoder.c
33940+++ b/drivers/media/video/saa7164/saa7164-encoder.c
33941@@ -1136,6 +1136,8 @@ struct saa7164_user_buffer *saa7164_enc_next_buf(struct saa7164_port *port)
33942 }
33943
33944 static ssize_t fops_read(struct file *file, char __user *buffer,
33945+ size_t count, loff_t *pos) __size_overflow(3);
33946+static ssize_t fops_read(struct file *file, char __user *buffer,
33947 size_t count, loff_t *pos)
33948 {
33949 struct saa7164_encoder_fh *fh = file->private_data;
33950diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
33951index e2e0341..b80056c 100644
33952--- a/drivers/media/video/saa7164/saa7164-vbi.c
33953+++ b/drivers/media/video/saa7164/saa7164-vbi.c
33954@@ -1081,6 +1081,8 @@ struct saa7164_user_buffer *saa7164_vbi_next_buf(struct saa7164_port *port)
33955 }
33956
33957 static ssize_t fops_read(struct file *file, char __user *buffer,
33958+ size_t count, loff_t *pos) __size_overflow(3);
33959+static ssize_t fops_read(struct file *file, char __user *buffer,
33960 size_t count, loff_t *pos)
33961 {
33962 struct saa7164_vbi_fh *fh = file->private_data;
33963diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
33964index a0895bf..b7ebb1b 100644
33965--- a/drivers/media/video/timblogiw.c
33966+++ b/drivers/media/video/timblogiw.c
33967@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
33968
33969 /* Platform device functions */
33970
33971-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
33972+static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
33973 .vidioc_querycap = timblogiw_querycap,
33974 .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
33975 .vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
33976@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
33977 .vidioc_enum_framesizes = timblogiw_enum_framesizes,
33978 };
33979
33980-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
33981+static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
33982 .owner = THIS_MODULE,
33983 .open = timblogiw_open,
33984 .release = timblogiw_close,
33985diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
33986index e9c6a60..daf6a33 100644
33987--- a/drivers/message/fusion/mptbase.c
33988+++ b/drivers/message/fusion/mptbase.c
33989@@ -6753,8 +6753,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
33990 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
33991 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
33992
33993+#ifdef CONFIG_GRKERNSEC_HIDESYM
33994+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
33995+#else
33996 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
33997 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
33998+#endif
33999+
34000 /*
34001 * Rounding UP to nearest 4-kB boundary here...
34002 */
34003diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
34004index 9d95042..b808101 100644
34005--- a/drivers/message/fusion/mptsas.c
34006+++ b/drivers/message/fusion/mptsas.c
34007@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
34008 return 0;
34009 }
34010
34011+static inline void
34012+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
34013+{
34014+ if (phy_info->port_details) {
34015+ phy_info->port_details->rphy = rphy;
34016+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
34017+ ioc->name, rphy));
34018+ }
34019+
34020+ if (rphy) {
34021+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
34022+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
34023+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
34024+ ioc->name, rphy, rphy->dev.release));
34025+ }
34026+}
34027+
34028 /* no mutex */
34029 static void
34030 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
34031@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
34032 return NULL;
34033 }
34034
34035-static inline void
34036-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
34037-{
34038- if (phy_info->port_details) {
34039- phy_info->port_details->rphy = rphy;
34040- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
34041- ioc->name, rphy));
34042- }
34043-
34044- if (rphy) {
34045- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
34046- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
34047- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
34048- ioc->name, rphy, rphy->dev.release));
34049- }
34050-}
34051-
34052 static inline struct sas_port *
34053 mptsas_get_port(struct mptsas_phyinfo *phy_info)
34054 {
34055diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
34056index 0c3ced7..1fe34ec 100644
34057--- a/drivers/message/fusion/mptscsih.c
34058+++ b/drivers/message/fusion/mptscsih.c
34059@@ -1270,15 +1270,16 @@ mptscsih_info(struct Scsi_Host *SChost)
34060
34061 h = shost_priv(SChost);
34062
34063- if (h) {
34064- if (h->info_kbuf == NULL)
34065- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34066- return h->info_kbuf;
34067- h->info_kbuf[0] = '\0';
34068+ if (!h)
34069+ return NULL;
34070
34071- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34072- h->info_kbuf[size-1] = '\0';
34073- }
34074+ if (h->info_kbuf == NULL)
34075+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34076+ return h->info_kbuf;
34077+ h->info_kbuf[0] = '\0';
34078+
34079+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34080+ h->info_kbuf[size-1] = '\0';
34081
34082 return h->info_kbuf;
34083 }
34084diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
34085index 07dbeaf..5533142 100644
34086--- a/drivers/message/i2o/i2o_proc.c
34087+++ b/drivers/message/i2o/i2o_proc.c
34088@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
34089 "Array Controller Device"
34090 };
34091
34092-static char *chtostr(u8 * chars, int n)
34093-{
34094- char tmp[256];
34095- tmp[0] = 0;
34096- return strncat(tmp, (char *)chars, n);
34097-}
34098-
34099 static int i2o_report_query_status(struct seq_file *seq, int block_status,
34100 char *group)
34101 {
34102@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
34103
34104 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
34105 seq_printf(seq, "%-#8x", ddm_table.module_id);
34106- seq_printf(seq, "%-29s",
34107- chtostr(ddm_table.module_name_version, 28));
34108+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
34109 seq_printf(seq, "%9d ", ddm_table.data_size);
34110 seq_printf(seq, "%8d", ddm_table.code_size);
34111
34112@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
34113
34114 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
34115 seq_printf(seq, "%-#8x", dst->module_id);
34116- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
34117- seq_printf(seq, "%-9s", chtostr(dst->date, 8));
34118+ seq_printf(seq, "%-.28s", dst->module_name_version);
34119+ seq_printf(seq, "%-.8s", dst->date);
34120 seq_printf(seq, "%8d ", dst->module_size);
34121 seq_printf(seq, "%8d ", dst->mpb_size);
34122 seq_printf(seq, "0x%04x", dst->module_flags);
34123@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
34124 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
34125 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
34126 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
34127- seq_printf(seq, "Vendor info : %s\n",
34128- chtostr((u8 *) (work32 + 2), 16));
34129- seq_printf(seq, "Product info : %s\n",
34130- chtostr((u8 *) (work32 + 6), 16));
34131- seq_printf(seq, "Description : %s\n",
34132- chtostr((u8 *) (work32 + 10), 16));
34133- seq_printf(seq, "Product rev. : %s\n",
34134- chtostr((u8 *) (work32 + 14), 8));
34135+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
34136+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
34137+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
34138+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
34139
34140 seq_printf(seq, "Serial number : ");
34141 print_serial_number(seq, (u8 *) (work32 + 16),
34142@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
34143 }
34144
34145 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
34146- seq_printf(seq, "Module name : %s\n",
34147- chtostr(result.module_name, 24));
34148- seq_printf(seq, "Module revision : %s\n",
34149- chtostr(result.module_rev, 8));
34150+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
34151+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
34152
34153 seq_printf(seq, "Serial number : ");
34154 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
34155@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
34156 return 0;
34157 }
34158
34159- seq_printf(seq, "Device name : %s\n",
34160- chtostr(result.device_name, 64));
34161- seq_printf(seq, "Service name : %s\n",
34162- chtostr(result.service_name, 64));
34163- seq_printf(seq, "Physical name : %s\n",
34164- chtostr(result.physical_location, 64));
34165- seq_printf(seq, "Instance number : %s\n",
34166- chtostr(result.instance_number, 4));
34167+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
34168+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
34169+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
34170+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
34171
34172 return 0;
34173 }
34174diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
34175index a8c08f3..155fe3d 100644
34176--- a/drivers/message/i2o/iop.c
34177+++ b/drivers/message/i2o/iop.c
34178@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
34179
34180 spin_lock_irqsave(&c->context_list_lock, flags);
34181
34182- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
34183- atomic_inc(&c->context_list_counter);
34184+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
34185+ atomic_inc_unchecked(&c->context_list_counter);
34186
34187- entry->context = atomic_read(&c->context_list_counter);
34188+ entry->context = atomic_read_unchecked(&c->context_list_counter);
34189
34190 list_add(&entry->list, &c->context_list);
34191
34192@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
34193
34194 #if BITS_PER_LONG == 64
34195 spin_lock_init(&c->context_list_lock);
34196- atomic_set(&c->context_list_counter, 0);
34197+ atomic_set_unchecked(&c->context_list_counter, 0);
34198 INIT_LIST_HEAD(&c->context_list);
34199 #endif
34200
34201diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
34202index 7ce65f4..e66e9bc 100644
34203--- a/drivers/mfd/abx500-core.c
34204+++ b/drivers/mfd/abx500-core.c
34205@@ -15,7 +15,7 @@ static LIST_HEAD(abx500_list);
34206
34207 struct abx500_device_entry {
34208 struct list_head list;
34209- struct abx500_ops ops;
34210+ abx500_ops_no_const ops;
34211 struct device *dev;
34212 };
34213
34214diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
34215index 5c2a06a..8fa077c 100644
34216--- a/drivers/mfd/janz-cmodio.c
34217+++ b/drivers/mfd/janz-cmodio.c
34218@@ -13,6 +13,7 @@
34219
34220 #include <linux/kernel.h>
34221 #include <linux/module.h>
34222+#include <linux/slab.h>
34223 #include <linux/init.h>
34224 #include <linux/pci.h>
34225 #include <linux/interrupt.h>
34226diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
34227index 29d12a7..f900ba4 100644
34228--- a/drivers/misc/lis3lv02d/lis3lv02d.c
34229+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
34230@@ -464,7 +464,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
34231 * the lid is closed. This leads to interrupts as soon as a little move
34232 * is done.
34233 */
34234- atomic_inc(&lis3->count);
34235+ atomic_inc_unchecked(&lis3->count);
34236
34237 wake_up_interruptible(&lis3->misc_wait);
34238 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
34239@@ -550,7 +550,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
34240 if (lis3->pm_dev)
34241 pm_runtime_get_sync(lis3->pm_dev);
34242
34243- atomic_set(&lis3->count, 0);
34244+ atomic_set_unchecked(&lis3->count, 0);
34245 return 0;
34246 }
34247
34248@@ -583,7 +583,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
34249 add_wait_queue(&lis3->misc_wait, &wait);
34250 while (true) {
34251 set_current_state(TASK_INTERRUPTIBLE);
34252- data = atomic_xchg(&lis3->count, 0);
34253+ data = atomic_xchg_unchecked(&lis3->count, 0);
34254 if (data)
34255 break;
34256
34257@@ -624,7 +624,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
34258 struct lis3lv02d, miscdev);
34259
34260 poll_wait(file, &lis3->misc_wait, wait);
34261- if (atomic_read(&lis3->count))
34262+ if (atomic_read_unchecked(&lis3->count))
34263 return POLLIN | POLLRDNORM;
34264 return 0;
34265 }
34266diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
34267index 2b1482a..5d33616 100644
34268--- a/drivers/misc/lis3lv02d/lis3lv02d.h
34269+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
34270@@ -266,7 +266,7 @@ struct lis3lv02d {
34271 struct input_polled_dev *idev; /* input device */
34272 struct platform_device *pdev; /* platform device */
34273 struct regulator_bulk_data regulators[2];
34274- atomic_t count; /* interrupt count after last read */
34275+ atomic_unchecked_t count; /* interrupt count after last read */
34276 union axis_conversion ac; /* hw -> logical axis */
34277 int mapped_btns[3];
34278
34279diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
34280index 2f30bad..c4c13d0 100644
34281--- a/drivers/misc/sgi-gru/gruhandles.c
34282+++ b/drivers/misc/sgi-gru/gruhandles.c
34283@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
34284 unsigned long nsec;
34285
34286 nsec = CLKS2NSEC(clks);
34287- atomic_long_inc(&mcs_op_statistics[op].count);
34288- atomic_long_add(nsec, &mcs_op_statistics[op].total);
34289+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
34290+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
34291 if (mcs_op_statistics[op].max < nsec)
34292 mcs_op_statistics[op].max = nsec;
34293 }
34294diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
34295index 7768b87..f8aac38 100644
34296--- a/drivers/misc/sgi-gru/gruprocfs.c
34297+++ b/drivers/misc/sgi-gru/gruprocfs.c
34298@@ -32,9 +32,9 @@
34299
34300 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
34301
34302-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
34303+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
34304 {
34305- unsigned long val = atomic_long_read(v);
34306+ unsigned long val = atomic_long_read_unchecked(v);
34307
34308 seq_printf(s, "%16lu %s\n", val, id);
34309 }
34310@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
34311
34312 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
34313 for (op = 0; op < mcsop_last; op++) {
34314- count = atomic_long_read(&mcs_op_statistics[op].count);
34315- total = atomic_long_read(&mcs_op_statistics[op].total);
34316+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
34317+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
34318 max = mcs_op_statistics[op].max;
34319 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
34320 count ? total / count : 0, max);
34321diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
34322index 5c3ce24..4915ccb 100644
34323--- a/drivers/misc/sgi-gru/grutables.h
34324+++ b/drivers/misc/sgi-gru/grutables.h
34325@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
34326 * GRU statistics.
34327 */
34328 struct gru_stats_s {
34329- atomic_long_t vdata_alloc;
34330- atomic_long_t vdata_free;
34331- atomic_long_t gts_alloc;
34332- atomic_long_t gts_free;
34333- atomic_long_t gms_alloc;
34334- atomic_long_t gms_free;
34335- atomic_long_t gts_double_allocate;
34336- atomic_long_t assign_context;
34337- atomic_long_t assign_context_failed;
34338- atomic_long_t free_context;
34339- atomic_long_t load_user_context;
34340- atomic_long_t load_kernel_context;
34341- atomic_long_t lock_kernel_context;
34342- atomic_long_t unlock_kernel_context;
34343- atomic_long_t steal_user_context;
34344- atomic_long_t steal_kernel_context;
34345- atomic_long_t steal_context_failed;
34346- atomic_long_t nopfn;
34347- atomic_long_t asid_new;
34348- atomic_long_t asid_next;
34349- atomic_long_t asid_wrap;
34350- atomic_long_t asid_reuse;
34351- atomic_long_t intr;
34352- atomic_long_t intr_cbr;
34353- atomic_long_t intr_tfh;
34354- atomic_long_t intr_spurious;
34355- atomic_long_t intr_mm_lock_failed;
34356- atomic_long_t call_os;
34357- atomic_long_t call_os_wait_queue;
34358- atomic_long_t user_flush_tlb;
34359- atomic_long_t user_unload_context;
34360- atomic_long_t user_exception;
34361- atomic_long_t set_context_option;
34362- atomic_long_t check_context_retarget_intr;
34363- atomic_long_t check_context_unload;
34364- atomic_long_t tlb_dropin;
34365- atomic_long_t tlb_preload_page;
34366- atomic_long_t tlb_dropin_fail_no_asid;
34367- atomic_long_t tlb_dropin_fail_upm;
34368- atomic_long_t tlb_dropin_fail_invalid;
34369- atomic_long_t tlb_dropin_fail_range_active;
34370- atomic_long_t tlb_dropin_fail_idle;
34371- atomic_long_t tlb_dropin_fail_fmm;
34372- atomic_long_t tlb_dropin_fail_no_exception;
34373- atomic_long_t tfh_stale_on_fault;
34374- atomic_long_t mmu_invalidate_range;
34375- atomic_long_t mmu_invalidate_page;
34376- atomic_long_t flush_tlb;
34377- atomic_long_t flush_tlb_gru;
34378- atomic_long_t flush_tlb_gru_tgh;
34379- atomic_long_t flush_tlb_gru_zero_asid;
34380+ atomic_long_unchecked_t vdata_alloc;
34381+ atomic_long_unchecked_t vdata_free;
34382+ atomic_long_unchecked_t gts_alloc;
34383+ atomic_long_unchecked_t gts_free;
34384+ atomic_long_unchecked_t gms_alloc;
34385+ atomic_long_unchecked_t gms_free;
34386+ atomic_long_unchecked_t gts_double_allocate;
34387+ atomic_long_unchecked_t assign_context;
34388+ atomic_long_unchecked_t assign_context_failed;
34389+ atomic_long_unchecked_t free_context;
34390+ atomic_long_unchecked_t load_user_context;
34391+ atomic_long_unchecked_t load_kernel_context;
34392+ atomic_long_unchecked_t lock_kernel_context;
34393+ atomic_long_unchecked_t unlock_kernel_context;
34394+ atomic_long_unchecked_t steal_user_context;
34395+ atomic_long_unchecked_t steal_kernel_context;
34396+ atomic_long_unchecked_t steal_context_failed;
34397+ atomic_long_unchecked_t nopfn;
34398+ atomic_long_unchecked_t asid_new;
34399+ atomic_long_unchecked_t asid_next;
34400+ atomic_long_unchecked_t asid_wrap;
34401+ atomic_long_unchecked_t asid_reuse;
34402+ atomic_long_unchecked_t intr;
34403+ atomic_long_unchecked_t intr_cbr;
34404+ atomic_long_unchecked_t intr_tfh;
34405+ atomic_long_unchecked_t intr_spurious;
34406+ atomic_long_unchecked_t intr_mm_lock_failed;
34407+ atomic_long_unchecked_t call_os;
34408+ atomic_long_unchecked_t call_os_wait_queue;
34409+ atomic_long_unchecked_t user_flush_tlb;
34410+ atomic_long_unchecked_t user_unload_context;
34411+ atomic_long_unchecked_t user_exception;
34412+ atomic_long_unchecked_t set_context_option;
34413+ atomic_long_unchecked_t check_context_retarget_intr;
34414+ atomic_long_unchecked_t check_context_unload;
34415+ atomic_long_unchecked_t tlb_dropin;
34416+ atomic_long_unchecked_t tlb_preload_page;
34417+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
34418+ atomic_long_unchecked_t tlb_dropin_fail_upm;
34419+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
34420+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
34421+ atomic_long_unchecked_t tlb_dropin_fail_idle;
34422+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
34423+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
34424+ atomic_long_unchecked_t tfh_stale_on_fault;
34425+ atomic_long_unchecked_t mmu_invalidate_range;
34426+ atomic_long_unchecked_t mmu_invalidate_page;
34427+ atomic_long_unchecked_t flush_tlb;
34428+ atomic_long_unchecked_t flush_tlb_gru;
34429+ atomic_long_unchecked_t flush_tlb_gru_tgh;
34430+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
34431
34432- atomic_long_t copy_gpa;
34433- atomic_long_t read_gpa;
34434+ atomic_long_unchecked_t copy_gpa;
34435+ atomic_long_unchecked_t read_gpa;
34436
34437- atomic_long_t mesq_receive;
34438- atomic_long_t mesq_receive_none;
34439- atomic_long_t mesq_send;
34440- atomic_long_t mesq_send_failed;
34441- atomic_long_t mesq_noop;
34442- atomic_long_t mesq_send_unexpected_error;
34443- atomic_long_t mesq_send_lb_overflow;
34444- atomic_long_t mesq_send_qlimit_reached;
34445- atomic_long_t mesq_send_amo_nacked;
34446- atomic_long_t mesq_send_put_nacked;
34447- atomic_long_t mesq_page_overflow;
34448- atomic_long_t mesq_qf_locked;
34449- atomic_long_t mesq_qf_noop_not_full;
34450- atomic_long_t mesq_qf_switch_head_failed;
34451- atomic_long_t mesq_qf_unexpected_error;
34452- atomic_long_t mesq_noop_unexpected_error;
34453- atomic_long_t mesq_noop_lb_overflow;
34454- atomic_long_t mesq_noop_qlimit_reached;
34455- atomic_long_t mesq_noop_amo_nacked;
34456- atomic_long_t mesq_noop_put_nacked;
34457- atomic_long_t mesq_noop_page_overflow;
34458+ atomic_long_unchecked_t mesq_receive;
34459+ atomic_long_unchecked_t mesq_receive_none;
34460+ atomic_long_unchecked_t mesq_send;
34461+ atomic_long_unchecked_t mesq_send_failed;
34462+ atomic_long_unchecked_t mesq_noop;
34463+ atomic_long_unchecked_t mesq_send_unexpected_error;
34464+ atomic_long_unchecked_t mesq_send_lb_overflow;
34465+ atomic_long_unchecked_t mesq_send_qlimit_reached;
34466+ atomic_long_unchecked_t mesq_send_amo_nacked;
34467+ atomic_long_unchecked_t mesq_send_put_nacked;
34468+ atomic_long_unchecked_t mesq_page_overflow;
34469+ atomic_long_unchecked_t mesq_qf_locked;
34470+ atomic_long_unchecked_t mesq_qf_noop_not_full;
34471+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
34472+ atomic_long_unchecked_t mesq_qf_unexpected_error;
34473+ atomic_long_unchecked_t mesq_noop_unexpected_error;
34474+ atomic_long_unchecked_t mesq_noop_lb_overflow;
34475+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
34476+ atomic_long_unchecked_t mesq_noop_amo_nacked;
34477+ atomic_long_unchecked_t mesq_noop_put_nacked;
34478+ atomic_long_unchecked_t mesq_noop_page_overflow;
34479
34480 };
34481
34482@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
34483 tghop_invalidate, mcsop_last};
34484
34485 struct mcs_op_statistic {
34486- atomic_long_t count;
34487- atomic_long_t total;
34488+ atomic_long_unchecked_t count;
34489+ atomic_long_unchecked_t total;
34490 unsigned long max;
34491 };
34492
34493@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
34494
34495 #define STAT(id) do { \
34496 if (gru_options & OPT_STATS) \
34497- atomic_long_inc(&gru_stats.id); \
34498+ atomic_long_inc_unchecked(&gru_stats.id); \
34499 } while (0)
34500
34501 #ifdef CONFIG_SGI_GRU_DEBUG
34502diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
34503index 851b2f2..a4ec097 100644
34504--- a/drivers/misc/sgi-xp/xp.h
34505+++ b/drivers/misc/sgi-xp/xp.h
34506@@ -289,7 +289,7 @@ struct xpc_interface {
34507 xpc_notify_func, void *);
34508 void (*received) (short, int, void *);
34509 enum xp_retval (*partid_to_nasids) (short, void *);
34510-};
34511+} __no_const;
34512
34513 extern struct xpc_interface xpc_interface;
34514
34515diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
34516index b94d5f7..7f494c5 100644
34517--- a/drivers/misc/sgi-xp/xpc.h
34518+++ b/drivers/misc/sgi-xp/xpc.h
34519@@ -835,6 +835,7 @@ struct xpc_arch_operations {
34520 void (*received_payload) (struct xpc_channel *, void *);
34521 void (*notify_senders_of_disconnect) (struct xpc_channel *);
34522 };
34523+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
34524
34525 /* struct xpc_partition act_state values (for XPC HB) */
34526
34527@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
34528 /* found in xpc_main.c */
34529 extern struct device *xpc_part;
34530 extern struct device *xpc_chan;
34531-extern struct xpc_arch_operations xpc_arch_ops;
34532+extern xpc_arch_operations_no_const xpc_arch_ops;
34533 extern int xpc_disengage_timelimit;
34534 extern int xpc_disengage_timedout;
34535 extern int xpc_activate_IRQ_rcvd;
34536diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
34537index 8d082b4..aa749ae 100644
34538--- a/drivers/misc/sgi-xp/xpc_main.c
34539+++ b/drivers/misc/sgi-xp/xpc_main.c
34540@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_notifier = {
34541 .notifier_call = xpc_system_die,
34542 };
34543
34544-struct xpc_arch_operations xpc_arch_ops;
34545+xpc_arch_operations_no_const xpc_arch_ops;
34546
34547 /*
34548 * Timer function to enforce the timelimit on the partition disengage.
34549diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
34550index 6878a94..fe5c5f1 100644
34551--- a/drivers/mmc/host/sdhci-pci.c
34552+++ b/drivers/mmc/host/sdhci-pci.c
34553@@ -673,7 +673,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
34554 .probe = via_probe,
34555 };
34556
34557-static const struct pci_device_id pci_ids[] __devinitdata = {
34558+static const struct pci_device_id pci_ids[] __devinitconst = {
34559 {
34560 .vendor = PCI_VENDOR_ID_RICOH,
34561 .device = PCI_DEVICE_ID_RICOH_R5C822,
34562diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
34563index e9fad91..0a7a16a 100644
34564--- a/drivers/mtd/devices/doc2000.c
34565+++ b/drivers/mtd/devices/doc2000.c
34566@@ -773,7 +773,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
34567
34568 /* The ECC will not be calculated correctly if less than 512 is written */
34569 /* DBB-
34570- if (len != 0x200 && eccbuf)
34571+ if (len != 0x200)
34572 printk(KERN_WARNING
34573 "ECC needs a full sector write (adr: %lx size %lx)\n",
34574 (long) to, (long) len);
34575diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
34576index a3f7a27..234016e 100644
34577--- a/drivers/mtd/devices/doc2001.c
34578+++ b/drivers/mtd/devices/doc2001.c
34579@@ -392,7 +392,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
34580 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
34581
34582 /* Don't allow read past end of device */
34583- if (from >= this->totlen)
34584+ if (from >= this->totlen || !len)
34585 return -EINVAL;
34586
34587 /* Don't allow a single read to cross a 512-byte block boundary */
34588diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
34589index 3984d48..28aa897 100644
34590--- a/drivers/mtd/nand/denali.c
34591+++ b/drivers/mtd/nand/denali.c
34592@@ -26,6 +26,7 @@
34593 #include <linux/pci.h>
34594 #include <linux/mtd/mtd.h>
34595 #include <linux/module.h>
34596+#include <linux/slab.h>
34597
34598 #include "denali.h"
34599
34600diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
34601index ac40925..483b753 100644
34602--- a/drivers/mtd/nftlmount.c
34603+++ b/drivers/mtd/nftlmount.c
34604@@ -24,6 +24,7 @@
34605 #include <asm/errno.h>
34606 #include <linux/delay.h>
34607 #include <linux/slab.h>
34608+#include <linux/sched.h>
34609 #include <linux/mtd/mtd.h>
34610 #include <linux/mtd/nand.h>
34611 #include <linux/mtd/nftl.h>
34612diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
34613index 6c3fb5a..5b2eeb0 100644
34614--- a/drivers/mtd/ubi/build.c
34615+++ b/drivers/mtd/ubi/build.c
34616@@ -1311,7 +1311,7 @@ module_exit(ubi_exit);
34617 static int __init bytes_str_to_int(const char *str)
34618 {
34619 char *endp;
34620- unsigned long result;
34621+ unsigned long result, scale = 1;
34622
34623 result = simple_strtoul(str, &endp, 0);
34624 if (str == endp || result >= INT_MAX) {
34625@@ -1322,11 +1322,11 @@ static int __init bytes_str_to_int(const char *str)
34626
34627 switch (*endp) {
34628 case 'G':
34629- result *= 1024;
34630+ scale *= 1024;
34631 case 'M':
34632- result *= 1024;
34633+ scale *= 1024;
34634 case 'K':
34635- result *= 1024;
34636+ scale *= 1024;
34637 if (endp[1] == 'i' && endp[2] == 'B')
34638 endp += 2;
34639 case '\0':
34640@@ -1337,7 +1337,13 @@ static int __init bytes_str_to_int(const char *str)
34641 return -EINVAL;
34642 }
34643
34644- return result;
34645+ if (result*scale >= INT_MAX) {
34646+ printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n",
34647+ str);
34648+ return -EINVAL;
34649+ }
34650+
34651+ return result*scale;
34652 }
34653
34654 /**
34655diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
34656index ab80c0d..aec8580 100644
34657--- a/drivers/mtd/ubi/debug.c
34658+++ b/drivers/mtd/ubi/debug.c
34659@@ -338,6 +338,8 @@ out:
34660
34661 /* Write an UBI debugfs file */
34662 static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
34663+ size_t count, loff_t *ppos) __size_overflow(3);
34664+static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
34665 size_t count, loff_t *ppos)
34666 {
34667 unsigned long ubi_num = (unsigned long)file->private_data;
34668diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
34669index 1feae59..c2a61d2 100644
34670--- a/drivers/net/ethernet/atheros/atlx/atl2.c
34671+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
34672@@ -2857,7 +2857,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
34673 */
34674
34675 #define ATL2_PARAM(X, desc) \
34676- static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34677+ static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34678 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
34679 MODULE_PARM_DESC(X, desc);
34680 #else
34681diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34682index 9a517c2..a50cfcb 100644
34683--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34684+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34685@@ -449,7 +449,7 @@ struct bnx2x_rx_mode_obj {
34686
34687 int (*wait_comp)(struct bnx2x *bp,
34688 struct bnx2x_rx_mode_ramrod_params *p);
34689-};
34690+} __no_const;
34691
34692 /********************** Set multicast group ***********************************/
34693
34694diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
34695index 94b4bd0..73c02de 100644
34696--- a/drivers/net/ethernet/broadcom/tg3.h
34697+++ b/drivers/net/ethernet/broadcom/tg3.h
34698@@ -134,6 +134,7 @@
34699 #define CHIPREV_ID_5750_A0 0x4000
34700 #define CHIPREV_ID_5750_A1 0x4001
34701 #define CHIPREV_ID_5750_A3 0x4003
34702+#define CHIPREV_ID_5750_C1 0x4201
34703 #define CHIPREV_ID_5750_C2 0x4202
34704 #define CHIPREV_ID_5752_A0_HW 0x5000
34705 #define CHIPREV_ID_5752_A0 0x6000
34706diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34707index c5f5479..2e8c260 100644
34708--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34709+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34710@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
34711 */
34712 struct l2t_skb_cb {
34713 arp_failure_handler_func arp_failure_handler;
34714-};
34715+} __no_const;
34716
34717 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
34718
34719diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
34720index cfb60e1..9c76da7 100644
34721--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
34722+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
34723@@ -611,6 +611,8 @@ static void recycle_rx_buf(struct adapter *adap, struct sge_fl *q,
34724 * of the SW ring.
34725 */
34726 static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
34727+ size_t sw_size, dma_addr_t * phys, void *metadata) __size_overflow(2,4);
34728+static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
34729 size_t sw_size, dma_addr_t * phys, void *metadata)
34730 {
34731 size_t len = nelem * elem_size;
34732diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
34733index 140254c..5b8a0a6 100644
34734--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
34735+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
34736@@ -593,6 +593,9 @@ static inline void __refill_fl(struct adapter *adap, struct sge_fl *fl)
34737 */
34738 static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
34739 size_t sw_size, dma_addr_t *phys, void *metadata,
34740+ size_t stat_size, int node) __size_overflow(2,4);
34741+static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
34742+ size_t sw_size, dma_addr_t *phys, void *metadata,
34743 size_t stat_size, int node)
34744 {
34745 size_t len = nelem * elem_size + stat_size;
34746diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34747index 8d5d55a..a3c3474 100644
34748--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34749+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34750@@ -730,6 +730,9 @@ static inline void __refill_fl(struct adapter *adapter, struct sge_fl *fl)
34751 */
34752 static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
34753 size_t swsize, dma_addr_t *busaddrp, void *swringp,
34754+ size_t stat_size) __size_overflow(2,4);
34755+static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
34756+ size_t swsize, dma_addr_t *busaddrp, void *swringp,
34757 size_t stat_size)
34758 {
34759 /*
34760diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
34761index 871bcaa..4043505 100644
34762--- a/drivers/net/ethernet/dec/tulip/de4x5.c
34763+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
34764@@ -5397,7 +5397,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34765 for (i=0; i<ETH_ALEN; i++) {
34766 tmp.addr[i] = dev->dev_addr[i];
34767 }
34768- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34769+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34770 break;
34771
34772 case DE4X5_SET_HWADDR: /* Set the hardware address */
34773@@ -5437,7 +5437,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34774 spin_lock_irqsave(&lp->lock, flags);
34775 memcpy(&statbuf, &lp->pktStats, ioc->len);
34776 spin_unlock_irqrestore(&lp->lock, flags);
34777- if (copy_to_user(ioc->data, &statbuf, ioc->len))
34778+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
34779 return -EFAULT;
34780 break;
34781 }
34782diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
34783index 14d5b61..1398636 100644
34784--- a/drivers/net/ethernet/dec/tulip/eeprom.c
34785+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
34786@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
34787 {NULL}};
34788
34789
34790-static const char *block_name[] __devinitdata = {
34791+static const char *block_name[] __devinitconst = {
34792 "21140 non-MII",
34793 "21140 MII PHY",
34794 "21142 Serial PHY",
34795diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
34796index 4d01219..b58d26d 100644
34797--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
34798+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
34799@@ -236,7 +236,7 @@ struct pci_id_info {
34800 int drv_flags; /* Driver use, intended as capability flags. */
34801 };
34802
34803-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
34804+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
34805 { /* Sometime a Level-One switch card. */
34806 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
34807 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
34808diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
34809index dcd7f7a..ecb7fb3 100644
34810--- a/drivers/net/ethernet/dlink/sundance.c
34811+++ b/drivers/net/ethernet/dlink/sundance.c
34812@@ -218,7 +218,7 @@ enum {
34813 struct pci_id_info {
34814 const char *name;
34815 };
34816-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
34817+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
34818 {"D-Link DFE-550TX FAST Ethernet Adapter"},
34819 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
34820 {"D-Link DFE-580TX 4 port Server Adapter"},
34821diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
34822index bf266a0..e024af7 100644
34823--- a/drivers/net/ethernet/emulex/benet/be_main.c
34824+++ b/drivers/net/ethernet/emulex/benet/be_main.c
34825@@ -397,7 +397,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
34826
34827 if (wrapped)
34828 newacc += 65536;
34829- ACCESS_ONCE(*acc) = newacc;
34830+ ACCESS_ONCE_RW(*acc) = newacc;
34831 }
34832
34833 void be_parse_stats(struct be_adapter *adapter)
34834diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
34835index fb5579a..debdffa 100644
34836--- a/drivers/net/ethernet/faraday/ftgmac100.c
34837+++ b/drivers/net/ethernet/faraday/ftgmac100.c
34838@@ -30,6 +30,8 @@
34839 #include <linux/netdevice.h>
34840 #include <linux/phy.h>
34841 #include <linux/platform_device.h>
34842+#include <linux/interrupt.h>
34843+#include <linux/irqreturn.h>
34844 #include <net/ip.h>
34845
34846 #include "ftgmac100.h"
34847diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
34848index a127cb2..0d043cd 100644
34849--- a/drivers/net/ethernet/faraday/ftmac100.c
34850+++ b/drivers/net/ethernet/faraday/ftmac100.c
34851@@ -30,6 +30,8 @@
34852 #include <linux/module.h>
34853 #include <linux/netdevice.h>
34854 #include <linux/platform_device.h>
34855+#include <linux/interrupt.h>
34856+#include <linux/irqreturn.h>
34857
34858 #include "ftmac100.h"
34859
34860diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
34861index 61d2bdd..7f1154a 100644
34862--- a/drivers/net/ethernet/fealnx.c
34863+++ b/drivers/net/ethernet/fealnx.c
34864@@ -150,7 +150,7 @@ struct chip_info {
34865 int flags;
34866 };
34867
34868-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
34869+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
34870 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
34871 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
34872 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
34873diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34874index e1159e5..e18684d 100644
34875--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34876+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34877@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
34878 {
34879 struct e1000_hw *hw = &adapter->hw;
34880 struct e1000_mac_info *mac = &hw->mac;
34881- struct e1000_mac_operations *func = &mac->ops;
34882+ e1000_mac_operations_no_const *func = &mac->ops;
34883
34884 /* Set media type */
34885 switch (adapter->pdev->device) {
34886diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
34887index a3e65fd..f451444 100644
34888--- a/drivers/net/ethernet/intel/e1000e/82571.c
34889+++ b/drivers/net/ethernet/intel/e1000e/82571.c
34890@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
34891 {
34892 struct e1000_hw *hw = &adapter->hw;
34893 struct e1000_mac_info *mac = &hw->mac;
34894- struct e1000_mac_operations *func = &mac->ops;
34895+ e1000_mac_operations_no_const *func = &mac->ops;
34896 u32 swsm = 0;
34897 u32 swsm2 = 0;
34898 bool force_clear_smbi = false;
34899diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
34900index 2967039..ca8c40c 100644
34901--- a/drivers/net/ethernet/intel/e1000e/hw.h
34902+++ b/drivers/net/ethernet/intel/e1000e/hw.h
34903@@ -778,6 +778,7 @@ struct e1000_mac_operations {
34904 void (*write_vfta)(struct e1000_hw *, u32, u32);
34905 s32 (*read_mac_addr)(struct e1000_hw *);
34906 };
34907+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34908
34909 /*
34910 * When to use various PHY register access functions:
34911@@ -818,6 +819,7 @@ struct e1000_phy_operations {
34912 void (*power_up)(struct e1000_hw *);
34913 void (*power_down)(struct e1000_hw *);
34914 };
34915+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34916
34917 /* Function pointers for the NVM. */
34918 struct e1000_nvm_operations {
34919@@ -829,9 +831,10 @@ struct e1000_nvm_operations {
34920 s32 (*validate)(struct e1000_hw *);
34921 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
34922 };
34923+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34924
34925 struct e1000_mac_info {
34926- struct e1000_mac_operations ops;
34927+ e1000_mac_operations_no_const ops;
34928 u8 addr[ETH_ALEN];
34929 u8 perm_addr[ETH_ALEN];
34930
34931@@ -872,7 +875,7 @@ struct e1000_mac_info {
34932 };
34933
34934 struct e1000_phy_info {
34935- struct e1000_phy_operations ops;
34936+ e1000_phy_operations_no_const ops;
34937
34938 enum e1000_phy_type type;
34939
34940@@ -906,7 +909,7 @@ struct e1000_phy_info {
34941 };
34942
34943 struct e1000_nvm_info {
34944- struct e1000_nvm_operations ops;
34945+ e1000_nvm_operations_no_const ops;
34946
34947 enum e1000_nvm_type type;
34948 enum e1000_nvm_override override;
34949diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
34950index 4519a13..f97fcd0 100644
34951--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
34952+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
34953@@ -314,6 +314,7 @@ struct e1000_mac_operations {
34954 s32 (*read_mac_addr)(struct e1000_hw *);
34955 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
34956 };
34957+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34958
34959 struct e1000_phy_operations {
34960 s32 (*acquire)(struct e1000_hw *);
34961@@ -330,6 +331,7 @@ struct e1000_phy_operations {
34962 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
34963 s32 (*write_reg)(struct e1000_hw *, u32, u16);
34964 };
34965+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34966
34967 struct e1000_nvm_operations {
34968 s32 (*acquire)(struct e1000_hw *);
34969@@ -339,6 +341,7 @@ struct e1000_nvm_operations {
34970 s32 (*update)(struct e1000_hw *);
34971 s32 (*validate)(struct e1000_hw *);
34972 };
34973+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34974
34975 struct e1000_info {
34976 s32 (*get_invariants)(struct e1000_hw *);
34977@@ -350,7 +353,7 @@ struct e1000_info {
34978 extern const struct e1000_info e1000_82575_info;
34979
34980 struct e1000_mac_info {
34981- struct e1000_mac_operations ops;
34982+ e1000_mac_operations_no_const ops;
34983
34984 u8 addr[6];
34985 u8 perm_addr[6];
34986@@ -388,7 +391,7 @@ struct e1000_mac_info {
34987 };
34988
34989 struct e1000_phy_info {
34990- struct e1000_phy_operations ops;
34991+ e1000_phy_operations_no_const ops;
34992
34993 enum e1000_phy_type type;
34994
34995@@ -423,7 +426,7 @@ struct e1000_phy_info {
34996 };
34997
34998 struct e1000_nvm_info {
34999- struct e1000_nvm_operations ops;
35000+ e1000_nvm_operations_no_const ops;
35001 enum e1000_nvm_type type;
35002 enum e1000_nvm_override override;
35003
35004@@ -468,6 +471,7 @@ struct e1000_mbx_operations {
35005 s32 (*check_for_ack)(struct e1000_hw *, u16);
35006 s32 (*check_for_rst)(struct e1000_hw *, u16);
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@@ -479,7 +483,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/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
35022index d7ed58f..64cde36 100644
35023--- a/drivers/net/ethernet/intel/igbvf/vf.h
35024+++ b/drivers/net/ethernet/intel/igbvf/vf.h
35025@@ -189,9 +189,10 @@ struct e1000_mac_operations {
35026 s32 (*read_mac_addr)(struct e1000_hw *);
35027 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
35028 };
35029+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
35030
35031 struct e1000_mac_info {
35032- struct e1000_mac_operations ops;
35033+ e1000_mac_operations_no_const ops;
35034 u8 addr[6];
35035 u8 perm_addr[6];
35036
35037@@ -213,6 +214,7 @@ struct e1000_mbx_operations {
35038 s32 (*check_for_ack)(struct e1000_hw *);
35039 s32 (*check_for_rst)(struct e1000_hw *);
35040 };
35041+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
35042
35043 struct e1000_mbx_stats {
35044 u32 msgs_tx;
35045@@ -224,7 +226,7 @@ struct e1000_mbx_stats {
35046 };
35047
35048 struct e1000_mbx_info {
35049- struct e1000_mbx_operations ops;
35050+ e1000_mbx_operations_no_const ops;
35051 struct e1000_mbx_stats stats;
35052 u32 timeout;
35053 u32 usec_delay;
35054diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35055index 6c5cca8..de8ef63 100644
35056--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35057+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35058@@ -2708,6 +2708,7 @@ struct ixgbe_eeprom_operations {
35059 s32 (*update_checksum)(struct ixgbe_hw *);
35060 u16 (*calc_checksum)(struct ixgbe_hw *);
35061 };
35062+typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
35063
35064 struct ixgbe_mac_operations {
35065 s32 (*init_hw)(struct ixgbe_hw *);
35066@@ -2769,6 +2770,7 @@ struct ixgbe_mac_operations {
35067 /* Manageability interface */
35068 s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
35069 };
35070+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35071
35072 struct ixgbe_phy_operations {
35073 s32 (*identify)(struct ixgbe_hw *);
35074@@ -2788,9 +2790,10 @@ struct ixgbe_phy_operations {
35075 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
35076 s32 (*check_overtemp)(struct ixgbe_hw *);
35077 };
35078+typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
35079
35080 struct ixgbe_eeprom_info {
35081- struct ixgbe_eeprom_operations ops;
35082+ ixgbe_eeprom_operations_no_const ops;
35083 enum ixgbe_eeprom_type type;
35084 u32 semaphore_delay;
35085 u16 word_size;
35086@@ -2800,7 +2803,7 @@ struct ixgbe_eeprom_info {
35087
35088 #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
35089 struct ixgbe_mac_info {
35090- struct ixgbe_mac_operations ops;
35091+ ixgbe_mac_operations_no_const ops;
35092 enum ixgbe_mac_type type;
35093 u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
35094 u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
35095@@ -2828,7 +2831,7 @@ struct ixgbe_mac_info {
35096 };
35097
35098 struct ixgbe_phy_info {
35099- struct ixgbe_phy_operations ops;
35100+ ixgbe_phy_operations_no_const ops;
35101 struct mdio_if_info mdio;
35102 enum ixgbe_phy_type type;
35103 u32 id;
35104@@ -2856,6 +2859,7 @@ struct ixgbe_mbx_operations {
35105 s32 (*check_for_ack)(struct ixgbe_hw *, u16);
35106 s32 (*check_for_rst)(struct ixgbe_hw *, u16);
35107 };
35108+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35109
35110 struct ixgbe_mbx_stats {
35111 u32 msgs_tx;
35112@@ -2867,7 +2871,7 @@ struct ixgbe_mbx_stats {
35113 };
35114
35115 struct ixgbe_mbx_info {
35116- struct ixgbe_mbx_operations ops;
35117+ ixgbe_mbx_operations_no_const ops;
35118 struct ixgbe_mbx_stats stats;
35119 u32 timeout;
35120 u32 usec_delay;
35121diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
35122index 10306b4..28df758 100644
35123--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
35124+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
35125@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
35126 s32 (*clear_vfta)(struct ixgbe_hw *);
35127 s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
35128 };
35129+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35130
35131 enum ixgbe_mac_type {
35132 ixgbe_mac_unknown = 0,
35133@@ -79,7 +80,7 @@ enum ixgbe_mac_type {
35134 };
35135
35136 struct ixgbe_mac_info {
35137- struct ixgbe_mac_operations ops;
35138+ ixgbe_mac_operations_no_const ops;
35139 u8 addr[6];
35140 u8 perm_addr[6];
35141
35142@@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
35143 s32 (*check_for_ack)(struct ixgbe_hw *);
35144 s32 (*check_for_rst)(struct ixgbe_hw *);
35145 };
35146+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35147
35148 struct ixgbe_mbx_stats {
35149 u32 msgs_tx;
35150@@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
35151 };
35152
35153 struct ixgbe_mbx_info {
35154- struct ixgbe_mbx_operations ops;
35155+ ixgbe_mbx_operations_no_const ops;
35156 struct ixgbe_mbx_stats stats;
35157 u32 timeout;
35158 u32 udelay;
35159diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
35160index 94bbc85..78c12e6 100644
35161--- a/drivers/net/ethernet/mellanox/mlx4/main.c
35162+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
35163@@ -40,6 +40,7 @@
35164 #include <linux/dma-mapping.h>
35165 #include <linux/slab.h>
35166 #include <linux/io-mapping.h>
35167+#include <linux/sched.h>
35168
35169 #include <linux/mlx4/device.h>
35170 #include <linux/mlx4/doorbell.h>
35171diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35172index 5046a64..71ca936 100644
35173--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
35174+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35175@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
35176 void (*link_down)(struct __vxge_hw_device *devh);
35177 void (*crit_err)(struct __vxge_hw_device *devh,
35178 enum vxge_hw_event type, u64 ext_data);
35179-};
35180+} __no_const;
35181
35182 /*
35183 * struct __vxge_hw_blockpool_entry - Block private data structure
35184diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35185index 4a518a3..936b334 100644
35186--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35187+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35188@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
35189 struct vxge_hw_mempool_dma *dma_object,
35190 u32 index,
35191 u32 is_last);
35192-};
35193+} __no_const;
35194
35195 #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
35196 ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
35197diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
35198index c8f47f1..5da9840 100644
35199--- a/drivers/net/ethernet/realtek/r8169.c
35200+++ b/drivers/net/ethernet/realtek/r8169.c
35201@@ -698,17 +698,17 @@ struct rtl8169_private {
35202 struct mdio_ops {
35203 void (*write)(void __iomem *, int, int);
35204 int (*read)(void __iomem *, int);
35205- } mdio_ops;
35206+ } __no_const mdio_ops;
35207
35208 struct pll_power_ops {
35209 void (*down)(struct rtl8169_private *);
35210 void (*up)(struct rtl8169_private *);
35211- } pll_power_ops;
35212+ } __no_const pll_power_ops;
35213
35214 struct jumbo_ops {
35215 void (*enable)(struct rtl8169_private *);
35216 void (*disable)(struct rtl8169_private *);
35217- } jumbo_ops;
35218+ } __no_const jumbo_ops;
35219
35220 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
35221 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
35222diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
35223index 1b4658c..a30dabb 100644
35224--- a/drivers/net/ethernet/sis/sis190.c
35225+++ b/drivers/net/ethernet/sis/sis190.c
35226@@ -1624,7 +1624,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
35227 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
35228 struct net_device *dev)
35229 {
35230- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
35231+ static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
35232 struct sis190_private *tp = netdev_priv(dev);
35233 struct pci_dev *isa_bridge;
35234 u8 reg, tmp8;
35235diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35236index 41e6b33..8e89b0f 100644
35237--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35238+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35239@@ -139,8 +139,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
35240
35241 writel(value, ioaddr + MMC_CNTRL);
35242
35243- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35244- MMC_CNTRL, value);
35245+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35246+// MMC_CNTRL, value);
35247 }
35248
35249 /* To mask all all interrupts.*/
35250diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
35251index edfa15d..002bfa9 100644
35252--- a/drivers/net/ppp/ppp_generic.c
35253+++ b/drivers/net/ppp/ppp_generic.c
35254@@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35255 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
35256 struct ppp_stats stats;
35257 struct ppp_comp_stats cstats;
35258- char *vers;
35259
35260 switch (cmd) {
35261 case SIOCGPPPSTATS:
35262@@ -1009,8 +1008,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35263 break;
35264
35265 case SIOCGPPPVER:
35266- vers = PPP_VERSION;
35267- if (copy_to_user(addr, vers, strlen(vers) + 1))
35268+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
35269 break;
35270 err = 0;
35271 break;
35272diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
35273index 515f122..41dd273 100644
35274--- a/drivers/net/tokenring/abyss.c
35275+++ b/drivers/net/tokenring/abyss.c
35276@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = {
35277
35278 static int __init abyss_init (void)
35279 {
35280- abyss_netdev_ops = tms380tr_netdev_ops;
35281+ pax_open_kernel();
35282+ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35283
35284- abyss_netdev_ops.ndo_open = abyss_open;
35285- abyss_netdev_ops.ndo_stop = abyss_close;
35286+ *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
35287+ *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
35288+ pax_close_kernel();
35289
35290 return pci_register_driver(&abyss_driver);
35291 }
35292diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
35293index 6153cfd..cf69c1c 100644
35294--- a/drivers/net/tokenring/madgemc.c
35295+++ b/drivers/net/tokenring/madgemc.c
35296@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver = {
35297
35298 static int __init madgemc_init (void)
35299 {
35300- madgemc_netdev_ops = tms380tr_netdev_ops;
35301- madgemc_netdev_ops.ndo_open = madgemc_open;
35302- madgemc_netdev_ops.ndo_stop = madgemc_close;
35303+ pax_open_kernel();
35304+ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35305+ *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
35306+ *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
35307+ pax_close_kernel();
35308
35309 return mca_register_driver (&madgemc_driver);
35310 }
35311diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
35312index 8d362e6..f91cc52 100644
35313--- a/drivers/net/tokenring/proteon.c
35314+++ b/drivers/net/tokenring/proteon.c
35315@@ -353,9 +353,11 @@ static int __init proteon_init(void)
35316 struct platform_device *pdev;
35317 int i, num = 0, err = 0;
35318
35319- proteon_netdev_ops = tms380tr_netdev_ops;
35320- proteon_netdev_ops.ndo_open = proteon_open;
35321- proteon_netdev_ops.ndo_stop = tms380tr_close;
35322+ pax_open_kernel();
35323+ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35324+ *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
35325+ *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
35326+ pax_close_kernel();
35327
35328 err = platform_driver_register(&proteon_driver);
35329 if (err)
35330diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
35331index 46db5c5..37c1536 100644
35332--- a/drivers/net/tokenring/skisa.c
35333+++ b/drivers/net/tokenring/skisa.c
35334@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
35335 struct platform_device *pdev;
35336 int i, num = 0, err = 0;
35337
35338- sk_isa_netdev_ops = tms380tr_netdev_ops;
35339- sk_isa_netdev_ops.ndo_open = sk_isa_open;
35340- sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35341+ pax_open_kernel();
35342+ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35343+ *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
35344+ *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35345+ pax_close_kernel();
35346
35347 err = platform_driver_register(&sk_isa_driver);
35348 if (err)
35349diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
35350index 304fe78..db112fa 100644
35351--- a/drivers/net/usb/hso.c
35352+++ b/drivers/net/usb/hso.c
35353@@ -71,7 +71,7 @@
35354 #include <asm/byteorder.h>
35355 #include <linux/serial_core.h>
35356 #include <linux/serial.h>
35357-
35358+#include <asm/local.h>
35359
35360 #define MOD_AUTHOR "Option Wireless"
35361 #define MOD_DESCRIPTION "USB High Speed Option driver"
35362@@ -257,7 +257,7 @@ struct hso_serial {
35363
35364 /* from usb_serial_port */
35365 struct tty_struct *tty;
35366- int open_count;
35367+ local_t open_count;
35368 spinlock_t serial_lock;
35369
35370 int (*write_data) (struct hso_serial *serial);
35371@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
35372 struct urb *urb;
35373
35374 urb = serial->rx_urb[0];
35375- if (serial->open_count > 0) {
35376+ if (local_read(&serial->open_count) > 0) {
35377 count = put_rxbuf_data(urb, serial);
35378 if (count == -1)
35379 return;
35380@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
35381 DUMP1(urb->transfer_buffer, urb->actual_length);
35382
35383 /* Anyone listening? */
35384- if (serial->open_count == 0)
35385+ if (local_read(&serial->open_count) == 0)
35386 return;
35387
35388 if (status == 0) {
35389@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35390 spin_unlock_irq(&serial->serial_lock);
35391
35392 /* check for port already opened, if not set the termios */
35393- serial->open_count++;
35394- if (serial->open_count == 1) {
35395+ if (local_inc_return(&serial->open_count) == 1) {
35396 serial->rx_state = RX_IDLE;
35397 /* Force default termio settings */
35398 _hso_serial_set_termios(tty, NULL);
35399@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35400 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
35401 if (result) {
35402 hso_stop_serial_device(serial->parent);
35403- serial->open_count--;
35404+ local_dec(&serial->open_count);
35405 kref_put(&serial->parent->ref, hso_serial_ref_free);
35406 }
35407 } else {
35408@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
35409
35410 /* reset the rts and dtr */
35411 /* do the actual close */
35412- serial->open_count--;
35413+ local_dec(&serial->open_count);
35414
35415- if (serial->open_count <= 0) {
35416- serial->open_count = 0;
35417+ if (local_read(&serial->open_count) <= 0) {
35418+ local_set(&serial->open_count, 0);
35419 spin_lock_irq(&serial->serial_lock);
35420 if (serial->tty == tty) {
35421 serial->tty->driver_data = NULL;
35422@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
35423
35424 /* the actual setup */
35425 spin_lock_irqsave(&serial->serial_lock, flags);
35426- if (serial->open_count)
35427+ if (local_read(&serial->open_count))
35428 _hso_serial_set_termios(tty, old);
35429 else
35430 tty->termios = old;
35431@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *urb)
35432 D1("Pending read interrupt on port %d\n", i);
35433 spin_lock(&serial->serial_lock);
35434 if (serial->rx_state == RX_IDLE &&
35435- serial->open_count > 0) {
35436+ local_read(&serial->open_count) > 0) {
35437 /* Setup and send a ctrl req read on
35438 * port i */
35439 if (!serial->rx_urb_filled[0]) {
35440@@ -3098,7 +3097,7 @@ static int hso_resume(struct usb_interface *iface)
35441 /* Start all serial ports */
35442 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
35443 if (serial_table[i] && (serial_table[i]->interface == iface)) {
35444- if (dev2ser(serial_table[i])->open_count) {
35445+ if (local_read(&dev2ser(serial_table[i])->open_count)) {
35446 result =
35447 hso_start_serial_device(serial_table[i], GFP_NOIO);
35448 hso_kick_transmit(dev2ser(serial_table[i]));
35449diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
35450index e662cbc..8d4a102 100644
35451--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
35452+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
35453@@ -601,8 +601,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
35454 * Return with error code if any of the queue indices
35455 * is out of range
35456 */
35457- if (p->ring_index[i] < 0 ||
35458- p->ring_index[i] >= adapter->num_rx_queues)
35459+ if (p->ring_index[i] >= adapter->num_rx_queues)
35460 return -EINVAL;
35461 }
35462
35463diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
35464index 0f9ee46..e2d6e65 100644
35465--- a/drivers/net/wireless/ath/ath.h
35466+++ b/drivers/net/wireless/ath/ath.h
35467@@ -119,6 +119,7 @@ struct ath_ops {
35468 void (*write_flush) (void *);
35469 u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
35470 };
35471+typedef struct ath_ops __no_const ath_ops_no_const;
35472
35473 struct ath_common;
35474 struct ath_bus_ops;
35475diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
35476index 8c5ce8b..abf101b 100644
35477--- a/drivers/net/wireless/ath/ath5k/debug.c
35478+++ b/drivers/net/wireless/ath/ath5k/debug.c
35479@@ -343,6 +343,9 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35480
35481 static ssize_t write_file_debug(struct file *file,
35482 const char __user *userbuf,
35483+ size_t count, loff_t *ppos) __size_overflow(3);
35484+static ssize_t write_file_debug(struct file *file,
35485+ const char __user *userbuf,
35486 size_t count, loff_t *ppos)
35487 {
35488 struct ath5k_hw *ah = file->private_data;
35489diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35490index b592016..fe47870 100644
35491--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35492+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35493@@ -183,8 +183,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35494 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
35495 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
35496
35497- ACCESS_ONCE(ads->ds_link) = i->link;
35498- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
35499+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
35500+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
35501
35502 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
35503 ctl6 = SM(i->keytype, AR_EncrType);
35504@@ -198,26 +198,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35505
35506 if ((i->is_first || i->is_last) &&
35507 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
35508- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
35509+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
35510 | set11nTries(i->rates, 1)
35511 | set11nTries(i->rates, 2)
35512 | set11nTries(i->rates, 3)
35513 | (i->dur_update ? AR_DurUpdateEna : 0)
35514 | SM(0, AR_BurstDur);
35515
35516- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
35517+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
35518 | set11nRate(i->rates, 1)
35519 | set11nRate(i->rates, 2)
35520 | set11nRate(i->rates, 3);
35521 } else {
35522- ACCESS_ONCE(ads->ds_ctl2) = 0;
35523- ACCESS_ONCE(ads->ds_ctl3) = 0;
35524+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
35525+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
35526 }
35527
35528 if (!i->is_first) {
35529- ACCESS_ONCE(ads->ds_ctl0) = 0;
35530- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35531- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35532+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
35533+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35534+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35535 return;
35536 }
35537
35538@@ -242,7 +242,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35539 break;
35540 }
35541
35542- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35543+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35544 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35545 | SM(i->txpower, AR_XmitPower)
35546 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35547@@ -252,19 +252,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35548 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
35549 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
35550
35551- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35552- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35553+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35554+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35555
35556 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
35557 return;
35558
35559- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35560+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35561 | set11nPktDurRTSCTS(i->rates, 1);
35562
35563- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35564+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35565 | set11nPktDurRTSCTS(i->rates, 3);
35566
35567- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35568+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35569 | set11nRateFlags(i->rates, 1)
35570 | set11nRateFlags(i->rates, 2)
35571 | set11nRateFlags(i->rates, 3)
35572diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35573index f5ae3c6..7936af3 100644
35574--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35575+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35576@@ -35,47 +35,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35577 (i->qcu << AR_TxQcuNum_S) | 0x17;
35578
35579 checksum += val;
35580- ACCESS_ONCE(ads->info) = val;
35581+ ACCESS_ONCE_RW(ads->info) = val;
35582
35583 checksum += i->link;
35584- ACCESS_ONCE(ads->link) = i->link;
35585+ ACCESS_ONCE_RW(ads->link) = i->link;
35586
35587 checksum += i->buf_addr[0];
35588- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
35589+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
35590 checksum += i->buf_addr[1];
35591- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
35592+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
35593 checksum += i->buf_addr[2];
35594- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
35595+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
35596 checksum += i->buf_addr[3];
35597- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
35598+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
35599
35600 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
35601- ACCESS_ONCE(ads->ctl3) = val;
35602+ ACCESS_ONCE_RW(ads->ctl3) = val;
35603 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
35604- ACCESS_ONCE(ads->ctl5) = val;
35605+ ACCESS_ONCE_RW(ads->ctl5) = val;
35606 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
35607- ACCESS_ONCE(ads->ctl7) = val;
35608+ ACCESS_ONCE_RW(ads->ctl7) = val;
35609 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
35610- ACCESS_ONCE(ads->ctl9) = val;
35611+ ACCESS_ONCE_RW(ads->ctl9) = val;
35612
35613 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
35614- ACCESS_ONCE(ads->ctl10) = checksum;
35615+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
35616
35617 if (i->is_first || i->is_last) {
35618- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
35619+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
35620 | set11nTries(i->rates, 1)
35621 | set11nTries(i->rates, 2)
35622 | set11nTries(i->rates, 3)
35623 | (i->dur_update ? AR_DurUpdateEna : 0)
35624 | SM(0, AR_BurstDur);
35625
35626- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
35627+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
35628 | set11nRate(i->rates, 1)
35629 | set11nRate(i->rates, 2)
35630 | set11nRate(i->rates, 3);
35631 } else {
35632- ACCESS_ONCE(ads->ctl13) = 0;
35633- ACCESS_ONCE(ads->ctl14) = 0;
35634+ ACCESS_ONCE_RW(ads->ctl13) = 0;
35635+ ACCESS_ONCE_RW(ads->ctl14) = 0;
35636 }
35637
35638 ads->ctl20 = 0;
35639@@ -84,17 +84,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35640
35641 ctl17 = SM(i->keytype, AR_EncrType);
35642 if (!i->is_first) {
35643- ACCESS_ONCE(ads->ctl11) = 0;
35644- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35645- ACCESS_ONCE(ads->ctl15) = 0;
35646- ACCESS_ONCE(ads->ctl16) = 0;
35647- ACCESS_ONCE(ads->ctl17) = ctl17;
35648- ACCESS_ONCE(ads->ctl18) = 0;
35649- ACCESS_ONCE(ads->ctl19) = 0;
35650+ ACCESS_ONCE_RW(ads->ctl11) = 0;
35651+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35652+ ACCESS_ONCE_RW(ads->ctl15) = 0;
35653+ ACCESS_ONCE_RW(ads->ctl16) = 0;
35654+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35655+ ACCESS_ONCE_RW(ads->ctl18) = 0;
35656+ ACCESS_ONCE_RW(ads->ctl19) = 0;
35657 return;
35658 }
35659
35660- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35661+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35662 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35663 | SM(i->txpower, AR_XmitPower)
35664 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35665@@ -130,22 +130,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35666 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
35667 ctl12 |= SM(val, AR_PAPRDChainMask);
35668
35669- ACCESS_ONCE(ads->ctl12) = ctl12;
35670- ACCESS_ONCE(ads->ctl17) = ctl17;
35671+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
35672+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35673
35674- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
35675+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
35676 | set11nPktDurRTSCTS(i->rates, 1);
35677
35678- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
35679+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
35680 | set11nPktDurRTSCTS(i->rates, 3);
35681
35682- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
35683+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
35684 | set11nRateFlags(i->rates, 1)
35685 | set11nRateFlags(i->rates, 2)
35686 | set11nRateFlags(i->rates, 3)
35687 | SM(i->rtscts_rate, AR_RTSCTSRate);
35688
35689- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
35690+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
35691 }
35692
35693 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
35694diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
35695index 2741203..837a960 100644
35696--- a/drivers/net/wireless/ath/ath9k/debug.c
35697+++ b/drivers/net/wireless/ath/ath9k/debug.c
35698@@ -60,6 +60,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35699 }
35700
35701 static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35702+ size_t count, loff_t *ppos) __size_overflow(3);
35703+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35704 size_t count, loff_t *ppos)
35705 {
35706 struct ath_softc *sc = file->private_data;
35707diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35708index d3ff33c..c98bcda 100644
35709--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35710+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35711@@ -464,6 +464,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35712 }
35713
35714 static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35715+ size_t count, loff_t *ppos) __size_overflow(3);
35716+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35717 size_t count, loff_t *ppos)
35718 {
35719 struct ath9k_htc_priv *priv = file->private_data;
35720diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
35721index 1bd8edf..10c6d30 100644
35722--- a/drivers/net/wireless/ath/ath9k/hw.h
35723+++ b/drivers/net/wireless/ath/ath9k/hw.h
35724@@ -605,7 +605,7 @@ struct ath_hw_private_ops {
35725
35726 /* ANI */
35727 void (*ani_cache_ini_regs)(struct ath_hw *ah);
35728-};
35729+} __no_const;
35730
35731 /**
35732 * struct ath_hw_ops - callbacks used by hardware code and driver code
35733@@ -635,7 +635,7 @@ struct ath_hw_ops {
35734 void (*antdiv_comb_conf_set)(struct ath_hw *ah,
35735 struct ath_hw_antcomb_conf *antconf);
35736
35737-};
35738+} __no_const;
35739
35740 struct ath_nf_limits {
35741 s16 max;
35742@@ -655,7 +655,7 @@ enum ath_cal_list {
35743 #define AH_FASTCC 0x4
35744
35745 struct ath_hw {
35746- struct ath_ops reg_ops;
35747+ ath_ops_no_const reg_ops;
35748
35749 struct ieee80211_hw *hw;
35750 struct ath_common common;
35751diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35752index bea8524..c677c06 100644
35753--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35754+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35755@@ -547,7 +547,7 @@ struct phy_func_ptr {
35756 void (*carrsuppr)(struct brcms_phy *);
35757 s32 (*rxsigpwr)(struct brcms_phy *, s32);
35758 void (*detach)(struct brcms_phy *);
35759-};
35760+} __no_const;
35761
35762 struct brcms_phy {
35763 struct brcms_phy_pub pubpi_ro;
35764diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
35765index 05f2ad1..ae00eea 100644
35766--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
35767+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
35768@@ -3685,7 +3685,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
35769 */
35770 if (iwl3945_mod_params.disable_hw_scan) {
35771 IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
35772- iwl3945_hw_ops.hw_scan = NULL;
35773+ pax_open_kernel();
35774+ *(void **)&iwl3945_hw_ops.hw_scan = NULL;
35775+ pax_close_kernel();
35776 }
35777
35778 IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
35779diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
35780index 69a77e2..552b42c 100644
35781--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
35782+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
35783@@ -71,8 +71,8 @@ do { \
35784 } while (0)
35785
35786 #else
35787-#define IWL_DEBUG(m, level, fmt, args...)
35788-#define IWL_DEBUG_LIMIT(m, level, fmt, args...)
35789+#define IWL_DEBUG(m, level, fmt, args...) do {} while (0)
35790+#define IWL_DEBUG_LIMIT(m, level, fmt, args...) do {} while (0)
35791 #define iwl_print_hex_dump(m, level, p, len)
35792 #endif /* CONFIG_IWLWIFI_DEBUG */
35793
35794diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
35795index 523ad55..f8c5dc5 100644
35796--- a/drivers/net/wireless/mac80211_hwsim.c
35797+++ b/drivers/net/wireless/mac80211_hwsim.c
35798@@ -1678,9 +1678,11 @@ static int __init init_mac80211_hwsim(void)
35799 return -EINVAL;
35800
35801 if (fake_hw_scan) {
35802- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
35803- mac80211_hwsim_ops.sw_scan_start = NULL;
35804- mac80211_hwsim_ops.sw_scan_complete = NULL;
35805+ pax_open_kernel();
35806+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
35807+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
35808+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
35809+ pax_close_kernel();
35810 }
35811
35812 spin_lock_init(&hwsim_radio_lock);
35813diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
35814index 30f138b..c904585 100644
35815--- a/drivers/net/wireless/mwifiex/main.h
35816+++ b/drivers/net/wireless/mwifiex/main.h
35817@@ -543,7 +543,7 @@ struct mwifiex_if_ops {
35818 void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
35819 int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);
35820 int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
35821-};
35822+} __no_const;
35823
35824 struct mwifiex_adapter {
35825 u8 iface_type;
35826diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
35827index 0c13840..a5c3ed6 100644
35828--- a/drivers/net/wireless/rndis_wlan.c
35829+++ b/drivers/net/wireless/rndis_wlan.c
35830@@ -1275,7 +1275,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
35831
35832 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
35833
35834- if (rts_threshold < 0 || rts_threshold > 2347)
35835+ if (rts_threshold > 2347)
35836 rts_threshold = 2347;
35837
35838 tmp = cpu_to_le32(rts_threshold);
35839diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h
35840index a77f1bb..c608b2b 100644
35841--- a/drivers/net/wireless/wl1251/wl1251.h
35842+++ b/drivers/net/wireless/wl1251/wl1251.h
35843@@ -266,7 +266,7 @@ struct wl1251_if_operations {
35844 void (*reset)(struct wl1251 *wl);
35845 void (*enable_irq)(struct wl1251 *wl);
35846 void (*disable_irq)(struct wl1251 *wl);
35847-};
35848+} __no_const;
35849
35850 struct wl1251 {
35851 struct ieee80211_hw *hw;
35852diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
35853index f34b5b2..b5abb9f 100644
35854--- a/drivers/oprofile/buffer_sync.c
35855+++ b/drivers/oprofile/buffer_sync.c
35856@@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
35857 if (cookie == NO_COOKIE)
35858 offset = pc;
35859 if (cookie == INVALID_COOKIE) {
35860- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
35861+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
35862 offset = pc;
35863 }
35864 if (cookie != last_cookie) {
35865@@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
35866 /* add userspace sample */
35867
35868 if (!mm) {
35869- atomic_inc(&oprofile_stats.sample_lost_no_mm);
35870+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
35871 return 0;
35872 }
35873
35874 cookie = lookup_dcookie(mm, s->eip, &offset);
35875
35876 if (cookie == INVALID_COOKIE) {
35877- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
35878+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
35879 return 0;
35880 }
35881
35882@@ -563,7 +563,7 @@ void sync_buffer(int cpu)
35883 /* ignore backtraces if failed to add a sample */
35884 if (state == sb_bt_start) {
35885 state = sb_bt_ignore;
35886- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
35887+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
35888 }
35889 }
35890 release_mm(mm);
35891diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
35892index c0cc4e7..44d4e54 100644
35893--- a/drivers/oprofile/event_buffer.c
35894+++ b/drivers/oprofile/event_buffer.c
35895@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
35896 }
35897
35898 if (buffer_pos == buffer_size) {
35899- atomic_inc(&oprofile_stats.event_lost_overflow);
35900+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
35901 return;
35902 }
35903
35904diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
35905index f8c752e..28bf4fc 100644
35906--- a/drivers/oprofile/oprof.c
35907+++ b/drivers/oprofile/oprof.c
35908@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
35909 if (oprofile_ops.switch_events())
35910 return;
35911
35912- atomic_inc(&oprofile_stats.multiplex_counter);
35913+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
35914 start_switch_worker();
35915 }
35916
35917diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
35918index 84a208d..f07d177 100644
35919--- a/drivers/oprofile/oprofile_files.c
35920+++ b/drivers/oprofile/oprofile_files.c
35921@@ -36,6 +36,8 @@ static ssize_t timeout_read(struct file *file, char __user *buf,
35922
35923
35924 static ssize_t timeout_write(struct file *file, char const __user *buf,
35925+ size_t count, loff_t *offset) __size_overflow(3);
35926+static ssize_t timeout_write(struct file *file, char const __user *buf,
35927 size_t count, loff_t *offset)
35928 {
35929 unsigned long val;
35930@@ -72,6 +74,7 @@ static ssize_t depth_read(struct file *file, char __user *buf, size_t count, lof
35931 }
35932
35933
35934+static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
35935 static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
35936 {
35937 unsigned long val;
35938@@ -126,12 +129,14 @@ static const struct file_operations cpu_type_fops = {
35939 };
35940
35941
35942+static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset) __size_overflow(3);
35943 static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
35944 {
35945 return oprofilefs_ulong_to_user(oprofile_started, buf, count, offset);
35946 }
35947
35948
35949+static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
35950 static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
35951 {
35952 unsigned long val;
35953diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
35954index 917d28e..d62d981 100644
35955--- a/drivers/oprofile/oprofile_stats.c
35956+++ b/drivers/oprofile/oprofile_stats.c
35957@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
35958 cpu_buf->sample_invalid_eip = 0;
35959 }
35960
35961- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
35962- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
35963- atomic_set(&oprofile_stats.event_lost_overflow, 0);
35964- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
35965- atomic_set(&oprofile_stats.multiplex_counter, 0);
35966+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
35967+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
35968+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
35969+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
35970+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
35971 }
35972
35973
35974diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
35975index 38b6fc0..b5cbfce 100644
35976--- a/drivers/oprofile/oprofile_stats.h
35977+++ b/drivers/oprofile/oprofile_stats.h
35978@@ -13,11 +13,11 @@
35979 #include <linux/atomic.h>
35980
35981 struct oprofile_stat_struct {
35982- atomic_t sample_lost_no_mm;
35983- atomic_t sample_lost_no_mapping;
35984- atomic_t bt_lost_no_mapping;
35985- atomic_t event_lost_overflow;
35986- atomic_t multiplex_counter;
35987+ atomic_unchecked_t sample_lost_no_mm;
35988+ atomic_unchecked_t sample_lost_no_mapping;
35989+ atomic_unchecked_t bt_lost_no_mapping;
35990+ atomic_unchecked_t event_lost_overflow;
35991+ atomic_unchecked_t multiplex_counter;
35992 };
35993
35994 extern struct oprofile_stat_struct oprofile_stats;
35995diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
35996index 2f0aa0f..d5246c3 100644
35997--- a/drivers/oprofile/oprofilefs.c
35998+++ b/drivers/oprofile/oprofilefs.c
35999@@ -97,6 +97,7 @@ static ssize_t ulong_read_file(struct file *file, char __user *buf, size_t count
36000 }
36001
36002
36003+static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
36004 static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset)
36005 {
36006 unsigned long value;
36007@@ -193,7 +194,7 @@ static const struct file_operations atomic_ro_fops = {
36008
36009
36010 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
36011- char const *name, atomic_t *val)
36012+ char const *name, atomic_unchecked_t *val)
36013 {
36014 return __oprofilefs_create_file(sb, root, name,
36015 &atomic_ro_fops, 0444, val);
36016diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
36017index 3f56bc0..707d642 100644
36018--- a/drivers/parport/procfs.c
36019+++ b/drivers/parport/procfs.c
36020@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
36021
36022 *ppos += len;
36023
36024- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
36025+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
36026 }
36027
36028 #ifdef CONFIG_PARPORT_1284
36029@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
36030
36031 *ppos += len;
36032
36033- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
36034+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
36035 }
36036 #endif /* IEEE1284.3 support. */
36037
36038diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
36039index 9fff878..ad0ad53 100644
36040--- a/drivers/pci/hotplug/cpci_hotplug.h
36041+++ b/drivers/pci/hotplug/cpci_hotplug.h
36042@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
36043 int (*hardware_test) (struct slot* slot, u32 value);
36044 u8 (*get_power) (struct slot* slot);
36045 int (*set_power) (struct slot* slot, int value);
36046-};
36047+} __no_const;
36048
36049 struct cpci_hp_controller {
36050 unsigned int irq;
36051diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
36052index 76ba8a1..20ca857 100644
36053--- a/drivers/pci/hotplug/cpqphp_nvram.c
36054+++ b/drivers/pci/hotplug/cpqphp_nvram.c
36055@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
36056
36057 void compaq_nvram_init (void __iomem *rom_start)
36058 {
36059+
36060+#ifndef CONFIG_PAX_KERNEXEC
36061 if (rom_start) {
36062 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
36063 }
36064+#endif
36065+
36066 dbg("int15 entry = %p\n", compaq_int15_entry_point);
36067
36068 /* initialize our int15 lock */
36069diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
36070index 1cfbf22..be96487 100644
36071--- a/drivers/pci/pcie/aspm.c
36072+++ b/drivers/pci/pcie/aspm.c
36073@@ -27,9 +27,9 @@
36074 #define MODULE_PARAM_PREFIX "pcie_aspm."
36075
36076 /* Note: those are not register definitions */
36077-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
36078-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
36079-#define ASPM_STATE_L1 (4) /* L1 state */
36080+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
36081+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
36082+#define ASPM_STATE_L1 (4U) /* L1 state */
36083 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
36084 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
36085
36086diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
36087index dfee1b3..a454fb6 100644
36088--- a/drivers/pci/probe.c
36089+++ b/drivers/pci/probe.c
36090@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
36091 u32 l, sz, mask;
36092 u16 orig_cmd;
36093
36094- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
36095+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
36096
36097 if (!dev->mmio_always_on) {
36098 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
36099diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
36100index 27911b5..5b6db88 100644
36101--- a/drivers/pci/proc.c
36102+++ b/drivers/pci/proc.c
36103@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
36104 static int __init pci_proc_init(void)
36105 {
36106 struct pci_dev *dev = NULL;
36107+
36108+#ifdef CONFIG_GRKERNSEC_PROC_ADD
36109+#ifdef CONFIG_GRKERNSEC_PROC_USER
36110+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
36111+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
36112+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
36113+#endif
36114+#else
36115 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
36116+#endif
36117 proc_create("devices", 0, proc_bus_pci_dir,
36118 &proc_bus_pci_dev_operations);
36119 proc_initialized = 1;
36120diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
36121index d9312b3..59f63f2 100644
36122--- a/drivers/platform/x86/asus_acpi.c
36123+++ b/drivers/platform/x86/asus_acpi.c
36124@@ -887,6 +887,8 @@ static int lcd_proc_open(struct inode *inode, struct file *file)
36125 }
36126
36127 static ssize_t lcd_proc_write(struct file *file, const char __user *buffer,
36128+ size_t count, loff_t *pos) __size_overflow(3);
36129+static ssize_t lcd_proc_write(struct file *file, const char __user *buffer,
36130 size_t count, loff_t *pos)
36131 {
36132 int rv, value;
36133diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
36134index 7b82868..b9344c9 100644
36135--- a/drivers/platform/x86/thinkpad_acpi.c
36136+++ b/drivers/platform/x86/thinkpad_acpi.c
36137@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
36138 return 0;
36139 }
36140
36141-void static hotkey_mask_warn_incomplete_mask(void)
36142+static void hotkey_mask_warn_incomplete_mask(void)
36143 {
36144 /* log only what the user can fix... */
36145 const u32 wantedmask = hotkey_driver_mask &
36146@@ -2325,11 +2325,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
36147 }
36148 }
36149
36150-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36151- struct tp_nvram_state *newn,
36152- const u32 event_mask)
36153-{
36154-
36155 #define TPACPI_COMPARE_KEY(__scancode, __member) \
36156 do { \
36157 if ((event_mask & (1 << __scancode)) && \
36158@@ -2343,36 +2338,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36159 tpacpi_hotkey_send_key(__scancode); \
36160 } while (0)
36161
36162- void issue_volchange(const unsigned int oldvol,
36163- const unsigned int newvol)
36164- {
36165- unsigned int i = oldvol;
36166+static void issue_volchange(const unsigned int oldvol,
36167+ const unsigned int newvol,
36168+ const u32 event_mask)
36169+{
36170+ unsigned int i = oldvol;
36171
36172- while (i > newvol) {
36173- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36174- i--;
36175- }
36176- while (i < newvol) {
36177- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36178- i++;
36179- }
36180+ while (i > newvol) {
36181+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36182+ i--;
36183 }
36184+ while (i < newvol) {
36185+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36186+ i++;
36187+ }
36188+}
36189
36190- void issue_brightnesschange(const unsigned int oldbrt,
36191- const unsigned int newbrt)
36192- {
36193- unsigned int i = oldbrt;
36194+static void issue_brightnesschange(const unsigned int oldbrt,
36195+ const unsigned int newbrt,
36196+ const u32 event_mask)
36197+{
36198+ unsigned int i = oldbrt;
36199
36200- while (i > newbrt) {
36201- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36202- i--;
36203- }
36204- while (i < newbrt) {
36205- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36206- i++;
36207- }
36208+ while (i > newbrt) {
36209+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36210+ i--;
36211+ }
36212+ while (i < newbrt) {
36213+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36214+ i++;
36215 }
36216+}
36217
36218+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36219+ struct tp_nvram_state *newn,
36220+ const u32 event_mask)
36221+{
36222 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
36223 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
36224 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
36225@@ -2406,7 +2407,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36226 oldn->volume_level != newn->volume_level) {
36227 /* recently muted, or repeated mute keypress, or
36228 * multiple presses ending in mute */
36229- issue_volchange(oldn->volume_level, newn->volume_level);
36230+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36231 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
36232 }
36233 } else {
36234@@ -2416,7 +2417,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36235 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36236 }
36237 if (oldn->volume_level != newn->volume_level) {
36238- issue_volchange(oldn->volume_level, newn->volume_level);
36239+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36240 } else if (oldn->volume_toggle != newn->volume_toggle) {
36241 /* repeated vol up/down keypress at end of scale ? */
36242 if (newn->volume_level == 0)
36243@@ -2429,7 +2430,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36244 /* handle brightness */
36245 if (oldn->brightness_level != newn->brightness_level) {
36246 issue_brightnesschange(oldn->brightness_level,
36247- newn->brightness_level);
36248+ newn->brightness_level,
36249+ event_mask);
36250 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
36251 /* repeated key presses that didn't change state */
36252 if (newn->brightness_level == 0)
36253@@ -2438,10 +2440,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36254 && !tp_features.bright_unkfw)
36255 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36256 }
36257+}
36258
36259 #undef TPACPI_COMPARE_KEY
36260 #undef TPACPI_MAY_SEND_KEY
36261-}
36262
36263 /*
36264 * Polling driver
36265diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
36266index dcdc1f4..85cee16 100644
36267--- a/drivers/platform/x86/toshiba_acpi.c
36268+++ b/drivers/platform/x86/toshiba_acpi.c
36269@@ -517,6 +517,8 @@ static int set_lcd_status(struct backlight_device *bd)
36270 }
36271
36272 static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
36273+ size_t count, loff_t *pos) __size_overflow(3);
36274+static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
36275 size_t count, loff_t *pos)
36276 {
36277 struct toshiba_acpi_dev *dev = PDE(file->f_path.dentry->d_inode)->data;
36278diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
36279index b859d16..5cc6b1a 100644
36280--- a/drivers/pnp/pnpbios/bioscalls.c
36281+++ b/drivers/pnp/pnpbios/bioscalls.c
36282@@ -59,7 +59,7 @@ do { \
36283 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
36284 } while(0)
36285
36286-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
36287+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
36288 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
36289
36290 /*
36291@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36292
36293 cpu = get_cpu();
36294 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
36295+
36296+ pax_open_kernel();
36297 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
36298+ pax_close_kernel();
36299
36300 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
36301 spin_lock_irqsave(&pnp_bios_lock, flags);
36302@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36303 :"memory");
36304 spin_unlock_irqrestore(&pnp_bios_lock, flags);
36305
36306+ pax_open_kernel();
36307 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
36308+ pax_close_kernel();
36309+
36310 put_cpu();
36311
36312 /* If we get here and this is set then the PnP BIOS faulted on us. */
36313@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
36314 return status;
36315 }
36316
36317-void pnpbios_calls_init(union pnp_bios_install_struct *header)
36318+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
36319 {
36320 int i;
36321
36322@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36323 pnp_bios_callpoint.offset = header->fields.pm16offset;
36324 pnp_bios_callpoint.segment = PNP_CS16;
36325
36326+ pax_open_kernel();
36327+
36328 for_each_possible_cpu(i) {
36329 struct desc_struct *gdt = get_cpu_gdt_table(i);
36330 if (!gdt)
36331@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36332 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
36333 (unsigned long)__va(header->fields.pm16dseg));
36334 }
36335+
36336+ pax_close_kernel();
36337 }
36338diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
36339index b0ecacb..7c9da2e 100644
36340--- a/drivers/pnp/resource.c
36341+++ b/drivers/pnp/resource.c
36342@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
36343 return 1;
36344
36345 /* check if the resource is valid */
36346- if (*irq < 0 || *irq > 15)
36347+ if (*irq > 15)
36348 return 0;
36349
36350 /* check if the resource is reserved */
36351@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
36352 return 1;
36353
36354 /* check if the resource is valid */
36355- if (*dma < 0 || *dma == 4 || *dma > 7)
36356+ if (*dma == 4 || *dma > 7)
36357 return 0;
36358
36359 /* check if the resource is reserved */
36360diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
36361index bb16f5b..c751eef 100644
36362--- a/drivers/power/bq27x00_battery.c
36363+++ b/drivers/power/bq27x00_battery.c
36364@@ -67,7 +67,7 @@
36365 struct bq27x00_device_info;
36366 struct bq27x00_access_methods {
36367 int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
36368-};
36369+} __no_const;
36370
36371 enum bq27x00_chip { BQ27000, BQ27500 };
36372
36373diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
36374index 33f5d9a..d957d3f 100644
36375--- a/drivers/regulator/max8660.c
36376+++ b/drivers/regulator/max8660.c
36377@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struct i2c_client *client,
36378 max8660->shadow_regs[MAX8660_OVER1] = 5;
36379 } else {
36380 /* Otherwise devices can be toggled via software */
36381- max8660_dcdc_ops.enable = max8660_dcdc_enable;
36382- max8660_dcdc_ops.disable = max8660_dcdc_disable;
36383+ pax_open_kernel();
36384+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
36385+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
36386+ pax_close_kernel();
36387 }
36388
36389 /*
36390diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
36391index 023d17d..74ef35b 100644
36392--- a/drivers/regulator/mc13892-regulator.c
36393+++ b/drivers/regulator/mc13892-regulator.c
36394@@ -565,10 +565,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
36395 }
36396 mc13xxx_unlock(mc13892);
36397
36398- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36399+ pax_open_kernel();
36400+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36401 = mc13892_vcam_set_mode;
36402- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36403+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36404 = mc13892_vcam_get_mode;
36405+ pax_close_kernel();
36406 for (i = 0; i < pdata->num_regulators; i++) {
36407 init_data = &pdata->regulators[i];
36408 priv->regulators[i] = regulator_register(
36409diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
36410index cace6d3..f623fda 100644
36411--- a/drivers/rtc/rtc-dev.c
36412+++ b/drivers/rtc/rtc-dev.c
36413@@ -14,6 +14,7 @@
36414 #include <linux/module.h>
36415 #include <linux/rtc.h>
36416 #include <linux/sched.h>
36417+#include <linux/grsecurity.h>
36418 #include "rtc-core.h"
36419
36420 static dev_t rtc_devt;
36421@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
36422 if (copy_from_user(&tm, uarg, sizeof(tm)))
36423 return -EFAULT;
36424
36425+ gr_log_timechange();
36426+
36427 return rtc_set_time(rtc, &tm);
36428
36429 case RTC_PIE_ON:
36430diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
36431index ffb5878..e6d785c 100644
36432--- a/drivers/scsi/aacraid/aacraid.h
36433+++ b/drivers/scsi/aacraid/aacraid.h
36434@@ -492,7 +492,7 @@ struct adapter_ops
36435 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
36436 /* Administrative operations */
36437 int (*adapter_comm)(struct aac_dev * dev, int comm);
36438-};
36439+} __no_const;
36440
36441 /*
36442 * Define which interrupt handler needs to be installed
36443diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
36444index 705e13e..91c873c 100644
36445--- a/drivers/scsi/aacraid/linit.c
36446+++ b/drivers/scsi/aacraid/linit.c
36447@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
36448 #elif defined(__devinitconst)
36449 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36450 #else
36451-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
36452+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36453 #endif
36454 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
36455 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
36456diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
36457index d5ff142..49c0ebb 100644
36458--- a/drivers/scsi/aic94xx/aic94xx_init.c
36459+++ b/drivers/scsi/aic94xx/aic94xx_init.c
36460@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
36461 .lldd_control_phy = asd_control_phy,
36462 };
36463
36464-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
36465+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
36466 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
36467 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
36468 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
36469diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h
36470index a796de9..1ef20e1 100644
36471--- a/drivers/scsi/bfa/bfa.h
36472+++ b/drivers/scsi/bfa/bfa.h
36473@@ -196,7 +196,7 @@ struct bfa_hwif_s {
36474 u32 *end);
36475 int cpe_vec_q0;
36476 int rme_vec_q0;
36477-};
36478+} __no_const;
36479 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
36480
36481 struct bfa_faa_cbfn_s {
36482diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c
36483index e07bd47..cd1bbbb 100644
36484--- a/drivers/scsi/bfa/bfa_fcpim.c
36485+++ b/drivers/scsi/bfa/bfa_fcpim.c
36486@@ -4121,7 +4121,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
36487
36488 bfa_iotag_attach(fcp);
36489
36490- fcp->itn_arr = (struct bfa_itn_s *) bfa_mem_kva_curp(fcp);
36491+ fcp->itn_arr = (bfa_itn_s_no_const *) bfa_mem_kva_curp(fcp);
36492 bfa_mem_kva_curp(fcp) = (u8 *)fcp->itn_arr +
36493 (fcp->num_itns * sizeof(struct bfa_itn_s));
36494 memset(fcp->itn_arr, 0,
36495@@ -4179,7 +4179,7 @@ bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36496 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
36497 {
36498 struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
36499- struct bfa_itn_s *itn;
36500+ bfa_itn_s_no_const *itn;
36501
36502 itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
36503 itn->isr = isr;
36504diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
36505index 1080bcb..a3b39e3 100644
36506--- a/drivers/scsi/bfa/bfa_fcpim.h
36507+++ b/drivers/scsi/bfa/bfa_fcpim.h
36508@@ -37,6 +37,7 @@ struct bfa_iotag_s {
36509 struct bfa_itn_s {
36510 bfa_isr_func_t isr;
36511 };
36512+typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
36513
36514 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36515 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
36516@@ -149,7 +150,7 @@ struct bfa_fcp_mod_s {
36517 struct list_head iotag_tio_free_q; /* free IO resources */
36518 struct list_head iotag_unused_q; /* unused IO resources*/
36519 struct bfa_iotag_s *iotag_arr;
36520- struct bfa_itn_s *itn_arr;
36521+ bfa_itn_s_no_const *itn_arr;
36522 int num_ioim_reqs;
36523 int num_fwtio_reqs;
36524 int num_itns;
36525diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
36526index 546d46b..642fa5b 100644
36527--- a/drivers/scsi/bfa/bfa_ioc.h
36528+++ b/drivers/scsi/bfa/bfa_ioc.h
36529@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
36530 bfa_ioc_disable_cbfn_t disable_cbfn;
36531 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
36532 bfa_ioc_reset_cbfn_t reset_cbfn;
36533-};
36534+} __no_const;
36535
36536 /*
36537 * IOC event notification mechanism.
36538@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
36539 void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
36540 bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
36541 bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
36542-};
36543+} __no_const;
36544
36545 /*
36546 * Queue element to wait for room in request queue. FIFO order is
36547diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
36548index 351dc0b..951dc32 100644
36549--- a/drivers/scsi/hosts.c
36550+++ b/drivers/scsi/hosts.c
36551@@ -42,7 +42,7 @@
36552 #include "scsi_logging.h"
36553
36554
36555-static atomic_t scsi_host_next_hn; /* host_no for next new host */
36556+static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
36557
36558
36559 static void scsi_host_cls_release(struct device *dev)
36560@@ -357,7 +357,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
36561 * subtract one because we increment first then return, but we need to
36562 * know what the next host number was before increment
36563 */
36564- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
36565+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
36566 shost->dma_channel = 0xff;
36567
36568 /* These three are default values which can be overridden */
36569diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
36570index 865d452..e9b7fa7 100644
36571--- a/drivers/scsi/hpsa.c
36572+++ b/drivers/scsi/hpsa.c
36573@@ -505,7 +505,7 @@ static inline u32 next_command(struct ctlr_info *h)
36574 u32 a;
36575
36576 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
36577- return h->access.command_completed(h);
36578+ return h->access->command_completed(h);
36579
36580 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
36581 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
36582@@ -2989,7 +2989,7 @@ static void start_io(struct ctlr_info *h)
36583 while (!list_empty(&h->reqQ)) {
36584 c = list_entry(h->reqQ.next, struct CommandList, list);
36585 /* can't do anything if fifo is full */
36586- if ((h->access.fifo_full(h))) {
36587+ if ((h->access->fifo_full(h))) {
36588 dev_warn(&h->pdev->dev, "fifo full\n");
36589 break;
36590 }
36591@@ -2999,7 +2999,7 @@ static void start_io(struct ctlr_info *h)
36592 h->Qdepth--;
36593
36594 /* Tell the controller execute command */
36595- h->access.submit_command(h, c);
36596+ h->access->submit_command(h, c);
36597
36598 /* Put job onto the completed Q */
36599 addQ(&h->cmpQ, c);
36600@@ -3008,17 +3008,17 @@ static void start_io(struct ctlr_info *h)
36601
36602 static inline unsigned long get_next_completion(struct ctlr_info *h)
36603 {
36604- return h->access.command_completed(h);
36605+ return h->access->command_completed(h);
36606 }
36607
36608 static inline bool interrupt_pending(struct ctlr_info *h)
36609 {
36610- return h->access.intr_pending(h);
36611+ return h->access->intr_pending(h);
36612 }
36613
36614 static inline long interrupt_not_for_us(struct ctlr_info *h)
36615 {
36616- return (h->access.intr_pending(h) == 0) ||
36617+ return (h->access->intr_pending(h) == 0) ||
36618 (h->interrupts_enabled == 0);
36619 }
36620
36621@@ -3917,7 +3917,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
36622 if (prod_index < 0)
36623 return -ENODEV;
36624 h->product_name = products[prod_index].product_name;
36625- h->access = *(products[prod_index].access);
36626+ h->access = products[prod_index].access;
36627
36628 if (hpsa_board_disabled(h->pdev)) {
36629 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
36630@@ -4162,7 +4162,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
36631
36632 assert_spin_locked(&lockup_detector_lock);
36633 remove_ctlr_from_lockup_detector_list(h);
36634- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36635+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36636 spin_lock_irqsave(&h->lock, flags);
36637 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
36638 spin_unlock_irqrestore(&h->lock, flags);
36639@@ -4340,7 +4340,7 @@ reinit_after_soft_reset:
36640 }
36641
36642 /* make sure the board interrupts are off */
36643- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36644+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36645
36646 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
36647 goto clean2;
36648@@ -4374,7 +4374,7 @@ reinit_after_soft_reset:
36649 * fake ones to scoop up any residual completions.
36650 */
36651 spin_lock_irqsave(&h->lock, flags);
36652- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36653+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36654 spin_unlock_irqrestore(&h->lock, flags);
36655 free_irq(h->intr[h->intr_mode], h);
36656 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
36657@@ -4393,9 +4393,9 @@ reinit_after_soft_reset:
36658 dev_info(&h->pdev->dev, "Board READY.\n");
36659 dev_info(&h->pdev->dev,
36660 "Waiting for stale completions to drain.\n");
36661- h->access.set_intr_mask(h, HPSA_INTR_ON);
36662+ h->access->set_intr_mask(h, HPSA_INTR_ON);
36663 msleep(10000);
36664- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36665+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36666
36667 rc = controller_reset_failed(h->cfgtable);
36668 if (rc)
36669@@ -4416,7 +4416,7 @@ reinit_after_soft_reset:
36670 }
36671
36672 /* Turn the interrupts on so we can service requests */
36673- h->access.set_intr_mask(h, HPSA_INTR_ON);
36674+ h->access->set_intr_mask(h, HPSA_INTR_ON);
36675
36676 hpsa_hba_inquiry(h);
36677 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
36678@@ -4468,7 +4468,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
36679 * To write all data in the battery backed cache to disks
36680 */
36681 hpsa_flush_cache(h);
36682- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36683+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36684 free_irq(h->intr[h->intr_mode], h);
36685 #ifdef CONFIG_PCI_MSI
36686 if (h->msix_vector)
36687@@ -4632,7 +4632,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
36688 return;
36689 }
36690 /* Change the access methods to the performant access methods */
36691- h->access = SA5_performant_access;
36692+ h->access = &SA5_performant_access;
36693 h->transMethod = CFGTBL_Trans_Performant;
36694 }
36695
36696diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
36697index 91edafb..a9b88ec 100644
36698--- a/drivers/scsi/hpsa.h
36699+++ b/drivers/scsi/hpsa.h
36700@@ -73,7 +73,7 @@ struct ctlr_info {
36701 unsigned int msix_vector;
36702 unsigned int msi_vector;
36703 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
36704- struct access_method access;
36705+ struct access_method *access;
36706
36707 /* queue and queue Info */
36708 struct list_head reqQ;
36709diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
36710index f2df059..a3a9930 100644
36711--- a/drivers/scsi/ips.h
36712+++ b/drivers/scsi/ips.h
36713@@ -1027,7 +1027,7 @@ typedef struct {
36714 int (*intr)(struct ips_ha *);
36715 void (*enableint)(struct ips_ha *);
36716 uint32_t (*statupd)(struct ips_ha *);
36717-} ips_hw_func_t;
36718+} __no_const ips_hw_func_t;
36719
36720 typedef struct ips_ha {
36721 uint8_t ha_id[IPS_MAX_CHANNELS+1];
36722diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
36723index 9de9db2..1e09660 100644
36724--- a/drivers/scsi/libfc/fc_exch.c
36725+++ b/drivers/scsi/libfc/fc_exch.c
36726@@ -105,12 +105,12 @@ struct fc_exch_mgr {
36727 * all together if not used XXX
36728 */
36729 struct {
36730- atomic_t no_free_exch;
36731- atomic_t no_free_exch_xid;
36732- atomic_t xid_not_found;
36733- atomic_t xid_busy;
36734- atomic_t seq_not_found;
36735- atomic_t non_bls_resp;
36736+ atomic_unchecked_t no_free_exch;
36737+ atomic_unchecked_t no_free_exch_xid;
36738+ atomic_unchecked_t xid_not_found;
36739+ atomic_unchecked_t xid_busy;
36740+ atomic_unchecked_t seq_not_found;
36741+ atomic_unchecked_t non_bls_resp;
36742 } stats;
36743 };
36744
36745@@ -719,7 +719,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
36746 /* allocate memory for exchange */
36747 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
36748 if (!ep) {
36749- atomic_inc(&mp->stats.no_free_exch);
36750+ atomic_inc_unchecked(&mp->stats.no_free_exch);
36751 goto out;
36752 }
36753 memset(ep, 0, sizeof(*ep));
36754@@ -780,7 +780,7 @@ out:
36755 return ep;
36756 err:
36757 spin_unlock_bh(&pool->lock);
36758- atomic_inc(&mp->stats.no_free_exch_xid);
36759+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
36760 mempool_free(ep, mp->ep_pool);
36761 return NULL;
36762 }
36763@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36764 xid = ntohs(fh->fh_ox_id); /* we originated exch */
36765 ep = fc_exch_find(mp, xid);
36766 if (!ep) {
36767- atomic_inc(&mp->stats.xid_not_found);
36768+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36769 reject = FC_RJT_OX_ID;
36770 goto out;
36771 }
36772@@ -953,7 +953,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36773 ep = fc_exch_find(mp, xid);
36774 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
36775 if (ep) {
36776- atomic_inc(&mp->stats.xid_busy);
36777+ atomic_inc_unchecked(&mp->stats.xid_busy);
36778 reject = FC_RJT_RX_ID;
36779 goto rel;
36780 }
36781@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36782 }
36783 xid = ep->xid; /* get our XID */
36784 } else if (!ep) {
36785- atomic_inc(&mp->stats.xid_not_found);
36786+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36787 reject = FC_RJT_RX_ID; /* XID not found */
36788 goto out;
36789 }
36790@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36791 } else {
36792 sp = &ep->seq;
36793 if (sp->id != fh->fh_seq_id) {
36794- atomic_inc(&mp->stats.seq_not_found);
36795+ atomic_inc_unchecked(&mp->stats.seq_not_found);
36796 if (f_ctl & FC_FC_END_SEQ) {
36797 /*
36798 * Update sequence_id based on incoming last
36799@@ -1431,22 +1431,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36800
36801 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
36802 if (!ep) {
36803- atomic_inc(&mp->stats.xid_not_found);
36804+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36805 goto out;
36806 }
36807 if (ep->esb_stat & ESB_ST_COMPLETE) {
36808- atomic_inc(&mp->stats.xid_not_found);
36809+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36810 goto rel;
36811 }
36812 if (ep->rxid == FC_XID_UNKNOWN)
36813 ep->rxid = ntohs(fh->fh_rx_id);
36814 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
36815- atomic_inc(&mp->stats.xid_not_found);
36816+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36817 goto rel;
36818 }
36819 if (ep->did != ntoh24(fh->fh_s_id) &&
36820 ep->did != FC_FID_FLOGI) {
36821- atomic_inc(&mp->stats.xid_not_found);
36822+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36823 goto rel;
36824 }
36825 sof = fr_sof(fp);
36826@@ -1455,7 +1455,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36827 sp->ssb_stat |= SSB_ST_RESP;
36828 sp->id = fh->fh_seq_id;
36829 } else if (sp->id != fh->fh_seq_id) {
36830- atomic_inc(&mp->stats.seq_not_found);
36831+ atomic_inc_unchecked(&mp->stats.seq_not_found);
36832 goto rel;
36833 }
36834
36835@@ -1519,9 +1519,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36836 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
36837
36838 if (!sp)
36839- atomic_inc(&mp->stats.xid_not_found);
36840+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36841 else
36842- atomic_inc(&mp->stats.non_bls_resp);
36843+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
36844
36845 fc_frame_free(fp);
36846 }
36847diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
36848index db9238f..4378ed2 100644
36849--- a/drivers/scsi/libsas/sas_ata.c
36850+++ b/drivers/scsi/libsas/sas_ata.c
36851@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sata_ops = {
36852 .postreset = ata_std_postreset,
36853 .error_handler = ata_std_error_handler,
36854 .post_internal_cmd = sas_ata_post_internal,
36855- .qc_defer = ata_std_qc_defer,
36856+ .qc_defer = ata_std_qc_defer,
36857 .qc_prep = ata_noop_qc_prep,
36858 .qc_issue = sas_ata_qc_issue,
36859 .qc_fill_rtf = sas_ata_qc_fill_rtf,
36860diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
36861index bb4c8e0..f33d849 100644
36862--- a/drivers/scsi/lpfc/lpfc.h
36863+++ b/drivers/scsi/lpfc/lpfc.h
36864@@ -425,7 +425,7 @@ struct lpfc_vport {
36865 struct dentry *debug_nodelist;
36866 struct dentry *vport_debugfs_root;
36867 struct lpfc_debugfs_trc *disc_trc;
36868- atomic_t disc_trc_cnt;
36869+ atomic_unchecked_t disc_trc_cnt;
36870 #endif
36871 uint8_t stat_data_enabled;
36872 uint8_t stat_data_blocked;
36873@@ -835,8 +835,8 @@ struct lpfc_hba {
36874 struct timer_list fabric_block_timer;
36875 unsigned long bit_flags;
36876 #define FABRIC_COMANDS_BLOCKED 0
36877- atomic_t num_rsrc_err;
36878- atomic_t num_cmd_success;
36879+ atomic_unchecked_t num_rsrc_err;
36880+ atomic_unchecked_t num_cmd_success;
36881 unsigned long last_rsrc_error_time;
36882 unsigned long last_ramp_down_time;
36883 unsigned long last_ramp_up_time;
36884@@ -866,7 +866,7 @@ struct lpfc_hba {
36885
36886 struct dentry *debug_slow_ring_trc;
36887 struct lpfc_debugfs_trc *slow_ring_trc;
36888- atomic_t slow_ring_trc_cnt;
36889+ atomic_unchecked_t slow_ring_trc_cnt;
36890 /* iDiag debugfs sub-directory */
36891 struct dentry *idiag_root;
36892 struct dentry *idiag_pci_cfg;
36893diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
36894index 2838259..a07cfb5 100644
36895--- a/drivers/scsi/lpfc/lpfc_debugfs.c
36896+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
36897@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
36898
36899 #include <linux/debugfs.h>
36900
36901-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
36902+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
36903 static unsigned long lpfc_debugfs_start_time = 0L;
36904
36905 /* iDiag */
36906@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
36907 lpfc_debugfs_enable = 0;
36908
36909 len = 0;
36910- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
36911+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
36912 (lpfc_debugfs_max_disc_trc - 1);
36913 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
36914 dtp = vport->disc_trc + i;
36915@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
36916 lpfc_debugfs_enable = 0;
36917
36918 len = 0;
36919- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
36920+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
36921 (lpfc_debugfs_max_slow_ring_trc - 1);
36922 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
36923 dtp = phba->slow_ring_trc + i;
36924@@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
36925 !vport || !vport->disc_trc)
36926 return;
36927
36928- index = atomic_inc_return(&vport->disc_trc_cnt) &
36929+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
36930 (lpfc_debugfs_max_disc_trc - 1);
36931 dtp = vport->disc_trc + index;
36932 dtp->fmt = fmt;
36933 dtp->data1 = data1;
36934 dtp->data2 = data2;
36935 dtp->data3 = data3;
36936- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
36937+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
36938 dtp->jif = jiffies;
36939 #endif
36940 return;
36941@@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
36942 !phba || !phba->slow_ring_trc)
36943 return;
36944
36945- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
36946+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
36947 (lpfc_debugfs_max_slow_ring_trc - 1);
36948 dtp = phba->slow_ring_trc + index;
36949 dtp->fmt = fmt;
36950 dtp->data1 = data1;
36951 dtp->data2 = data2;
36952 dtp->data3 = data3;
36953- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
36954+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
36955 dtp->jif = jiffies;
36956 #endif
36957 return;
36958@@ -3986,7 +3986,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
36959 "slow_ring buffer\n");
36960 goto debug_failed;
36961 }
36962- atomic_set(&phba->slow_ring_trc_cnt, 0);
36963+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
36964 memset(phba->slow_ring_trc, 0,
36965 (sizeof(struct lpfc_debugfs_trc) *
36966 lpfc_debugfs_max_slow_ring_trc));
36967@@ -4032,7 +4032,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
36968 "buffer\n");
36969 goto debug_failed;
36970 }
36971- atomic_set(&vport->disc_trc_cnt, 0);
36972+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
36973
36974 snprintf(name, sizeof(name), "discovery_trace");
36975 vport->debug_disc_trc =
36976diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
36977index 55bc4fc..a2a109c 100644
36978--- a/drivers/scsi/lpfc/lpfc_init.c
36979+++ b/drivers/scsi/lpfc/lpfc_init.c
36980@@ -10027,8 +10027,10 @@ lpfc_init(void)
36981 printk(LPFC_COPYRIGHT "\n");
36982
36983 if (lpfc_enable_npiv) {
36984- lpfc_transport_functions.vport_create = lpfc_vport_create;
36985- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
36986+ pax_open_kernel();
36987+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
36988+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
36989+ pax_close_kernel();
36990 }
36991 lpfc_transport_template =
36992 fc_attach_transport(&lpfc_transport_functions);
36993diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
36994index 2e1e54e..1af0a0d 100644
36995--- a/drivers/scsi/lpfc/lpfc_scsi.c
36996+++ b/drivers/scsi/lpfc/lpfc_scsi.c
36997@@ -305,7 +305,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
36998 uint32_t evt_posted;
36999
37000 spin_lock_irqsave(&phba->hbalock, flags);
37001- atomic_inc(&phba->num_rsrc_err);
37002+ atomic_inc_unchecked(&phba->num_rsrc_err);
37003 phba->last_rsrc_error_time = jiffies;
37004
37005 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
37006@@ -346,7 +346,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
37007 unsigned long flags;
37008 struct lpfc_hba *phba = vport->phba;
37009 uint32_t evt_posted;
37010- atomic_inc(&phba->num_cmd_success);
37011+ atomic_inc_unchecked(&phba->num_cmd_success);
37012
37013 if (vport->cfg_lun_queue_depth <= queue_depth)
37014 return;
37015@@ -390,8 +390,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37016 unsigned long num_rsrc_err, num_cmd_success;
37017 int i;
37018
37019- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
37020- num_cmd_success = atomic_read(&phba->num_cmd_success);
37021+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
37022+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
37023
37024 vports = lpfc_create_vport_work_array(phba);
37025 if (vports != NULL)
37026@@ -411,8 +411,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37027 }
37028 }
37029 lpfc_destroy_vport_work_array(phba, vports);
37030- atomic_set(&phba->num_rsrc_err, 0);
37031- atomic_set(&phba->num_cmd_success, 0);
37032+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37033+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37034 }
37035
37036 /**
37037@@ -446,8 +446,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
37038 }
37039 }
37040 lpfc_destroy_vport_work_array(phba, vports);
37041- atomic_set(&phba->num_rsrc_err, 0);
37042- atomic_set(&phba->num_cmd_success, 0);
37043+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37044+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37045 }
37046
37047 /**
37048diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
37049index 5163edb..7b142bc 100644
37050--- a/drivers/scsi/pmcraid.c
37051+++ b/drivers/scsi/pmcraid.c
37052@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
37053 res->scsi_dev = scsi_dev;
37054 scsi_dev->hostdata = res;
37055 res->change_detected = 0;
37056- atomic_set(&res->read_failures, 0);
37057- atomic_set(&res->write_failures, 0);
37058+ atomic_set_unchecked(&res->read_failures, 0);
37059+ atomic_set_unchecked(&res->write_failures, 0);
37060 rc = 0;
37061 }
37062 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
37063@@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
37064
37065 /* If this was a SCSI read/write command keep count of errors */
37066 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
37067- atomic_inc(&res->read_failures);
37068+ atomic_inc_unchecked(&res->read_failures);
37069 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
37070- atomic_inc(&res->write_failures);
37071+ atomic_inc_unchecked(&res->write_failures);
37072
37073 if (!RES_IS_GSCSI(res->cfg_entry) &&
37074 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
37075@@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
37076 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37077 * hrrq_id assigned here in queuecommand
37078 */
37079- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37080+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37081 pinstance->num_hrrq;
37082 cmd->cmd_done = pmcraid_io_done;
37083
37084@@ -3859,7 +3859,7 @@ static long pmcraid_ioctl_passthrough(
37085 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37086 * hrrq_id assigned here in queuecommand
37087 */
37088- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37089+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37090 pinstance->num_hrrq;
37091
37092 if (request_size) {
37093@@ -4497,7 +4497,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
37094
37095 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
37096 /* add resources only after host is added into system */
37097- if (!atomic_read(&pinstance->expose_resources))
37098+ if (!atomic_read_unchecked(&pinstance->expose_resources))
37099 return;
37100
37101 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
37102@@ -5331,8 +5331,8 @@ static int __devinit pmcraid_init_instance(
37103 init_waitqueue_head(&pinstance->reset_wait_q);
37104
37105 atomic_set(&pinstance->outstanding_cmds, 0);
37106- atomic_set(&pinstance->last_message_id, 0);
37107- atomic_set(&pinstance->expose_resources, 0);
37108+ atomic_set_unchecked(&pinstance->last_message_id, 0);
37109+ atomic_set_unchecked(&pinstance->expose_resources, 0);
37110
37111 INIT_LIST_HEAD(&pinstance->free_res_q);
37112 INIT_LIST_HEAD(&pinstance->used_res_q);
37113@@ -6047,7 +6047,7 @@ static int __devinit pmcraid_probe(
37114 /* Schedule worker thread to handle CCN and take care of adding and
37115 * removing devices to OS
37116 */
37117- atomic_set(&pinstance->expose_resources, 1);
37118+ atomic_set_unchecked(&pinstance->expose_resources, 1);
37119 schedule_work(&pinstance->worker_q);
37120 return rc;
37121
37122diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
37123index ca496c7..9c791d5 100644
37124--- a/drivers/scsi/pmcraid.h
37125+++ b/drivers/scsi/pmcraid.h
37126@@ -748,7 +748,7 @@ struct pmcraid_instance {
37127 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
37128
37129 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
37130- atomic_t last_message_id;
37131+ atomic_unchecked_t last_message_id;
37132
37133 /* configuration table */
37134 struct pmcraid_config_table *cfg_table;
37135@@ -777,7 +777,7 @@ struct pmcraid_instance {
37136 atomic_t outstanding_cmds;
37137
37138 /* should add/delete resources to mid-layer now ?*/
37139- atomic_t expose_resources;
37140+ atomic_unchecked_t expose_resources;
37141
37142
37143
37144@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
37145 struct pmcraid_config_table_entry_ext cfg_entry_ext;
37146 };
37147 struct scsi_device *scsi_dev; /* Link scsi_device structure */
37148- atomic_t read_failures; /* count of failed READ commands */
37149- atomic_t write_failures; /* count of failed WRITE commands */
37150+ atomic_unchecked_t read_failures; /* count of failed READ commands */
37151+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
37152
37153 /* To indicate add/delete/modify during CCN */
37154 u8 change_detected;
37155diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
37156index fcf052c..a8025a4 100644
37157--- a/drivers/scsi/qla2xxx/qla_def.h
37158+++ b/drivers/scsi/qla2xxx/qla_def.h
37159@@ -2244,7 +2244,7 @@ struct isp_operations {
37160 int (*get_flash_version) (struct scsi_qla_host *, void *);
37161 int (*start_scsi) (srb_t *);
37162 int (*abort_isp) (struct scsi_qla_host *);
37163-};
37164+} __no_const;
37165
37166 /* MSI-X Support *************************************************************/
37167
37168diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
37169index fd5edc6..4906148 100644
37170--- a/drivers/scsi/qla4xxx/ql4_def.h
37171+++ b/drivers/scsi/qla4xxx/ql4_def.h
37172@@ -258,7 +258,7 @@ struct ddb_entry {
37173 * (4000 only) */
37174 atomic_t relogin_timer; /* Max Time to wait for
37175 * relogin to complete */
37176- atomic_t relogin_retry_count; /* Num of times relogin has been
37177+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
37178 * retried */
37179 uint32_t default_time2wait; /* Default Min time between
37180 * relogins (+aens) */
37181diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
37182index 4169c8b..a8b896b 100644
37183--- a/drivers/scsi/qla4xxx/ql4_os.c
37184+++ b/drivers/scsi/qla4xxx/ql4_os.c
37185@@ -2104,12 +2104,12 @@ void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
37186 */
37187 if (!iscsi_is_session_online(cls_sess)) {
37188 /* Reset retry relogin timer */
37189- atomic_inc(&ddb_entry->relogin_retry_count);
37190+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
37191 DEBUG2(ql4_printk(KERN_INFO, ha,
37192 "%s: index[%d] relogin timed out-retrying"
37193 " relogin (%d), retry (%d)\n", __func__,
37194 ddb_entry->fw_ddb_index,
37195- atomic_read(&ddb_entry->relogin_retry_count),
37196+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
37197 ddb_entry->default_time2wait + 4));
37198 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
37199 atomic_set(&ddb_entry->retry_relogin_timer,
37200@@ -3835,7 +3835,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
37201
37202 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
37203 atomic_set(&ddb_entry->relogin_timer, 0);
37204- atomic_set(&ddb_entry->relogin_retry_count, 0);
37205+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
37206
37207 ddb_entry->default_relogin_timeout =
37208 le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
37209diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
37210index 2aeb2e9..46e3925 100644
37211--- a/drivers/scsi/scsi.c
37212+++ b/drivers/scsi/scsi.c
37213@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
37214 unsigned long timeout;
37215 int rtn = 0;
37216
37217- atomic_inc(&cmd->device->iorequest_cnt);
37218+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37219
37220 /* check if the device is still usable */
37221 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
37222diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
37223index f85cfa6..a57c9e8 100644
37224--- a/drivers/scsi/scsi_lib.c
37225+++ b/drivers/scsi/scsi_lib.c
37226@@ -1416,7 +1416,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
37227 shost = sdev->host;
37228 scsi_init_cmd_errh(cmd);
37229 cmd->result = DID_NO_CONNECT << 16;
37230- atomic_inc(&cmd->device->iorequest_cnt);
37231+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37232
37233 /*
37234 * SCSI request completion path will do scsi_device_unbusy(),
37235@@ -1442,9 +1442,9 @@ static void scsi_softirq_done(struct request *rq)
37236
37237 INIT_LIST_HEAD(&cmd->eh_entry);
37238
37239- atomic_inc(&cmd->device->iodone_cnt);
37240+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
37241 if (cmd->result)
37242- atomic_inc(&cmd->device->ioerr_cnt);
37243+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
37244
37245 disposition = scsi_decide_disposition(cmd);
37246 if (disposition != SUCCESS &&
37247diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
37248index 04c2a27..9d8bd66 100644
37249--- a/drivers/scsi/scsi_sysfs.c
37250+++ b/drivers/scsi/scsi_sysfs.c
37251@@ -660,7 +660,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
37252 char *buf) \
37253 { \
37254 struct scsi_device *sdev = to_scsi_device(dev); \
37255- unsigned long long count = atomic_read(&sdev->field); \
37256+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
37257 return snprintf(buf, 20, "0x%llx\n", count); \
37258 } \
37259 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
37260diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
37261index 84a1fdf..693b0d6 100644
37262--- a/drivers/scsi/scsi_tgt_lib.c
37263+++ b/drivers/scsi/scsi_tgt_lib.c
37264@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
37265 int err;
37266
37267 dprintk("%lx %u\n", uaddr, len);
37268- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
37269+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
37270 if (err) {
37271 /*
37272 * TODO: need to fixup sg_tablesize, max_segment_size,
37273diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
37274index 1b21491..1b7f60e 100644
37275--- a/drivers/scsi/scsi_transport_fc.c
37276+++ b/drivers/scsi/scsi_transport_fc.c
37277@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
37278 * Netlink Infrastructure
37279 */
37280
37281-static atomic_t fc_event_seq;
37282+static atomic_unchecked_t fc_event_seq;
37283
37284 /**
37285 * fc_get_event_number - Obtain the next sequential FC event number
37286@@ -497,7 +497,7 @@ static atomic_t fc_event_seq;
37287 u32
37288 fc_get_event_number(void)
37289 {
37290- return atomic_add_return(1, &fc_event_seq);
37291+ return atomic_add_return_unchecked(1, &fc_event_seq);
37292 }
37293 EXPORT_SYMBOL(fc_get_event_number);
37294
37295@@ -645,7 +645,7 @@ static __init int fc_transport_init(void)
37296 {
37297 int error;
37298
37299- atomic_set(&fc_event_seq, 0);
37300+ atomic_set_unchecked(&fc_event_seq, 0);
37301
37302 error = transport_class_register(&fc_host_class);
37303 if (error)
37304@@ -835,7 +835,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
37305 char *cp;
37306
37307 *val = simple_strtoul(buf, &cp, 0);
37308- if ((*cp && (*cp != '\n')) || (*val < 0))
37309+ if (*cp && (*cp != '\n'))
37310 return -EINVAL;
37311 /*
37312 * Check for overflow; dev_loss_tmo is u32
37313diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
37314index 96029e6..4d77fa0 100644
37315--- a/drivers/scsi/scsi_transport_iscsi.c
37316+++ b/drivers/scsi/scsi_transport_iscsi.c
37317@@ -79,7 +79,7 @@ struct iscsi_internal {
37318 struct transport_container session_cont;
37319 };
37320
37321-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
37322+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
37323 static struct workqueue_struct *iscsi_eh_timer_workq;
37324
37325 static DEFINE_IDA(iscsi_sess_ida);
37326@@ -1062,7 +1062,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
37327 int err;
37328
37329 ihost = shost->shost_data;
37330- session->sid = atomic_add_return(1, &iscsi_session_nr);
37331+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
37332
37333 if (target_id == ISCSI_MAX_TARGET) {
37334 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
37335@@ -2663,7 +2663,7 @@ static __init int iscsi_transport_init(void)
37336 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
37337 ISCSI_TRANSPORT_VERSION);
37338
37339- atomic_set(&iscsi_session_nr, 0);
37340+ atomic_set_unchecked(&iscsi_session_nr, 0);
37341
37342 err = class_register(&iscsi_transport_class);
37343 if (err)
37344diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
37345index 21a045e..ec89e03 100644
37346--- a/drivers/scsi/scsi_transport_srp.c
37347+++ b/drivers/scsi/scsi_transport_srp.c
37348@@ -33,7 +33,7 @@
37349 #include "scsi_transport_srp_internal.h"
37350
37351 struct srp_host_attrs {
37352- atomic_t next_port_id;
37353+ atomic_unchecked_t next_port_id;
37354 };
37355 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
37356
37357@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
37358 struct Scsi_Host *shost = dev_to_shost(dev);
37359 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
37360
37361- atomic_set(&srp_host->next_port_id, 0);
37362+ atomic_set_unchecked(&srp_host->next_port_id, 0);
37363 return 0;
37364 }
37365
37366@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
37367 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
37368 rport->roles = ids->roles;
37369
37370- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
37371+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
37372 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
37373
37374 transport_setup_device(&rport->dev);
37375diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
37376index 441a1c5..07cece7 100644
37377--- a/drivers/scsi/sg.c
37378+++ b/drivers/scsi/sg.c
37379@@ -1077,7 +1077,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
37380 sdp->disk->disk_name,
37381 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
37382 NULL,
37383- (char *)arg);
37384+ (char __user *)arg);
37385 case BLKTRACESTART:
37386 return blk_trace_startstop(sdp->device->request_queue, 1);
37387 case BLKTRACESTOP:
37388@@ -2312,7 +2312,7 @@ struct sg_proc_leaf {
37389 const struct file_operations * fops;
37390 };
37391
37392-static struct sg_proc_leaf sg_proc_leaf_arr[] = {
37393+static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
37394 {"allow_dio", &adio_fops},
37395 {"debug", &debug_fops},
37396 {"def_reserved_size", &dressz_fops},
37397@@ -2327,7 +2327,7 @@ sg_proc_init(void)
37398 {
37399 int k, mask;
37400 int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
37401- struct sg_proc_leaf * leaf;
37402+ const struct sg_proc_leaf * leaf;
37403
37404 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
37405 if (!sg_proc_sgp)
37406diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
37407index f64250e..1ee3049 100644
37408--- a/drivers/spi/spi-dw-pci.c
37409+++ b/drivers/spi/spi-dw-pci.c
37410@@ -149,7 +149,7 @@ static int spi_resume(struct pci_dev *pdev)
37411 #define spi_resume NULL
37412 #endif
37413
37414-static const struct pci_device_id pci_ids[] __devinitdata = {
37415+static const struct pci_device_id pci_ids[] __devinitconst = {
37416 /* Intel MID platform SPI controller 0 */
37417 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
37418 {},
37419diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
37420index 77eae99..b7cdcc9 100644
37421--- a/drivers/spi/spi.c
37422+++ b/drivers/spi/spi.c
37423@@ -1024,7 +1024,7 @@ int spi_bus_unlock(struct spi_master *master)
37424 EXPORT_SYMBOL_GPL(spi_bus_unlock);
37425
37426 /* portable code must never pass more than 32 bytes */
37427-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
37428+#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
37429
37430 static u8 *buf;
37431
37432diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c
37433index 436fe97..4082570 100644
37434--- a/drivers/staging/gma500/power.c
37435+++ b/drivers/staging/gma500/power.c
37436@@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
37437 ret = gma_resume_pci(dev->pdev);
37438 if (ret == 0) {
37439 /* FIXME: we want to defer this for Medfield/Oaktrail */
37440- gma_resume_display(dev);
37441+ gma_resume_display(dev->pdev);
37442 psb_irq_preinstall(dev);
37443 psb_irq_postinstall(dev);
37444 pm_runtime_get(&dev->pdev->dev);
37445diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
37446index bafccb3..e3ac78d 100644
37447--- a/drivers/staging/hv/rndis_filter.c
37448+++ b/drivers/staging/hv/rndis_filter.c
37449@@ -42,7 +42,7 @@ struct rndis_device {
37450
37451 enum rndis_device_state state;
37452 bool link_state;
37453- atomic_t new_req_id;
37454+ atomic_unchecked_t new_req_id;
37455
37456 spinlock_t request_lock;
37457 struct list_head req_list;
37458@@ -116,7 +116,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
37459 * template
37460 */
37461 set = &rndis_msg->msg.set_req;
37462- set->req_id = atomic_inc_return(&dev->new_req_id);
37463+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
37464
37465 /* Add to the request list */
37466 spin_lock_irqsave(&dev->request_lock, flags);
37467@@ -646,7 +646,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
37468
37469 /* Setup the rndis set */
37470 halt = &request->request_msg.msg.halt_req;
37471- halt->req_id = atomic_inc_return(&dev->new_req_id);
37472+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
37473
37474 /* Ignore return since this msg is optional. */
37475 rndis_filter_send_request(dev, request);
37476diff --git a/drivers/staging/iio/buffer_generic.h b/drivers/staging/iio/buffer_generic.h
37477index 9e8f010..af9efb56 100644
37478--- a/drivers/staging/iio/buffer_generic.h
37479+++ b/drivers/staging/iio/buffer_generic.h
37480@@ -64,7 +64,7 @@ struct iio_buffer_access_funcs {
37481
37482 int (*is_enabled)(struct iio_buffer *buffer);
37483 int (*enable)(struct iio_buffer *buffer);
37484-};
37485+} __no_const;
37486
37487 /**
37488 * struct iio_buffer_setup_ops - buffer setup related callbacks
37489diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
37490index 8b307b4..a97ac91 100644
37491--- a/drivers/staging/octeon/ethernet-rx.c
37492+++ b/drivers/staging/octeon/ethernet-rx.c
37493@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37494 /* Increment RX stats for virtual ports */
37495 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
37496 #ifdef CONFIG_64BIT
37497- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
37498- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
37499+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
37500+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
37501 #else
37502- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
37503- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
37504+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
37505+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
37506 #endif
37507 }
37508 netif_receive_skb(skb);
37509@@ -436,9 +436,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37510 dev->name);
37511 */
37512 #ifdef CONFIG_64BIT
37513- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
37514+ atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37515 #else
37516- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
37517+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
37518 #endif
37519 dev_kfree_skb_irq(skb);
37520 }
37521diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
37522index 076f866..2308070 100644
37523--- a/drivers/staging/octeon/ethernet.c
37524+++ b/drivers/staging/octeon/ethernet.c
37525@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
37526 * since the RX tasklet also increments it.
37527 */
37528 #ifdef CONFIG_64BIT
37529- atomic64_add(rx_status.dropped_packets,
37530- (atomic64_t *)&priv->stats.rx_dropped);
37531+ atomic64_add_unchecked(rx_status.dropped_packets,
37532+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37533 #else
37534- atomic_add(rx_status.dropped_packets,
37535- (atomic_t *)&priv->stats.rx_dropped);
37536+ atomic_add_unchecked(rx_status.dropped_packets,
37537+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
37538 #endif
37539 }
37540
37541diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
37542index 7a19555..466456d 100644
37543--- a/drivers/staging/pohmelfs/inode.c
37544+++ b/drivers/staging/pohmelfs/inode.c
37545@@ -1861,7 +1861,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
37546 mutex_init(&psb->mcache_lock);
37547 psb->mcache_root = RB_ROOT;
37548 psb->mcache_timeout = msecs_to_jiffies(5000);
37549- atomic_long_set(&psb->mcache_gen, 0);
37550+ atomic_long_set_unchecked(&psb->mcache_gen, 0);
37551
37552 psb->trans_max_pages = 100;
37553
37554@@ -1876,7 +1876,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
37555 INIT_LIST_HEAD(&psb->crypto_ready_list);
37556 INIT_LIST_HEAD(&psb->crypto_active_list);
37557
37558- atomic_set(&psb->trans_gen, 1);
37559+ atomic_set_unchecked(&psb->trans_gen, 1);
37560 atomic_long_set(&psb->total_inodes, 0);
37561
37562 mutex_init(&psb->state_lock);
37563diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
37564index e22665c..a2a9390 100644
37565--- a/drivers/staging/pohmelfs/mcache.c
37566+++ b/drivers/staging/pohmelfs/mcache.c
37567@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start
37568 m->data = data;
37569 m->start = start;
37570 m->size = size;
37571- m->gen = atomic_long_inc_return(&psb->mcache_gen);
37572+ m->gen = atomic_long_inc_return_unchecked(&psb->mcache_gen);
37573
37574 mutex_lock(&psb->mcache_lock);
37575 err = pohmelfs_mcache_insert(psb, m);
37576diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
37577index 985b6b7..7699e05 100644
37578--- a/drivers/staging/pohmelfs/netfs.h
37579+++ b/drivers/staging/pohmelfs/netfs.h
37580@@ -571,14 +571,14 @@ struct pohmelfs_config;
37581 struct pohmelfs_sb {
37582 struct rb_root mcache_root;
37583 struct mutex mcache_lock;
37584- atomic_long_t mcache_gen;
37585+ atomic_long_unchecked_t mcache_gen;
37586 unsigned long mcache_timeout;
37587
37588 unsigned int idx;
37589
37590 unsigned int trans_retries;
37591
37592- atomic_t trans_gen;
37593+ atomic_unchecked_t trans_gen;
37594
37595 unsigned int crypto_attached_size;
37596 unsigned int crypto_align_size;
37597diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
37598index 06c1a74..866eebc 100644
37599--- a/drivers/staging/pohmelfs/trans.c
37600+++ b/drivers/staging/pohmelfs/trans.c
37601@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb)
37602 int err;
37603 struct netfs_cmd *cmd = t->iovec.iov_base;
37604
37605- t->gen = atomic_inc_return(&psb->trans_gen);
37606+ t->gen = atomic_inc_return_unchecked(&psb->trans_gen);
37607
37608 cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
37609 t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
37610diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
37611index c36a140..dd27fda 100644
37612--- a/drivers/staging/rtl8192e/rtllib_module.c
37613+++ b/drivers/staging/rtl8192e/rtllib_module.c
37614@@ -228,6 +228,8 @@ static int show_debug_level(char *page, char **start, off_t offset,
37615 }
37616
37617 static int store_debug_level(struct file *file, const char __user *buffer,
37618+ unsigned long count, void *data) __size_overflow(3);
37619+static int store_debug_level(struct file *file, const char __user *buffer,
37620 unsigned long count, void *data)
37621 {
37622 char buf[] = "0x00000000";
37623diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37624index e3d47bc..85f4d0d 100644
37625--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37626+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37627@@ -250,6 +250,8 @@ static int show_debug_level(char *page, char **start, off_t offset,
37628 }
37629
37630 static int store_debug_level(struct file *file, const char *buffer,
37631+ unsigned long count, void *data) __size_overflow(3);
37632+static int store_debug_level(struct file *file, const char *buffer,
37633 unsigned long count, void *data)
37634 {
37635 char buf[] = "0x00000000";
37636diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
37637index 86308a0..feaa925 100644
37638--- a/drivers/staging/rtl8712/rtl871x_io.h
37639+++ b/drivers/staging/rtl8712/rtl871x_io.h
37640@@ -108,7 +108,7 @@ struct _io_ops {
37641 u8 *pmem);
37642 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
37643 u8 *pmem);
37644-};
37645+} __no_const;
37646
37647 struct io_req {
37648 struct list_head list;
37649diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
37650index c7b5e8b..783d6cb 100644
37651--- a/drivers/staging/sbe-2t3e3/netdev.c
37652+++ b/drivers/staging/sbe-2t3e3/netdev.c
37653@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
37654 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
37655
37656 if (rlen)
37657- if (copy_to_user(data, &resp, rlen))
37658+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
37659 return -EFAULT;
37660
37661 return 0;
37662diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
37663index be21617..0954e45 100644
37664--- a/drivers/staging/usbip/usbip_common.h
37665+++ b/drivers/staging/usbip/usbip_common.h
37666@@ -289,7 +289,7 @@ struct usbip_device {
37667 void (*shutdown)(struct usbip_device *);
37668 void (*reset)(struct usbip_device *);
37669 void (*unusable)(struct usbip_device *);
37670- } eh_ops;
37671+ } __no_const eh_ops;
37672 };
37673
37674 #if 0
37675diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
37676index 88b3298..3783eee 100644
37677--- a/drivers/staging/usbip/vhci.h
37678+++ b/drivers/staging/usbip/vhci.h
37679@@ -88,7 +88,7 @@ struct vhci_hcd {
37680 unsigned resuming:1;
37681 unsigned long re_timeout;
37682
37683- atomic_t seqnum;
37684+ atomic_unchecked_t seqnum;
37685
37686 /*
37687 * NOTE:
37688diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
37689index 2ee97e2..0420b86 100644
37690--- a/drivers/staging/usbip/vhci_hcd.c
37691+++ b/drivers/staging/usbip/vhci_hcd.c
37692@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
37693 return;
37694 }
37695
37696- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
37697+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37698 if (priv->seqnum == 0xffff)
37699 dev_info(&urb->dev->dev, "seqnum max\n");
37700
37701@@ -779,7 +779,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
37702 return -ENOMEM;
37703 }
37704
37705- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
37706+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37707 if (unlink->seqnum == 0xffff)
37708 pr_info("seqnum max\n");
37709
37710@@ -969,7 +969,7 @@ static int vhci_start(struct usb_hcd *hcd)
37711 vdev->rhport = rhport;
37712 }
37713
37714- atomic_set(&vhci->seqnum, 0);
37715+ atomic_set_unchecked(&vhci->seqnum, 0);
37716 spin_lock_init(&vhci->lock);
37717
37718 hcd->power_budget = 0; /* no limit */
37719diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
37720index 3872b8c..fe6d2f4 100644
37721--- a/drivers/staging/usbip/vhci_rx.c
37722+++ b/drivers/staging/usbip/vhci_rx.c
37723@@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
37724 if (!urb) {
37725 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
37726 pr_info("max seqnum %d\n",
37727- atomic_read(&the_controller->seqnum));
37728+ atomic_read_unchecked(&the_controller->seqnum));
37729 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
37730 return;
37731 }
37732diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
37733index 7735027..30eed13 100644
37734--- a/drivers/staging/vt6655/hostap.c
37735+++ b/drivers/staging/vt6655/hostap.c
37736@@ -79,14 +79,13 @@ static int msglevel =MSG_LEVEL_INFO;
37737 *
37738 */
37739
37740+static net_device_ops_no_const apdev_netdev_ops;
37741+
37742 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37743 {
37744 PSDevice apdev_priv;
37745 struct net_device *dev = pDevice->dev;
37746 int ret;
37747- const struct net_device_ops apdev_netdev_ops = {
37748- .ndo_start_xmit = pDevice->tx_80211,
37749- };
37750
37751 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37752
37753@@ -98,6 +97,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37754 *apdev_priv = *pDevice;
37755 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37756
37757+ /* only half broken now */
37758+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37759 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37760
37761 pDevice->apdev->type = ARPHRD_IEEE80211;
37762diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
37763index 51b5adf..098e320 100644
37764--- a/drivers/staging/vt6656/hostap.c
37765+++ b/drivers/staging/vt6656/hostap.c
37766@@ -80,14 +80,13 @@ static int msglevel =MSG_LEVEL_INFO;
37767 *
37768 */
37769
37770+static net_device_ops_no_const apdev_netdev_ops;
37771+
37772 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37773 {
37774 PSDevice apdev_priv;
37775 struct net_device *dev = pDevice->dev;
37776 int ret;
37777- const struct net_device_ops apdev_netdev_ops = {
37778- .ndo_start_xmit = pDevice->tx_80211,
37779- };
37780
37781 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37782
37783@@ -99,6 +98,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37784 *apdev_priv = *pDevice;
37785 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37786
37787+ /* only half broken now */
37788+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37789 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37790
37791 pDevice->apdev->type = ARPHRD_IEEE80211;
37792diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
37793index 7843dfd..3db105f 100644
37794--- a/drivers/staging/wlan-ng/hfa384x_usb.c
37795+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
37796@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
37797
37798 struct usbctlx_completor {
37799 int (*complete) (struct usbctlx_completor *);
37800-};
37801+} __no_const;
37802
37803 static int
37804 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
37805diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
37806index 1ca66ea..76f1343 100644
37807--- a/drivers/staging/zcache/tmem.c
37808+++ b/drivers/staging/zcache/tmem.c
37809@@ -39,7 +39,7 @@
37810 * A tmem host implementation must use this function to register callbacks
37811 * for memory allocation.
37812 */
37813-static struct tmem_hostops tmem_hostops;
37814+static tmem_hostops_no_const tmem_hostops;
37815
37816 static void tmem_objnode_tree_init(void);
37817
37818@@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_hostops *m)
37819 * A tmem host implementation must use this function to register
37820 * callbacks for a page-accessible memory (PAM) implementation
37821 */
37822-static struct tmem_pamops tmem_pamops;
37823+static tmem_pamops_no_const tmem_pamops;
37824
37825 void tmem_register_pamops(struct tmem_pamops *m)
37826 {
37827diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
37828index ed147c4..94fc3c6 100644
37829--- a/drivers/staging/zcache/tmem.h
37830+++ b/drivers/staging/zcache/tmem.h
37831@@ -180,6 +180,7 @@ struct tmem_pamops {
37832 void (*new_obj)(struct tmem_obj *);
37833 int (*replace_in_obj)(void *, struct tmem_obj *);
37834 };
37835+typedef struct tmem_pamops __no_const tmem_pamops_no_const;
37836 extern void tmem_register_pamops(struct tmem_pamops *m);
37837
37838 /* memory allocation methods provided by the host implementation */
37839@@ -189,6 +190,7 @@ struct tmem_hostops {
37840 struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
37841 void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
37842 };
37843+typedef struct tmem_hostops __no_const tmem_hostops_no_const;
37844 extern void tmem_register_hostops(struct tmem_hostops *m);
37845
37846 /* core tmem accessor functions */
37847diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
37848index 0c1d5c73..88e90a8 100644
37849--- a/drivers/target/iscsi/iscsi_target.c
37850+++ b/drivers/target/iscsi/iscsi_target.c
37851@@ -1364,7 +1364,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
37852 * outstanding_r2ts reaches zero, go ahead and send the delayed
37853 * TASK_ABORTED status.
37854 */
37855- if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
37856+ if (atomic_read_unchecked(&se_cmd->t_transport_aborted) != 0) {
37857 if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
37858 if (--cmd->outstanding_r2ts < 1) {
37859 iscsit_stop_dataout_timer(cmd);
37860diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
37861index 6845228..df77141 100644
37862--- a/drivers/target/target_core_tmr.c
37863+++ b/drivers/target/target_core_tmr.c
37864@@ -250,7 +250,7 @@ static void core_tmr_drain_task_list(
37865 cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
37866 cmd->t_task_list_num,
37867 atomic_read(&cmd->t_task_cdbs_left),
37868- atomic_read(&cmd->t_task_cdbs_sent),
37869+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
37870 atomic_read(&cmd->t_transport_active),
37871 atomic_read(&cmd->t_transport_stop),
37872 atomic_read(&cmd->t_transport_sent));
37873@@ -281,7 +281,7 @@ static void core_tmr_drain_task_list(
37874 pr_debug("LUN_RESET: got t_transport_active = 1 for"
37875 " task: %p, t_fe_count: %d dev: %p\n", task,
37876 fe_count, dev);
37877- atomic_set(&cmd->t_transport_aborted, 1);
37878+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
37879 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37880
37881 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
37882@@ -289,7 +289,7 @@ static void core_tmr_drain_task_list(
37883 }
37884 pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
37885 " t_fe_count: %d dev: %p\n", task, fe_count, dev);
37886- atomic_set(&cmd->t_transport_aborted, 1);
37887+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
37888 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37889
37890 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
37891diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
37892index e4ddb93..2fc6e0f 100644
37893--- a/drivers/target/target_core_transport.c
37894+++ b/drivers/target/target_core_transport.c
37895@@ -1343,7 +1343,7 @@ struct se_device *transport_add_device_to_core_hba(
37896
37897 dev->queue_depth = dev_limits->queue_depth;
37898 atomic_set(&dev->depth_left, dev->queue_depth);
37899- atomic_set(&dev->dev_ordered_id, 0);
37900+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
37901
37902 se_dev_set_default_attribs(dev, dev_limits);
37903
37904@@ -1530,7 +1530,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
37905 * Used to determine when ORDERED commands should go from
37906 * Dormant to Active status.
37907 */
37908- cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
37909+ cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
37910 smp_mb__after_atomic_inc();
37911 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
37912 cmd->se_ordered_id, cmd->sam_task_attr,
37913@@ -1800,7 +1800,7 @@ static void transport_generic_request_failure(struct se_cmd *cmd)
37914 " t_transport_active: %d t_transport_stop: %d"
37915 " t_transport_sent: %d\n", cmd->t_task_list_num,
37916 atomic_read(&cmd->t_task_cdbs_left),
37917- atomic_read(&cmd->t_task_cdbs_sent),
37918+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
37919 atomic_read(&cmd->t_task_cdbs_ex_left),
37920 atomic_read(&cmd->t_transport_active),
37921 atomic_read(&cmd->t_transport_stop),
37922@@ -2089,9 +2089,9 @@ check_depth:
37923
37924 spin_lock_irqsave(&cmd->t_state_lock, flags);
37925 task->task_flags |= (TF_ACTIVE | TF_SENT);
37926- atomic_inc(&cmd->t_task_cdbs_sent);
37927+ atomic_inc_unchecked(&cmd->t_task_cdbs_sent);
37928
37929- if (atomic_read(&cmd->t_task_cdbs_sent) ==
37930+ if (atomic_read_unchecked(&cmd->t_task_cdbs_sent) ==
37931 cmd->t_task_list_num)
37932 atomic_set(&cmd->t_transport_sent, 1);
37933
37934@@ -4296,7 +4296,7 @@ bool transport_wait_for_tasks(struct se_cmd *cmd)
37935 atomic_set(&cmd->transport_lun_stop, 0);
37936 }
37937 if (!atomic_read(&cmd->t_transport_active) ||
37938- atomic_read(&cmd->t_transport_aborted)) {
37939+ atomic_read_unchecked(&cmd->t_transport_aborted)) {
37940 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37941 return false;
37942 }
37943@@ -4545,7 +4545,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
37944 {
37945 int ret = 0;
37946
37947- if (atomic_read(&cmd->t_transport_aborted) != 0) {
37948+ if (atomic_read_unchecked(&cmd->t_transport_aborted) != 0) {
37949 if (!send_status ||
37950 (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
37951 return 1;
37952@@ -4582,7 +4582,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
37953 */
37954 if (cmd->data_direction == DMA_TO_DEVICE) {
37955 if (cmd->se_tfo->write_pending_status(cmd) != 0) {
37956- atomic_inc(&cmd->t_transport_aborted);
37957+ atomic_inc_unchecked(&cmd->t_transport_aborted);
37958 smp_mb__after_atomic_inc();
37959 }
37960 }
37961diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
37962index b9040be..e3f5aab 100644
37963--- a/drivers/tty/hvc/hvcs.c
37964+++ b/drivers/tty/hvc/hvcs.c
37965@@ -83,6 +83,7 @@
37966 #include <asm/hvcserver.h>
37967 #include <asm/uaccess.h>
37968 #include <asm/vio.h>
37969+#include <asm/local.h>
37970
37971 /*
37972 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
37973@@ -270,7 +271,7 @@ struct hvcs_struct {
37974 unsigned int index;
37975
37976 struct tty_struct *tty;
37977- int open_count;
37978+ local_t open_count;
37979
37980 /*
37981 * Used to tell the driver kernel_thread what operations need to take
37982@@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
37983
37984 spin_lock_irqsave(&hvcsd->lock, flags);
37985
37986- if (hvcsd->open_count > 0) {
37987+ if (local_read(&hvcsd->open_count) > 0) {
37988 spin_unlock_irqrestore(&hvcsd->lock, flags);
37989 printk(KERN_INFO "HVCS: vterm state unchanged. "
37990 "The hvcs device node is still in use.\n");
37991@@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
37992 if ((retval = hvcs_partner_connect(hvcsd)))
37993 goto error_release;
37994
37995- hvcsd->open_count = 1;
37996+ local_set(&hvcsd->open_count, 1);
37997 hvcsd->tty = tty;
37998 tty->driver_data = hvcsd;
37999
38000@@ -1179,7 +1180,7 @@ fast_open:
38001
38002 spin_lock_irqsave(&hvcsd->lock, flags);
38003 kref_get(&hvcsd->kref);
38004- hvcsd->open_count++;
38005+ local_inc(&hvcsd->open_count);
38006 hvcsd->todo_mask |= HVCS_SCHED_READ;
38007 spin_unlock_irqrestore(&hvcsd->lock, flags);
38008
38009@@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
38010 hvcsd = tty->driver_data;
38011
38012 spin_lock_irqsave(&hvcsd->lock, flags);
38013- if (--hvcsd->open_count == 0) {
38014+ if (local_dec_and_test(&hvcsd->open_count)) {
38015
38016 vio_disable_interrupts(hvcsd->vdev);
38017
38018@@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
38019 free_irq(irq, hvcsd);
38020 kref_put(&hvcsd->kref, destroy_hvcs_struct);
38021 return;
38022- } else if (hvcsd->open_count < 0) {
38023+ } else if (local_read(&hvcsd->open_count) < 0) {
38024 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
38025 " is missmanaged.\n",
38026- hvcsd->vdev->unit_address, hvcsd->open_count);
38027+ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
38028 }
38029
38030 spin_unlock_irqrestore(&hvcsd->lock, flags);
38031@@ -1268,7 +1269,7 @@ static void hvcs_hangup(struct tty_struct * tty)
38032
38033 spin_lock_irqsave(&hvcsd->lock, flags);
38034 /* Preserve this so that we know how many kref refs to put */
38035- temp_open_count = hvcsd->open_count;
38036+ temp_open_count = local_read(&hvcsd->open_count);
38037
38038 /*
38039 * Don't kref put inside the spinlock because the destruction
38040@@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struct * tty)
38041 hvcsd->tty->driver_data = NULL;
38042 hvcsd->tty = NULL;
38043
38044- hvcsd->open_count = 0;
38045+ local_set(&hvcsd->open_count, 0);
38046
38047 /* This will drop any buffered data on the floor which is OK in a hangup
38048 * scenario. */
38049@@ -1354,7 +1355,7 @@ static int hvcs_write(struct tty_struct *tty,
38050 * the middle of a write operation? This is a crummy place to do this
38051 * but we want to keep it all in the spinlock.
38052 */
38053- if (hvcsd->open_count <= 0) {
38054+ if (local_read(&hvcsd->open_count) <= 0) {
38055 spin_unlock_irqrestore(&hvcsd->lock, flags);
38056 return -ENODEV;
38057 }
38058@@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_struct *tty)
38059 {
38060 struct hvcs_struct *hvcsd = tty->driver_data;
38061
38062- if (!hvcsd || hvcsd->open_count <= 0)
38063+ if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
38064 return 0;
38065
38066 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
38067diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
38068index ef92869..f4ebd88 100644
38069--- a/drivers/tty/ipwireless/tty.c
38070+++ b/drivers/tty/ipwireless/tty.c
38071@@ -29,6 +29,7 @@
38072 #include <linux/tty_driver.h>
38073 #include <linux/tty_flip.h>
38074 #include <linux/uaccess.h>
38075+#include <asm/local.h>
38076
38077 #include "tty.h"
38078 #include "network.h"
38079@@ -51,7 +52,7 @@ struct ipw_tty {
38080 int tty_type;
38081 struct ipw_network *network;
38082 struct tty_struct *linux_tty;
38083- int open_count;
38084+ local_t open_count;
38085 unsigned int control_lines;
38086 struct mutex ipw_tty_mutex;
38087 int tx_bytes_queued;
38088@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
38089 mutex_unlock(&tty->ipw_tty_mutex);
38090 return -ENODEV;
38091 }
38092- if (tty->open_count == 0)
38093+ if (local_read(&tty->open_count) == 0)
38094 tty->tx_bytes_queued = 0;
38095
38096- tty->open_count++;
38097+ local_inc(&tty->open_count);
38098
38099 tty->linux_tty = linux_tty;
38100 linux_tty->driver_data = tty;
38101@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
38102
38103 static void do_ipw_close(struct ipw_tty *tty)
38104 {
38105- tty->open_count--;
38106-
38107- if (tty->open_count == 0) {
38108+ if (local_dec_return(&tty->open_count) == 0) {
38109 struct tty_struct *linux_tty = tty->linux_tty;
38110
38111 if (linux_tty != NULL) {
38112@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
38113 return;
38114
38115 mutex_lock(&tty->ipw_tty_mutex);
38116- if (tty->open_count == 0) {
38117+ if (local_read(&tty->open_count) == 0) {
38118 mutex_unlock(&tty->ipw_tty_mutex);
38119 return;
38120 }
38121@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
38122 return;
38123 }
38124
38125- if (!tty->open_count) {
38126+ if (!local_read(&tty->open_count)) {
38127 mutex_unlock(&tty->ipw_tty_mutex);
38128 return;
38129 }
38130@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty,
38131 return -ENODEV;
38132
38133 mutex_lock(&tty->ipw_tty_mutex);
38134- if (!tty->open_count) {
38135+ if (!local_read(&tty->open_count)) {
38136 mutex_unlock(&tty->ipw_tty_mutex);
38137 return -EINVAL;
38138 }
38139@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
38140 if (!tty)
38141 return -ENODEV;
38142
38143- if (!tty->open_count)
38144+ if (!local_read(&tty->open_count))
38145 return -EINVAL;
38146
38147 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
38148@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
38149 if (!tty)
38150 return 0;
38151
38152- if (!tty->open_count)
38153+ if (!local_read(&tty->open_count))
38154 return 0;
38155
38156 return tty->tx_bytes_queued;
38157@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
38158 if (!tty)
38159 return -ENODEV;
38160
38161- if (!tty->open_count)
38162+ if (!local_read(&tty->open_count))
38163 return -EINVAL;
38164
38165 return get_control_lines(tty);
38166@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
38167 if (!tty)
38168 return -ENODEV;
38169
38170- if (!tty->open_count)
38171+ if (!local_read(&tty->open_count))
38172 return -EINVAL;
38173
38174 return set_control_lines(tty, set, clear);
38175@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
38176 if (!tty)
38177 return -ENODEV;
38178
38179- if (!tty->open_count)
38180+ if (!local_read(&tty->open_count))
38181 return -EINVAL;
38182
38183 /* FIXME: Exactly how is the tty object locked here .. */
38184@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
38185 against a parallel ioctl etc */
38186 mutex_lock(&ttyj->ipw_tty_mutex);
38187 }
38188- while (ttyj->open_count)
38189+ while (local_read(&ttyj->open_count))
38190 do_ipw_close(ttyj);
38191 ipwireless_disassociate_network_ttys(network,
38192 ttyj->channel_idx);
38193diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
38194index fc7bbba..9527e93 100644
38195--- a/drivers/tty/n_gsm.c
38196+++ b/drivers/tty/n_gsm.c
38197@@ -1629,7 +1629,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
38198 kref_init(&dlci->ref);
38199 mutex_init(&dlci->mutex);
38200 dlci->fifo = &dlci->_fifo;
38201- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
38202+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
38203 kfree(dlci);
38204 return NULL;
38205 }
38206diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
38207index 39d6ab6..eb97f41 100644
38208--- a/drivers/tty/n_tty.c
38209+++ b/drivers/tty/n_tty.c
38210@@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
38211 {
38212 *ops = tty_ldisc_N_TTY;
38213 ops->owner = NULL;
38214- ops->refcount = ops->flags = 0;
38215+ atomic_set(&ops->refcount, 0);
38216+ ops->flags = 0;
38217 }
38218 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
38219diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
38220index e18604b..a7d5a11 100644
38221--- a/drivers/tty/pty.c
38222+++ b/drivers/tty/pty.c
38223@@ -773,8 +773,10 @@ static void __init unix98_pty_init(void)
38224 register_sysctl_table(pty_root_table);
38225
38226 /* Now create the /dev/ptmx special device */
38227+ pax_open_kernel();
38228 tty_default_fops(&ptmx_fops);
38229- ptmx_fops.open = ptmx_open;
38230+ *(void **)&ptmx_fops.open = ptmx_open;
38231+ pax_close_kernel();
38232
38233 cdev_init(&ptmx_cdev, &ptmx_fops);
38234 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
38235diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
38236index 2b42a01..32a2ed3 100644
38237--- a/drivers/tty/serial/kgdboc.c
38238+++ b/drivers/tty/serial/kgdboc.c
38239@@ -24,8 +24,9 @@
38240 #define MAX_CONFIG_LEN 40
38241
38242 static struct kgdb_io kgdboc_io_ops;
38243+static struct kgdb_io kgdboc_io_ops_console;
38244
38245-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
38246+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
38247 static int configured = -1;
38248
38249 static char config[MAX_CONFIG_LEN];
38250@@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
38251 kgdboc_unregister_kbd();
38252 if (configured == 1)
38253 kgdb_unregister_io_module(&kgdboc_io_ops);
38254+ else if (configured == 2)
38255+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
38256 }
38257
38258 static int configure_kgdboc(void)
38259@@ -157,13 +160,13 @@ static int configure_kgdboc(void)
38260 int err;
38261 char *cptr = config;
38262 struct console *cons;
38263+ int is_console = 0;
38264
38265 err = kgdboc_option_setup(config);
38266 if (err || !strlen(config) || isspace(config[0]))
38267 goto noconfig;
38268
38269 err = -ENODEV;
38270- kgdboc_io_ops.is_console = 0;
38271 kgdb_tty_driver = NULL;
38272
38273 kgdboc_use_kms = 0;
38274@@ -184,7 +187,7 @@ static int configure_kgdboc(void)
38275 int idx;
38276 if (cons->device && cons->device(cons, &idx) == p &&
38277 idx == tty_line) {
38278- kgdboc_io_ops.is_console = 1;
38279+ is_console = 1;
38280 break;
38281 }
38282 cons = cons->next;
38283@@ -194,12 +197,16 @@ static int configure_kgdboc(void)
38284 kgdb_tty_line = tty_line;
38285
38286 do_register:
38287- err = kgdb_register_io_module(&kgdboc_io_ops);
38288+ if (is_console) {
38289+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
38290+ configured = 2;
38291+ } else {
38292+ err = kgdb_register_io_module(&kgdboc_io_ops);
38293+ configured = 1;
38294+ }
38295 if (err)
38296 goto noconfig;
38297
38298- configured = 1;
38299-
38300 return 0;
38301
38302 noconfig:
38303@@ -213,7 +220,7 @@ noconfig:
38304 static int __init init_kgdboc(void)
38305 {
38306 /* Already configured? */
38307- if (configured == 1)
38308+ if (configured >= 1)
38309 return 0;
38310
38311 return configure_kgdboc();
38312@@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
38313 if (config[len - 1] == '\n')
38314 config[len - 1] = '\0';
38315
38316- if (configured == 1)
38317+ if (configured >= 1)
38318 cleanup_kgdboc();
38319
38320 /* Go and configure with the new params. */
38321@@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
38322 .post_exception = kgdboc_post_exp_handler,
38323 };
38324
38325+static struct kgdb_io kgdboc_io_ops_console = {
38326+ .name = "kgdboc",
38327+ .read_char = kgdboc_get_char,
38328+ .write_char = kgdboc_put_char,
38329+ .pre_exception = kgdboc_pre_exp_handler,
38330+ .post_exception = kgdboc_post_exp_handler,
38331+ .is_console = 1
38332+};
38333+
38334 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
38335 /* This is only available if kgdboc is a built in for early debugging */
38336 static int __init kgdboc_early_init(char *opt)
38337diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
38338index 05085be..67eadb0 100644
38339--- a/drivers/tty/tty_io.c
38340+++ b/drivers/tty/tty_io.c
38341@@ -3240,7 +3240,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
38342
38343 void tty_default_fops(struct file_operations *fops)
38344 {
38345- *fops = tty_fops;
38346+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
38347 }
38348
38349 /*
38350diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
38351index 8e0924f..4204eb4 100644
38352--- a/drivers/tty/tty_ldisc.c
38353+++ b/drivers/tty/tty_ldisc.c
38354@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *ld)
38355 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
38356 struct tty_ldisc_ops *ldo = ld->ops;
38357
38358- ldo->refcount--;
38359+ atomic_dec(&ldo->refcount);
38360 module_put(ldo->owner);
38361 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38362
38363@@ -110,7 +110,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
38364 spin_lock_irqsave(&tty_ldisc_lock, flags);
38365 tty_ldiscs[disc] = new_ldisc;
38366 new_ldisc->num = disc;
38367- new_ldisc->refcount = 0;
38368+ atomic_set(&new_ldisc->refcount, 0);
38369 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38370
38371 return ret;
38372@@ -138,7 +138,7 @@ int tty_unregister_ldisc(int disc)
38373 return -EINVAL;
38374
38375 spin_lock_irqsave(&tty_ldisc_lock, flags);
38376- if (tty_ldiscs[disc]->refcount)
38377+ if (atomic_read(&tty_ldiscs[disc]->refcount))
38378 ret = -EBUSY;
38379 else
38380 tty_ldiscs[disc] = NULL;
38381@@ -159,7 +159,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
38382 if (ldops) {
38383 ret = ERR_PTR(-EAGAIN);
38384 if (try_module_get(ldops->owner)) {
38385- ldops->refcount++;
38386+ atomic_inc(&ldops->refcount);
38387 ret = ldops;
38388 }
38389 }
38390@@ -172,7 +172,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
38391 unsigned long flags;
38392
38393 spin_lock_irqsave(&tty_ldisc_lock, flags);
38394- ldops->refcount--;
38395+ atomic_dec(&ldops->refcount);
38396 module_put(ldops->owner);
38397 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38398 }
38399diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
38400index a605549..6bd3c96 100644
38401--- a/drivers/tty/vt/keyboard.c
38402+++ b/drivers/tty/vt/keyboard.c
38403@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
38404 kbd->kbdmode == VC_OFF) &&
38405 value != KVAL(K_SAK))
38406 return; /* SAK is allowed even in raw mode */
38407+
38408+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
38409+ {
38410+ void *func = fn_handler[value];
38411+ if (func == fn_show_state || func == fn_show_ptregs ||
38412+ func == fn_show_mem)
38413+ return;
38414+ }
38415+#endif
38416+
38417 fn_handler[value](vc);
38418 }
38419
38420diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
38421index 65447c5..0526f0a 100644
38422--- a/drivers/tty/vt/vt_ioctl.c
38423+++ b/drivers/tty/vt/vt_ioctl.c
38424@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
38425 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
38426 return -EFAULT;
38427
38428- if (!capable(CAP_SYS_TTY_CONFIG))
38429- perm = 0;
38430-
38431 switch (cmd) {
38432 case KDGKBENT:
38433 key_map = key_maps[s];
38434@@ -221,6 +218,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
38435 val = (i ? K_HOLE : K_NOSUCHMAP);
38436 return put_user(val, &user_kbe->kb_value);
38437 case KDSKBENT:
38438+ if (!capable(CAP_SYS_TTY_CONFIG))
38439+ perm = 0;
38440+
38441 if (!perm)
38442 return -EPERM;
38443 if (!i && v == K_NOSUCHMAP) {
38444@@ -322,9 +322,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38445 int i, j, k;
38446 int ret;
38447
38448- if (!capable(CAP_SYS_TTY_CONFIG))
38449- perm = 0;
38450-
38451 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
38452 if (!kbs) {
38453 ret = -ENOMEM;
38454@@ -358,6 +355,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38455 kfree(kbs);
38456 return ((p && *p) ? -EOVERFLOW : 0);
38457 case KDSKBSENT:
38458+ if (!capable(CAP_SYS_TTY_CONFIG))
38459+ perm = 0;
38460+
38461 if (!perm) {
38462 ret = -EPERM;
38463 goto reterr;
38464diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
38465index a783d53..cb30d94 100644
38466--- a/drivers/uio/uio.c
38467+++ b/drivers/uio/uio.c
38468@@ -25,6 +25,7 @@
38469 #include <linux/kobject.h>
38470 #include <linux/cdev.h>
38471 #include <linux/uio_driver.h>
38472+#include <asm/local.h>
38473
38474 #define UIO_MAX_DEVICES (1U << MINORBITS)
38475
38476@@ -32,10 +33,10 @@ struct uio_device {
38477 struct module *owner;
38478 struct device *dev;
38479 int minor;
38480- atomic_t event;
38481+ atomic_unchecked_t event;
38482 struct fasync_struct *async_queue;
38483 wait_queue_head_t wait;
38484- int vma_count;
38485+ local_t vma_count;
38486 struct uio_info *info;
38487 struct kobject *map_dir;
38488 struct kobject *portio_dir;
38489@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
38490 struct device_attribute *attr, char *buf)
38491 {
38492 struct uio_device *idev = dev_get_drvdata(dev);
38493- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
38494+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
38495 }
38496
38497 static struct device_attribute uio_class_attributes[] = {
38498@@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *info)
38499 {
38500 struct uio_device *idev = info->uio_dev;
38501
38502- atomic_inc(&idev->event);
38503+ atomic_inc_unchecked(&idev->event);
38504 wake_up_interruptible(&idev->wait);
38505 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
38506 }
38507@@ -461,7 +462,7 @@ static int uio_open(struct inode *inode, struct file *filep)
38508 }
38509
38510 listener->dev = idev;
38511- listener->event_count = atomic_read(&idev->event);
38512+ listener->event_count = atomic_read_unchecked(&idev->event);
38513 filep->private_data = listener;
38514
38515 if (idev->info->open) {
38516@@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
38517 return -EIO;
38518
38519 poll_wait(filep, &idev->wait, wait);
38520- if (listener->event_count != atomic_read(&idev->event))
38521+ if (listener->event_count != atomic_read_unchecked(&idev->event))
38522 return POLLIN | POLLRDNORM;
38523 return 0;
38524 }
38525@@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
38526 do {
38527 set_current_state(TASK_INTERRUPTIBLE);
38528
38529- event_count = atomic_read(&idev->event);
38530+ event_count = atomic_read_unchecked(&idev->event);
38531 if (event_count != listener->event_count) {
38532 if (copy_to_user(buf, &event_count, count))
38533 retval = -EFAULT;
38534@@ -606,13 +607,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
38535 static void uio_vma_open(struct vm_area_struct *vma)
38536 {
38537 struct uio_device *idev = vma->vm_private_data;
38538- idev->vma_count++;
38539+ local_inc(&idev->vma_count);
38540 }
38541
38542 static void uio_vma_close(struct vm_area_struct *vma)
38543 {
38544 struct uio_device *idev = vma->vm_private_data;
38545- idev->vma_count--;
38546+ local_dec(&idev->vma_count);
38547 }
38548
38549 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
38550@@ -821,7 +822,7 @@ int __uio_register_device(struct module *owner,
38551 idev->owner = owner;
38552 idev->info = info;
38553 init_waitqueue_head(&idev->wait);
38554- atomic_set(&idev->event, 0);
38555+ atomic_set_unchecked(&idev->event, 0);
38556
38557 ret = uio_get_minor(idev);
38558 if (ret)
38559diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
38560index a845f8b..4f54072 100644
38561--- a/drivers/usb/atm/cxacru.c
38562+++ b/drivers/usb/atm/cxacru.c
38563@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
38564 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
38565 if (ret < 2)
38566 return -EINVAL;
38567- if (index < 0 || index > 0x7f)
38568+ if (index > 0x7f)
38569 return -EINVAL;
38570 pos += tmp;
38571
38572diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
38573index d3448ca..d2864ca 100644
38574--- a/drivers/usb/atm/usbatm.c
38575+++ b/drivers/usb/atm/usbatm.c
38576@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38577 if (printk_ratelimit())
38578 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
38579 __func__, vpi, vci);
38580- atomic_inc(&vcc->stats->rx_err);
38581+ atomic_inc_unchecked(&vcc->stats->rx_err);
38582 return;
38583 }
38584
38585@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38586 if (length > ATM_MAX_AAL5_PDU) {
38587 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
38588 __func__, length, vcc);
38589- atomic_inc(&vcc->stats->rx_err);
38590+ atomic_inc_unchecked(&vcc->stats->rx_err);
38591 goto out;
38592 }
38593
38594@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38595 if (sarb->len < pdu_length) {
38596 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
38597 __func__, pdu_length, sarb->len, vcc);
38598- atomic_inc(&vcc->stats->rx_err);
38599+ atomic_inc_unchecked(&vcc->stats->rx_err);
38600 goto out;
38601 }
38602
38603 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
38604 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
38605 __func__, vcc);
38606- atomic_inc(&vcc->stats->rx_err);
38607+ atomic_inc_unchecked(&vcc->stats->rx_err);
38608 goto out;
38609 }
38610
38611@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38612 if (printk_ratelimit())
38613 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
38614 __func__, length);
38615- atomic_inc(&vcc->stats->rx_drop);
38616+ atomic_inc_unchecked(&vcc->stats->rx_drop);
38617 goto out;
38618 }
38619
38620@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38621
38622 vcc->push(vcc, skb);
38623
38624- atomic_inc(&vcc->stats->rx);
38625+ atomic_inc_unchecked(&vcc->stats->rx);
38626 out:
38627 skb_trim(sarb, 0);
38628 }
38629@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
38630 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
38631
38632 usbatm_pop(vcc, skb);
38633- atomic_inc(&vcc->stats->tx);
38634+ atomic_inc_unchecked(&vcc->stats->tx);
38635
38636 skb = skb_dequeue(&instance->sndqueue);
38637 }
38638@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
38639 if (!left--)
38640 return sprintf(page,
38641 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
38642- atomic_read(&atm_dev->stats.aal5.tx),
38643- atomic_read(&atm_dev->stats.aal5.tx_err),
38644- atomic_read(&atm_dev->stats.aal5.rx),
38645- atomic_read(&atm_dev->stats.aal5.rx_err),
38646- atomic_read(&atm_dev->stats.aal5.rx_drop));
38647+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
38648+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
38649+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
38650+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
38651+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
38652
38653 if (!left--) {
38654 if (instance->disconnected)
38655diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
38656index d956965..4179a77 100644
38657--- a/drivers/usb/core/devices.c
38658+++ b/drivers/usb/core/devices.c
38659@@ -126,7 +126,7 @@ static const char format_endpt[] =
38660 * time it gets called.
38661 */
38662 static struct device_connect_event {
38663- atomic_t count;
38664+ atomic_unchecked_t count;
38665 wait_queue_head_t wait;
38666 } device_event = {
38667 .count = ATOMIC_INIT(1),
38668@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
38669
38670 void usbfs_conn_disc_event(void)
38671 {
38672- atomic_add(2, &device_event.count);
38673+ atomic_add_unchecked(2, &device_event.count);
38674 wake_up(&device_event.wait);
38675 }
38676
38677@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
38678
38679 poll_wait(file, &device_event.wait, wait);
38680
38681- event_count = atomic_read(&device_event.count);
38682+ event_count = atomic_read_unchecked(&device_event.count);
38683 if (file->f_version != event_count) {
38684 file->f_version = event_count;
38685 return POLLIN | POLLRDNORM;
38686diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
38687index 1fc8f12..20647c1 100644
38688--- a/drivers/usb/early/ehci-dbgp.c
38689+++ b/drivers/usb/early/ehci-dbgp.c
38690@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
38691
38692 #ifdef CONFIG_KGDB
38693 static struct kgdb_io kgdbdbgp_io_ops;
38694-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
38695+static struct kgdb_io kgdbdbgp_io_ops_console;
38696+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
38697 #else
38698 #define dbgp_kgdb_mode (0)
38699 #endif
38700@@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
38701 .write_char = kgdbdbgp_write_char,
38702 };
38703
38704+static struct kgdb_io kgdbdbgp_io_ops_console = {
38705+ .name = "kgdbdbgp",
38706+ .read_char = kgdbdbgp_read_char,
38707+ .write_char = kgdbdbgp_write_char,
38708+ .is_console = 1
38709+};
38710+
38711 static int kgdbdbgp_wait_time;
38712
38713 static int __init kgdbdbgp_parse_config(char *str)
38714@@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
38715 ptr++;
38716 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
38717 }
38718- kgdb_register_io_module(&kgdbdbgp_io_ops);
38719- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
38720+ if (early_dbgp_console.index != -1)
38721+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
38722+ else
38723+ kgdb_register_io_module(&kgdbdbgp_io_ops);
38724
38725 return 0;
38726 }
38727diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
38728index d6bea3e..60b250e 100644
38729--- a/drivers/usb/wusbcore/wa-hc.h
38730+++ b/drivers/usb/wusbcore/wa-hc.h
38731@@ -192,7 +192,7 @@ struct wahc {
38732 struct list_head xfer_delayed_list;
38733 spinlock_t xfer_list_lock;
38734 struct work_struct xfer_work;
38735- atomic_t xfer_id_count;
38736+ atomic_unchecked_t xfer_id_count;
38737 };
38738
38739
38740@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
38741 INIT_LIST_HEAD(&wa->xfer_delayed_list);
38742 spin_lock_init(&wa->xfer_list_lock);
38743 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
38744- atomic_set(&wa->xfer_id_count, 1);
38745+ atomic_set_unchecked(&wa->xfer_id_count, 1);
38746 }
38747
38748 /**
38749diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
38750index 57c01ab..8a05959 100644
38751--- a/drivers/usb/wusbcore/wa-xfer.c
38752+++ b/drivers/usb/wusbcore/wa-xfer.c
38753@@ -296,7 +296,7 @@ out:
38754 */
38755 static void wa_xfer_id_init(struct wa_xfer *xfer)
38756 {
38757- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
38758+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
38759 }
38760
38761 /*
38762diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
38763index c14c42b..f955cc2 100644
38764--- a/drivers/vhost/vhost.c
38765+++ b/drivers/vhost/vhost.c
38766@@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
38767 return 0;
38768 }
38769
38770-static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
38771+static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
38772 {
38773 struct file *eventfp, *filep = NULL,
38774 *pollstart = NULL, *pollstop = NULL;
38775diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
38776index b0b2ac3..89a4399 100644
38777--- a/drivers/video/aty/aty128fb.c
38778+++ b/drivers/video/aty/aty128fb.c
38779@@ -148,7 +148,7 @@ enum {
38780 };
38781
38782 /* Must match above enum */
38783-static const char *r128_family[] __devinitdata = {
38784+static const char *r128_family[] __devinitconst = {
38785 "AGP",
38786 "PCI",
38787 "PRO AGP",
38788diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
38789index 5c3960d..15cf8fc 100644
38790--- a/drivers/video/fbcmap.c
38791+++ b/drivers/video/fbcmap.c
38792@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
38793 rc = -ENODEV;
38794 goto out;
38795 }
38796- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
38797- !info->fbops->fb_setcmap)) {
38798+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
38799 rc = -EINVAL;
38800 goto out1;
38801 }
38802diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
38803index ad93629..e020fc3 100644
38804--- a/drivers/video/fbmem.c
38805+++ b/drivers/video/fbmem.c
38806@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
38807 image->dx += image->width + 8;
38808 }
38809 } else if (rotate == FB_ROTATE_UD) {
38810- for (x = 0; x < num && image->dx >= 0; x++) {
38811+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
38812 info->fbops->fb_imageblit(info, image);
38813 image->dx -= image->width + 8;
38814 }
38815@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
38816 image->dy += image->height + 8;
38817 }
38818 } else if (rotate == FB_ROTATE_CCW) {
38819- for (x = 0; x < num && image->dy >= 0; x++) {
38820+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
38821 info->fbops->fb_imageblit(info, image);
38822 image->dy -= image->height + 8;
38823 }
38824@@ -1143,7 +1143,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
38825 return -EFAULT;
38826 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
38827 return -EINVAL;
38828- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
38829+ if (con2fb.framebuffer >= FB_MAX)
38830 return -EINVAL;
38831 if (!registered_fb[con2fb.framebuffer])
38832 request_module("fb%d", con2fb.framebuffer);
38833diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
38834index 5a5d092..265c5ed 100644
38835--- a/drivers/video/geode/gx1fb_core.c
38836+++ b/drivers/video/geode/gx1fb_core.c
38837@@ -29,7 +29,7 @@ static int crt_option = 1;
38838 static char panel_option[32] = "";
38839
38840 /* Modes relevant to the GX1 (taken from modedb.c) */
38841-static const struct fb_videomode __devinitdata gx1_modedb[] = {
38842+static const struct fb_videomode __devinitconst gx1_modedb[] = {
38843 /* 640x480-60 VESA */
38844 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
38845 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
38846diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
38847index 0fad23f..0e9afa4 100644
38848--- a/drivers/video/gxt4500.c
38849+++ b/drivers/video/gxt4500.c
38850@@ -156,7 +156,7 @@ struct gxt4500_par {
38851 static char *mode_option;
38852
38853 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
38854-static const struct fb_videomode defaultmode __devinitdata = {
38855+static const struct fb_videomode defaultmode __devinitconst = {
38856 .refresh = 60,
38857 .xres = 1280,
38858 .yres = 1024,
38859@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
38860 return 0;
38861 }
38862
38863-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
38864+static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
38865 .id = "IBM GXT4500P",
38866 .type = FB_TYPE_PACKED_PIXELS,
38867 .visual = FB_VISUAL_PSEUDOCOLOR,
38868diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
38869index 7672d2e..b56437f 100644
38870--- a/drivers/video/i810/i810_accel.c
38871+++ b/drivers/video/i810/i810_accel.c
38872@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
38873 }
38874 }
38875 printk("ringbuffer lockup!!!\n");
38876+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
38877 i810_report_error(mmio);
38878 par->dev_flags |= LOCKUP;
38879 info->pixmap.scan_align = 1;
38880diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
38881index 318f6fb..9a389c1 100644
38882--- a/drivers/video/i810/i810_main.c
38883+++ b/drivers/video/i810/i810_main.c
38884@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
38885 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
38886
38887 /* PCI */
38888-static const char *i810_pci_list[] __devinitdata = {
38889+static const char *i810_pci_list[] __devinitconst = {
38890 "Intel(R) 810 Framebuffer Device" ,
38891 "Intel(R) 810-DC100 Framebuffer Device" ,
38892 "Intel(R) 810E Framebuffer Device" ,
38893diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
38894index de36693..3c63fc2 100644
38895--- a/drivers/video/jz4740_fb.c
38896+++ b/drivers/video/jz4740_fb.c
38897@@ -136,7 +136,7 @@ struct jzfb {
38898 uint32_t pseudo_palette[16];
38899 };
38900
38901-static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
38902+static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
38903 .id = "JZ4740 FB",
38904 .type = FB_TYPE_PACKED_PIXELS,
38905 .visual = FB_VISUAL_TRUECOLOR,
38906diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
38907index 3c14e43..eafa544 100644
38908--- a/drivers/video/logo/logo_linux_clut224.ppm
38909+++ b/drivers/video/logo/logo_linux_clut224.ppm
38910@@ -1,1604 +1,1123 @@
38911 P3
38912-# Standard 224-color Linux logo
38913 80 80
38914 255
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- 6 6 6 6 6 6 10 10 10 10 10 10
38925- 10 10 10 6 6 6 6 6 6 6 6 6
38926- 0 0 0 0 0 0 0 0 0 0 0 0
38927- 0 0 0 0 0 0 0 0 0 0 0 0
38928- 0 0 0 0 0 0 0 0 0 0 0 0
38929- 0 0 0 0 0 0 0 0 0 0 0 0
38930- 0 0 0 0 0 0 0 0 0 0 0 0
38931- 0 0 0 0 0 0 0 0 0 0 0 0
38932- 0 0 0 0 0 0 0 0 0 0 0 0
38933- 0 0 0 0 0 0 0 0 0 0 0 0
38934- 0 0 0 0 0 0 0 0 0 0 0 0
38935- 0 0 0 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 0 0 0 0 0 0 0 0 0 0
38942- 0 0 0 0 0 0 0 0 0 0 0 0
38943- 0 0 0 6 6 6 10 10 10 14 14 14
38944- 22 22 22 26 26 26 30 30 30 34 34 34
38945- 30 30 30 30 30 30 26 26 26 18 18 18
38946- 14 14 14 10 10 10 6 6 6 0 0 0
38947- 0 0 0 0 0 0 0 0 0 0 0 0
38948- 0 0 0 0 0 0 0 0 0 0 0 0
38949- 0 0 0 0 0 0 0 0 0 0 0 0
38950- 0 0 0 0 0 0 0 0 0 0 0 0
38951- 0 0 0 0 0 0 0 0 0 0 0 0
38952- 0 0 0 0 0 0 0 0 0 0 0 0
38953- 0 0 0 0 0 0 0 0 0 0 0 0
38954- 0 0 0 0 0 0 0 0 0 0 0 0
38955- 0 0 0 0 0 0 0 0 0 0 0 0
38956- 0 0 0 0 0 1 0 0 1 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 0 0 0 0 0 0 0 0 0 0
38962- 0 0 0 0 0 0 0 0 0 0 0 0
38963- 6 6 6 14 14 14 26 26 26 42 42 42
38964- 54 54 54 66 66 66 78 78 78 78 78 78
38965- 78 78 78 74 74 74 66 66 66 54 54 54
38966- 42 42 42 26 26 26 18 18 18 10 10 10
38967- 6 6 6 0 0 0 0 0 0 0 0 0
38968- 0 0 0 0 0 0 0 0 0 0 0 0
38969- 0 0 0 0 0 0 0 0 0 0 0 0
38970- 0 0 0 0 0 0 0 0 0 0 0 0
38971- 0 0 0 0 0 0 0 0 0 0 0 0
38972- 0 0 0 0 0 0 0 0 0 0 0 0
38973- 0 0 0 0 0 0 0 0 0 0 0 0
38974- 0 0 0 0 0 0 0 0 0 0 0 0
38975- 0 0 0 0 0 0 0 0 0 0 0 0
38976- 0 0 1 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 0 0 0 0 0 0 0 0 0 0
38982- 0 0 0 0 0 0 0 0 0 10 10 10
38983- 22 22 22 42 42 42 66 66 66 86 86 86
38984- 66 66 66 38 38 38 38 38 38 22 22 22
38985- 26 26 26 34 34 34 54 54 54 66 66 66
38986- 86 86 86 70 70 70 46 46 46 26 26 26
38987- 14 14 14 6 6 6 0 0 0 0 0 0
38988- 0 0 0 0 0 0 0 0 0 0 0 0
38989- 0 0 0 0 0 0 0 0 0 0 0 0
38990- 0 0 0 0 0 0 0 0 0 0 0 0
38991- 0 0 0 0 0 0 0 0 0 0 0 0
38992- 0 0 0 0 0 0 0 0 0 0 0 0
38993- 0 0 0 0 0 0 0 0 0 0 0 0
38994- 0 0 0 0 0 0 0 0 0 0 0 0
38995- 0 0 0 0 0 0 0 0 0 0 0 0
38996- 0 0 1 0 0 1 0 0 1 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 10 10 10 26 26 26
39003- 50 50 50 82 82 82 58 58 58 6 6 6
39004- 2 2 6 2 2 6 2 2 6 2 2 6
39005- 2 2 6 2 2 6 2 2 6 2 2 6
39006- 6 6 6 54 54 54 86 86 86 66 66 66
39007- 38 38 38 18 18 18 6 6 6 0 0 0
39008- 0 0 0 0 0 0 0 0 0 0 0 0
39009- 0 0 0 0 0 0 0 0 0 0 0 0
39010- 0 0 0 0 0 0 0 0 0 0 0 0
39011- 0 0 0 0 0 0 0 0 0 0 0 0
39012- 0 0 0 0 0 0 0 0 0 0 0 0
39013- 0 0 0 0 0 0 0 0 0 0 0 0
39014- 0 0 0 0 0 0 0 0 0 0 0 0
39015- 0 0 0 0 0 0 0 0 0 0 0 0
39016- 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 0 0 0 0 0 0 0
39022- 0 0 0 6 6 6 22 22 22 50 50 50
39023- 78 78 78 34 34 34 2 2 6 2 2 6
39024- 2 2 6 2 2 6 2 2 6 2 2 6
39025- 2 2 6 2 2 6 2 2 6 2 2 6
39026- 2 2 6 2 2 6 6 6 6 70 70 70
39027- 78 78 78 46 46 46 22 22 22 6 6 6
39028- 0 0 0 0 0 0 0 0 0 0 0 0
39029- 0 0 0 0 0 0 0 0 0 0 0 0
39030- 0 0 0 0 0 0 0 0 0 0 0 0
39031- 0 0 0 0 0 0 0 0 0 0 0 0
39032- 0 0 0 0 0 0 0 0 0 0 0 0
39033- 0 0 0 0 0 0 0 0 0 0 0 0
39034- 0 0 0 0 0 0 0 0 0 0 0 0
39035- 0 0 0 0 0 0 0 0 0 0 0 0
39036- 0 0 1 0 0 1 0 0 1 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 0 0 0 0 0 0 0 0 0 0
39042- 6 6 6 18 18 18 42 42 42 82 82 82
39043- 26 26 26 2 2 6 2 2 6 2 2 6
39044- 2 2 6 2 2 6 2 2 6 2 2 6
39045- 2 2 6 2 2 6 2 2 6 14 14 14
39046- 46 46 46 34 34 34 6 6 6 2 2 6
39047- 42 42 42 78 78 78 42 42 42 18 18 18
39048- 6 6 6 0 0 0 0 0 0 0 0 0
39049- 0 0 0 0 0 0 0 0 0 0 0 0
39050- 0 0 0 0 0 0 0 0 0 0 0 0
39051- 0 0 0 0 0 0 0 0 0 0 0 0
39052- 0 0 0 0 0 0 0 0 0 0 0 0
39053- 0 0 0 0 0 0 0 0 0 0 0 0
39054- 0 0 0 0 0 0 0 0 0 0 0 0
39055- 0 0 0 0 0 0 0 0 0 0 0 0
39056- 0 0 1 0 0 0 0 0 1 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 0 0 0 0 0 0 0
39062- 10 10 10 30 30 30 66 66 66 58 58 58
39063- 2 2 6 2 2 6 2 2 6 2 2 6
39064- 2 2 6 2 2 6 2 2 6 2 2 6
39065- 2 2 6 2 2 6 2 2 6 26 26 26
39066- 86 86 86 101 101 101 46 46 46 10 10 10
39067- 2 2 6 58 58 58 70 70 70 34 34 34
39068- 10 10 10 0 0 0 0 0 0 0 0 0
39069- 0 0 0 0 0 0 0 0 0 0 0 0
39070- 0 0 0 0 0 0 0 0 0 0 0 0
39071- 0 0 0 0 0 0 0 0 0 0 0 0
39072- 0 0 0 0 0 0 0 0 0 0 0 0
39073- 0 0 0 0 0 0 0 0 0 0 0 0
39074- 0 0 0 0 0 0 0 0 0 0 0 0
39075- 0 0 0 0 0 0 0 0 0 0 0 0
39076- 0 0 1 0 0 1 0 0 1 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 0 0 0 0 0 0 0 0 0 0
39082- 14 14 14 42 42 42 86 86 86 10 10 10
39083- 2 2 6 2 2 6 2 2 6 2 2 6
39084- 2 2 6 2 2 6 2 2 6 2 2 6
39085- 2 2 6 2 2 6 2 2 6 30 30 30
39086- 94 94 94 94 94 94 58 58 58 26 26 26
39087- 2 2 6 6 6 6 78 78 78 54 54 54
39088- 22 22 22 6 6 6 0 0 0 0 0 0
39089- 0 0 0 0 0 0 0 0 0 0 0 0
39090- 0 0 0 0 0 0 0 0 0 0 0 0
39091- 0 0 0 0 0 0 0 0 0 0 0 0
39092- 0 0 0 0 0 0 0 0 0 0 0 0
39093- 0 0 0 0 0 0 0 0 0 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 0 0 0 0 0 0 0 6 6 6
39102- 22 22 22 62 62 62 62 62 62 2 2 6
39103- 2 2 6 2 2 6 2 2 6 2 2 6
39104- 2 2 6 2 2 6 2 2 6 2 2 6
39105- 2 2 6 2 2 6 2 2 6 26 26 26
39106- 54 54 54 38 38 38 18 18 18 10 10 10
39107- 2 2 6 2 2 6 34 34 34 82 82 82
39108- 38 38 38 14 14 14 0 0 0 0 0 0
39109- 0 0 0 0 0 0 0 0 0 0 0 0
39110- 0 0 0 0 0 0 0 0 0 0 0 0
39111- 0 0 0 0 0 0 0 0 0 0 0 0
39112- 0 0 0 0 0 0 0 0 0 0 0 0
39113- 0 0 0 0 0 0 0 0 0 0 0 0
39114- 0 0 0 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 1 0 0 1 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 6 6 6
39122- 30 30 30 78 78 78 30 30 30 2 2 6
39123- 2 2 6 2 2 6 2 2 6 2 2 6
39124- 2 2 6 2 2 6 2 2 6 2 2 6
39125- 2 2 6 2 2 6 2 2 6 10 10 10
39126- 10 10 10 2 2 6 2 2 6 2 2 6
39127- 2 2 6 2 2 6 2 2 6 78 78 78
39128- 50 50 50 18 18 18 6 6 6 0 0 0
39129- 0 0 0 0 0 0 0 0 0 0 0 0
39130- 0 0 0 0 0 0 0 0 0 0 0 0
39131- 0 0 0 0 0 0 0 0 0 0 0 0
39132- 0 0 0 0 0 0 0 0 0 0 0 0
39133- 0 0 0 0 0 0 0 0 0 0 0 0
39134- 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 1 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 0 0 0 0
39141- 0 0 0 0 0 0 0 0 0 10 10 10
39142- 38 38 38 86 86 86 14 14 14 2 2 6
39143- 2 2 6 2 2 6 2 2 6 2 2 6
39144- 2 2 6 2 2 6 2 2 6 2 2 6
39145- 2 2 6 2 2 6 2 2 6 2 2 6
39146- 2 2 6 2 2 6 2 2 6 2 2 6
39147- 2 2 6 2 2 6 2 2 6 54 54 54
39148- 66 66 66 26 26 26 6 6 6 0 0 0
39149- 0 0 0 0 0 0 0 0 0 0 0 0
39150- 0 0 0 0 0 0 0 0 0 0 0 0
39151- 0 0 0 0 0 0 0 0 0 0 0 0
39152- 0 0 0 0 0 0 0 0 0 0 0 0
39153- 0 0 0 0 0 0 0 0 0 0 0 0
39154- 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 1 0 0 1 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 14 14 14
39162- 42 42 42 82 82 82 2 2 6 2 2 6
39163- 2 2 6 6 6 6 10 10 10 2 2 6
39164- 2 2 6 2 2 6 2 2 6 2 2 6
39165- 2 2 6 2 2 6 2 2 6 6 6 6
39166- 14 14 14 10 10 10 2 2 6 2 2 6
39167- 2 2 6 2 2 6 2 2 6 18 18 18
39168- 82 82 82 34 34 34 10 10 10 0 0 0
39169- 0 0 0 0 0 0 0 0 0 0 0 0
39170- 0 0 0 0 0 0 0 0 0 0 0 0
39171- 0 0 0 0 0 0 0 0 0 0 0 0
39172- 0 0 0 0 0 0 0 0 0 0 0 0
39173- 0 0 0 0 0 0 0 0 0 0 0 0
39174- 0 0 0 0 0 0 0 0 0 0 0 0
39175- 0 0 0 0 0 0 0 0 0 0 0 0
39176- 0 0 1 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 0 0 0 0
39181- 0 0 0 0 0 0 0 0 0 14 14 14
39182- 46 46 46 86 86 86 2 2 6 2 2 6
39183- 6 6 6 6 6 6 22 22 22 34 34 34
39184- 6 6 6 2 2 6 2 2 6 2 2 6
39185- 2 2 6 2 2 6 18 18 18 34 34 34
39186- 10 10 10 50 50 50 22 22 22 2 2 6
39187- 2 2 6 2 2 6 2 2 6 10 10 10
39188- 86 86 86 42 42 42 14 14 14 0 0 0
39189- 0 0 0 0 0 0 0 0 0 0 0 0
39190- 0 0 0 0 0 0 0 0 0 0 0 0
39191- 0 0 0 0 0 0 0 0 0 0 0 0
39192- 0 0 0 0 0 0 0 0 0 0 0 0
39193- 0 0 0 0 0 0 0 0 0 0 0 0
39194- 0 0 0 0 0 0 0 0 0 0 0 0
39195- 0 0 0 0 0 0 0 0 0 0 0 0
39196- 0 0 1 0 0 1 0 0 1 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 0 0 0 0
39201- 0 0 0 0 0 0 0 0 0 14 14 14
39202- 46 46 46 86 86 86 2 2 6 2 2 6
39203- 38 38 38 116 116 116 94 94 94 22 22 22
39204- 22 22 22 2 2 6 2 2 6 2 2 6
39205- 14 14 14 86 86 86 138 138 138 162 162 162
39206-154 154 154 38 38 38 26 26 26 6 6 6
39207- 2 2 6 2 2 6 2 2 6 2 2 6
39208- 86 86 86 46 46 46 14 14 14 0 0 0
39209- 0 0 0 0 0 0 0 0 0 0 0 0
39210- 0 0 0 0 0 0 0 0 0 0 0 0
39211- 0 0 0 0 0 0 0 0 0 0 0 0
39212- 0 0 0 0 0 0 0 0 0 0 0 0
39213- 0 0 0 0 0 0 0 0 0 0 0 0
39214- 0 0 0 0 0 0 0 0 0 0 0 0
39215- 0 0 0 0 0 0 0 0 0 0 0 0
39216- 0 0 0 0 0 0 0 0 0 0 0 0
39217- 0 0 0 0 0 0 0 0 0 0 0 0
39218- 0 0 0 0 0 0 0 0 0 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 0 0 0 0
39221- 0 0 0 0 0 0 0 0 0 14 14 14
39222- 46 46 46 86 86 86 2 2 6 14 14 14
39223-134 134 134 198 198 198 195 195 195 116 116 116
39224- 10 10 10 2 2 6 2 2 6 6 6 6
39225-101 98 89 187 187 187 210 210 210 218 218 218
39226-214 214 214 134 134 134 14 14 14 6 6 6
39227- 2 2 6 2 2 6 2 2 6 2 2 6
39228- 86 86 86 50 50 50 18 18 18 6 6 6
39229- 0 0 0 0 0 0 0 0 0 0 0 0
39230- 0 0 0 0 0 0 0 0 0 0 0 0
39231- 0 0 0 0 0 0 0 0 0 0 0 0
39232- 0 0 0 0 0 0 0 0 0 0 0 0
39233- 0 0 0 0 0 0 0 0 0 0 0 0
39234- 0 0 0 0 0 0 0 0 0 0 0 0
39235- 0 0 0 0 0 0 0 0 1 0 0 0
39236- 0 0 1 0 0 1 0 0 1 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 14 14 14
39242- 46 46 46 86 86 86 2 2 6 54 54 54
39243-218 218 218 195 195 195 226 226 226 246 246 246
39244- 58 58 58 2 2 6 2 2 6 30 30 30
39245-210 210 210 253 253 253 174 174 174 123 123 123
39246-221 221 221 234 234 234 74 74 74 2 2 6
39247- 2 2 6 2 2 6 2 2 6 2 2 6
39248- 70 70 70 58 58 58 22 22 22 6 6 6
39249- 0 0 0 0 0 0 0 0 0 0 0 0
39250- 0 0 0 0 0 0 0 0 0 0 0 0
39251- 0 0 0 0 0 0 0 0 0 0 0 0
39252- 0 0 0 0 0 0 0 0 0 0 0 0
39253- 0 0 0 0 0 0 0 0 0 0 0 0
39254- 0 0 0 0 0 0 0 0 0 0 0 0
39255- 0 0 0 0 0 0 0 0 0 0 0 0
39256- 0 0 0 0 0 0 0 0 0 0 0 0
39257- 0 0 0 0 0 0 0 0 0 0 0 0
39258- 0 0 0 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 14 14 14
39262- 46 46 46 82 82 82 2 2 6 106 106 106
39263-170 170 170 26 26 26 86 86 86 226 226 226
39264-123 123 123 10 10 10 14 14 14 46 46 46
39265-231 231 231 190 190 190 6 6 6 70 70 70
39266- 90 90 90 238 238 238 158 158 158 2 2 6
39267- 2 2 6 2 2 6 2 2 6 2 2 6
39268- 70 70 70 58 58 58 22 22 22 6 6 6
39269- 0 0 0 0 0 0 0 0 0 0 0 0
39270- 0 0 0 0 0 0 0 0 0 0 0 0
39271- 0 0 0 0 0 0 0 0 0 0 0 0
39272- 0 0 0 0 0 0 0 0 0 0 0 0
39273- 0 0 0 0 0 0 0 0 0 0 0 0
39274- 0 0 0 0 0 0 0 0 0 0 0 0
39275- 0 0 0 0 0 0 0 0 1 0 0 0
39276- 0 0 1 0 0 1 0 0 1 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 14 14 14
39282- 42 42 42 86 86 86 6 6 6 116 116 116
39283-106 106 106 6 6 6 70 70 70 149 149 149
39284-128 128 128 18 18 18 38 38 38 54 54 54
39285-221 221 221 106 106 106 2 2 6 14 14 14
39286- 46 46 46 190 190 190 198 198 198 2 2 6
39287- 2 2 6 2 2 6 2 2 6 2 2 6
39288- 74 74 74 62 62 62 22 22 22 6 6 6
39289- 0 0 0 0 0 0 0 0 0 0 0 0
39290- 0 0 0 0 0 0 0 0 0 0 0 0
39291- 0 0 0 0 0 0 0 0 0 0 0 0
39292- 0 0 0 0 0 0 0 0 0 0 0 0
39293- 0 0 0 0 0 0 0 0 0 0 0 0
39294- 0 0 0 0 0 0 0 0 0 0 0 0
39295- 0 0 0 0 0 0 0 0 1 0 0 0
39296- 0 0 1 0 0 0 0 0 1 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 14 14 14
39302- 42 42 42 94 94 94 14 14 14 101 101 101
39303-128 128 128 2 2 6 18 18 18 116 116 116
39304-118 98 46 121 92 8 121 92 8 98 78 10
39305-162 162 162 106 106 106 2 2 6 2 2 6
39306- 2 2 6 195 195 195 195 195 195 6 6 6
39307- 2 2 6 2 2 6 2 2 6 2 2 6
39308- 74 74 74 62 62 62 22 22 22 6 6 6
39309- 0 0 0 0 0 0 0 0 0 0 0 0
39310- 0 0 0 0 0 0 0 0 0 0 0 0
39311- 0 0 0 0 0 0 0 0 0 0 0 0
39312- 0 0 0 0 0 0 0 0 0 0 0 0
39313- 0 0 0 0 0 0 0 0 0 0 0 0
39314- 0 0 0 0 0 0 0 0 0 0 0 0
39315- 0 0 0 0 0 0 0 0 1 0 0 1
39316- 0 0 1 0 0 0 0 0 1 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 10 10 10
39322- 38 38 38 90 90 90 14 14 14 58 58 58
39323-210 210 210 26 26 26 54 38 6 154 114 10
39324-226 170 11 236 186 11 225 175 15 184 144 12
39325-215 174 15 175 146 61 37 26 9 2 2 6
39326- 70 70 70 246 246 246 138 138 138 2 2 6
39327- 2 2 6 2 2 6 2 2 6 2 2 6
39328- 70 70 70 66 66 66 26 26 26 6 6 6
39329- 0 0 0 0 0 0 0 0 0 0 0 0
39330- 0 0 0 0 0 0 0 0 0 0 0 0
39331- 0 0 0 0 0 0 0 0 0 0 0 0
39332- 0 0 0 0 0 0 0 0 0 0 0 0
39333- 0 0 0 0 0 0 0 0 0 0 0 0
39334- 0 0 0 0 0 0 0 0 0 0 0 0
39335- 0 0 0 0 0 0 0 0 0 0 0 0
39336- 0 0 0 0 0 0 0 0 0 0 0 0
39337- 0 0 0 0 0 0 0 0 0 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 10 10 10
39342- 38 38 38 86 86 86 14 14 14 10 10 10
39343-195 195 195 188 164 115 192 133 9 225 175 15
39344-239 182 13 234 190 10 232 195 16 232 200 30
39345-245 207 45 241 208 19 232 195 16 184 144 12
39346-218 194 134 211 206 186 42 42 42 2 2 6
39347- 2 2 6 2 2 6 2 2 6 2 2 6
39348- 50 50 50 74 74 74 30 30 30 6 6 6
39349- 0 0 0 0 0 0 0 0 0 0 0 0
39350- 0 0 0 0 0 0 0 0 0 0 0 0
39351- 0 0 0 0 0 0 0 0 0 0 0 0
39352- 0 0 0 0 0 0 0 0 0 0 0 0
39353- 0 0 0 0 0 0 0 0 0 0 0 0
39354- 0 0 0 0 0 0 0 0 0 0 0 0
39355- 0 0 0 0 0 0 0 0 0 0 0 0
39356- 0 0 0 0 0 0 0 0 0 0 0 0
39357- 0 0 0 0 0 0 0 0 0 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 10 10 10
39362- 34 34 34 86 86 86 14 14 14 2 2 6
39363-121 87 25 192 133 9 219 162 10 239 182 13
39364-236 186 11 232 195 16 241 208 19 244 214 54
39365-246 218 60 246 218 38 246 215 20 241 208 19
39366-241 208 19 226 184 13 121 87 25 2 2 6
39367- 2 2 6 2 2 6 2 2 6 2 2 6
39368- 50 50 50 82 82 82 34 34 34 10 10 10
39369- 0 0 0 0 0 0 0 0 0 0 0 0
39370- 0 0 0 0 0 0 0 0 0 0 0 0
39371- 0 0 0 0 0 0 0 0 0 0 0 0
39372- 0 0 0 0 0 0 0 0 0 0 0 0
39373- 0 0 0 0 0 0 0 0 0 0 0 0
39374- 0 0 0 0 0 0 0 0 0 0 0 0
39375- 0 0 0 0 0 0 0 0 0 0 0 0
39376- 0 0 0 0 0 0 0 0 0 0 0 0
39377- 0 0 0 0 0 0 0 0 0 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 10 10 10
39382- 34 34 34 82 82 82 30 30 30 61 42 6
39383-180 123 7 206 145 10 230 174 11 239 182 13
39384-234 190 10 238 202 15 241 208 19 246 218 74
39385-246 218 38 246 215 20 246 215 20 246 215 20
39386-226 184 13 215 174 15 184 144 12 6 6 6
39387- 2 2 6 2 2 6 2 2 6 2 2 6
39388- 26 26 26 94 94 94 42 42 42 14 14 14
39389- 0 0 0 0 0 0 0 0 0 0 0 0
39390- 0 0 0 0 0 0 0 0 0 0 0 0
39391- 0 0 0 0 0 0 0 0 0 0 0 0
39392- 0 0 0 0 0 0 0 0 0 0 0 0
39393- 0 0 0 0 0 0 0 0 0 0 0 0
39394- 0 0 0 0 0 0 0 0 0 0 0 0
39395- 0 0 0 0 0 0 0 0 0 0 0 0
39396- 0 0 0 0 0 0 0 0 0 0 0 0
39397- 0 0 0 0 0 0 0 0 0 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 10 10 10
39402- 30 30 30 78 78 78 50 50 50 104 69 6
39403-192 133 9 216 158 10 236 178 12 236 186 11
39404-232 195 16 241 208 19 244 214 54 245 215 43
39405-246 215 20 246 215 20 241 208 19 198 155 10
39406-200 144 11 216 158 10 156 118 10 2 2 6
39407- 2 2 6 2 2 6 2 2 6 2 2 6
39408- 6 6 6 90 90 90 54 54 54 18 18 18
39409- 6 6 6 0 0 0 0 0 0 0 0 0
39410- 0 0 0 0 0 0 0 0 0 0 0 0
39411- 0 0 0 0 0 0 0 0 0 0 0 0
39412- 0 0 0 0 0 0 0 0 0 0 0 0
39413- 0 0 0 0 0 0 0 0 0 0 0 0
39414- 0 0 0 0 0 0 0 0 0 0 0 0
39415- 0 0 0 0 0 0 0 0 0 0 0 0
39416- 0 0 0 0 0 0 0 0 0 0 0 0
39417- 0 0 0 0 0 0 0 0 0 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 10 10 10
39422- 30 30 30 78 78 78 46 46 46 22 22 22
39423-137 92 6 210 162 10 239 182 13 238 190 10
39424-238 202 15 241 208 19 246 215 20 246 215 20
39425-241 208 19 203 166 17 185 133 11 210 150 10
39426-216 158 10 210 150 10 102 78 10 2 2 6
39427- 6 6 6 54 54 54 14 14 14 2 2 6
39428- 2 2 6 62 62 62 74 74 74 30 30 30
39429- 10 10 10 0 0 0 0 0 0 0 0 0
39430- 0 0 0 0 0 0 0 0 0 0 0 0
39431- 0 0 0 0 0 0 0 0 0 0 0 0
39432- 0 0 0 0 0 0 0 0 0 0 0 0
39433- 0 0 0 0 0 0 0 0 0 0 0 0
39434- 0 0 0 0 0 0 0 0 0 0 0 0
39435- 0 0 0 0 0 0 0 0 0 0 0 0
39436- 0 0 0 0 0 0 0 0 0 0 0 0
39437- 0 0 0 0 0 0 0 0 0 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 10 10 10
39442- 34 34 34 78 78 78 50 50 50 6 6 6
39443- 94 70 30 139 102 15 190 146 13 226 184 13
39444-232 200 30 232 195 16 215 174 15 190 146 13
39445-168 122 10 192 133 9 210 150 10 213 154 11
39446-202 150 34 182 157 106 101 98 89 2 2 6
39447- 2 2 6 78 78 78 116 116 116 58 58 58
39448- 2 2 6 22 22 22 90 90 90 46 46 46
39449- 18 18 18 6 6 6 0 0 0 0 0 0
39450- 0 0 0 0 0 0 0 0 0 0 0 0
39451- 0 0 0 0 0 0 0 0 0 0 0 0
39452- 0 0 0 0 0 0 0 0 0 0 0 0
39453- 0 0 0 0 0 0 0 0 0 0 0 0
39454- 0 0 0 0 0 0 0 0 0 0 0 0
39455- 0 0 0 0 0 0 0 0 0 0 0 0
39456- 0 0 0 0 0 0 0 0 0 0 0 0
39457- 0 0 0 0 0 0 0 0 0 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 10 10 10
39462- 38 38 38 86 86 86 50 50 50 6 6 6
39463-128 128 128 174 154 114 156 107 11 168 122 10
39464-198 155 10 184 144 12 197 138 11 200 144 11
39465-206 145 10 206 145 10 197 138 11 188 164 115
39466-195 195 195 198 198 198 174 174 174 14 14 14
39467- 2 2 6 22 22 22 116 116 116 116 116 116
39468- 22 22 22 2 2 6 74 74 74 70 70 70
39469- 30 30 30 10 10 10 0 0 0 0 0 0
39470- 0 0 0 0 0 0 0 0 0 0 0 0
39471- 0 0 0 0 0 0 0 0 0 0 0 0
39472- 0 0 0 0 0 0 0 0 0 0 0 0
39473- 0 0 0 0 0 0 0 0 0 0 0 0
39474- 0 0 0 0 0 0 0 0 0 0 0 0
39475- 0 0 0 0 0 0 0 0 0 0 0 0
39476- 0 0 0 0 0 0 0 0 0 0 0 0
39477- 0 0 0 0 0 0 0 0 0 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 6 6 6 18 18 18
39482- 50 50 50 101 101 101 26 26 26 10 10 10
39483-138 138 138 190 190 190 174 154 114 156 107 11
39484-197 138 11 200 144 11 197 138 11 192 133 9
39485-180 123 7 190 142 34 190 178 144 187 187 187
39486-202 202 202 221 221 221 214 214 214 66 66 66
39487- 2 2 6 2 2 6 50 50 50 62 62 62
39488- 6 6 6 2 2 6 10 10 10 90 90 90
39489- 50 50 50 18 18 18 6 6 6 0 0 0
39490- 0 0 0 0 0 0 0 0 0 0 0 0
39491- 0 0 0 0 0 0 0 0 0 0 0 0
39492- 0 0 0 0 0 0 0 0 0 0 0 0
39493- 0 0 0 0 0 0 0 0 0 0 0 0
39494- 0 0 0 0 0 0 0 0 0 0 0 0
39495- 0 0 0 0 0 0 0 0 0 0 0 0
39496- 0 0 0 0 0 0 0 0 0 0 0 0
39497- 0 0 0 0 0 0 0 0 0 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 10 10 10 34 34 34
39502- 74 74 74 74 74 74 2 2 6 6 6 6
39503-144 144 144 198 198 198 190 190 190 178 166 146
39504-154 121 60 156 107 11 156 107 11 168 124 44
39505-174 154 114 187 187 187 190 190 190 210 210 210
39506-246 246 246 253 253 253 253 253 253 182 182 182
39507- 6 6 6 2 2 6 2 2 6 2 2 6
39508- 2 2 6 2 2 6 2 2 6 62 62 62
39509- 74 74 74 34 34 34 14 14 14 0 0 0
39510- 0 0 0 0 0 0 0 0 0 0 0 0
39511- 0 0 0 0 0 0 0 0 0 0 0 0
39512- 0 0 0 0 0 0 0 0 0 0 0 0
39513- 0 0 0 0 0 0 0 0 0 0 0 0
39514- 0 0 0 0 0 0 0 0 0 0 0 0
39515- 0 0 0 0 0 0 0 0 0 0 0 0
39516- 0 0 0 0 0 0 0 0 0 0 0 0
39517- 0 0 0 0 0 0 0 0 0 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 10 10 10 22 22 22 54 54 54
39522- 94 94 94 18 18 18 2 2 6 46 46 46
39523-234 234 234 221 221 221 190 190 190 190 190 190
39524-190 190 190 187 187 187 187 187 187 190 190 190
39525-190 190 190 195 195 195 214 214 214 242 242 242
39526-253 253 253 253 253 253 253 253 253 253 253 253
39527- 82 82 82 2 2 6 2 2 6 2 2 6
39528- 2 2 6 2 2 6 2 2 6 14 14 14
39529- 86 86 86 54 54 54 22 22 22 6 6 6
39530- 0 0 0 0 0 0 0 0 0 0 0 0
39531- 0 0 0 0 0 0 0 0 0 0 0 0
39532- 0 0 0 0 0 0 0 0 0 0 0 0
39533- 0 0 0 0 0 0 0 0 0 0 0 0
39534- 0 0 0 0 0 0 0 0 0 0 0 0
39535- 0 0 0 0 0 0 0 0 0 0 0 0
39536- 0 0 0 0 0 0 0 0 0 0 0 0
39537- 0 0 0 0 0 0 0 0 0 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- 6 6 6 18 18 18 46 46 46 90 90 90
39542- 46 46 46 18 18 18 6 6 6 182 182 182
39543-253 253 253 246 246 246 206 206 206 190 190 190
39544-190 190 190 190 190 190 190 190 190 190 190 190
39545-206 206 206 231 231 231 250 250 250 253 253 253
39546-253 253 253 253 253 253 253 253 253 253 253 253
39547-202 202 202 14 14 14 2 2 6 2 2 6
39548- 2 2 6 2 2 6 2 2 6 2 2 6
39549- 42 42 42 86 86 86 42 42 42 18 18 18
39550- 6 6 6 0 0 0 0 0 0 0 0 0
39551- 0 0 0 0 0 0 0 0 0 0 0 0
39552- 0 0 0 0 0 0 0 0 0 0 0 0
39553- 0 0 0 0 0 0 0 0 0 0 0 0
39554- 0 0 0 0 0 0 0 0 0 0 0 0
39555- 0 0 0 0 0 0 0 0 0 0 0 0
39556- 0 0 0 0 0 0 0 0 0 0 0 0
39557- 0 0 0 0 0 0 0 0 0 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 6 6 6
39561- 14 14 14 38 38 38 74 74 74 66 66 66
39562- 2 2 6 6 6 6 90 90 90 250 250 250
39563-253 253 253 253 253 253 238 238 238 198 198 198
39564-190 190 190 190 190 190 195 195 195 221 221 221
39565-246 246 246 253 253 253 253 253 253 253 253 253
39566-253 253 253 253 253 253 253 253 253 253 253 253
39567-253 253 253 82 82 82 2 2 6 2 2 6
39568- 2 2 6 2 2 6 2 2 6 2 2 6
39569- 2 2 6 78 78 78 70 70 70 34 34 34
39570- 14 14 14 6 6 6 0 0 0 0 0 0
39571- 0 0 0 0 0 0 0 0 0 0 0 0
39572- 0 0 0 0 0 0 0 0 0 0 0 0
39573- 0 0 0 0 0 0 0 0 0 0 0 0
39574- 0 0 0 0 0 0 0 0 0 0 0 0
39575- 0 0 0 0 0 0 0 0 0 0 0 0
39576- 0 0 0 0 0 0 0 0 0 0 0 0
39577- 0 0 0 0 0 0 0 0 0 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 14 14 14
39581- 34 34 34 66 66 66 78 78 78 6 6 6
39582- 2 2 6 18 18 18 218 218 218 253 253 253
39583-253 253 253 253 253 253 253 253 253 246 246 246
39584-226 226 226 231 231 231 246 246 246 253 253 253
39585-253 253 253 253 253 253 253 253 253 253 253 253
39586-253 253 253 253 253 253 253 253 253 253 253 253
39587-253 253 253 178 178 178 2 2 6 2 2 6
39588- 2 2 6 2 2 6 2 2 6 2 2 6
39589- 2 2 6 18 18 18 90 90 90 62 62 62
39590- 30 30 30 10 10 10 0 0 0 0 0 0
39591- 0 0 0 0 0 0 0 0 0 0 0 0
39592- 0 0 0 0 0 0 0 0 0 0 0 0
39593- 0 0 0 0 0 0 0 0 0 0 0 0
39594- 0 0 0 0 0 0 0 0 0 0 0 0
39595- 0 0 0 0 0 0 0 0 0 0 0 0
39596- 0 0 0 0 0 0 0 0 0 0 0 0
39597- 0 0 0 0 0 0 0 0 0 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 10 10 10 26 26 26
39601- 58 58 58 90 90 90 18 18 18 2 2 6
39602- 2 2 6 110 110 110 253 253 253 253 253 253
39603-253 253 253 253 253 253 253 253 253 253 253 253
39604-250 250 250 253 253 253 253 253 253 253 253 253
39605-253 253 253 253 253 253 253 253 253 253 253 253
39606-253 253 253 253 253 253 253 253 253 253 253 253
39607-253 253 253 231 231 231 18 18 18 2 2 6
39608- 2 2 6 2 2 6 2 2 6 2 2 6
39609- 2 2 6 2 2 6 18 18 18 94 94 94
39610- 54 54 54 26 26 26 10 10 10 0 0 0
39611- 0 0 0 0 0 0 0 0 0 0 0 0
39612- 0 0 0 0 0 0 0 0 0 0 0 0
39613- 0 0 0 0 0 0 0 0 0 0 0 0
39614- 0 0 0 0 0 0 0 0 0 0 0 0
39615- 0 0 0 0 0 0 0 0 0 0 0 0
39616- 0 0 0 0 0 0 0 0 0 0 0 0
39617- 0 0 0 0 0 0 0 0 0 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 6 6 6 22 22 22 50 50 50
39621- 90 90 90 26 26 26 2 2 6 2 2 6
39622- 14 14 14 195 195 195 250 250 250 253 253 253
39623-253 253 253 253 253 253 253 253 253 253 253 253
39624-253 253 253 253 253 253 253 253 253 253 253 253
39625-253 253 253 253 253 253 253 253 253 253 253 253
39626-253 253 253 253 253 253 253 253 253 253 253 253
39627-250 250 250 242 242 242 54 54 54 2 2 6
39628- 2 2 6 2 2 6 2 2 6 2 2 6
39629- 2 2 6 2 2 6 2 2 6 38 38 38
39630- 86 86 86 50 50 50 22 22 22 6 6 6
39631- 0 0 0 0 0 0 0 0 0 0 0 0
39632- 0 0 0 0 0 0 0 0 0 0 0 0
39633- 0 0 0 0 0 0 0 0 0 0 0 0
39634- 0 0 0 0 0 0 0 0 0 0 0 0
39635- 0 0 0 0 0 0 0 0 0 0 0 0
39636- 0 0 0 0 0 0 0 0 0 0 0 0
39637- 0 0 0 0 0 0 0 0 0 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- 6 6 6 14 14 14 38 38 38 82 82 82
39641- 34 34 34 2 2 6 2 2 6 2 2 6
39642- 42 42 42 195 195 195 246 246 246 253 253 253
39643-253 253 253 253 253 253 253 253 253 250 250 250
39644-242 242 242 242 242 242 250 250 250 253 253 253
39645-253 253 253 253 253 253 253 253 253 253 253 253
39646-253 253 253 250 250 250 246 246 246 238 238 238
39647-226 226 226 231 231 231 101 101 101 6 6 6
39648- 2 2 6 2 2 6 2 2 6 2 2 6
39649- 2 2 6 2 2 6 2 2 6 2 2 6
39650- 38 38 38 82 82 82 42 42 42 14 14 14
39651- 6 6 6 0 0 0 0 0 0 0 0 0
39652- 0 0 0 0 0 0 0 0 0 0 0 0
39653- 0 0 0 0 0 0 0 0 0 0 0 0
39654- 0 0 0 0 0 0 0 0 0 0 0 0
39655- 0 0 0 0 0 0 0 0 0 0 0 0
39656- 0 0 0 0 0 0 0 0 0 0 0 0
39657- 0 0 0 0 0 0 0 0 0 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- 10 10 10 26 26 26 62 62 62 66 66 66
39661- 2 2 6 2 2 6 2 2 6 6 6 6
39662- 70 70 70 170 170 170 206 206 206 234 234 234
39663-246 246 246 250 250 250 250 250 250 238 238 238
39664-226 226 226 231 231 231 238 238 238 250 250 250
39665-250 250 250 250 250 250 246 246 246 231 231 231
39666-214 214 214 206 206 206 202 202 202 202 202 202
39667-198 198 198 202 202 202 182 182 182 18 18 18
39668- 2 2 6 2 2 6 2 2 6 2 2 6
39669- 2 2 6 2 2 6 2 2 6 2 2 6
39670- 2 2 6 62 62 62 66 66 66 30 30 30
39671- 10 10 10 0 0 0 0 0 0 0 0 0
39672- 0 0 0 0 0 0 0 0 0 0 0 0
39673- 0 0 0 0 0 0 0 0 0 0 0 0
39674- 0 0 0 0 0 0 0 0 0 0 0 0
39675- 0 0 0 0 0 0 0 0 0 0 0 0
39676- 0 0 0 0 0 0 0 0 0 0 0 0
39677- 0 0 0 0 0 0 0 0 0 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- 14 14 14 42 42 42 82 82 82 18 18 18
39681- 2 2 6 2 2 6 2 2 6 10 10 10
39682- 94 94 94 182 182 182 218 218 218 242 242 242
39683-250 250 250 253 253 253 253 253 253 250 250 250
39684-234 234 234 253 253 253 253 253 253 253 253 253
39685-253 253 253 253 253 253 253 253 253 246 246 246
39686-238 238 238 226 226 226 210 210 210 202 202 202
39687-195 195 195 195 195 195 210 210 210 158 158 158
39688- 6 6 6 14 14 14 50 50 50 14 14 14
39689- 2 2 6 2 2 6 2 2 6 2 2 6
39690- 2 2 6 6 6 6 86 86 86 46 46 46
39691- 18 18 18 6 6 6 0 0 0 0 0 0
39692- 0 0 0 0 0 0 0 0 0 0 0 0
39693- 0 0 0 0 0 0 0 0 0 0 0 0
39694- 0 0 0 0 0 0 0 0 0 0 0 0
39695- 0 0 0 0 0 0 0 0 0 0 0 0
39696- 0 0 0 0 0 0 0 0 0 0 0 0
39697- 0 0 0 0 0 0 0 0 0 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 6 6 6
39700- 22 22 22 54 54 54 70 70 70 2 2 6
39701- 2 2 6 10 10 10 2 2 6 22 22 22
39702-166 166 166 231 231 231 250 250 250 253 253 253
39703-253 253 253 253 253 253 253 253 253 250 250 250
39704-242 242 242 253 253 253 253 253 253 253 253 253
39705-253 253 253 253 253 253 253 253 253 253 253 253
39706-253 253 253 253 253 253 253 253 253 246 246 246
39707-231 231 231 206 206 206 198 198 198 226 226 226
39708- 94 94 94 2 2 6 6 6 6 38 38 38
39709- 30 30 30 2 2 6 2 2 6 2 2 6
39710- 2 2 6 2 2 6 62 62 62 66 66 66
39711- 26 26 26 10 10 10 0 0 0 0 0 0
39712- 0 0 0 0 0 0 0 0 0 0 0 0
39713- 0 0 0 0 0 0 0 0 0 0 0 0
39714- 0 0 0 0 0 0 0 0 0 0 0 0
39715- 0 0 0 0 0 0 0 0 0 0 0 0
39716- 0 0 0 0 0 0 0 0 0 0 0 0
39717- 0 0 0 0 0 0 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 10 10 10
39720- 30 30 30 74 74 74 50 50 50 2 2 6
39721- 26 26 26 26 26 26 2 2 6 106 106 106
39722-238 238 238 253 253 253 253 253 253 253 253 253
39723-253 253 253 253 253 253 253 253 253 253 253 253
39724-253 253 253 253 253 253 253 253 253 253 253 253
39725-253 253 253 253 253 253 253 253 253 253 253 253
39726-253 253 253 253 253 253 253 253 253 253 253 253
39727-253 253 253 246 246 246 218 218 218 202 202 202
39728-210 210 210 14 14 14 2 2 6 2 2 6
39729- 30 30 30 22 22 22 2 2 6 2 2 6
39730- 2 2 6 2 2 6 18 18 18 86 86 86
39731- 42 42 42 14 14 14 0 0 0 0 0 0
39732- 0 0 0 0 0 0 0 0 0 0 0 0
39733- 0 0 0 0 0 0 0 0 0 0 0 0
39734- 0 0 0 0 0 0 0 0 0 0 0 0
39735- 0 0 0 0 0 0 0 0 0 0 0 0
39736- 0 0 0 0 0 0 0 0 0 0 0 0
39737- 0 0 0 0 0 0 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 14 14 14
39740- 42 42 42 90 90 90 22 22 22 2 2 6
39741- 42 42 42 2 2 6 18 18 18 218 218 218
39742-253 253 253 253 253 253 253 253 253 253 253 253
39743-253 253 253 253 253 253 253 253 253 253 253 253
39744-253 253 253 253 253 253 253 253 253 253 253 253
39745-253 253 253 253 253 253 253 253 253 253 253 253
39746-253 253 253 253 253 253 253 253 253 253 253 253
39747-253 253 253 253 253 253 250 250 250 221 221 221
39748-218 218 218 101 101 101 2 2 6 14 14 14
39749- 18 18 18 38 38 38 10 10 10 2 2 6
39750- 2 2 6 2 2 6 2 2 6 78 78 78
39751- 58 58 58 22 22 22 6 6 6 0 0 0
39752- 0 0 0 0 0 0 0 0 0 0 0 0
39753- 0 0 0 0 0 0 0 0 0 0 0 0
39754- 0 0 0 0 0 0 0 0 0 0 0 0
39755- 0 0 0 0 0 0 0 0 0 0 0 0
39756- 0 0 0 0 0 0 0 0 0 0 0 0
39757- 0 0 0 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 6 6 6 18 18 18
39760- 54 54 54 82 82 82 2 2 6 26 26 26
39761- 22 22 22 2 2 6 123 123 123 253 253 253
39762-253 253 253 253 253 253 253 253 253 253 253 253
39763-253 253 253 253 253 253 253 253 253 253 253 253
39764-253 253 253 253 253 253 253 253 253 253 253 253
39765-253 253 253 253 253 253 253 253 253 253 253 253
39766-253 253 253 253 253 253 253 253 253 253 253 253
39767-253 253 253 253 253 253 253 253 253 250 250 250
39768-238 238 238 198 198 198 6 6 6 38 38 38
39769- 58 58 58 26 26 26 38 38 38 2 2 6
39770- 2 2 6 2 2 6 2 2 6 46 46 46
39771- 78 78 78 30 30 30 10 10 10 0 0 0
39772- 0 0 0 0 0 0 0 0 0 0 0 0
39773- 0 0 0 0 0 0 0 0 0 0 0 0
39774- 0 0 0 0 0 0 0 0 0 0 0 0
39775- 0 0 0 0 0 0 0 0 0 0 0 0
39776- 0 0 0 0 0 0 0 0 0 0 0 0
39777- 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 10 10 10 30 30 30
39780- 74 74 74 58 58 58 2 2 6 42 42 42
39781- 2 2 6 22 22 22 231 231 231 253 253 253
39782-253 253 253 253 253 253 253 253 253 253 253 253
39783-253 253 253 253 253 253 253 253 253 250 250 250
39784-253 253 253 253 253 253 253 253 253 253 253 253
39785-253 253 253 253 253 253 253 253 253 253 253 253
39786-253 253 253 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 246 246 246 46 46 46 38 38 38
39789- 42 42 42 14 14 14 38 38 38 14 14 14
39790- 2 2 6 2 2 6 2 2 6 6 6 6
39791- 86 86 86 46 46 46 14 14 14 0 0 0
39792- 0 0 0 0 0 0 0 0 0 0 0 0
39793- 0 0 0 0 0 0 0 0 0 0 0 0
39794- 0 0 0 0 0 0 0 0 0 0 0 0
39795- 0 0 0 0 0 0 0 0 0 0 0 0
39796- 0 0 0 0 0 0 0 0 0 0 0 0
39797- 0 0 0 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 6 6 6 14 14 14 42 42 42
39800- 90 90 90 18 18 18 18 18 18 26 26 26
39801- 2 2 6 116 116 116 253 253 253 253 253 253
39802-253 253 253 253 253 253 253 253 253 253 253 253
39803-253 253 253 253 253 253 250 250 250 238 238 238
39804-253 253 253 253 253 253 253 253 253 253 253 253
39805-253 253 253 253 253 253 253 253 253 253 253 253
39806-253 253 253 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 94 94 94 6 6 6
39809- 2 2 6 2 2 6 10 10 10 34 34 34
39810- 2 2 6 2 2 6 2 2 6 2 2 6
39811- 74 74 74 58 58 58 22 22 22 6 6 6
39812- 0 0 0 0 0 0 0 0 0 0 0 0
39813- 0 0 0 0 0 0 0 0 0 0 0 0
39814- 0 0 0 0 0 0 0 0 0 0 0 0
39815- 0 0 0 0 0 0 0 0 0 0 0 0
39816- 0 0 0 0 0 0 0 0 0 0 0 0
39817- 0 0 0 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 10 10 10 26 26 26 66 66 66
39820- 82 82 82 2 2 6 38 38 38 6 6 6
39821- 14 14 14 210 210 210 253 253 253 253 253 253
39822-253 253 253 253 253 253 253 253 253 253 253 253
39823-253 253 253 253 253 253 246 246 246 242 242 242
39824-253 253 253 253 253 253 253 253 253 253 253 253
39825-253 253 253 253 253 253 253 253 253 253 253 253
39826-253 253 253 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 144 144 144 2 2 6
39829- 2 2 6 2 2 6 2 2 6 46 46 46
39830- 2 2 6 2 2 6 2 2 6 2 2 6
39831- 42 42 42 74 74 74 30 30 30 10 10 10
39832- 0 0 0 0 0 0 0 0 0 0 0 0
39833- 0 0 0 0 0 0 0 0 0 0 0 0
39834- 0 0 0 0 0 0 0 0 0 0 0 0
39835- 0 0 0 0 0 0 0 0 0 0 0 0
39836- 0 0 0 0 0 0 0 0 0 0 0 0
39837- 0 0 0 0 0 0 0 0 0 0 0 0
39838- 0 0 0 0 0 0 0 0 0 0 0 0
39839- 6 6 6 14 14 14 42 42 42 90 90 90
39840- 26 26 26 6 6 6 42 42 42 2 2 6
39841- 74 74 74 250 250 250 253 253 253 253 253 253
39842-253 253 253 253 253 253 253 253 253 253 253 253
39843-253 253 253 253 253 253 242 242 242 242 242 242
39844-253 253 253 253 253 253 253 253 253 253 253 253
39845-253 253 253 253 253 253 253 253 253 253 253 253
39846-253 253 253 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 182 182 182 2 2 6
39849- 2 2 6 2 2 6 2 2 6 46 46 46
39850- 2 2 6 2 2 6 2 2 6 2 2 6
39851- 10 10 10 86 86 86 38 38 38 10 10 10
39852- 0 0 0 0 0 0 0 0 0 0 0 0
39853- 0 0 0 0 0 0 0 0 0 0 0 0
39854- 0 0 0 0 0 0 0 0 0 0 0 0
39855- 0 0 0 0 0 0 0 0 0 0 0 0
39856- 0 0 0 0 0 0 0 0 0 0 0 0
39857- 0 0 0 0 0 0 0 0 0 0 0 0
39858- 0 0 0 0 0 0 0 0 0 0 0 0
39859- 10 10 10 26 26 26 66 66 66 82 82 82
39860- 2 2 6 22 22 22 18 18 18 2 2 6
39861-149 149 149 253 253 253 253 253 253 253 253 253
39862-253 253 253 253 253 253 253 253 253 253 253 253
39863-253 253 253 253 253 253 234 234 234 242 242 242
39864-253 253 253 253 253 253 253 253 253 253 253 253
39865-253 253 253 253 253 253 253 253 253 253 253 253
39866-253 253 253 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 206 206 206 2 2 6
39869- 2 2 6 2 2 6 2 2 6 38 38 38
39870- 2 2 6 2 2 6 2 2 6 2 2 6
39871- 6 6 6 86 86 86 46 46 46 14 14 14
39872- 0 0 0 0 0 0 0 0 0 0 0 0
39873- 0 0 0 0 0 0 0 0 0 0 0 0
39874- 0 0 0 0 0 0 0 0 0 0 0 0
39875- 0 0 0 0 0 0 0 0 0 0 0 0
39876- 0 0 0 0 0 0 0 0 0 0 0 0
39877- 0 0 0 0 0 0 0 0 0 0 0 0
39878- 0 0 0 0 0 0 0 0 0 6 6 6
39879- 18 18 18 46 46 46 86 86 86 18 18 18
39880- 2 2 6 34 34 34 10 10 10 6 6 6
39881-210 210 210 253 253 253 253 253 253 253 253 253
39882-253 253 253 253 253 253 253 253 253 253 253 253
39883-253 253 253 253 253 253 234 234 234 242 242 242
39884-253 253 253 253 253 253 253 253 253 253 253 253
39885-253 253 253 253 253 253 253 253 253 253 253 253
39886-253 253 253 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 221 221 221 6 6 6
39889- 2 2 6 2 2 6 6 6 6 30 30 30
39890- 2 2 6 2 2 6 2 2 6 2 2 6
39891- 2 2 6 82 82 82 54 54 54 18 18 18
39892- 6 6 6 0 0 0 0 0 0 0 0 0
39893- 0 0 0 0 0 0 0 0 0 0 0 0
39894- 0 0 0 0 0 0 0 0 0 0 0 0
39895- 0 0 0 0 0 0 0 0 0 0 0 0
39896- 0 0 0 0 0 0 0 0 0 0 0 0
39897- 0 0 0 0 0 0 0 0 0 0 0 0
39898- 0 0 0 0 0 0 0 0 0 10 10 10
39899- 26 26 26 66 66 66 62 62 62 2 2 6
39900- 2 2 6 38 38 38 10 10 10 26 26 26
39901-238 238 238 253 253 253 253 253 253 253 253 253
39902-253 253 253 253 253 253 253 253 253 253 253 253
39903-253 253 253 253 253 253 231 231 231 238 238 238
39904-253 253 253 253 253 253 253 253 253 253 253 253
39905-253 253 253 253 253 253 253 253 253 253 253 253
39906-253 253 253 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 6 6 6
39909- 2 2 6 2 2 6 10 10 10 30 30 30
39910- 2 2 6 2 2 6 2 2 6 2 2 6
39911- 2 2 6 66 66 66 58 58 58 22 22 22
39912- 6 6 6 0 0 0 0 0 0 0 0 0
39913- 0 0 0 0 0 0 0 0 0 0 0 0
39914- 0 0 0 0 0 0 0 0 0 0 0 0
39915- 0 0 0 0 0 0 0 0 0 0 0 0
39916- 0 0 0 0 0 0 0 0 0 0 0 0
39917- 0 0 0 0 0 0 0 0 0 0 0 0
39918- 0 0 0 0 0 0 0 0 0 10 10 10
39919- 38 38 38 78 78 78 6 6 6 2 2 6
39920- 2 2 6 46 46 46 14 14 14 42 42 42
39921-246 246 246 253 253 253 253 253 253 253 253 253
39922-253 253 253 253 253 253 253 253 253 253 253 253
39923-253 253 253 253 253 253 231 231 231 242 242 242
39924-253 253 253 253 253 253 253 253 253 253 253 253
39925-253 253 253 253 253 253 253 253 253 253 253 253
39926-253 253 253 253 253 253 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 234 234 234 10 10 10
39929- 2 2 6 2 2 6 22 22 22 14 14 14
39930- 2 2 6 2 2 6 2 2 6 2 2 6
39931- 2 2 6 66 66 66 62 62 62 22 22 22
39932- 6 6 6 0 0 0 0 0 0 0 0 0
39933- 0 0 0 0 0 0 0 0 0 0 0 0
39934- 0 0 0 0 0 0 0 0 0 0 0 0
39935- 0 0 0 0 0 0 0 0 0 0 0 0
39936- 0 0 0 0 0 0 0 0 0 0 0 0
39937- 0 0 0 0 0 0 0 0 0 0 0 0
39938- 0 0 0 0 0 0 6 6 6 18 18 18
39939- 50 50 50 74 74 74 2 2 6 2 2 6
39940- 14 14 14 70 70 70 34 34 34 62 62 62
39941-250 250 250 253 253 253 253 253 253 253 253 253
39942-253 253 253 253 253 253 253 253 253 253 253 253
39943-253 253 253 253 253 253 231 231 231 246 246 246
39944-253 253 253 253 253 253 253 253 253 253 253 253
39945-253 253 253 253 253 253 253 253 253 253 253 253
39946-253 253 253 253 253 253 253 253 253 253 253 253
39947-253 253 253 253 253 253 253 253 253 253 253 253
39948-253 253 253 253 253 253 234 234 234 14 14 14
39949- 2 2 6 2 2 6 30 30 30 2 2 6
39950- 2 2 6 2 2 6 2 2 6 2 2 6
39951- 2 2 6 66 66 66 62 62 62 22 22 22
39952- 6 6 6 0 0 0 0 0 0 0 0 0
39953- 0 0 0 0 0 0 0 0 0 0 0 0
39954- 0 0 0 0 0 0 0 0 0 0 0 0
39955- 0 0 0 0 0 0 0 0 0 0 0 0
39956- 0 0 0 0 0 0 0 0 0 0 0 0
39957- 0 0 0 0 0 0 0 0 0 0 0 0
39958- 0 0 0 0 0 0 6 6 6 18 18 18
39959- 54 54 54 62 62 62 2 2 6 2 2 6
39960- 2 2 6 30 30 30 46 46 46 70 70 70
39961-250 250 250 253 253 253 253 253 253 253 253 253
39962-253 253 253 253 253 253 253 253 253 253 253 253
39963-253 253 253 253 253 253 231 231 231 246 246 246
39964-253 253 253 253 253 253 253 253 253 253 253 253
39965-253 253 253 253 253 253 253 253 253 253 253 253
39966-253 253 253 253 253 253 253 253 253 253 253 253
39967-253 253 253 253 253 253 253 253 253 253 253 253
39968-253 253 253 253 253 253 226 226 226 10 10 10
39969- 2 2 6 6 6 6 30 30 30 2 2 6
39970- 2 2 6 2 2 6 2 2 6 2 2 6
39971- 2 2 6 66 66 66 58 58 58 22 22 22
39972- 6 6 6 0 0 0 0 0 0 0 0 0
39973- 0 0 0 0 0 0 0 0 0 0 0 0
39974- 0 0 0 0 0 0 0 0 0 0 0 0
39975- 0 0 0 0 0 0 0 0 0 0 0 0
39976- 0 0 0 0 0 0 0 0 0 0 0 0
39977- 0 0 0 0 0 0 0 0 0 0 0 0
39978- 0 0 0 0 0 0 6 6 6 22 22 22
39979- 58 58 58 62 62 62 2 2 6 2 2 6
39980- 2 2 6 2 2 6 30 30 30 78 78 78
39981-250 250 250 253 253 253 253 253 253 253 253 253
39982-253 253 253 253 253 253 253 253 253 253 253 253
39983-253 253 253 253 253 253 231 231 231 246 246 246
39984-253 253 253 253 253 253 253 253 253 253 253 253
39985-253 253 253 253 253 253 253 253 253 253 253 253
39986-253 253 253 253 253 253 253 253 253 253 253 253
39987-253 253 253 253 253 253 253 253 253 253 253 253
39988-253 253 253 253 253 253 206 206 206 2 2 6
39989- 22 22 22 34 34 34 18 14 6 22 22 22
39990- 26 26 26 18 18 18 6 6 6 2 2 6
39991- 2 2 6 82 82 82 54 54 54 18 18 18
39992- 6 6 6 0 0 0 0 0 0 0 0 0
39993- 0 0 0 0 0 0 0 0 0 0 0 0
39994- 0 0 0 0 0 0 0 0 0 0 0 0
39995- 0 0 0 0 0 0 0 0 0 0 0 0
39996- 0 0 0 0 0 0 0 0 0 0 0 0
39997- 0 0 0 0 0 0 0 0 0 0 0 0
39998- 0 0 0 0 0 0 6 6 6 26 26 26
39999- 62 62 62 106 106 106 74 54 14 185 133 11
40000-210 162 10 121 92 8 6 6 6 62 62 62
40001-238 238 238 253 253 253 253 253 253 253 253 253
40002-253 253 253 253 253 253 253 253 253 253 253 253
40003-253 253 253 253 253 253 231 231 231 246 246 246
40004-253 253 253 253 253 253 253 253 253 253 253 253
40005-253 253 253 253 253 253 253 253 253 253 253 253
40006-253 253 253 253 253 253 253 253 253 253 253 253
40007-253 253 253 253 253 253 253 253 253 253 253 253
40008-253 253 253 253 253 253 158 158 158 18 18 18
40009- 14 14 14 2 2 6 2 2 6 2 2 6
40010- 6 6 6 18 18 18 66 66 66 38 38 38
40011- 6 6 6 94 94 94 50 50 50 18 18 18
40012- 6 6 6 0 0 0 0 0 0 0 0 0
40013- 0 0 0 0 0 0 0 0 0 0 0 0
40014- 0 0 0 0 0 0 0 0 0 0 0 0
40015- 0 0 0 0 0 0 0 0 0 0 0 0
40016- 0 0 0 0 0 0 0 0 0 0 0 0
40017- 0 0 0 0 0 0 0 0 0 6 6 6
40018- 10 10 10 10 10 10 18 18 18 38 38 38
40019- 78 78 78 142 134 106 216 158 10 242 186 14
40020-246 190 14 246 190 14 156 118 10 10 10 10
40021- 90 90 90 238 238 238 253 253 253 253 253 253
40022-253 253 253 253 253 253 253 253 253 253 253 253
40023-253 253 253 253 253 253 231 231 231 250 250 250
40024-253 253 253 253 253 253 253 253 253 253 253 253
40025-253 253 253 253 253 253 253 253 253 253 253 253
40026-253 253 253 253 253 253 253 253 253 253 253 253
40027-253 253 253 253 253 253 253 253 253 246 230 190
40028-238 204 91 238 204 91 181 142 44 37 26 9
40029- 2 2 6 2 2 6 2 2 6 2 2 6
40030- 2 2 6 2 2 6 38 38 38 46 46 46
40031- 26 26 26 106 106 106 54 54 54 18 18 18
40032- 6 6 6 0 0 0 0 0 0 0 0 0
40033- 0 0 0 0 0 0 0 0 0 0 0 0
40034- 0 0 0 0 0 0 0 0 0 0 0 0
40035- 0 0 0 0 0 0 0 0 0 0 0 0
40036- 0 0 0 0 0 0 0 0 0 0 0 0
40037- 0 0 0 6 6 6 14 14 14 22 22 22
40038- 30 30 30 38 38 38 50 50 50 70 70 70
40039-106 106 106 190 142 34 226 170 11 242 186 14
40040-246 190 14 246 190 14 246 190 14 154 114 10
40041- 6 6 6 74 74 74 226 226 226 253 253 253
40042-253 253 253 253 253 253 253 253 253 253 253 253
40043-253 253 253 253 253 253 231 231 231 250 250 250
40044-253 253 253 253 253 253 253 253 253 253 253 253
40045-253 253 253 253 253 253 253 253 253 253 253 253
40046-253 253 253 253 253 253 253 253 253 253 253 253
40047-253 253 253 253 253 253 253 253 253 228 184 62
40048-241 196 14 241 208 19 232 195 16 38 30 10
40049- 2 2 6 2 2 6 2 2 6 2 2 6
40050- 2 2 6 6 6 6 30 30 30 26 26 26
40051-203 166 17 154 142 90 66 66 66 26 26 26
40052- 6 6 6 0 0 0 0 0 0 0 0 0
40053- 0 0 0 0 0 0 0 0 0 0 0 0
40054- 0 0 0 0 0 0 0 0 0 0 0 0
40055- 0 0 0 0 0 0 0 0 0 0 0 0
40056- 0 0 0 0 0 0 0 0 0 0 0 0
40057- 6 6 6 18 18 18 38 38 38 58 58 58
40058- 78 78 78 86 86 86 101 101 101 123 123 123
40059-175 146 61 210 150 10 234 174 13 246 186 14
40060-246 190 14 246 190 14 246 190 14 238 190 10
40061-102 78 10 2 2 6 46 46 46 198 198 198
40062-253 253 253 253 253 253 253 253 253 253 253 253
40063-253 253 253 253 253 253 234 234 234 242 242 242
40064-253 253 253 253 253 253 253 253 253 253 253 253
40065-253 253 253 253 253 253 253 253 253 253 253 253
40066-253 253 253 253 253 253 253 253 253 253 253 253
40067-253 253 253 253 253 253 253 253 253 224 178 62
40068-242 186 14 241 196 14 210 166 10 22 18 6
40069- 2 2 6 2 2 6 2 2 6 2 2 6
40070- 2 2 6 2 2 6 6 6 6 121 92 8
40071-238 202 15 232 195 16 82 82 82 34 34 34
40072- 10 10 10 0 0 0 0 0 0 0 0 0
40073- 0 0 0 0 0 0 0 0 0 0 0 0
40074- 0 0 0 0 0 0 0 0 0 0 0 0
40075- 0 0 0 0 0 0 0 0 0 0 0 0
40076- 0 0 0 0 0 0 0 0 0 0 0 0
40077- 14 14 14 38 38 38 70 70 70 154 122 46
40078-190 142 34 200 144 11 197 138 11 197 138 11
40079-213 154 11 226 170 11 242 186 14 246 190 14
40080-246 190 14 246 190 14 246 190 14 246 190 14
40081-225 175 15 46 32 6 2 2 6 22 22 22
40082-158 158 158 250 250 250 253 253 253 253 253 253
40083-253 253 253 253 253 253 253 253 253 253 253 253
40084-253 253 253 253 253 253 253 253 253 253 253 253
40085-253 253 253 253 253 253 253 253 253 253 253 253
40086-253 253 253 253 253 253 253 253 253 253 253 253
40087-253 253 253 250 250 250 242 242 242 224 178 62
40088-239 182 13 236 186 11 213 154 11 46 32 6
40089- 2 2 6 2 2 6 2 2 6 2 2 6
40090- 2 2 6 2 2 6 61 42 6 225 175 15
40091-238 190 10 236 186 11 112 100 78 42 42 42
40092- 14 14 14 0 0 0 0 0 0 0 0 0
40093- 0 0 0 0 0 0 0 0 0 0 0 0
40094- 0 0 0 0 0 0 0 0 0 0 0 0
40095- 0 0 0 0 0 0 0 0 0 0 0 0
40096- 0 0 0 0 0 0 0 0 0 6 6 6
40097- 22 22 22 54 54 54 154 122 46 213 154 11
40098-226 170 11 230 174 11 226 170 11 226 170 11
40099-236 178 12 242 186 14 246 190 14 246 190 14
40100-246 190 14 246 190 14 246 190 14 246 190 14
40101-241 196 14 184 144 12 10 10 10 2 2 6
40102- 6 6 6 116 116 116 242 242 242 253 253 253
40103-253 253 253 253 253 253 253 253 253 253 253 253
40104-253 253 253 253 253 253 253 253 253 253 253 253
40105-253 253 253 253 253 253 253 253 253 253 253 253
40106-253 253 253 253 253 253 253 253 253 253 253 253
40107-253 253 253 231 231 231 198 198 198 214 170 54
40108-236 178 12 236 178 12 210 150 10 137 92 6
40109- 18 14 6 2 2 6 2 2 6 2 2 6
40110- 6 6 6 70 47 6 200 144 11 236 178 12
40111-239 182 13 239 182 13 124 112 88 58 58 58
40112- 22 22 22 6 6 6 0 0 0 0 0 0
40113- 0 0 0 0 0 0 0 0 0 0 0 0
40114- 0 0 0 0 0 0 0 0 0 0 0 0
40115- 0 0 0 0 0 0 0 0 0 0 0 0
40116- 0 0 0 0 0 0 0 0 0 10 10 10
40117- 30 30 30 70 70 70 180 133 36 226 170 11
40118-239 182 13 242 186 14 242 186 14 246 186 14
40119-246 190 14 246 190 14 246 190 14 246 190 14
40120-246 190 14 246 190 14 246 190 14 246 190 14
40121-246 190 14 232 195 16 98 70 6 2 2 6
40122- 2 2 6 2 2 6 66 66 66 221 221 221
40123-253 253 253 253 253 253 253 253 253 253 253 253
40124-253 253 253 253 253 253 253 253 253 253 253 253
40125-253 253 253 253 253 253 253 253 253 253 253 253
40126-253 253 253 253 253 253 253 253 253 253 253 253
40127-253 253 253 206 206 206 198 198 198 214 166 58
40128-230 174 11 230 174 11 216 158 10 192 133 9
40129-163 110 8 116 81 8 102 78 10 116 81 8
40130-167 114 7 197 138 11 226 170 11 239 182 13
40131-242 186 14 242 186 14 162 146 94 78 78 78
40132- 34 34 34 14 14 14 6 6 6 0 0 0
40133- 0 0 0 0 0 0 0 0 0 0 0 0
40134- 0 0 0 0 0 0 0 0 0 0 0 0
40135- 0 0 0 0 0 0 0 0 0 0 0 0
40136- 0 0 0 0 0 0 0 0 0 6 6 6
40137- 30 30 30 78 78 78 190 142 34 226 170 11
40138-239 182 13 246 190 14 246 190 14 246 190 14
40139-246 190 14 246 190 14 246 190 14 246 190 14
40140-246 190 14 246 190 14 246 190 14 246 190 14
40141-246 190 14 241 196 14 203 166 17 22 18 6
40142- 2 2 6 2 2 6 2 2 6 38 38 38
40143-218 218 218 253 253 253 253 253 253 253 253 253
40144-253 253 253 253 253 253 253 253 253 253 253 253
40145-253 253 253 253 253 253 253 253 253 253 253 253
40146-253 253 253 253 253 253 253 253 253 253 253 253
40147-250 250 250 206 206 206 198 198 198 202 162 69
40148-226 170 11 236 178 12 224 166 10 210 150 10
40149-200 144 11 197 138 11 192 133 9 197 138 11
40150-210 150 10 226 170 11 242 186 14 246 190 14
40151-246 190 14 246 186 14 225 175 15 124 112 88
40152- 62 62 62 30 30 30 14 14 14 6 6 6
40153- 0 0 0 0 0 0 0 0 0 0 0 0
40154- 0 0 0 0 0 0 0 0 0 0 0 0
40155- 0 0 0 0 0 0 0 0 0 0 0 0
40156- 0 0 0 0 0 0 0 0 0 10 10 10
40157- 30 30 30 78 78 78 174 135 50 224 166 10
40158-239 182 13 246 190 14 246 190 14 246 190 14
40159-246 190 14 246 190 14 246 190 14 246 190 14
40160-246 190 14 246 190 14 246 190 14 246 190 14
40161-246 190 14 246 190 14 241 196 14 139 102 15
40162- 2 2 6 2 2 6 2 2 6 2 2 6
40163- 78 78 78 250 250 250 253 253 253 253 253 253
40164-253 253 253 253 253 253 253 253 253 253 253 253
40165-253 253 253 253 253 253 253 253 253 253 253 253
40166-253 253 253 253 253 253 253 253 253 253 253 253
40167-250 250 250 214 214 214 198 198 198 190 150 46
40168-219 162 10 236 178 12 234 174 13 224 166 10
40169-216 158 10 213 154 11 213 154 11 216 158 10
40170-226 170 11 239 182 13 246 190 14 246 190 14
40171-246 190 14 246 190 14 242 186 14 206 162 42
40172-101 101 101 58 58 58 30 30 30 14 14 14
40173- 6 6 6 0 0 0 0 0 0 0 0 0
40174- 0 0 0 0 0 0 0 0 0 0 0 0
40175- 0 0 0 0 0 0 0 0 0 0 0 0
40176- 0 0 0 0 0 0 0 0 0 10 10 10
40177- 30 30 30 74 74 74 174 135 50 216 158 10
40178-236 178 12 246 190 14 246 190 14 246 190 14
40179-246 190 14 246 190 14 246 190 14 246 190 14
40180-246 190 14 246 190 14 246 190 14 246 190 14
40181-246 190 14 246 190 14 241 196 14 226 184 13
40182- 61 42 6 2 2 6 2 2 6 2 2 6
40183- 22 22 22 238 238 238 253 253 253 253 253 253
40184-253 253 253 253 253 253 253 253 253 253 253 253
40185-253 253 253 253 253 253 253 253 253 253 253 253
40186-253 253 253 253 253 253 253 253 253 253 253 253
40187-253 253 253 226 226 226 187 187 187 180 133 36
40188-216 158 10 236 178 12 239 182 13 236 178 12
40189-230 174 11 226 170 11 226 170 11 230 174 11
40190-236 178 12 242 186 14 246 190 14 246 190 14
40191-246 190 14 246 190 14 246 186 14 239 182 13
40192-206 162 42 106 106 106 66 66 66 34 34 34
40193- 14 14 14 6 6 6 0 0 0 0 0 0
40194- 0 0 0 0 0 0 0 0 0 0 0 0
40195- 0 0 0 0 0 0 0 0 0 0 0 0
40196- 0 0 0 0 0 0 0 0 0 6 6 6
40197- 26 26 26 70 70 70 163 133 67 213 154 11
40198-236 178 12 246 190 14 246 190 14 246 190 14
40199-246 190 14 246 190 14 246 190 14 246 190 14
40200-246 190 14 246 190 14 246 190 14 246 190 14
40201-246 190 14 246 190 14 246 190 14 241 196 14
40202-190 146 13 18 14 6 2 2 6 2 2 6
40203- 46 46 46 246 246 246 253 253 253 253 253 253
40204-253 253 253 253 253 253 253 253 253 253 253 253
40205-253 253 253 253 253 253 253 253 253 253 253 253
40206-253 253 253 253 253 253 253 253 253 253 253 253
40207-253 253 253 221 221 221 86 86 86 156 107 11
40208-216 158 10 236 178 12 242 186 14 246 186 14
40209-242 186 14 239 182 13 239 182 13 242 186 14
40210-242 186 14 246 186 14 246 190 14 246 190 14
40211-246 190 14 246 190 14 246 190 14 246 190 14
40212-242 186 14 225 175 15 142 122 72 66 66 66
40213- 30 30 30 10 10 10 0 0 0 0 0 0
40214- 0 0 0 0 0 0 0 0 0 0 0 0
40215- 0 0 0 0 0 0 0 0 0 0 0 0
40216- 0 0 0 0 0 0 0 0 0 6 6 6
40217- 26 26 26 70 70 70 163 133 67 210 150 10
40218-236 178 12 246 190 14 246 190 14 246 190 14
40219-246 190 14 246 190 14 246 190 14 246 190 14
40220-246 190 14 246 190 14 246 190 14 246 190 14
40221-246 190 14 246 190 14 246 190 14 246 190 14
40222-232 195 16 121 92 8 34 34 34 106 106 106
40223-221 221 221 253 253 253 253 253 253 253 253 253
40224-253 253 253 253 253 253 253 253 253 253 253 253
40225-253 253 253 253 253 253 253 253 253 253 253 253
40226-253 253 253 253 253 253 253 253 253 253 253 253
40227-242 242 242 82 82 82 18 14 6 163 110 8
40228-216 158 10 236 178 12 242 186 14 246 190 14
40229-246 190 14 246 190 14 246 190 14 246 190 14
40230-246 190 14 246 190 14 246 190 14 246 190 14
40231-246 190 14 246 190 14 246 190 14 246 190 14
40232-246 190 14 246 190 14 242 186 14 163 133 67
40233- 46 46 46 18 18 18 6 6 6 0 0 0
40234- 0 0 0 0 0 0 0 0 0 0 0 0
40235- 0 0 0 0 0 0 0 0 0 0 0 0
40236- 0 0 0 0 0 0 0 0 0 10 10 10
40237- 30 30 30 78 78 78 163 133 67 210 150 10
40238-236 178 12 246 186 14 246 190 14 246 190 14
40239-246 190 14 246 190 14 246 190 14 246 190 14
40240-246 190 14 246 190 14 246 190 14 246 190 14
40241-246 190 14 246 190 14 246 190 14 246 190 14
40242-241 196 14 215 174 15 190 178 144 253 253 253
40243-253 253 253 253 253 253 253 253 253 253 253 253
40244-253 253 253 253 253 253 253 253 253 253 253 253
40245-253 253 253 253 253 253 253 253 253 253 253 253
40246-253 253 253 253 253 253 253 253 253 218 218 218
40247- 58 58 58 2 2 6 22 18 6 167 114 7
40248-216 158 10 236 178 12 246 186 14 246 190 14
40249-246 190 14 246 190 14 246 190 14 246 190 14
40250-246 190 14 246 190 14 246 190 14 246 190 14
40251-246 190 14 246 190 14 246 190 14 246 190 14
40252-246 190 14 246 186 14 242 186 14 190 150 46
40253- 54 54 54 22 22 22 6 6 6 0 0 0
40254- 0 0 0 0 0 0 0 0 0 0 0 0
40255- 0 0 0 0 0 0 0 0 0 0 0 0
40256- 0 0 0 0 0 0 0 0 0 14 14 14
40257- 38 38 38 86 86 86 180 133 36 213 154 11
40258-236 178 12 246 186 14 246 190 14 246 190 14
40259-246 190 14 246 190 14 246 190 14 246 190 14
40260-246 190 14 246 190 14 246 190 14 246 190 14
40261-246 190 14 246 190 14 246 190 14 246 190 14
40262-246 190 14 232 195 16 190 146 13 214 214 214
40263-253 253 253 253 253 253 253 253 253 253 253 253
40264-253 253 253 253 253 253 253 253 253 253 253 253
40265-253 253 253 253 253 253 253 253 253 253 253 253
40266-253 253 253 250 250 250 170 170 170 26 26 26
40267- 2 2 6 2 2 6 37 26 9 163 110 8
40268-219 162 10 239 182 13 246 186 14 246 190 14
40269-246 190 14 246 190 14 246 190 14 246 190 14
40270-246 190 14 246 190 14 246 190 14 246 190 14
40271-246 190 14 246 190 14 246 190 14 246 190 14
40272-246 186 14 236 178 12 224 166 10 142 122 72
40273- 46 46 46 18 18 18 6 6 6 0 0 0
40274- 0 0 0 0 0 0 0 0 0 0 0 0
40275- 0 0 0 0 0 0 0 0 0 0 0 0
40276- 0 0 0 0 0 0 6 6 6 18 18 18
40277- 50 50 50 109 106 95 192 133 9 224 166 10
40278-242 186 14 246 190 14 246 190 14 246 190 14
40279-246 190 14 246 190 14 246 190 14 246 190 14
40280-246 190 14 246 190 14 246 190 14 246 190 14
40281-246 190 14 246 190 14 246 190 14 246 190 14
40282-242 186 14 226 184 13 210 162 10 142 110 46
40283-226 226 226 253 253 253 253 253 253 253 253 253
40284-253 253 253 253 253 253 253 253 253 253 253 253
40285-253 253 253 253 253 253 253 253 253 253 253 253
40286-198 198 198 66 66 66 2 2 6 2 2 6
40287- 2 2 6 2 2 6 50 34 6 156 107 11
40288-219 162 10 239 182 13 246 186 14 246 190 14
40289-246 190 14 246 190 14 246 190 14 246 190 14
40290-246 190 14 246 190 14 246 190 14 246 190 14
40291-246 190 14 246 190 14 246 190 14 242 186 14
40292-234 174 13 213 154 11 154 122 46 66 66 66
40293- 30 30 30 10 10 10 0 0 0 0 0 0
40294- 0 0 0 0 0 0 0 0 0 0 0 0
40295- 0 0 0 0 0 0 0 0 0 0 0 0
40296- 0 0 0 0 0 0 6 6 6 22 22 22
40297- 58 58 58 154 121 60 206 145 10 234 174 13
40298-242 186 14 246 186 14 246 190 14 246 190 14
40299-246 190 14 246 190 14 246 190 14 246 190 14
40300-246 190 14 246 190 14 246 190 14 246 190 14
40301-246 190 14 246 190 14 246 190 14 246 190 14
40302-246 186 14 236 178 12 210 162 10 163 110 8
40303- 61 42 6 138 138 138 218 218 218 250 250 250
40304-253 253 253 253 253 253 253 253 253 250 250 250
40305-242 242 242 210 210 210 144 144 144 66 66 66
40306- 6 6 6 2 2 6 2 2 6 2 2 6
40307- 2 2 6 2 2 6 61 42 6 163 110 8
40308-216 158 10 236 178 12 246 190 14 246 190 14
40309-246 190 14 246 190 14 246 190 14 246 190 14
40310-246 190 14 246 190 14 246 190 14 246 190 14
40311-246 190 14 239 182 13 230 174 11 216 158 10
40312-190 142 34 124 112 88 70 70 70 38 38 38
40313- 18 18 18 6 6 6 0 0 0 0 0 0
40314- 0 0 0 0 0 0 0 0 0 0 0 0
40315- 0 0 0 0 0 0 0 0 0 0 0 0
40316- 0 0 0 0 0 0 6 6 6 22 22 22
40317- 62 62 62 168 124 44 206 145 10 224 166 10
40318-236 178 12 239 182 13 242 186 14 242 186 14
40319-246 186 14 246 190 14 246 190 14 246 190 14
40320-246 190 14 246 190 14 246 190 14 246 190 14
40321-246 190 14 246 190 14 246 190 14 246 190 14
40322-246 190 14 236 178 12 216 158 10 175 118 6
40323- 80 54 7 2 2 6 6 6 6 30 30 30
40324- 54 54 54 62 62 62 50 50 50 38 38 38
40325- 14 14 14 2 2 6 2 2 6 2 2 6
40326- 2 2 6 2 2 6 2 2 6 2 2 6
40327- 2 2 6 6 6 6 80 54 7 167 114 7
40328-213 154 11 236 178 12 246 190 14 246 190 14
40329-246 190 14 246 190 14 246 190 14 246 190 14
40330-246 190 14 242 186 14 239 182 13 239 182 13
40331-230 174 11 210 150 10 174 135 50 124 112 88
40332- 82 82 82 54 54 54 34 34 34 18 18 18
40333- 6 6 6 0 0 0 0 0 0 0 0 0
40334- 0 0 0 0 0 0 0 0 0 0 0 0
40335- 0 0 0 0 0 0 0 0 0 0 0 0
40336- 0 0 0 0 0 0 6 6 6 18 18 18
40337- 50 50 50 158 118 36 192 133 9 200 144 11
40338-216 158 10 219 162 10 224 166 10 226 170 11
40339-230 174 11 236 178 12 239 182 13 239 182 13
40340-242 186 14 246 186 14 246 190 14 246 190 14
40341-246 190 14 246 190 14 246 190 14 246 190 14
40342-246 186 14 230 174 11 210 150 10 163 110 8
40343-104 69 6 10 10 10 2 2 6 2 2 6
40344- 2 2 6 2 2 6 2 2 6 2 2 6
40345- 2 2 6 2 2 6 2 2 6 2 2 6
40346- 2 2 6 2 2 6 2 2 6 2 2 6
40347- 2 2 6 6 6 6 91 60 6 167 114 7
40348-206 145 10 230 174 11 242 186 14 246 190 14
40349-246 190 14 246 190 14 246 186 14 242 186 14
40350-239 182 13 230 174 11 224 166 10 213 154 11
40351-180 133 36 124 112 88 86 86 86 58 58 58
40352- 38 38 38 22 22 22 10 10 10 6 6 6
40353- 0 0 0 0 0 0 0 0 0 0 0 0
40354- 0 0 0 0 0 0 0 0 0 0 0 0
40355- 0 0 0 0 0 0 0 0 0 0 0 0
40356- 0 0 0 0 0 0 0 0 0 14 14 14
40357- 34 34 34 70 70 70 138 110 50 158 118 36
40358-167 114 7 180 123 7 192 133 9 197 138 11
40359-200 144 11 206 145 10 213 154 11 219 162 10
40360-224 166 10 230 174 11 239 182 13 242 186 14
40361-246 186 14 246 186 14 246 186 14 246 186 14
40362-239 182 13 216 158 10 185 133 11 152 99 6
40363-104 69 6 18 14 6 2 2 6 2 2 6
40364- 2 2 6 2 2 6 2 2 6 2 2 6
40365- 2 2 6 2 2 6 2 2 6 2 2 6
40366- 2 2 6 2 2 6 2 2 6 2 2 6
40367- 2 2 6 6 6 6 80 54 7 152 99 6
40368-192 133 9 219 162 10 236 178 12 239 182 13
40369-246 186 14 242 186 14 239 182 13 236 178 12
40370-224 166 10 206 145 10 192 133 9 154 121 60
40371- 94 94 94 62 62 62 42 42 42 22 22 22
40372- 14 14 14 6 6 6 0 0 0 0 0 0
40373- 0 0 0 0 0 0 0 0 0 0 0 0
40374- 0 0 0 0 0 0 0 0 0 0 0 0
40375- 0 0 0 0 0 0 0 0 0 0 0 0
40376- 0 0 0 0 0 0 0 0 0 6 6 6
40377- 18 18 18 34 34 34 58 58 58 78 78 78
40378-101 98 89 124 112 88 142 110 46 156 107 11
40379-163 110 8 167 114 7 175 118 6 180 123 7
40380-185 133 11 197 138 11 210 150 10 219 162 10
40381-226 170 11 236 178 12 236 178 12 234 174 13
40382-219 162 10 197 138 11 163 110 8 130 83 6
40383- 91 60 6 10 10 10 2 2 6 2 2 6
40384- 18 18 18 38 38 38 38 38 38 38 38 38
40385- 38 38 38 38 38 38 38 38 38 38 38 38
40386- 38 38 38 38 38 38 26 26 26 2 2 6
40387- 2 2 6 6 6 6 70 47 6 137 92 6
40388-175 118 6 200 144 11 219 162 10 230 174 11
40389-234 174 13 230 174 11 219 162 10 210 150 10
40390-192 133 9 163 110 8 124 112 88 82 82 82
40391- 50 50 50 30 30 30 14 14 14 6 6 6
40392- 0 0 0 0 0 0 0 0 0 0 0 0
40393- 0 0 0 0 0 0 0 0 0 0 0 0
40394- 0 0 0 0 0 0 0 0 0 0 0 0
40395- 0 0 0 0 0 0 0 0 0 0 0 0
40396- 0 0 0 0 0 0 0 0 0 0 0 0
40397- 6 6 6 14 14 14 22 22 22 34 34 34
40398- 42 42 42 58 58 58 74 74 74 86 86 86
40399-101 98 89 122 102 70 130 98 46 121 87 25
40400-137 92 6 152 99 6 163 110 8 180 123 7
40401-185 133 11 197 138 11 206 145 10 200 144 11
40402-180 123 7 156 107 11 130 83 6 104 69 6
40403- 50 34 6 54 54 54 110 110 110 101 98 89
40404- 86 86 86 82 82 82 78 78 78 78 78 78
40405- 78 78 78 78 78 78 78 78 78 78 78 78
40406- 78 78 78 82 82 82 86 86 86 94 94 94
40407-106 106 106 101 101 101 86 66 34 124 80 6
40408-156 107 11 180 123 7 192 133 9 200 144 11
40409-206 145 10 200 144 11 192 133 9 175 118 6
40410-139 102 15 109 106 95 70 70 70 42 42 42
40411- 22 22 22 10 10 10 0 0 0 0 0 0
40412- 0 0 0 0 0 0 0 0 0 0 0 0
40413- 0 0 0 0 0 0 0 0 0 0 0 0
40414- 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6 10 10 10
40418- 14 14 14 22 22 22 30 30 30 38 38 38
40419- 50 50 50 62 62 62 74 74 74 90 90 90
40420-101 98 89 112 100 78 121 87 25 124 80 6
40421-137 92 6 152 99 6 152 99 6 152 99 6
40422-138 86 6 124 80 6 98 70 6 86 66 30
40423-101 98 89 82 82 82 58 58 58 46 46 46
40424- 38 38 38 34 34 34 34 34 34 34 34 34
40425- 34 34 34 34 34 34 34 34 34 34 34 34
40426- 34 34 34 34 34 34 38 38 38 42 42 42
40427- 54 54 54 82 82 82 94 86 76 91 60 6
40428-134 86 6 156 107 11 167 114 7 175 118 6
40429-175 118 6 167 114 7 152 99 6 121 87 25
40430-101 98 89 62 62 62 34 34 34 18 18 18
40431- 6 6 6 0 0 0 0 0 0 0 0 0
40432- 0 0 0 0 0 0 0 0 0 0 0 0
40433- 0 0 0 0 0 0 0 0 0 0 0 0
40434- 0 0 0 0 0 0 0 0 0 0 0 0
40435- 0 0 0 0 0 0 0 0 0 0 0 0
40436- 0 0 0 0 0 0 0 0 0 0 0 0
40437- 0 0 0 0 0 0 0 0 0 0 0 0
40438- 0 0 0 6 6 6 6 6 6 10 10 10
40439- 18 18 18 22 22 22 30 30 30 42 42 42
40440- 50 50 50 66 66 66 86 86 86 101 98 89
40441-106 86 58 98 70 6 104 69 6 104 69 6
40442-104 69 6 91 60 6 82 62 34 90 90 90
40443- 62 62 62 38 38 38 22 22 22 14 14 14
40444- 10 10 10 10 10 10 10 10 10 10 10 10
40445- 10 10 10 10 10 10 6 6 6 10 10 10
40446- 10 10 10 10 10 10 10 10 10 14 14 14
40447- 22 22 22 42 42 42 70 70 70 89 81 66
40448- 80 54 7 104 69 6 124 80 6 137 92 6
40449-134 86 6 116 81 8 100 82 52 86 86 86
40450- 58 58 58 30 30 30 14 14 14 6 6 6
40451- 0 0 0 0 0 0 0 0 0 0 0 0
40452- 0 0 0 0 0 0 0 0 0 0 0 0
40453- 0 0 0 0 0 0 0 0 0 0 0 0
40454- 0 0 0 0 0 0 0 0 0 0 0 0
40455- 0 0 0 0 0 0 0 0 0 0 0 0
40456- 0 0 0 0 0 0 0 0 0 0 0 0
40457- 0 0 0 0 0 0 0 0 0 0 0 0
40458- 0 0 0 0 0 0 0 0 0 0 0 0
40459- 0 0 0 6 6 6 10 10 10 14 14 14
40460- 18 18 18 26 26 26 38 38 38 54 54 54
40461- 70 70 70 86 86 86 94 86 76 89 81 66
40462- 89 81 66 86 86 86 74 74 74 50 50 50
40463- 30 30 30 14 14 14 6 6 6 0 0 0
40464- 0 0 0 0 0 0 0 0 0 0 0 0
40465- 0 0 0 0 0 0 0 0 0 0 0 0
40466- 0 0 0 0 0 0 0 0 0 0 0 0
40467- 6 6 6 18 18 18 34 34 34 58 58 58
40468- 82 82 82 89 81 66 89 81 66 89 81 66
40469- 94 86 66 94 86 76 74 74 74 50 50 50
40470- 26 26 26 14 14 14 6 6 6 0 0 0
40471- 0 0 0 0 0 0 0 0 0 0 0 0
40472- 0 0 0 0 0 0 0 0 0 0 0 0
40473- 0 0 0 0 0 0 0 0 0 0 0 0
40474- 0 0 0 0 0 0 0 0 0 0 0 0
40475- 0 0 0 0 0 0 0 0 0 0 0 0
40476- 0 0 0 0 0 0 0 0 0 0 0 0
40477- 0 0 0 0 0 0 0 0 0 0 0 0
40478- 0 0 0 0 0 0 0 0 0 0 0 0
40479- 0 0 0 0 0 0 0 0 0 0 0 0
40480- 6 6 6 6 6 6 14 14 14 18 18 18
40481- 30 30 30 38 38 38 46 46 46 54 54 54
40482- 50 50 50 42 42 42 30 30 30 18 18 18
40483- 10 10 10 0 0 0 0 0 0 0 0 0
40484- 0 0 0 0 0 0 0 0 0 0 0 0
40485- 0 0 0 0 0 0 0 0 0 0 0 0
40486- 0 0 0 0 0 0 0 0 0 0 0 0
40487- 0 0 0 6 6 6 14 14 14 26 26 26
40488- 38 38 38 50 50 50 58 58 58 58 58 58
40489- 54 54 54 42 42 42 30 30 30 18 18 18
40490- 10 10 10 0 0 0 0 0 0 0 0 0
40491- 0 0 0 0 0 0 0 0 0 0 0 0
40492- 0 0 0 0 0 0 0 0 0 0 0 0
40493- 0 0 0 0 0 0 0 0 0 0 0 0
40494- 0 0 0 0 0 0 0 0 0 0 0 0
40495- 0 0 0 0 0 0 0 0 0 0 0 0
40496- 0 0 0 0 0 0 0 0 0 0 0 0
40497- 0 0 0 0 0 0 0 0 0 0 0 0
40498- 0 0 0 0 0 0 0 0 0 0 0 0
40499- 0 0 0 0 0 0 0 0 0 0 0 0
40500- 0 0 0 0 0 0 0 0 0 6 6 6
40501- 6 6 6 10 10 10 14 14 14 18 18 18
40502- 18 18 18 14 14 14 10 10 10 6 6 6
40503- 0 0 0 0 0 0 0 0 0 0 0 0
40504- 0 0 0 0 0 0 0 0 0 0 0 0
40505- 0 0 0 0 0 0 0 0 0 0 0 0
40506- 0 0 0 0 0 0 0 0 0 0 0 0
40507- 0 0 0 0 0 0 0 0 0 6 6 6
40508- 14 14 14 18 18 18 22 22 22 22 22 22
40509- 18 18 18 14 14 14 10 10 10 6 6 6
40510- 0 0 0 0 0 0 0 0 0 0 0 0
40511- 0 0 0 0 0 0 0 0 0 0 0 0
40512- 0 0 0 0 0 0 0 0 0 0 0 0
40513- 0 0 0 0 0 0 0 0 0 0 0 0
40514- 0 0 0 0 0 0 0 0 0 0 0 0
40515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40520+4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
40523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40528+4 4 4 4 4 4
40529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40534+4 4 4 4 4 4 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+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40537+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40538+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40539+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40542+4 4 4 4 4 4
40543+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40544+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40548+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40549+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40550+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40551+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40552+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40553+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40554+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40555+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40556+4 4 4 4 4 4
40557+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40558+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40559+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40563+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40564+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40565+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40566+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40567+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40568+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40569+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40570+4 4 4 4 4 4
40571+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40572+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40573+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40576+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40577+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40578+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40579+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40580+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40581+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40582+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40583+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40584+4 4 4 4 4 4
40585+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40586+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40590+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40591+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40592+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40593+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40594+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40595+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40596+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40597+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40598+4 4 4 4 4 4
40599+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40600+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40601+4 4 4 4 4 4 4 4 4 4 4 4 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 3 3 3 0 0 0 0 0 0
40604+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
40605+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40606+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40607+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40608+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
40609+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40610+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
40611+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40612+4 4 4 4 4 4
40613+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40614+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40615+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40617+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
40618+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
40619+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40620+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40621+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40622+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
40623+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
40624+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
40625+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40626+4 4 4 4 4 4
40627+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40628+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40629+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40630+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40631+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
40632+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
40633+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40634+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40635+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40636+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
40637+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
40638+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
40639+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
40640+4 4 4 4 4 4
40641+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40642+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40643+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40644+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
40645+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
40646+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
40647+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
40648+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40649+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
40650+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
40651+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
40652+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
40653+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
40654+4 4 4 4 4 4
40655+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40656+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40657+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40658+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
40659+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
40660+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
40661+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
40662+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
40663+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
40664+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
40665+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
40666+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
40667+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
40668+4 4 4 4 4 4
40669+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40670+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40671+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
40672+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
40673+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
40674+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
40675+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
40676+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
40677+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
40678+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
40679+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
40680+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
40681+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
40682+4 4 4 4 4 4
40683+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40684+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40685+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
40686+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
40687+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
40688+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
40689+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
40690+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
40691+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
40692+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
40693+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
40694+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
40695+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
40696+4 4 4 4 4 4
40697+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40698+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40699+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
40700+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
40701+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
40702+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
40703+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
40704+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
40705+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
40706+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
40707+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
40708+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
40709+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
40710+4 4 4 4 4 4
40711+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40712+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40713+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
40714+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
40715+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
40716+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
40717+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
40718+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
40719+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
40720+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
40721+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
40722+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
40723+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40724+4 4 4 4 4 4
40725+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40727+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
40728+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
40729+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
40730+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
40731+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
40732+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
40733+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
40734+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
40735+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
40736+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
40737+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
40738+4 4 4 4 4 4
40739+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40740+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
40741+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
40742+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
40743+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
40744+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
40745+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
40746+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
40747+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
40748+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
40749+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
40750+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
40751+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
40752+4 4 4 4 4 4
40753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40754+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
40755+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
40756+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
40757+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
40758+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
40759+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
40760+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
40761+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
40762+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
40763+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
40764+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
40765+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
40766+0 0 0 4 4 4
40767+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
40768+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
40769+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
40770+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
40771+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
40772+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
40773+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
40774+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
40775+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
40776+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
40777+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
40778+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
40779+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
40780+2 0 0 0 0 0
40781+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
40782+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
40783+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
40784+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
40785+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
40786+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
40787+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
40788+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
40789+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
40790+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
40791+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
40792+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
40793+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
40794+37 38 37 0 0 0
40795+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
40796+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
40797+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
40798+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
40799+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
40800+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
40801+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
40802+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
40803+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
40804+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
40805+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
40806+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
40807+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
40808+85 115 134 4 0 0
40809+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
40810+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
40811+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
40812+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
40813+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
40814+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
40815+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
40816+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
40817+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
40818+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
40819+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
40820+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
40821+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
40822+60 73 81 4 0 0
40823+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
40824+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
40825+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
40826+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
40827+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
40828+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
40829+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
40830+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
40831+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
40832+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
40833+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
40834+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
40835+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
40836+16 19 21 4 0 0
40837+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
40838+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
40839+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
40840+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
40841+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
40842+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
40843+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
40844+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
40845+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
40846+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
40847+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
40848+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
40849+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
40850+4 0 0 4 3 3
40851+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
40852+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
40853+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
40854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
40855+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
40856+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
40857+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
40858+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
40859+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
40860+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
40861+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
40862+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
40863+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
40864+3 2 2 4 4 4
40865+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
40866+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
40867+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
40868+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
40869+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
40870+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
40871+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
40872+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
40873+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
40874+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
40875+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
40876+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
40877+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
40878+4 4 4 4 4 4
40879+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
40880+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
40881+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
40882+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
40883+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
40884+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
40885+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
40886+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
40887+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
40888+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
40889+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
40890+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
40891+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
40892+4 4 4 4 4 4
40893+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
40894+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
40895+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
40896+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
40897+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
40898+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
40899+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
40900+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
40901+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
40902+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
40903+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
40904+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
40905+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
40906+5 5 5 5 5 5
40907+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
40908+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
40909+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
40910+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
40911+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
40912+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40913+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
40914+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
40915+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
40916+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
40917+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
40918+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
40919+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
40920+5 5 5 4 4 4
40921+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
40922+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
40923+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
40924+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
40925+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
40926+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
40927+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
40928+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
40929+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
40930+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
40931+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
40932+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
40933+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40934+4 4 4 4 4 4
40935+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
40936+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
40937+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
40938+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
40939+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
40940+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40941+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40942+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
40943+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
40944+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
40945+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
40946+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
40947+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40948+4 4 4 4 4 4
40949+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
40950+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
40951+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
40952+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
40953+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
40954+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
40955+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
40956+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
40957+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
40958+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
40959+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
40960+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40961+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40962+4 4 4 4 4 4
40963+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
40964+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
40965+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
40966+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
40967+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
40968+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40969+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40970+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
40971+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
40972+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
40973+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
40974+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40975+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40976+4 4 4 4 4 4
40977+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
40978+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
40979+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
40980+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
40981+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
40982+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
40983+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
40984+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
40985+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
40986+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
40987+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
40988+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40989+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40990+4 4 4 4 4 4
40991+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
40992+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
40993+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
40994+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
40995+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
40996+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
40997+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
40998+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
40999+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
41000+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
41001+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
41002+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41003+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41004+4 4 4 4 4 4
41005+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
41006+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
41007+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
41008+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
41009+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41010+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
41011+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
41012+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
41013+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
41014+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
41015+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
41016+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41017+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41018+4 4 4 4 4 4
41019+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
41020+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
41021+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
41022+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41023+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
41024+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
41025+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
41026+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
41027+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
41028+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
41029+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41030+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41031+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41032+4 4 4 4 4 4
41033+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
41034+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
41035+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
41036+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41037+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41038+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
41039+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
41040+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
41041+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
41042+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
41043+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41044+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41045+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41046+4 4 4 4 4 4
41047+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
41048+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
41049+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41050+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41051+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41052+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
41053+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
41054+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
41055+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
41056+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
41057+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41058+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41059+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41060+4 4 4 4 4 4
41061+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
41062+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
41063+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41064+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41065+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41066+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
41067+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
41068+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
41069+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41070+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41071+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41072+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41073+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41074+4 4 4 4 4 4
41075+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41076+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
41077+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41078+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
41079+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
41080+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
41081+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
41082+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
41083+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41084+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41085+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41086+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41087+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41088+4 4 4 4 4 4
41089+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41090+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
41091+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41092+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
41093+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41094+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
41095+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
41096+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
41097+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41098+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41099+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41100+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41101+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41102+4 4 4 4 4 4
41103+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
41104+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
41105+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41106+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
41107+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
41108+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
41109+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
41110+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
41111+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41112+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41113+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41114+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41115+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41116+4 4 4 4 4 4
41117+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
41118+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
41119+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41120+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
41121+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
41122+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
41123+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
41124+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
41125+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41126+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41127+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41128+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41129+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41130+4 4 4 4 4 4
41131+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41132+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
41133+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41134+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
41135+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
41136+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
41137+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
41138+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
41139+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41140+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41141+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41142+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41143+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41144+4 4 4 4 4 4
41145+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
41146+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
41147+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41148+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
41149+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
41150+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
41151+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
41152+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
41153+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
41154+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41155+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41156+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41157+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41158+4 4 4 4 4 4
41159+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41160+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
41161+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
41162+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
41163+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
41164+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
41165+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
41166+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
41167+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41168+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41169+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41170+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41171+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41172+4 4 4 4 4 4
41173+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41174+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
41175+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41176+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
41177+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
41178+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
41179+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
41180+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
41181+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41182+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41183+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41184+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41185+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41186+4 4 4 4 4 4
41187+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41188+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
41189+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
41190+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
41191+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
41192+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
41193+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41194+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
41195+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41196+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41197+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41198+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41199+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41200+4 4 4 4 4 4
41201+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41202+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
41203+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
41204+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41205+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
41206+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
41207+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41208+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
41209+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41210+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41211+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41212+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41213+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41214+4 4 4 4 4 4
41215+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41216+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
41217+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
41218+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
41219+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
41220+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
41221+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
41222+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
41223+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
41224+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41225+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41226+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41227+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41228+4 4 4 4 4 4
41229+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41230+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
41231+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
41232+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
41233+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
41234+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
41235+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
41236+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
41237+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
41238+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41239+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41240+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41241+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41242+4 4 4 4 4 4
41243+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
41244+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
41245+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
41246+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
41247+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41248+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
41249+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
41250+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
41251+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
41252+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41253+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41254+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41255+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41256+4 4 4 4 4 4
41257+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41258+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
41259+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
41260+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
41261+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
41262+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
41263+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
41264+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
41265+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
41266+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41267+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41268+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41269+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41270+4 4 4 4 4 4
41271+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
41272+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
41273+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
41274+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
41275+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
41276+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
41277+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
41278+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
41279+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
41280+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
41281+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41282+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41283+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41284+4 4 4 4 4 4
41285+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
41286+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41287+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
41288+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
41289+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
41290+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
41291+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
41292+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
41293+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
41294+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
41295+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41296+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
41299+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
41300+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41301+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
41302+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
41303+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
41304+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
41305+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41306+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
41307+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
41308+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
41309+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41310+4 4 4 4 4 4 4 4 4 4 4 4 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
41313+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
41314+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
41315+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
41316+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
41317+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
41318+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
41319+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
41320+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
41321+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
41322+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
41323+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41324+4 4 4 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
41327+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
41328+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
41329+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41330+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
41331+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
41332+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
41333+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
41334+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
41335+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
41336+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
41337+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41338+4 4 4 4 4 4 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
41341+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41342+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
41343+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
41344+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
41345+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
41346+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
41347+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
41348+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
41349+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
41350+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41351+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41352+4 4 4 4 4 4 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
41355+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
41356+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
41357+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
41358+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
41359+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
41360+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
41361+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
41362+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
41363+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
41364+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41365+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41366+4 4 4 4 4 4 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
41369+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
41370+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
41371+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
41372+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
41373+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
41374+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
41375+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
41376+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
41377+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
41378+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41379+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41380+4 4 4 4 4 4 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
41383+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
41384+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41385+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
41386+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41387+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
41388+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
41389+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
41390+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
41391+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
41392+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41394+4 4 4 4 4 4 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
41397+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
41398+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
41399+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
41400+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
41401+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
41402+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
41403+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
41404+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
41405+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
41406+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41408+4 4 4 4 4 4 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
41411+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41412+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
41413+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
41414+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
41415+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
41416+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
41417+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
41418+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
41419+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41422+4 4 4 4 4 4 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
41425+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
41426+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
41427+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41428+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
41429+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
41430+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
41431+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
41432+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
41433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41436+4 4 4 4 4 4 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
41439+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41440+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
41441+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
41442+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
41443+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
41444+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
41445+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
41446+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41450+4 4 4 4 4 4 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
41453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41454+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
41455+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41456+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
41457+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
41458+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
41459+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
41460+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
41461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41464+4 4 4 4 4 4 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
41467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41468+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
41469+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
41470+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
41471+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
41472+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
41473+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
41474+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
41475+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41478+4 4 4 4 4 4 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
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 5 5 5 5 5 5 5 5 5
41483+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
41484+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41485+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
41486+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
41487+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
41488+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41489+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41492+4 4 4 4 4 4 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
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 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41498+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
41499+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
41500+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
41501+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
41502+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41503+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41506+4 4 4 4 4 4 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
41509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41512+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41513+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
41514+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
41515+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
41516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41518+4 4 4 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
41523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41526+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41527+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41528+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
41529+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
41530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41532+4 4 4 4 4 4 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
41537+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41538+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41539+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41540+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41541+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41542+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41543+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
41544+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41548+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41549+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41550+4 4 4 4 4 4
41551+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41552+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41553+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41554+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
41555+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
41556+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
41557+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
41558+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41559+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41563+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41564+4 4 4 4 4 4
41565+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41566+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41567+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41568+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41569+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
41570+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41571+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41572+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41573+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41576+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41577+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41578+4 4 4 4 4 4
41579+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41580+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41581+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41582+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41583+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
41584+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
41585+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
41586+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41590+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41591+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41592+4 4 4 4 4 4
41593+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41594+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41595+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41596+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41597+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
41598+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
41599+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41600+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41601+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41602+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41604+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41605+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41606+4 4 4 4 4 4
41607+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41608+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41609+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41610+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41611+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
41612+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
41613+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41614+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41615+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41617+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41618+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41619+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41620+4 4 4 4 4 4
41621+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41622+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41623+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41624+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41625+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41626+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
41627+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41628+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41629+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41630+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41631+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41632+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41633+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41634+4 4 4 4 4 4
41635diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
41636index 3473e75..c930142 100644
41637--- a/drivers/video/udlfb.c
41638+++ b/drivers/video/udlfb.c
41639@@ -619,11 +619,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
41640 dlfb_urb_completion(urb);
41641
41642 error:
41643- atomic_add(bytes_sent, &dev->bytes_sent);
41644- atomic_add(bytes_identical, &dev->bytes_identical);
41645- atomic_add(width*height*2, &dev->bytes_rendered);
41646+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41647+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41648+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
41649 end_cycles = get_cycles();
41650- atomic_add(((unsigned int) ((end_cycles - start_cycles)
41651+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41652 >> 10)), /* Kcycles */
41653 &dev->cpu_kcycles_used);
41654
41655@@ -744,11 +744,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
41656 dlfb_urb_completion(urb);
41657
41658 error:
41659- atomic_add(bytes_sent, &dev->bytes_sent);
41660- atomic_add(bytes_identical, &dev->bytes_identical);
41661- atomic_add(bytes_rendered, &dev->bytes_rendered);
41662+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41663+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41664+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
41665 end_cycles = get_cycles();
41666- atomic_add(((unsigned int) ((end_cycles - start_cycles)
41667+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41668 >> 10)), /* Kcycles */
41669 &dev->cpu_kcycles_used);
41670 }
41671@@ -1368,7 +1368,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
41672 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41673 struct dlfb_data *dev = fb_info->par;
41674 return snprintf(buf, PAGE_SIZE, "%u\n",
41675- atomic_read(&dev->bytes_rendered));
41676+ atomic_read_unchecked(&dev->bytes_rendered));
41677 }
41678
41679 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41680@@ -1376,7 +1376,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41681 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41682 struct dlfb_data *dev = fb_info->par;
41683 return snprintf(buf, PAGE_SIZE, "%u\n",
41684- atomic_read(&dev->bytes_identical));
41685+ atomic_read_unchecked(&dev->bytes_identical));
41686 }
41687
41688 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41689@@ -1384,7 +1384,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41690 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41691 struct dlfb_data *dev = fb_info->par;
41692 return snprintf(buf, PAGE_SIZE, "%u\n",
41693- atomic_read(&dev->bytes_sent));
41694+ atomic_read_unchecked(&dev->bytes_sent));
41695 }
41696
41697 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41698@@ -1392,7 +1392,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41699 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41700 struct dlfb_data *dev = fb_info->par;
41701 return snprintf(buf, PAGE_SIZE, "%u\n",
41702- atomic_read(&dev->cpu_kcycles_used));
41703+ atomic_read_unchecked(&dev->cpu_kcycles_used));
41704 }
41705
41706 static ssize_t edid_show(
41707@@ -1449,10 +1449,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
41708 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41709 struct dlfb_data *dev = fb_info->par;
41710
41711- atomic_set(&dev->bytes_rendered, 0);
41712- atomic_set(&dev->bytes_identical, 0);
41713- atomic_set(&dev->bytes_sent, 0);
41714- atomic_set(&dev->cpu_kcycles_used, 0);
41715+ atomic_set_unchecked(&dev->bytes_rendered, 0);
41716+ atomic_set_unchecked(&dev->bytes_identical, 0);
41717+ atomic_set_unchecked(&dev->bytes_sent, 0);
41718+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
41719
41720 return count;
41721 }
41722diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
41723index 7f8472c..9842e87 100644
41724--- a/drivers/video/uvesafb.c
41725+++ b/drivers/video/uvesafb.c
41726@@ -19,6 +19,7 @@
41727 #include <linux/io.h>
41728 #include <linux/mutex.h>
41729 #include <linux/slab.h>
41730+#include <linux/moduleloader.h>
41731 #include <video/edid.h>
41732 #include <video/uvesafb.h>
41733 #ifdef CONFIG_X86
41734@@ -121,7 +122,7 @@ static int uvesafb_helper_start(void)
41735 NULL,
41736 };
41737
41738- return call_usermodehelper(v86d_path, argv, envp, 1);
41739+ return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
41740 }
41741
41742 /*
41743@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
41744 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
41745 par->pmi_setpal = par->ypan = 0;
41746 } else {
41747+
41748+#ifdef CONFIG_PAX_KERNEXEC
41749+#ifdef CONFIG_MODULES
41750+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
41751+#endif
41752+ if (!par->pmi_code) {
41753+ par->pmi_setpal = par->ypan = 0;
41754+ return 0;
41755+ }
41756+#endif
41757+
41758 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
41759 + task->t.regs.edi);
41760+
41761+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41762+ pax_open_kernel();
41763+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
41764+ pax_close_kernel();
41765+
41766+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
41767+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
41768+#else
41769 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
41770 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
41771+#endif
41772+
41773 printk(KERN_INFO "uvesafb: protected mode interface info at "
41774 "%04x:%04x\n",
41775 (u16)task->t.regs.es, (u16)task->t.regs.edi);
41776@@ -1821,6 +1844,11 @@ out:
41777 if (par->vbe_modes)
41778 kfree(par->vbe_modes);
41779
41780+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41781+ if (par->pmi_code)
41782+ module_free_exec(NULL, par->pmi_code);
41783+#endif
41784+
41785 framebuffer_release(info);
41786 return err;
41787 }
41788@@ -1847,6 +1875,12 @@ static int uvesafb_remove(struct platform_device *dev)
41789 kfree(par->vbe_state_orig);
41790 if (par->vbe_state_saved)
41791 kfree(par->vbe_state_saved);
41792+
41793+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41794+ if (par->pmi_code)
41795+ module_free_exec(NULL, par->pmi_code);
41796+#endif
41797+
41798 }
41799
41800 framebuffer_release(info);
41801diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
41802index 501b340..86bd4cf 100644
41803--- a/drivers/video/vesafb.c
41804+++ b/drivers/video/vesafb.c
41805@@ -9,6 +9,7 @@
41806 */
41807
41808 #include <linux/module.h>
41809+#include <linux/moduleloader.h>
41810 #include <linux/kernel.h>
41811 #include <linux/errno.h>
41812 #include <linux/string.h>
41813@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
41814 static int vram_total __initdata; /* Set total amount of memory */
41815 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
41816 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
41817-static void (*pmi_start)(void) __read_mostly;
41818-static void (*pmi_pal) (void) __read_mostly;
41819+static void (*pmi_start)(void) __read_only;
41820+static void (*pmi_pal) (void) __read_only;
41821 static int depth __read_mostly;
41822 static int vga_compat __read_mostly;
41823 /* --------------------------------------------------------------------- */
41824@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
41825 unsigned int size_vmode;
41826 unsigned int size_remap;
41827 unsigned int size_total;
41828+ void *pmi_code = NULL;
41829
41830 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
41831 return -ENODEV;
41832@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
41833 size_remap = size_total;
41834 vesafb_fix.smem_len = size_remap;
41835
41836-#ifndef __i386__
41837- screen_info.vesapm_seg = 0;
41838-#endif
41839-
41840 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
41841 printk(KERN_WARNING
41842 "vesafb: cannot reserve video memory at 0x%lx\n",
41843@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
41844 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
41845 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
41846
41847+#ifdef __i386__
41848+
41849+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41850+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
41851+ if (!pmi_code)
41852+#elif !defined(CONFIG_PAX_KERNEXEC)
41853+ if (0)
41854+#endif
41855+
41856+#endif
41857+ screen_info.vesapm_seg = 0;
41858+
41859 if (screen_info.vesapm_seg) {
41860- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
41861- screen_info.vesapm_seg,screen_info.vesapm_off);
41862+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
41863+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
41864 }
41865
41866 if (screen_info.vesapm_seg < 0xc000)
41867@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
41868
41869 if (ypan || pmi_setpal) {
41870 unsigned short *pmi_base;
41871+
41872 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
41873- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
41874- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
41875+
41876+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41877+ pax_open_kernel();
41878+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
41879+#else
41880+ pmi_code = pmi_base;
41881+#endif
41882+
41883+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
41884+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
41885+
41886+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41887+ pmi_start = ktva_ktla(pmi_start);
41888+ pmi_pal = ktva_ktla(pmi_pal);
41889+ pax_close_kernel();
41890+#endif
41891+
41892 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
41893 if (pmi_base[3]) {
41894 printk(KERN_INFO "vesafb: pmi: ports = ");
41895@@ -488,6 +514,11 @@ static int __init vesafb_probe(struct platform_device *dev)
41896 info->node, info->fix.id);
41897 return 0;
41898 err:
41899+
41900+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41901+ module_free_exec(NULL, pmi_code);
41902+#endif
41903+
41904 if (info->screen_base)
41905 iounmap(info->screen_base);
41906 framebuffer_release(info);
41907diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
41908index 88714ae..16c2e11 100644
41909--- a/drivers/video/via/via_clock.h
41910+++ b/drivers/video/via/via_clock.h
41911@@ -56,7 +56,7 @@ struct via_clock {
41912
41913 void (*set_engine_pll_state)(u8 state);
41914 void (*set_engine_pll)(struct via_pll_config config);
41915-};
41916+} __no_const;
41917
41918
41919 static inline u32 get_pll_internal_frequency(u32 ref_freq,
41920diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
41921index e56c934..fc22f4b 100644
41922--- a/drivers/xen/xen-pciback/conf_space.h
41923+++ b/drivers/xen/xen-pciback/conf_space.h
41924@@ -44,15 +44,15 @@ struct config_field {
41925 struct {
41926 conf_dword_write write;
41927 conf_dword_read read;
41928- } dw;
41929+ } __no_const dw;
41930 struct {
41931 conf_word_write write;
41932 conf_word_read read;
41933- } w;
41934+ } __no_const w;
41935 struct {
41936 conf_byte_write write;
41937 conf_byte_read read;
41938- } b;
41939+ } __no_const b;
41940 } u;
41941 struct list_head list;
41942 };
41943diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
41944index 879ed88..bc03a01 100644
41945--- a/fs/9p/vfs_inode.c
41946+++ b/fs/9p/vfs_inode.c
41947@@ -1286,7 +1286,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
41948 void
41949 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
41950 {
41951- char *s = nd_get_link(nd);
41952+ const char *s = nd_get_link(nd);
41953
41954 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
41955 IS_ERR(s) ? "<error>" : s);
41956diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
41957index 79e2ca7..5828ad1 100644
41958--- a/fs/Kconfig.binfmt
41959+++ b/fs/Kconfig.binfmt
41960@@ -86,7 +86,7 @@ config HAVE_AOUT
41961
41962 config BINFMT_AOUT
41963 tristate "Kernel support for a.out and ECOFF binaries"
41964- depends on HAVE_AOUT
41965+ depends on HAVE_AOUT && BROKEN
41966 ---help---
41967 A.out (Assembler.OUTput) is a set of formats for libraries and
41968 executables used in the earliest versions of UNIX. Linux used
41969diff --git a/fs/aio.c b/fs/aio.c
41970index 67e4b90..fbb09dc 100644
41971--- a/fs/aio.c
41972+++ b/fs/aio.c
41973@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx *ctx)
41974 size += sizeof(struct io_event) * nr_events;
41975 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
41976
41977- if (nr_pages < 0)
41978+ if (nr_pages <= 0)
41979 return -EINVAL;
41980
41981 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
41982@@ -1463,22 +1463,27 @@ static ssize_t aio_fsync(struct kiocb *iocb)
41983 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
41984 {
41985 ssize_t ret;
41986+ struct iovec iovstack;
41987
41988 #ifdef CONFIG_COMPAT
41989 if (compat)
41990 ret = compat_rw_copy_check_uvector(type,
41991 (struct compat_iovec __user *)kiocb->ki_buf,
41992- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
41993+ kiocb->ki_nbytes, 1, &iovstack,
41994 &kiocb->ki_iovec, 1);
41995 else
41996 #endif
41997 ret = rw_copy_check_uvector(type,
41998 (struct iovec __user *)kiocb->ki_buf,
41999- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
42000+ kiocb->ki_nbytes, 1, &iovstack,
42001 &kiocb->ki_iovec, 1);
42002 if (ret < 0)
42003 goto out;
42004
42005+ if (kiocb->ki_iovec == &iovstack) {
42006+ kiocb->ki_inline_vec = iovstack;
42007+ kiocb->ki_iovec = &kiocb->ki_inline_vec;
42008+ }
42009 kiocb->ki_nr_segs = kiocb->ki_nbytes;
42010 kiocb->ki_cur_seg = 0;
42011 /* ki_nbytes/left now reflect bytes instead of segs */
42012diff --git a/fs/attr.c b/fs/attr.c
42013index 7ee7ba4..0c61a60 100644
42014--- a/fs/attr.c
42015+++ b/fs/attr.c
42016@@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
42017 unsigned long limit;
42018
42019 limit = rlimit(RLIMIT_FSIZE);
42020+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
42021 if (limit != RLIM_INFINITY && offset > limit)
42022 goto out_sig;
42023 if (offset > inode->i_sb->s_maxbytes)
42024diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
42025index 6861f61..a25f010 100644
42026--- a/fs/autofs4/waitq.c
42027+++ b/fs/autofs4/waitq.c
42028@@ -60,7 +60,7 @@ static int autofs4_write(struct file *file, const void *addr, int bytes)
42029 {
42030 unsigned long sigpipe, flags;
42031 mm_segment_t fs;
42032- const char *data = (const char *)addr;
42033+ const char __user *data = (const char __force_user *)addr;
42034 ssize_t wr = 0;
42035
42036 /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
42037diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
42038index 8342ca6..82fd192 100644
42039--- a/fs/befs/linuxvfs.c
42040+++ b/fs/befs/linuxvfs.c
42041@@ -503,7 +503,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
42042 {
42043 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
42044 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
42045- char *link = nd_get_link(nd);
42046+ const char *link = nd_get_link(nd);
42047 if (!IS_ERR(link))
42048 kfree(link);
42049 }
42050diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
42051index a6395bd..f1e376a 100644
42052--- a/fs/binfmt_aout.c
42053+++ b/fs/binfmt_aout.c
42054@@ -16,6 +16,7 @@
42055 #include <linux/string.h>
42056 #include <linux/fs.h>
42057 #include <linux/file.h>
42058+#include <linux/security.h>
42059 #include <linux/stat.h>
42060 #include <linux/fcntl.h>
42061 #include <linux/ptrace.h>
42062@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm)
42063 #endif
42064 # define START_STACK(u) ((void __user *)u.start_stack)
42065
42066+ memset(&dump, 0, sizeof(dump));
42067+
42068 fs = get_fs();
42069 set_fs(KERNEL_DS);
42070 has_dumped = 1;
42071@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredump_params *cprm)
42072
42073 /* If the size of the dump file exceeds the rlimit, then see what would happen
42074 if we wrote the stack, but not the data area. */
42075+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
42076 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
42077 dump.u_dsize = 0;
42078
42079 /* Make sure we have enough room to write the stack and data areas. */
42080+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
42081 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
42082 dump.u_ssize = 0;
42083
42084@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42085 rlim = rlimit(RLIMIT_DATA);
42086 if (rlim >= RLIM_INFINITY)
42087 rlim = ~0;
42088+
42089+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
42090 if (ex.a_data + ex.a_bss > rlim)
42091 return -ENOMEM;
42092
42093@@ -259,9 +266,37 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42094 current->mm->free_area_cache = current->mm->mmap_base;
42095 current->mm->cached_hole_size = 0;
42096
42097+ retval = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
42098+ if (retval < 0) {
42099+ /* Someone check-me: is this error path enough? */
42100+ send_sig(SIGKILL, current, 0);
42101+ return retval;
42102+ }
42103+
42104 install_exec_creds(bprm);
42105 current->flags &= ~PF_FORKNOEXEC;
42106
42107+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42108+ current->mm->pax_flags = 0UL;
42109+#endif
42110+
42111+#ifdef CONFIG_PAX_PAGEEXEC
42112+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
42113+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
42114+
42115+#ifdef CONFIG_PAX_EMUTRAMP
42116+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
42117+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
42118+#endif
42119+
42120+#ifdef CONFIG_PAX_MPROTECT
42121+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
42122+ current->mm->pax_flags |= MF_PAX_MPROTECT;
42123+#endif
42124+
42125+ }
42126+#endif
42127+
42128 if (N_MAGIC(ex) == OMAGIC) {
42129 unsigned long text_addr, map_size;
42130 loff_t pos;
42131@@ -334,7 +369,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42132
42133 down_write(&current->mm->mmap_sem);
42134 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
42135- PROT_READ | PROT_WRITE | PROT_EXEC,
42136+ PROT_READ | PROT_WRITE,
42137 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
42138 fd_offset + ex.a_text);
42139 up_write(&current->mm->mmap_sem);
42140@@ -352,13 +387,6 @@ beyond_if:
42141 return retval;
42142 }
42143
42144- retval = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
42145- if (retval < 0) {
42146- /* Someone check-me: is this error path enough? */
42147- send_sig(SIGKILL, current, 0);
42148- return retval;
42149- }
42150-
42151 current->mm->start_stack =
42152 (unsigned long) create_aout_tables((char __user *) bprm->p, bprm);
42153 #ifdef __alpha__
42154diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
42155index 6ff96c6..dbf63ee 100644
42156--- a/fs/binfmt_elf.c
42157+++ b/fs/binfmt_elf.c
42158@@ -32,6 +32,7 @@
42159 #include <linux/elf.h>
42160 #include <linux/utsname.h>
42161 #include <linux/coredump.h>
42162+#include <linux/xattr.h>
42163 #include <asm/uaccess.h>
42164 #include <asm/param.h>
42165 #include <asm/page.h>
42166@@ -51,6 +52,10 @@ static int elf_core_dump(struct coredump_params *cprm);
42167 #define elf_core_dump NULL
42168 #endif
42169
42170+#ifdef CONFIG_PAX_MPROTECT
42171+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
42172+#endif
42173+
42174 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
42175 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
42176 #else
42177@@ -70,6 +75,11 @@ static struct linux_binfmt elf_format = {
42178 .load_binary = load_elf_binary,
42179 .load_shlib = load_elf_library,
42180 .core_dump = elf_core_dump,
42181+
42182+#ifdef CONFIG_PAX_MPROTECT
42183+ .handle_mprotect= elf_handle_mprotect,
42184+#endif
42185+
42186 .min_coredump = ELF_EXEC_PAGESIZE,
42187 };
42188
42189@@ -77,6 +87,8 @@ static struct linux_binfmt elf_format = {
42190
42191 static int set_brk(unsigned long start, unsigned long end)
42192 {
42193+ unsigned long e = end;
42194+
42195 start = ELF_PAGEALIGN(start);
42196 end = ELF_PAGEALIGN(end);
42197 if (end > start) {
42198@@ -87,7 +99,7 @@ static int set_brk(unsigned long start, unsigned long end)
42199 if (BAD_ADDR(addr))
42200 return addr;
42201 }
42202- current->mm->start_brk = current->mm->brk = end;
42203+ current->mm->start_brk = current->mm->brk = e;
42204 return 0;
42205 }
42206
42207@@ -148,12 +160,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42208 elf_addr_t __user *u_rand_bytes;
42209 const char *k_platform = ELF_PLATFORM;
42210 const char *k_base_platform = ELF_BASE_PLATFORM;
42211- unsigned char k_rand_bytes[16];
42212+ u32 k_rand_bytes[4];
42213 int items;
42214 elf_addr_t *elf_info;
42215 int ei_index = 0;
42216 const struct cred *cred = current_cred();
42217 struct vm_area_struct *vma;
42218+ unsigned long saved_auxv[AT_VECTOR_SIZE];
42219
42220 /*
42221 * In some cases (e.g. Hyper-Threading), we want to avoid L1
42222@@ -195,8 +208,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42223 * Generate 16 random bytes for userspace PRNG seeding.
42224 */
42225 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
42226- u_rand_bytes = (elf_addr_t __user *)
42227- STACK_ALLOC(p, sizeof(k_rand_bytes));
42228+ srandom32(k_rand_bytes[0] ^ random32());
42229+ srandom32(k_rand_bytes[1] ^ random32());
42230+ srandom32(k_rand_bytes[2] ^ random32());
42231+ srandom32(k_rand_bytes[3] ^ random32());
42232+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
42233+ u_rand_bytes = (elf_addr_t __user *) p;
42234 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
42235 return -EFAULT;
42236
42237@@ -308,9 +325,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42238 return -EFAULT;
42239 current->mm->env_end = p;
42240
42241+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
42242+
42243 /* Put the elf_info on the stack in the right place. */
42244 sp = (elf_addr_t __user *)envp + 1;
42245- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
42246+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
42247 return -EFAULT;
42248 return 0;
42249 }
42250@@ -381,10 +400,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42251 {
42252 struct elf_phdr *elf_phdata;
42253 struct elf_phdr *eppnt;
42254- unsigned long load_addr = 0;
42255+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
42256 int load_addr_set = 0;
42257 unsigned long last_bss = 0, elf_bss = 0;
42258- unsigned long error = ~0UL;
42259+ unsigned long error = -EINVAL;
42260 unsigned long total_size;
42261 int retval, i, size;
42262
42263@@ -430,6 +449,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42264 goto out_close;
42265 }
42266
42267+#ifdef CONFIG_PAX_SEGMEXEC
42268+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
42269+ pax_task_size = SEGMEXEC_TASK_SIZE;
42270+#endif
42271+
42272 eppnt = elf_phdata;
42273 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
42274 if (eppnt->p_type == PT_LOAD) {
42275@@ -473,8 +497,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42276 k = load_addr + eppnt->p_vaddr;
42277 if (BAD_ADDR(k) ||
42278 eppnt->p_filesz > eppnt->p_memsz ||
42279- eppnt->p_memsz > TASK_SIZE ||
42280- TASK_SIZE - eppnt->p_memsz < k) {
42281+ eppnt->p_memsz > pax_task_size ||
42282+ pax_task_size - eppnt->p_memsz < k) {
42283 error = -ENOMEM;
42284 goto out_close;
42285 }
42286@@ -528,6 +552,351 @@ out:
42287 return error;
42288 }
42289
42290+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
42291+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
42292+{
42293+ unsigned long pax_flags = 0UL;
42294+
42295+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42296+
42297+#ifdef CONFIG_PAX_PAGEEXEC
42298+ if (elf_phdata->p_flags & PF_PAGEEXEC)
42299+ pax_flags |= MF_PAX_PAGEEXEC;
42300+#endif
42301+
42302+#ifdef CONFIG_PAX_SEGMEXEC
42303+ if (elf_phdata->p_flags & PF_SEGMEXEC)
42304+ pax_flags |= MF_PAX_SEGMEXEC;
42305+#endif
42306+
42307+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42308+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42309+ if ((__supported_pte_mask & _PAGE_NX))
42310+ pax_flags &= ~MF_PAX_SEGMEXEC;
42311+ else
42312+ pax_flags &= ~MF_PAX_PAGEEXEC;
42313+ }
42314+#endif
42315+
42316+#ifdef CONFIG_PAX_EMUTRAMP
42317+ if (elf_phdata->p_flags & PF_EMUTRAMP)
42318+ pax_flags |= MF_PAX_EMUTRAMP;
42319+#endif
42320+
42321+#ifdef CONFIG_PAX_MPROTECT
42322+ if (elf_phdata->p_flags & PF_MPROTECT)
42323+ pax_flags |= MF_PAX_MPROTECT;
42324+#endif
42325+
42326+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42327+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
42328+ pax_flags |= MF_PAX_RANDMMAP;
42329+#endif
42330+
42331+#endif
42332+
42333+ return pax_flags;
42334+}
42335+
42336+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
42337+{
42338+ unsigned long pax_flags = 0UL;
42339+
42340+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42341+
42342+#ifdef CONFIG_PAX_PAGEEXEC
42343+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
42344+ pax_flags |= MF_PAX_PAGEEXEC;
42345+#endif
42346+
42347+#ifdef CONFIG_PAX_SEGMEXEC
42348+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
42349+ pax_flags |= MF_PAX_SEGMEXEC;
42350+#endif
42351+
42352+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42353+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42354+ if ((__supported_pte_mask & _PAGE_NX))
42355+ pax_flags &= ~MF_PAX_SEGMEXEC;
42356+ else
42357+ pax_flags &= ~MF_PAX_PAGEEXEC;
42358+ }
42359+#endif
42360+
42361+#ifdef CONFIG_PAX_EMUTRAMP
42362+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
42363+ pax_flags |= MF_PAX_EMUTRAMP;
42364+#endif
42365+
42366+#ifdef CONFIG_PAX_MPROTECT
42367+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
42368+ pax_flags |= MF_PAX_MPROTECT;
42369+#endif
42370+
42371+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42372+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
42373+ pax_flags |= MF_PAX_RANDMMAP;
42374+#endif
42375+
42376+#endif
42377+
42378+ return pax_flags;
42379+}
42380+
42381+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
42382+{
42383+ unsigned long pax_flags = 0UL;
42384+
42385+#ifdef CONFIG_PAX_EI_PAX
42386+
42387+#ifdef CONFIG_PAX_PAGEEXEC
42388+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
42389+ pax_flags |= MF_PAX_PAGEEXEC;
42390+#endif
42391+
42392+#ifdef CONFIG_PAX_SEGMEXEC
42393+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
42394+ pax_flags |= MF_PAX_SEGMEXEC;
42395+#endif
42396+
42397+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42398+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42399+ if ((__supported_pte_mask & _PAGE_NX))
42400+ pax_flags &= ~MF_PAX_SEGMEXEC;
42401+ else
42402+ pax_flags &= ~MF_PAX_PAGEEXEC;
42403+ }
42404+#endif
42405+
42406+#ifdef CONFIG_PAX_EMUTRAMP
42407+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
42408+ pax_flags |= MF_PAX_EMUTRAMP;
42409+#endif
42410+
42411+#ifdef CONFIG_PAX_MPROTECT
42412+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
42413+ pax_flags |= MF_PAX_MPROTECT;
42414+#endif
42415+
42416+#ifdef CONFIG_PAX_ASLR
42417+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
42418+ pax_flags |= MF_PAX_RANDMMAP;
42419+#endif
42420+
42421+#else
42422+
42423+#ifdef CONFIG_PAX_PAGEEXEC
42424+ pax_flags |= MF_PAX_PAGEEXEC;
42425+#endif
42426+
42427+#ifdef CONFIG_PAX_MPROTECT
42428+ pax_flags |= MF_PAX_MPROTECT;
42429+#endif
42430+
42431+#ifdef CONFIG_PAX_RANDMMAP
42432+ pax_flags |= MF_PAX_RANDMMAP;
42433+#endif
42434+
42435+#ifdef CONFIG_PAX_SEGMEXEC
42436+ if (!(pax_flags & MF_PAX_PAGEEXEC) || !(__supported_pte_mask & _PAGE_NX)) {
42437+ pax_flags &= ~MF_PAX_PAGEEXEC;
42438+ pax_flags |= MF_PAX_SEGMEXEC;
42439+ }
42440+#endif
42441+
42442+#endif
42443+
42444+ return pax_flags;
42445+}
42446+
42447+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
42448+{
42449+
42450+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42451+ unsigned long i;
42452+
42453+ for (i = 0UL; i < elf_ex->e_phnum; i++)
42454+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
42455+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
42456+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
42457+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
42458+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
42459+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
42460+ return ~0UL;
42461+
42462+#ifdef CONFIG_PAX_SOFTMODE
42463+ if (pax_softmode)
42464+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
42465+ else
42466+#endif
42467+
42468+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
42469+ break;
42470+ }
42471+#endif
42472+
42473+ return ~0UL;
42474+}
42475+
42476+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42477+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
42478+{
42479+ unsigned long pax_flags = 0UL;
42480+
42481+#ifdef CONFIG_PAX_PAGEEXEC
42482+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
42483+ pax_flags |= MF_PAX_PAGEEXEC;
42484+#endif
42485+
42486+#ifdef CONFIG_PAX_SEGMEXEC
42487+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
42488+ pax_flags |= MF_PAX_SEGMEXEC;
42489+#endif
42490+
42491+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42492+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42493+ if ((__supported_pte_mask & _PAGE_NX))
42494+ pax_flags &= ~MF_PAX_SEGMEXEC;
42495+ else
42496+ pax_flags &= ~MF_PAX_PAGEEXEC;
42497+ }
42498+#endif
42499+
42500+#ifdef CONFIG_PAX_EMUTRAMP
42501+ if (pax_flags_softmode & MF_PAX_EMUTRAMP)
42502+ pax_flags |= MF_PAX_EMUTRAMP;
42503+#endif
42504+
42505+#ifdef CONFIG_PAX_MPROTECT
42506+ if (pax_flags_softmode & MF_PAX_MPROTECT)
42507+ pax_flags |= MF_PAX_MPROTECT;
42508+#endif
42509+
42510+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42511+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
42512+ pax_flags |= MF_PAX_RANDMMAP;
42513+#endif
42514+
42515+ return pax_flags;
42516+}
42517+
42518+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
42519+{
42520+ unsigned long pax_flags = 0UL;
42521+
42522+#ifdef CONFIG_PAX_PAGEEXEC
42523+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
42524+ pax_flags |= MF_PAX_PAGEEXEC;
42525+#endif
42526+
42527+#ifdef CONFIG_PAX_SEGMEXEC
42528+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
42529+ pax_flags |= MF_PAX_SEGMEXEC;
42530+#endif
42531+
42532+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42533+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42534+ if ((__supported_pte_mask & _PAGE_NX))
42535+ pax_flags &= ~MF_PAX_SEGMEXEC;
42536+ else
42537+ pax_flags &= ~MF_PAX_PAGEEXEC;
42538+ }
42539+#endif
42540+
42541+#ifdef CONFIG_PAX_EMUTRAMP
42542+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
42543+ pax_flags |= MF_PAX_EMUTRAMP;
42544+#endif
42545+
42546+#ifdef CONFIG_PAX_MPROTECT
42547+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
42548+ pax_flags |= MF_PAX_MPROTECT;
42549+#endif
42550+
42551+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42552+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
42553+ pax_flags |= MF_PAX_RANDMMAP;
42554+#endif
42555+
42556+ return pax_flags;
42557+}
42558+#endif
42559+
42560+static unsigned long pax_parse_xattr_pax(struct file * const file)
42561+{
42562+
42563+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42564+ ssize_t xattr_size, i;
42565+ unsigned char xattr_value[5];
42566+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
42567+
42568+ xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
42569+ if (xattr_size <= 0)
42570+ return ~0UL;
42571+
42572+ for (i = 0; i < xattr_size; i++)
42573+ switch (xattr_value[i]) {
42574+ default:
42575+ return ~0UL;
42576+
42577+#define parse_flag(option1, option2, flag) \
42578+ case option1: \
42579+ pax_flags_hardmode |= MF_PAX_##flag; \
42580+ break; \
42581+ case option2: \
42582+ pax_flags_softmode |= MF_PAX_##flag; \
42583+ break;
42584+
42585+ parse_flag('p', 'P', PAGEEXEC);
42586+ parse_flag('e', 'E', EMUTRAMP);
42587+ parse_flag('m', 'M', MPROTECT);
42588+ parse_flag('r', 'R', RANDMMAP);
42589+ parse_flag('s', 'S', SEGMEXEC);
42590+
42591+#undef parse_flag
42592+ }
42593+
42594+ if (pax_flags_hardmode & pax_flags_softmode)
42595+ return ~0UL;
42596+
42597+#ifdef CONFIG_PAX_SOFTMODE
42598+ if (pax_softmode)
42599+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
42600+ else
42601+#endif
42602+
42603+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
42604+#else
42605+ return ~0UL;
42606+#endif
42607+
42608+}
42609+
42610+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
42611+{
42612+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
42613+
42614+ pax_flags = pax_parse_ei_pax(elf_ex);
42615+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
42616+ xattr_pax_flags = pax_parse_xattr_pax(file);
42617+
42618+ if (pt_pax_flags == ~0UL)
42619+ pt_pax_flags = xattr_pax_flags;
42620+ else if (xattr_pax_flags == ~0UL)
42621+ xattr_pax_flags = pt_pax_flags;
42622+ if (pt_pax_flags != xattr_pax_flags)
42623+ return -EINVAL;
42624+ if (pt_pax_flags != ~0UL)
42625+ pax_flags = pt_pax_flags;
42626+
42627+ if (0 > pax_check_flags(&pax_flags))
42628+ return -EINVAL;
42629+
42630+ current->mm->pax_flags = pax_flags;
42631+ return 0;
42632+}
42633+#endif
42634+
42635 /*
42636 * These are the functions used to load ELF style executables and shared
42637 * libraries. There is no binary dependent code anywhere else.
42638@@ -544,6 +913,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
42639 {
42640 unsigned int random_variable = 0;
42641
42642+#ifdef CONFIG_PAX_RANDUSTACK
42643+ if (randomize_va_space)
42644+ return stack_top - current->mm->delta_stack;
42645+#endif
42646+
42647 if ((current->flags & PF_RANDOMIZE) &&
42648 !(current->personality & ADDR_NO_RANDOMIZE)) {
42649 random_variable = get_random_int() & STACK_RND_MASK;
42650@@ -562,7 +936,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42651 unsigned long load_addr = 0, load_bias = 0;
42652 int load_addr_set = 0;
42653 char * elf_interpreter = NULL;
42654- unsigned long error;
42655+ unsigned long error = 0;
42656 struct elf_phdr *elf_ppnt, *elf_phdata;
42657 unsigned long elf_bss, elf_brk;
42658 int retval, i;
42659@@ -572,11 +946,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42660 unsigned long start_code, end_code, start_data, end_data;
42661 unsigned long reloc_func_desc __maybe_unused = 0;
42662 int executable_stack = EXSTACK_DEFAULT;
42663- unsigned long def_flags = 0;
42664 struct {
42665 struct elfhdr elf_ex;
42666 struct elfhdr interp_elf_ex;
42667 } *loc;
42668+ unsigned long pax_task_size = TASK_SIZE;
42669
42670 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
42671 if (!loc) {
42672@@ -713,11 +1087,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42673
42674 /* OK, This is the point of no return */
42675 current->flags &= ~PF_FORKNOEXEC;
42676- current->mm->def_flags = def_flags;
42677+
42678+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42679+ current->mm->pax_flags = 0UL;
42680+#endif
42681+
42682+#ifdef CONFIG_PAX_DLRESOLVE
42683+ current->mm->call_dl_resolve = 0UL;
42684+#endif
42685+
42686+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
42687+ current->mm->call_syscall = 0UL;
42688+#endif
42689+
42690+#ifdef CONFIG_PAX_ASLR
42691+ current->mm->delta_mmap = 0UL;
42692+ current->mm->delta_stack = 0UL;
42693+#endif
42694+
42695+ current->mm->def_flags = 0;
42696+
42697+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
42698+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
42699+ send_sig(SIGKILL, current, 0);
42700+ goto out_free_dentry;
42701+ }
42702+#endif
42703+
42704+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
42705+ pax_set_initial_flags(bprm);
42706+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
42707+ if (pax_set_initial_flags_func)
42708+ (pax_set_initial_flags_func)(bprm);
42709+#endif
42710+
42711+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
42712+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
42713+ current->mm->context.user_cs_limit = PAGE_SIZE;
42714+ current->mm->def_flags |= VM_PAGEEXEC;
42715+ }
42716+#endif
42717+
42718+#ifdef CONFIG_PAX_SEGMEXEC
42719+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
42720+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
42721+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
42722+ pax_task_size = SEGMEXEC_TASK_SIZE;
42723+ current->mm->def_flags |= VM_NOHUGEPAGE;
42724+ }
42725+#endif
42726+
42727+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
42728+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42729+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
42730+ put_cpu();
42731+ }
42732+#endif
42733
42734 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
42735 may depend on the personality. */
42736 SET_PERSONALITY(loc->elf_ex);
42737+
42738+#ifdef CONFIG_PAX_ASLR
42739+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
42740+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
42741+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
42742+ }
42743+#endif
42744+
42745+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
42746+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42747+ executable_stack = EXSTACK_DISABLE_X;
42748+ current->personality &= ~READ_IMPLIES_EXEC;
42749+ } else
42750+#endif
42751+
42752 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
42753 current->personality |= READ_IMPLIES_EXEC;
42754
42755@@ -808,6 +1252,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42756 #else
42757 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
42758 #endif
42759+
42760+#ifdef CONFIG_PAX_RANDMMAP
42761+ /* PaX: randomize base address at the default exe base if requested */
42762+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
42763+#ifdef CONFIG_SPARC64
42764+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
42765+#else
42766+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
42767+#endif
42768+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
42769+ elf_flags |= MAP_FIXED;
42770+ }
42771+#endif
42772+
42773 }
42774
42775 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
42776@@ -840,9 +1298,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42777 * allowed task size. Note that p_filesz must always be
42778 * <= p_memsz so it is only necessary to check p_memsz.
42779 */
42780- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
42781- elf_ppnt->p_memsz > TASK_SIZE ||
42782- TASK_SIZE - elf_ppnt->p_memsz < k) {
42783+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
42784+ elf_ppnt->p_memsz > pax_task_size ||
42785+ pax_task_size - elf_ppnt->p_memsz < k) {
42786 /* set_brk can never work. Avoid overflows. */
42787 send_sig(SIGKILL, current, 0);
42788 retval = -EINVAL;
42789@@ -870,6 +1328,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42790 start_data += load_bias;
42791 end_data += load_bias;
42792
42793+#ifdef CONFIG_PAX_RANDMMAP
42794+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
42795+ elf_brk += PAGE_SIZE + ((pax_get_random_long() & ~PAGE_MASK) << 4);
42796+#endif
42797+
42798 /* Calling set_brk effectively mmaps the pages that we need
42799 * for the bss and break sections. We must do this before
42800 * mapping in the interpreter, to make sure it doesn't wind
42801@@ -881,9 +1344,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42802 goto out_free_dentry;
42803 }
42804 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
42805- send_sig(SIGSEGV, current, 0);
42806- retval = -EFAULT; /* Nobody gets to see this, but.. */
42807- goto out_free_dentry;
42808+ /*
42809+ * This bss-zeroing can fail if the ELF
42810+ * file specifies odd protections. So
42811+ * we don't check the return value
42812+ */
42813 }
42814
42815 if (elf_interpreter) {
42816@@ -1098,7 +1563,7 @@ out:
42817 * Decide what to dump of a segment, part, all or none.
42818 */
42819 static unsigned long vma_dump_size(struct vm_area_struct *vma,
42820- unsigned long mm_flags)
42821+ unsigned long mm_flags, long signr)
42822 {
42823 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
42824
42825@@ -1132,7 +1597,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
42826 if (vma->vm_file == NULL)
42827 return 0;
42828
42829- if (FILTER(MAPPED_PRIVATE))
42830+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
42831 goto whole;
42832
42833 /*
42834@@ -1354,9 +1819,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
42835 {
42836 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
42837 int i = 0;
42838- do
42839+ do {
42840 i += 2;
42841- while (auxv[i - 2] != AT_NULL);
42842+ } while (auxv[i - 2] != AT_NULL);
42843 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
42844 }
42845
42846@@ -1862,14 +2327,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
42847 }
42848
42849 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
42850- unsigned long mm_flags)
42851+ struct coredump_params *cprm)
42852 {
42853 struct vm_area_struct *vma;
42854 size_t size = 0;
42855
42856 for (vma = first_vma(current, gate_vma); vma != NULL;
42857 vma = next_vma(vma, gate_vma))
42858- size += vma_dump_size(vma, mm_flags);
42859+ size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
42860 return size;
42861 }
42862
42863@@ -1963,7 +2428,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42864
42865 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
42866
42867- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
42868+ offset += elf_core_vma_data_size(gate_vma, cprm);
42869 offset += elf_core_extra_data_size();
42870 e_shoff = offset;
42871
42872@@ -1977,10 +2442,12 @@ static int elf_core_dump(struct coredump_params *cprm)
42873 offset = dataoff;
42874
42875 size += sizeof(*elf);
42876+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42877 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
42878 goto end_coredump;
42879
42880 size += sizeof(*phdr4note);
42881+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42882 if (size > cprm->limit
42883 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
42884 goto end_coredump;
42885@@ -1994,7 +2461,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42886 phdr.p_offset = offset;
42887 phdr.p_vaddr = vma->vm_start;
42888 phdr.p_paddr = 0;
42889- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
42890+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
42891 phdr.p_memsz = vma->vm_end - vma->vm_start;
42892 offset += phdr.p_filesz;
42893 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
42894@@ -2005,6 +2472,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42895 phdr.p_align = ELF_EXEC_PAGESIZE;
42896
42897 size += sizeof(phdr);
42898+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42899 if (size > cprm->limit
42900 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
42901 goto end_coredump;
42902@@ -2029,7 +2497,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42903 unsigned long addr;
42904 unsigned long end;
42905
42906- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
42907+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
42908
42909 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
42910 struct page *page;
42911@@ -2038,6 +2506,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42912 page = get_dump_page(addr);
42913 if (page) {
42914 void *kaddr = kmap(page);
42915+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
42916 stop = ((size += PAGE_SIZE) > cprm->limit) ||
42917 !dump_write(cprm->file, kaddr,
42918 PAGE_SIZE);
42919@@ -2055,6 +2524,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42920
42921 if (e_phnum == PN_XNUM) {
42922 size += sizeof(*shdr4extnum);
42923+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42924 if (size > cprm->limit
42925 || !dump_write(cprm->file, shdr4extnum,
42926 sizeof(*shdr4extnum)))
42927@@ -2075,6 +2545,97 @@ out:
42928
42929 #endif /* CONFIG_ELF_CORE */
42930
42931+#ifdef CONFIG_PAX_MPROTECT
42932+/* PaX: non-PIC ELF libraries need relocations on their executable segments
42933+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
42934+ * we'll remove VM_MAYWRITE for good on RELRO segments.
42935+ *
42936+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
42937+ * basis because we want to allow the common case and not the special ones.
42938+ */
42939+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
42940+{
42941+ struct elfhdr elf_h;
42942+ struct elf_phdr elf_p;
42943+ unsigned long i;
42944+ unsigned long oldflags;
42945+ bool is_textrel_rw, is_textrel_rx, is_relro;
42946+
42947+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
42948+ return;
42949+
42950+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
42951+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
42952+
42953+#ifdef CONFIG_PAX_ELFRELOCS
42954+ /* possible TEXTREL */
42955+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
42956+ 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);
42957+#else
42958+ is_textrel_rw = false;
42959+ is_textrel_rx = false;
42960+#endif
42961+
42962+ /* possible RELRO */
42963+ is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
42964+
42965+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
42966+ return;
42967+
42968+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
42969+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
42970+
42971+#ifdef CONFIG_PAX_ETEXECRELOCS
42972+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
42973+#else
42974+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
42975+#endif
42976+
42977+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
42978+ !elf_check_arch(&elf_h) ||
42979+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
42980+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
42981+ return;
42982+
42983+ for (i = 0UL; i < elf_h.e_phnum; i++) {
42984+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
42985+ return;
42986+ switch (elf_p.p_type) {
42987+ case PT_DYNAMIC:
42988+ if (!is_textrel_rw && !is_textrel_rx)
42989+ continue;
42990+ i = 0UL;
42991+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
42992+ elf_dyn dyn;
42993+
42994+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
42995+ return;
42996+ if (dyn.d_tag == DT_NULL)
42997+ return;
42998+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
42999+ gr_log_textrel(vma);
43000+ if (is_textrel_rw)
43001+ vma->vm_flags |= VM_MAYWRITE;
43002+ else
43003+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
43004+ vma->vm_flags &= ~VM_MAYWRITE;
43005+ return;
43006+ }
43007+ i++;
43008+ }
43009+ return;
43010+
43011+ case PT_GNU_RELRO:
43012+ if (!is_relro)
43013+ continue;
43014+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
43015+ vma->vm_flags &= ~VM_MAYWRITE;
43016+ return;
43017+ }
43018+ }
43019+}
43020+#endif
43021+
43022 static int __init init_elf_binfmt(void)
43023 {
43024 return register_binfmt(&elf_format);
43025diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
43026index 1bffbe0..c8c283e 100644
43027--- a/fs/binfmt_flat.c
43028+++ b/fs/binfmt_flat.c
43029@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm,
43030 realdatastart = (unsigned long) -ENOMEM;
43031 printk("Unable to allocate RAM for process data, errno %d\n",
43032 (int)-realdatastart);
43033+ down_write(&current->mm->mmap_sem);
43034 do_munmap(current->mm, textpos, text_len);
43035+ up_write(&current->mm->mmap_sem);
43036 ret = realdatastart;
43037 goto err;
43038 }
43039@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm,
43040 }
43041 if (IS_ERR_VALUE(result)) {
43042 printk("Unable to read data+bss, errno %d\n", (int)-result);
43043+ down_write(&current->mm->mmap_sem);
43044 do_munmap(current->mm, textpos, text_len);
43045 do_munmap(current->mm, realdatastart, len);
43046+ up_write(&current->mm->mmap_sem);
43047 ret = result;
43048 goto err;
43049 }
43050@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm,
43051 }
43052 if (IS_ERR_VALUE(result)) {
43053 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
43054+ down_write(&current->mm->mmap_sem);
43055 do_munmap(current->mm, textpos, text_len + data_len + extra +
43056 MAX_SHARED_LIBS * sizeof(unsigned long));
43057+ up_write(&current->mm->mmap_sem);
43058 ret = result;
43059 goto err;
43060 }
43061diff --git a/fs/bio.c b/fs/bio.c
43062index b1fe82c..84da0a9 100644
43063--- a/fs/bio.c
43064+++ b/fs/bio.c
43065@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
43066 const int read = bio_data_dir(bio) == READ;
43067 struct bio_map_data *bmd = bio->bi_private;
43068 int i;
43069- char *p = bmd->sgvecs[0].iov_base;
43070+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
43071
43072 __bio_for_each_segment(bvec, bio, i, 0) {
43073 char *addr = page_address(bvec->bv_page);
43074diff --git a/fs/block_dev.c b/fs/block_dev.c
43075index b07f1da..9efcb92 100644
43076--- a/fs/block_dev.c
43077+++ b/fs/block_dev.c
43078@@ -681,7 +681,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
43079 else if (bdev->bd_contains == bdev)
43080 return true; /* is a whole device which isn't held */
43081
43082- else if (whole->bd_holder == bd_may_claim)
43083+ else if (whole->bd_holder == (void *)bd_may_claim)
43084 return true; /* is a partition of a device that is being partitioned */
43085 else if (whole->bd_holder != NULL)
43086 return false; /* is a partition of a held device */
43087diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
43088index dede441..f2a2507 100644
43089--- a/fs/btrfs/ctree.c
43090+++ b/fs/btrfs/ctree.c
43091@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
43092 free_extent_buffer(buf);
43093 add_root_to_dirty_list(root);
43094 } else {
43095- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
43096- parent_start = parent->start;
43097- else
43098+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
43099+ if (parent)
43100+ parent_start = parent->start;
43101+ else
43102+ parent_start = 0;
43103+ } else
43104 parent_start = 0;
43105
43106 WARN_ON(trans->transid != btrfs_header_generation(parent));
43107diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
43108index fd1a06d..6e9033d 100644
43109--- a/fs/btrfs/inode.c
43110+++ b/fs/btrfs/inode.c
43111@@ -6895,7 +6895,7 @@ fail:
43112 return -ENOMEM;
43113 }
43114
43115-static int btrfs_getattr(struct vfsmount *mnt,
43116+int btrfs_getattr(struct vfsmount *mnt,
43117 struct dentry *dentry, struct kstat *stat)
43118 {
43119 struct inode *inode = dentry->d_inode;
43120@@ -6909,6 +6909,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
43121 return 0;
43122 }
43123
43124+EXPORT_SYMBOL(btrfs_getattr);
43125+
43126+dev_t get_btrfs_dev_from_inode(struct inode *inode)
43127+{
43128+ return BTRFS_I(inode)->root->anon_dev;
43129+}
43130+EXPORT_SYMBOL(get_btrfs_dev_from_inode);
43131+
43132 /*
43133 * If a file is moved, it will inherit the cow and compression flags of the new
43134 * directory.
43135diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
43136index c04f02c..f5c9e2e 100644
43137--- a/fs/btrfs/ioctl.c
43138+++ b/fs/btrfs/ioctl.c
43139@@ -2733,9 +2733,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43140 for (i = 0; i < num_types; i++) {
43141 struct btrfs_space_info *tmp;
43142
43143+ /* Don't copy in more than we allocated */
43144 if (!slot_count)
43145 break;
43146
43147+ slot_count--;
43148+
43149 info = NULL;
43150 rcu_read_lock();
43151 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
43152@@ -2757,15 +2760,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43153 memcpy(dest, &space, sizeof(space));
43154 dest++;
43155 space_args.total_spaces++;
43156- slot_count--;
43157 }
43158- if (!slot_count)
43159- break;
43160 }
43161 up_read(&info->groups_sem);
43162 }
43163
43164- user_dest = (struct btrfs_ioctl_space_info *)
43165+ user_dest = (struct btrfs_ioctl_space_info __user *)
43166 (arg + sizeof(struct btrfs_ioctl_space_args));
43167
43168 if (copy_to_user(user_dest, dest_orig, alloc_size))
43169diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
43170index cfb5543..1ae7347 100644
43171--- a/fs/btrfs/relocation.c
43172+++ b/fs/btrfs/relocation.c
43173@@ -1244,7 +1244,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
43174 }
43175 spin_unlock(&rc->reloc_root_tree.lock);
43176
43177- BUG_ON((struct btrfs_root *)node->data != root);
43178+ BUG_ON(!node || (struct btrfs_root *)node->data != root);
43179
43180 if (!del) {
43181 spin_lock(&rc->reloc_root_tree.lock);
43182diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
43183index 622f469..e8d2d55 100644
43184--- a/fs/cachefiles/bind.c
43185+++ b/fs/cachefiles/bind.c
43186@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
43187 args);
43188
43189 /* start by checking things over */
43190- ASSERT(cache->fstop_percent >= 0 &&
43191- cache->fstop_percent < cache->fcull_percent &&
43192+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
43193 cache->fcull_percent < cache->frun_percent &&
43194 cache->frun_percent < 100);
43195
43196- ASSERT(cache->bstop_percent >= 0 &&
43197- cache->bstop_percent < cache->bcull_percent &&
43198+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
43199 cache->bcull_percent < cache->brun_percent &&
43200 cache->brun_percent < 100);
43201
43202diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
43203index 0a1467b..6a53245 100644
43204--- a/fs/cachefiles/daemon.c
43205+++ b/fs/cachefiles/daemon.c
43206@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
43207 if (n > buflen)
43208 return -EMSGSIZE;
43209
43210- if (copy_to_user(_buffer, buffer, n) != 0)
43211+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
43212 return -EFAULT;
43213
43214 return n;
43215@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
43216 if (test_bit(CACHEFILES_DEAD, &cache->flags))
43217 return -EIO;
43218
43219- if (datalen < 0 || datalen > PAGE_SIZE - 1)
43220+ if (datalen > PAGE_SIZE - 1)
43221 return -EOPNOTSUPP;
43222
43223 /* drag the command string into the kernel so we can parse it */
43224@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
43225 if (args[0] != '%' || args[1] != '\0')
43226 return -EINVAL;
43227
43228- if (fstop < 0 || fstop >= cache->fcull_percent)
43229+ if (fstop >= cache->fcull_percent)
43230 return cachefiles_daemon_range_error(cache, args);
43231
43232 cache->fstop_percent = fstop;
43233@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
43234 if (args[0] != '%' || args[1] != '\0')
43235 return -EINVAL;
43236
43237- if (bstop < 0 || bstop >= cache->bcull_percent)
43238+ if (bstop >= cache->bcull_percent)
43239 return cachefiles_daemon_range_error(cache, args);
43240
43241 cache->bstop_percent = bstop;
43242diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
43243index bd6bc1b..b627b53 100644
43244--- a/fs/cachefiles/internal.h
43245+++ b/fs/cachefiles/internal.h
43246@@ -57,7 +57,7 @@ struct cachefiles_cache {
43247 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
43248 struct rb_root active_nodes; /* active nodes (can't be culled) */
43249 rwlock_t active_lock; /* lock for active_nodes */
43250- atomic_t gravecounter; /* graveyard uniquifier */
43251+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
43252 unsigned frun_percent; /* when to stop culling (% files) */
43253 unsigned fcull_percent; /* when to start culling (% files) */
43254 unsigned fstop_percent; /* when to stop allocating (% files) */
43255@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
43256 * proc.c
43257 */
43258 #ifdef CONFIG_CACHEFILES_HISTOGRAM
43259-extern atomic_t cachefiles_lookup_histogram[HZ];
43260-extern atomic_t cachefiles_mkdir_histogram[HZ];
43261-extern atomic_t cachefiles_create_histogram[HZ];
43262+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43263+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43264+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
43265
43266 extern int __init cachefiles_proc_init(void);
43267 extern void cachefiles_proc_cleanup(void);
43268 static inline
43269-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
43270+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
43271 {
43272 unsigned long jif = jiffies - start_jif;
43273 if (jif >= HZ)
43274 jif = HZ - 1;
43275- atomic_inc(&histogram[jif]);
43276+ atomic_inc_unchecked(&histogram[jif]);
43277 }
43278
43279 #else
43280diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
43281index a0358c2..d6137f2 100644
43282--- a/fs/cachefiles/namei.c
43283+++ b/fs/cachefiles/namei.c
43284@@ -318,7 +318,7 @@ try_again:
43285 /* first step is to make up a grave dentry in the graveyard */
43286 sprintf(nbuffer, "%08x%08x",
43287 (uint32_t) get_seconds(),
43288- (uint32_t) atomic_inc_return(&cache->gravecounter));
43289+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
43290
43291 /* do the multiway lock magic */
43292 trap = lock_rename(cache->graveyard, dir);
43293diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
43294index eccd339..4c1d995 100644
43295--- a/fs/cachefiles/proc.c
43296+++ b/fs/cachefiles/proc.c
43297@@ -14,9 +14,9 @@
43298 #include <linux/seq_file.h>
43299 #include "internal.h"
43300
43301-atomic_t cachefiles_lookup_histogram[HZ];
43302-atomic_t cachefiles_mkdir_histogram[HZ];
43303-atomic_t cachefiles_create_histogram[HZ];
43304+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43305+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43306+atomic_unchecked_t cachefiles_create_histogram[HZ];
43307
43308 /*
43309 * display the latency histogram
43310@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
43311 return 0;
43312 default:
43313 index = (unsigned long) v - 3;
43314- x = atomic_read(&cachefiles_lookup_histogram[index]);
43315- y = atomic_read(&cachefiles_mkdir_histogram[index]);
43316- z = atomic_read(&cachefiles_create_histogram[index]);
43317+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
43318+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
43319+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
43320 if (x == 0 && y == 0 && z == 0)
43321 return 0;
43322
43323diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
43324index 0e3c092..818480e 100644
43325--- a/fs/cachefiles/rdwr.c
43326+++ b/fs/cachefiles/rdwr.c
43327@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
43328 old_fs = get_fs();
43329 set_fs(KERNEL_DS);
43330 ret = file->f_op->write(
43331- file, (const void __user *) data, len, &pos);
43332+ file, (const void __force_user *) data, len, &pos);
43333 set_fs(old_fs);
43334 kunmap(page);
43335 if (ret != len)
43336diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
43337index 9895400..fa40a7d 100644
43338--- a/fs/ceph/dir.c
43339+++ b/fs/ceph/dir.c
43340@@ -244,7 +244,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
43341 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
43342 struct ceph_mds_client *mdsc = fsc->mdsc;
43343 unsigned frag = fpos_frag(filp->f_pos);
43344- int off = fpos_off(filp->f_pos);
43345+ unsigned int off = fpos_off(filp->f_pos);
43346 int err;
43347 u32 ftype;
43348 struct ceph_mds_reply_info_parsed *rinfo;
43349diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
43350index cfd1ce3..6b13a74 100644
43351--- a/fs/cifs/asn1.c
43352+++ b/fs/cifs/asn1.c
43353@@ -416,6 +416,9 @@ asn1_subid_decode(struct asn1_ctx *ctx, unsigned long *subid)
43354
43355 static int
43356 asn1_oid_decode(struct asn1_ctx *ctx,
43357+ unsigned char *eoc, unsigned long **oid, unsigned int *len) __size_overflow(2);
43358+static int
43359+asn1_oid_decode(struct asn1_ctx *ctx,
43360 unsigned char *eoc, unsigned long **oid, unsigned int *len)
43361 {
43362 unsigned long subid;
43363diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
43364index 84e8c07..6170d31 100644
43365--- a/fs/cifs/cifs_debug.c
43366+++ b/fs/cifs/cifs_debug.c
43367@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43368
43369 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
43370 #ifdef CONFIG_CIFS_STATS2
43371- atomic_set(&totBufAllocCount, 0);
43372- atomic_set(&totSmBufAllocCount, 0);
43373+ atomic_set_unchecked(&totBufAllocCount, 0);
43374+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43375 #endif /* CONFIG_CIFS_STATS2 */
43376 spin_lock(&cifs_tcp_ses_lock);
43377 list_for_each(tmp1, &cifs_tcp_ses_list) {
43378@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43379 tcon = list_entry(tmp3,
43380 struct cifs_tcon,
43381 tcon_list);
43382- atomic_set(&tcon->num_smbs_sent, 0);
43383- atomic_set(&tcon->num_writes, 0);
43384- atomic_set(&tcon->num_reads, 0);
43385- atomic_set(&tcon->num_oplock_brks, 0);
43386- atomic_set(&tcon->num_opens, 0);
43387- atomic_set(&tcon->num_posixopens, 0);
43388- atomic_set(&tcon->num_posixmkdirs, 0);
43389- atomic_set(&tcon->num_closes, 0);
43390- atomic_set(&tcon->num_deletes, 0);
43391- atomic_set(&tcon->num_mkdirs, 0);
43392- atomic_set(&tcon->num_rmdirs, 0);
43393- atomic_set(&tcon->num_renames, 0);
43394- atomic_set(&tcon->num_t2renames, 0);
43395- atomic_set(&tcon->num_ffirst, 0);
43396- atomic_set(&tcon->num_fnext, 0);
43397- atomic_set(&tcon->num_fclose, 0);
43398- atomic_set(&tcon->num_hardlinks, 0);
43399- atomic_set(&tcon->num_symlinks, 0);
43400- atomic_set(&tcon->num_locks, 0);
43401+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
43402+ atomic_set_unchecked(&tcon->num_writes, 0);
43403+ atomic_set_unchecked(&tcon->num_reads, 0);
43404+ atomic_set_unchecked(&tcon->num_oplock_brks, 0);
43405+ atomic_set_unchecked(&tcon->num_opens, 0);
43406+ atomic_set_unchecked(&tcon->num_posixopens, 0);
43407+ atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
43408+ atomic_set_unchecked(&tcon->num_closes, 0);
43409+ atomic_set_unchecked(&tcon->num_deletes, 0);
43410+ atomic_set_unchecked(&tcon->num_mkdirs, 0);
43411+ atomic_set_unchecked(&tcon->num_rmdirs, 0);
43412+ atomic_set_unchecked(&tcon->num_renames, 0);
43413+ atomic_set_unchecked(&tcon->num_t2renames, 0);
43414+ atomic_set_unchecked(&tcon->num_ffirst, 0);
43415+ atomic_set_unchecked(&tcon->num_fnext, 0);
43416+ atomic_set_unchecked(&tcon->num_fclose, 0);
43417+ atomic_set_unchecked(&tcon->num_hardlinks, 0);
43418+ atomic_set_unchecked(&tcon->num_symlinks, 0);
43419+ atomic_set_unchecked(&tcon->num_locks, 0);
43420 }
43421 }
43422 }
43423@@ -327,8 +327,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43424 smBufAllocCount.counter, cifs_min_small);
43425 #ifdef CONFIG_CIFS_STATS2
43426 seq_printf(m, "Total Large %d Small %d Allocations\n",
43427- atomic_read(&totBufAllocCount),
43428- atomic_read(&totSmBufAllocCount));
43429+ atomic_read_unchecked(&totBufAllocCount),
43430+ atomic_read_unchecked(&totSmBufAllocCount));
43431 #endif /* CONFIG_CIFS_STATS2 */
43432
43433 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
43434@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43435 if (tcon->need_reconnect)
43436 seq_puts(m, "\tDISCONNECTED ");
43437 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
43438- atomic_read(&tcon->num_smbs_sent),
43439- atomic_read(&tcon->num_oplock_brks));
43440+ atomic_read_unchecked(&tcon->num_smbs_sent),
43441+ atomic_read_unchecked(&tcon->num_oplock_brks));
43442 seq_printf(m, "\nReads: %d Bytes: %lld",
43443- atomic_read(&tcon->num_reads),
43444+ atomic_read_unchecked(&tcon->num_reads),
43445 (long long)(tcon->bytes_read));
43446 seq_printf(m, "\nWrites: %d Bytes: %lld",
43447- atomic_read(&tcon->num_writes),
43448+ atomic_read_unchecked(&tcon->num_writes),
43449 (long long)(tcon->bytes_written));
43450 seq_printf(m, "\nFlushes: %d",
43451- atomic_read(&tcon->num_flushes));
43452+ atomic_read_unchecked(&tcon->num_flushes));
43453 seq_printf(m, "\nLocks: %d HardLinks: %d "
43454 "Symlinks: %d",
43455- atomic_read(&tcon->num_locks),
43456- atomic_read(&tcon->num_hardlinks),
43457- atomic_read(&tcon->num_symlinks));
43458+ atomic_read_unchecked(&tcon->num_locks),
43459+ atomic_read_unchecked(&tcon->num_hardlinks),
43460+ atomic_read_unchecked(&tcon->num_symlinks));
43461 seq_printf(m, "\nOpens: %d Closes: %d "
43462 "Deletes: %d",
43463- atomic_read(&tcon->num_opens),
43464- atomic_read(&tcon->num_closes),
43465- atomic_read(&tcon->num_deletes));
43466+ atomic_read_unchecked(&tcon->num_opens),
43467+ atomic_read_unchecked(&tcon->num_closes),
43468+ atomic_read_unchecked(&tcon->num_deletes));
43469 seq_printf(m, "\nPosix Opens: %d "
43470 "Posix Mkdirs: %d",
43471- atomic_read(&tcon->num_posixopens),
43472- atomic_read(&tcon->num_posixmkdirs));
43473+ atomic_read_unchecked(&tcon->num_posixopens),
43474+ atomic_read_unchecked(&tcon->num_posixmkdirs));
43475 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
43476- atomic_read(&tcon->num_mkdirs),
43477- atomic_read(&tcon->num_rmdirs));
43478+ atomic_read_unchecked(&tcon->num_mkdirs),
43479+ atomic_read_unchecked(&tcon->num_rmdirs));
43480 seq_printf(m, "\nRenames: %d T2 Renames %d",
43481- atomic_read(&tcon->num_renames),
43482- atomic_read(&tcon->num_t2renames));
43483+ atomic_read_unchecked(&tcon->num_renames),
43484+ atomic_read_unchecked(&tcon->num_t2renames));
43485 seq_printf(m, "\nFindFirst: %d FNext %d "
43486 "FClose %d",
43487- atomic_read(&tcon->num_ffirst),
43488- atomic_read(&tcon->num_fnext),
43489- atomic_read(&tcon->num_fclose));
43490+ atomic_read_unchecked(&tcon->num_ffirst),
43491+ atomic_read_unchecked(&tcon->num_fnext),
43492+ atomic_read_unchecked(&tcon->num_fclose));
43493 }
43494 }
43495 }
43496diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
43497index 8f1fe32..38f9e27 100644
43498--- a/fs/cifs/cifsfs.c
43499+++ b/fs/cifs/cifsfs.c
43500@@ -989,7 +989,7 @@ cifs_init_request_bufs(void)
43501 cifs_req_cachep = kmem_cache_create("cifs_request",
43502 CIFSMaxBufSize +
43503 MAX_CIFS_HDR_SIZE, 0,
43504- SLAB_HWCACHE_ALIGN, NULL);
43505+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
43506 if (cifs_req_cachep == NULL)
43507 return -ENOMEM;
43508
43509@@ -1016,7 +1016,7 @@ cifs_init_request_bufs(void)
43510 efficient to alloc 1 per page off the slab compared to 17K (5page)
43511 alloc of large cifs buffers even when page debugging is on */
43512 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
43513- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
43514+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
43515 NULL);
43516 if (cifs_sm_req_cachep == NULL) {
43517 mempool_destroy(cifs_req_poolp);
43518@@ -1101,8 +1101,8 @@ init_cifs(void)
43519 atomic_set(&bufAllocCount, 0);
43520 atomic_set(&smBufAllocCount, 0);
43521 #ifdef CONFIG_CIFS_STATS2
43522- atomic_set(&totBufAllocCount, 0);
43523- atomic_set(&totSmBufAllocCount, 0);
43524+ atomic_set_unchecked(&totBufAllocCount, 0);
43525+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43526 #endif /* CONFIG_CIFS_STATS2 */
43527
43528 atomic_set(&midCount, 0);
43529diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
43530index 8238aa1..0347196 100644
43531--- a/fs/cifs/cifsglob.h
43532+++ b/fs/cifs/cifsglob.h
43533@@ -392,28 +392,28 @@ struct cifs_tcon {
43534 __u16 Flags; /* optional support bits */
43535 enum statusEnum tidStatus;
43536 #ifdef CONFIG_CIFS_STATS
43537- atomic_t num_smbs_sent;
43538- atomic_t num_writes;
43539- atomic_t num_reads;
43540- atomic_t num_flushes;
43541- atomic_t num_oplock_brks;
43542- atomic_t num_opens;
43543- atomic_t num_closes;
43544- atomic_t num_deletes;
43545- atomic_t num_mkdirs;
43546- atomic_t num_posixopens;
43547- atomic_t num_posixmkdirs;
43548- atomic_t num_rmdirs;
43549- atomic_t num_renames;
43550- atomic_t num_t2renames;
43551- atomic_t num_ffirst;
43552- atomic_t num_fnext;
43553- atomic_t num_fclose;
43554- atomic_t num_hardlinks;
43555- atomic_t num_symlinks;
43556- atomic_t num_locks;
43557- atomic_t num_acl_get;
43558- atomic_t num_acl_set;
43559+ atomic_unchecked_t num_smbs_sent;
43560+ atomic_unchecked_t num_writes;
43561+ atomic_unchecked_t num_reads;
43562+ atomic_unchecked_t num_flushes;
43563+ atomic_unchecked_t num_oplock_brks;
43564+ atomic_unchecked_t num_opens;
43565+ atomic_unchecked_t num_closes;
43566+ atomic_unchecked_t num_deletes;
43567+ atomic_unchecked_t num_mkdirs;
43568+ atomic_unchecked_t num_posixopens;
43569+ atomic_unchecked_t num_posixmkdirs;
43570+ atomic_unchecked_t num_rmdirs;
43571+ atomic_unchecked_t num_renames;
43572+ atomic_unchecked_t num_t2renames;
43573+ atomic_unchecked_t num_ffirst;
43574+ atomic_unchecked_t num_fnext;
43575+ atomic_unchecked_t num_fclose;
43576+ atomic_unchecked_t num_hardlinks;
43577+ atomic_unchecked_t num_symlinks;
43578+ atomic_unchecked_t num_locks;
43579+ atomic_unchecked_t num_acl_get;
43580+ atomic_unchecked_t num_acl_set;
43581 #ifdef CONFIG_CIFS_STATS2
43582 unsigned long long time_writes;
43583 unsigned long long time_reads;
43584@@ -628,7 +628,7 @@ convert_delimiter(char *path, char delim)
43585 }
43586
43587 #ifdef CONFIG_CIFS_STATS
43588-#define cifs_stats_inc atomic_inc
43589+#define cifs_stats_inc atomic_inc_unchecked
43590
43591 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
43592 unsigned int bytes)
43593@@ -985,8 +985,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
43594 /* Various Debug counters */
43595 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
43596 #ifdef CONFIG_CIFS_STATS2
43597-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
43598-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
43599+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
43600+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
43601 #endif
43602 GLOBAL_EXTERN atomic_t smBufAllocCount;
43603 GLOBAL_EXTERN atomic_t midCount;
43604diff --git a/fs/cifs/link.c b/fs/cifs/link.c
43605index 6b0e064..94e6c3c 100644
43606--- a/fs/cifs/link.c
43607+++ b/fs/cifs/link.c
43608@@ -600,7 +600,7 @@ symlink_exit:
43609
43610 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
43611 {
43612- char *p = nd_get_link(nd);
43613+ const char *p = nd_get_link(nd);
43614 if (!IS_ERR(p))
43615 kfree(p);
43616 }
43617diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
43618index 703ef5c..2a44ed5 100644
43619--- a/fs/cifs/misc.c
43620+++ b/fs/cifs/misc.c
43621@@ -156,7 +156,7 @@ cifs_buf_get(void)
43622 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
43623 atomic_inc(&bufAllocCount);
43624 #ifdef CONFIG_CIFS_STATS2
43625- atomic_inc(&totBufAllocCount);
43626+ atomic_inc_unchecked(&totBufAllocCount);
43627 #endif /* CONFIG_CIFS_STATS2 */
43628 }
43629
43630@@ -191,7 +191,7 @@ cifs_small_buf_get(void)
43631 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
43632 atomic_inc(&smBufAllocCount);
43633 #ifdef CONFIG_CIFS_STATS2
43634- atomic_inc(&totSmBufAllocCount);
43635+ atomic_inc_unchecked(&totSmBufAllocCount);
43636 #endif /* CONFIG_CIFS_STATS2 */
43637
43638 }
43639diff --git a/fs/coda/cache.c b/fs/coda/cache.c
43640index 6901578..d402eb5 100644
43641--- a/fs/coda/cache.c
43642+++ b/fs/coda/cache.c
43643@@ -24,7 +24,7 @@
43644 #include "coda_linux.h"
43645 #include "coda_cache.h"
43646
43647-static atomic_t permission_epoch = ATOMIC_INIT(0);
43648+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
43649
43650 /* replace or extend an acl cache hit */
43651 void coda_cache_enter(struct inode *inode, int mask)
43652@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
43653 struct coda_inode_info *cii = ITOC(inode);
43654
43655 spin_lock(&cii->c_lock);
43656- cii->c_cached_epoch = atomic_read(&permission_epoch);
43657+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
43658 if (cii->c_uid != current_fsuid()) {
43659 cii->c_uid = current_fsuid();
43660 cii->c_cached_perm = mask;
43661@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
43662 {
43663 struct coda_inode_info *cii = ITOC(inode);
43664 spin_lock(&cii->c_lock);
43665- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
43666+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
43667 spin_unlock(&cii->c_lock);
43668 }
43669
43670 /* remove all acl caches */
43671 void coda_cache_clear_all(struct super_block *sb)
43672 {
43673- atomic_inc(&permission_epoch);
43674+ atomic_inc_unchecked(&permission_epoch);
43675 }
43676
43677
43678@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
43679 spin_lock(&cii->c_lock);
43680 hit = (mask & cii->c_cached_perm) == mask &&
43681 cii->c_uid == current_fsuid() &&
43682- cii->c_cached_epoch == atomic_read(&permission_epoch);
43683+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
43684 spin_unlock(&cii->c_lock);
43685
43686 return hit;
43687diff --git a/fs/compat.c b/fs/compat.c
43688index c987875..08771ca 100644
43689--- a/fs/compat.c
43690+++ b/fs/compat.c
43691@@ -132,8 +132,8 @@ asmlinkage long compat_sys_utimes(const char __user *filename, struct compat_tim
43692 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
43693 {
43694 compat_ino_t ino = stat->ino;
43695- typeof(ubuf->st_uid) uid = 0;
43696- typeof(ubuf->st_gid) gid = 0;
43697+ typeof(((struct compat_stat *)0)->st_uid) uid = 0;
43698+ typeof(((struct compat_stat *)0)->st_gid) gid = 0;
43699 int err;
43700
43701 SET_UID(uid, stat->uid);
43702@@ -504,7 +504,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
43703
43704 set_fs(KERNEL_DS);
43705 /* The __user pointer cast is valid because of the set_fs() */
43706- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
43707+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
43708 set_fs(oldfs);
43709 /* truncating is ok because it's a user address */
43710 if (!ret)
43711@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
43712 goto out;
43713
43714 ret = -EINVAL;
43715- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
43716+ if (nr_segs > UIO_MAXIOV)
43717 goto out;
43718 if (nr_segs > fast_segs) {
43719 ret = -ENOMEM;
43720@@ -845,6 +845,7 @@ struct compat_old_linux_dirent {
43721
43722 struct compat_readdir_callback {
43723 struct compat_old_linux_dirent __user *dirent;
43724+ struct file * file;
43725 int result;
43726 };
43727
43728@@ -862,6 +863,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
43729 buf->result = -EOVERFLOW;
43730 return -EOVERFLOW;
43731 }
43732+
43733+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43734+ return 0;
43735+
43736 buf->result++;
43737 dirent = buf->dirent;
43738 if (!access_ok(VERIFY_WRITE, dirent,
43739@@ -894,6 +899,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
43740
43741 buf.result = 0;
43742 buf.dirent = dirent;
43743+ buf.file = file;
43744
43745 error = vfs_readdir(file, compat_fillonedir, &buf);
43746 if (buf.result)
43747@@ -914,6 +920,7 @@ struct compat_linux_dirent {
43748 struct compat_getdents_callback {
43749 struct compat_linux_dirent __user *current_dir;
43750 struct compat_linux_dirent __user *previous;
43751+ struct file * file;
43752 int count;
43753 int error;
43754 };
43755@@ -935,6 +942,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
43756 buf->error = -EOVERFLOW;
43757 return -EOVERFLOW;
43758 }
43759+
43760+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43761+ return 0;
43762+
43763 dirent = buf->previous;
43764 if (dirent) {
43765 if (__put_user(offset, &dirent->d_off))
43766@@ -982,6 +993,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
43767 buf.previous = NULL;
43768 buf.count = count;
43769 buf.error = 0;
43770+ buf.file = file;
43771
43772 error = vfs_readdir(file, compat_filldir, &buf);
43773 if (error >= 0)
43774@@ -1003,6 +1015,7 @@ out:
43775 struct compat_getdents_callback64 {
43776 struct linux_dirent64 __user *current_dir;
43777 struct linux_dirent64 __user *previous;
43778+ struct file * file;
43779 int count;
43780 int error;
43781 };
43782@@ -1019,6 +1032,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
43783 buf->error = -EINVAL; /* only used if we fail.. */
43784 if (reclen > buf->count)
43785 return -EINVAL;
43786+
43787+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43788+ return 0;
43789+
43790 dirent = buf->previous;
43791
43792 if (dirent) {
43793@@ -1070,13 +1087,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
43794 buf.previous = NULL;
43795 buf.count = count;
43796 buf.error = 0;
43797+ buf.file = file;
43798
43799 error = vfs_readdir(file, compat_filldir64, &buf);
43800 if (error >= 0)
43801 error = buf.error;
43802 lastdirent = buf.previous;
43803 if (lastdirent) {
43804- typeof(lastdirent->d_off) d_off = file->f_pos;
43805+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
43806 if (__put_user_unaligned(d_off, &lastdirent->d_off))
43807 error = -EFAULT;
43808 else
43809diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
43810index 112e45a..b59845b 100644
43811--- a/fs/compat_binfmt_elf.c
43812+++ b/fs/compat_binfmt_elf.c
43813@@ -30,11 +30,13 @@
43814 #undef elf_phdr
43815 #undef elf_shdr
43816 #undef elf_note
43817+#undef elf_dyn
43818 #undef elf_addr_t
43819 #define elfhdr elf32_hdr
43820 #define elf_phdr elf32_phdr
43821 #define elf_shdr elf32_shdr
43822 #define elf_note elf32_note
43823+#define elf_dyn Elf32_Dyn
43824 #define elf_addr_t Elf32_Addr
43825
43826 /*
43827diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
43828index 51352de..93292ff 100644
43829--- a/fs/compat_ioctl.c
43830+++ b/fs/compat_ioctl.c
43831@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd,
43832
43833 err = get_user(palp, &up->palette);
43834 err |= get_user(length, &up->length);
43835+ if (err)
43836+ return -EFAULT;
43837
43838 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
43839 err = put_user(compat_ptr(palp), &up_native->palette);
43840@@ -621,7 +623,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
43841 return -EFAULT;
43842 if (__get_user(udata, &ss32->iomem_base))
43843 return -EFAULT;
43844- ss.iomem_base = compat_ptr(udata);
43845+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
43846 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
43847 __get_user(ss.port_high, &ss32->port_high))
43848 return -EFAULT;
43849@@ -796,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
43850 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
43851 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
43852 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
43853- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
43854+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
43855 return -EFAULT;
43856
43857 return ioctl_preallocate(file, p);
43858@@ -1644,8 +1646,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
43859 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
43860 {
43861 unsigned int a, b;
43862- a = *(unsigned int *)p;
43863- b = *(unsigned int *)q;
43864+ a = *(const unsigned int *)p;
43865+ b = *(const unsigned int *)q;
43866 if (a > b)
43867 return 1;
43868 if (a < b)
43869diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
43870index 9a37a9b..35792b6 100644
43871--- a/fs/configfs/dir.c
43872+++ b/fs/configfs/dir.c
43873@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
43874 }
43875 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
43876 struct configfs_dirent *next;
43877- const char * name;
43878+ const unsigned char * name;
43879+ char d_name[sizeof(next->s_dentry->d_iname)];
43880 int len;
43881 struct inode *inode = NULL;
43882
43883@@ -1585,7 +1586,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
43884 continue;
43885
43886 name = configfs_get_name(next);
43887- len = strlen(name);
43888+ if (next->s_dentry && name == next->s_dentry->d_iname) {
43889+ len = next->s_dentry->d_name.len;
43890+ memcpy(d_name, name, len);
43891+ name = d_name;
43892+ } else
43893+ len = strlen(name);
43894
43895 /*
43896 * We'll have a dentry and an inode for
43897diff --git a/fs/dcache.c b/fs/dcache.c
43898index f7908ae..920a680 100644
43899--- a/fs/dcache.c
43900+++ b/fs/dcache.c
43901@@ -3042,7 +3042,7 @@ void __init vfs_caches_init(unsigned long mempages)
43902 mempages -= reserve;
43903
43904 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
43905- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
43906+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
43907
43908 dcache_init();
43909 inode_init();
43910diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
43911index f3a257d..715ac0f 100644
43912--- a/fs/debugfs/inode.c
43913+++ b/fs/debugfs/inode.c
43914@@ -261,7 +261,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
43915 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
43916 {
43917 return debugfs_create_file(name,
43918+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
43919+ S_IFDIR | S_IRWXU,
43920+#else
43921 S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
43922+#endif
43923 parent, NULL, NULL);
43924 }
43925 EXPORT_SYMBOL_GPL(debugfs_create_dir);
43926diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
43927index af11098..81e3bbe 100644
43928--- a/fs/ecryptfs/inode.c
43929+++ b/fs/ecryptfs/inode.c
43930@@ -691,7 +691,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
43931 old_fs = get_fs();
43932 set_fs(get_ds());
43933 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
43934- (char __user *)lower_buf,
43935+ (char __force_user *)lower_buf,
43936 lower_bufsiz);
43937 set_fs(old_fs);
43938 if (rc < 0)
43939@@ -737,7 +737,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
43940 }
43941 old_fs = get_fs();
43942 set_fs(get_ds());
43943- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
43944+ rc = dentry->d_inode->i_op->readlink(dentry, (char __force_user *)buf, len);
43945 set_fs(old_fs);
43946 if (rc < 0) {
43947 kfree(buf);
43948@@ -752,7 +752,7 @@ out:
43949 static void
43950 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
43951 {
43952- char *buf = nd_get_link(nd);
43953+ const char *buf = nd_get_link(nd);
43954 if (!IS_ERR(buf)) {
43955 /* Free the char* */
43956 kfree(buf);
43957diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
43958index 0dc5a3d..d3cdeea 100644
43959--- a/fs/ecryptfs/miscdev.c
43960+++ b/fs/ecryptfs/miscdev.c
43961@@ -328,7 +328,7 @@ check_list:
43962 goto out_unlock_msg_ctx;
43963 i = 5;
43964 if (msg_ctx->msg) {
43965- if (copy_to_user(&buf[i], packet_length, packet_length_size))
43966+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
43967 goto out_unlock_msg_ctx;
43968 i += packet_length_size;
43969 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
43970diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
43971index 608c1c3..7d040a8 100644
43972--- a/fs/ecryptfs/read_write.c
43973+++ b/fs/ecryptfs/read_write.c
43974@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
43975 return -EIO;
43976 fs_save = get_fs();
43977 set_fs(get_ds());
43978- rc = vfs_write(lower_file, data, size, &offset);
43979+ rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
43980 set_fs(fs_save);
43981 mark_inode_dirty_sync(ecryptfs_inode);
43982 return rc;
43983@@ -244,7 +244,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
43984 return -EIO;
43985 fs_save = get_fs();
43986 set_fs(get_ds());
43987- rc = vfs_read(lower_file, data, size, &offset);
43988+ rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
43989 set_fs(fs_save);
43990 return rc;
43991 }
43992diff --git a/fs/exec.c b/fs/exec.c
43993index 3625464..ff895b9 100644
43994--- a/fs/exec.c
43995+++ b/fs/exec.c
43996@@ -55,12 +55,28 @@
43997 #include <linux/pipe_fs_i.h>
43998 #include <linux/oom.h>
43999 #include <linux/compat.h>
44000+#include <linux/random.h>
44001+#include <linux/seq_file.h>
44002+
44003+#ifdef CONFIG_PAX_REFCOUNT
44004+#include <linux/kallsyms.h>
44005+#include <linux/kdebug.h>
44006+#endif
44007
44008 #include <asm/uaccess.h>
44009 #include <asm/mmu_context.h>
44010 #include <asm/tlb.h>
44011 #include "internal.h"
44012
44013+#ifndef CONFIG_PAX_HAVE_ACL_FLAGS
44014+void __weak pax_set_initial_flags(struct linux_binprm *bprm) {}
44015+#endif
44016+
44017+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
44018+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
44019+EXPORT_SYMBOL(pax_set_initial_flags_func);
44020+#endif
44021+
44022 int core_uses_pid;
44023 char core_pattern[CORENAME_MAX_SIZE] = "core";
44024 unsigned int core_pipe_limit;
44025@@ -70,7 +86,7 @@ struct core_name {
44026 char *corename;
44027 int used, size;
44028 };
44029-static atomic_t call_count = ATOMIC_INIT(1);
44030+static atomic_unchecked_t call_count = ATOMIC_INIT(1);
44031
44032 /* The maximal length of core_pattern is also specified in sysctl.c */
44033
44034@@ -188,18 +204,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44035 int write)
44036 {
44037 struct page *page;
44038- int ret;
44039
44040-#ifdef CONFIG_STACK_GROWSUP
44041- if (write) {
44042- ret = expand_downwards(bprm->vma, pos);
44043- if (ret < 0)
44044- return NULL;
44045- }
44046-#endif
44047- ret = get_user_pages(current, bprm->mm, pos,
44048- 1, write, 1, &page, NULL);
44049- if (ret <= 0)
44050+ if (0 > expand_downwards(bprm->vma, pos))
44051+ return NULL;
44052+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
44053 return NULL;
44054
44055 if (write) {
44056@@ -215,6 +223,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44057 if (size <= ARG_MAX)
44058 return page;
44059
44060+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44061+ // only allow 512KB for argv+env on suid/sgid binaries
44062+ // to prevent easy ASLR exhaustion
44063+ if (((bprm->cred->euid != current_euid()) ||
44064+ (bprm->cred->egid != current_egid())) &&
44065+ (size > (512 * 1024))) {
44066+ put_page(page);
44067+ return NULL;
44068+ }
44069+#endif
44070+
44071 /*
44072 * Limit to 1/4-th the stack size for the argv+env strings.
44073 * This ensures that:
44074@@ -274,6 +293,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44075 vma->vm_end = STACK_TOP_MAX;
44076 vma->vm_start = vma->vm_end - PAGE_SIZE;
44077 vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
44078+
44079+#ifdef CONFIG_PAX_SEGMEXEC
44080+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
44081+#endif
44082+
44083 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
44084 INIT_LIST_HEAD(&vma->anon_vma_chain);
44085
44086@@ -288,6 +312,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44087 mm->stack_vm = mm->total_vm = 1;
44088 up_write(&mm->mmap_sem);
44089 bprm->p = vma->vm_end - sizeof(void *);
44090+
44091+#ifdef CONFIG_PAX_RANDUSTACK
44092+ if (randomize_va_space)
44093+ bprm->p ^= random32() & ~PAGE_MASK;
44094+#endif
44095+
44096 return 0;
44097 err:
44098 up_write(&mm->mmap_sem);
44099@@ -396,19 +426,7 @@ err:
44100 return err;
44101 }
44102
44103-struct user_arg_ptr {
44104-#ifdef CONFIG_COMPAT
44105- bool is_compat;
44106-#endif
44107- union {
44108- const char __user *const __user *native;
44109-#ifdef CONFIG_COMPAT
44110- compat_uptr_t __user *compat;
44111-#endif
44112- } ptr;
44113-};
44114-
44115-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44116+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44117 {
44118 const char __user *native;
44119
44120@@ -417,14 +435,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44121 compat_uptr_t compat;
44122
44123 if (get_user(compat, argv.ptr.compat + nr))
44124- return ERR_PTR(-EFAULT);
44125+ return (const char __force_user *)ERR_PTR(-EFAULT);
44126
44127 return compat_ptr(compat);
44128 }
44129 #endif
44130
44131 if (get_user(native, argv.ptr.native + nr))
44132- return ERR_PTR(-EFAULT);
44133+ return (const char __force_user *)ERR_PTR(-EFAULT);
44134
44135 return native;
44136 }
44137@@ -443,7 +461,7 @@ static int count(struct user_arg_ptr argv, int max)
44138 if (!p)
44139 break;
44140
44141- if (IS_ERR(p))
44142+ if (IS_ERR((const char __force_kernel *)p))
44143 return -EFAULT;
44144
44145 if (i++ >= max)
44146@@ -477,7 +495,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
44147
44148 ret = -EFAULT;
44149 str = get_user_arg_ptr(argv, argc);
44150- if (IS_ERR(str))
44151+ if (IS_ERR((const char __force_kernel *)str))
44152 goto out;
44153
44154 len = strnlen_user(str, MAX_ARG_STRLEN);
44155@@ -559,7 +577,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
44156 int r;
44157 mm_segment_t oldfs = get_fs();
44158 struct user_arg_ptr argv = {
44159- .ptr.native = (const char __user *const __user *)__argv,
44160+ .ptr.native = (const char __force_user *const __force_user *)__argv,
44161 };
44162
44163 set_fs(KERNEL_DS);
44164@@ -594,7 +612,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44165 unsigned long new_end = old_end - shift;
44166 struct mmu_gather tlb;
44167
44168- BUG_ON(new_start > new_end);
44169+ if (new_start >= new_end || new_start < mmap_min_addr)
44170+ return -ENOMEM;
44171
44172 /*
44173 * ensure there are no vmas between where we want to go
44174@@ -603,6 +622,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44175 if (vma != find_vma(mm, new_start))
44176 return -EFAULT;
44177
44178+#ifdef CONFIG_PAX_SEGMEXEC
44179+ BUG_ON(pax_find_mirror_vma(vma));
44180+#endif
44181+
44182 /*
44183 * cover the whole range: [new_start, old_end)
44184 */
44185@@ -683,10 +706,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44186 stack_top = arch_align_stack(stack_top);
44187 stack_top = PAGE_ALIGN(stack_top);
44188
44189- if (unlikely(stack_top < mmap_min_addr) ||
44190- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
44191- return -ENOMEM;
44192-
44193 stack_shift = vma->vm_end - stack_top;
44194
44195 bprm->p -= stack_shift;
44196@@ -698,8 +717,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
44197 bprm->exec -= stack_shift;
44198
44199 down_write(&mm->mmap_sem);
44200+
44201+ /* Move stack pages down in memory. */
44202+ if (stack_shift) {
44203+ ret = shift_arg_pages(vma, stack_shift);
44204+ if (ret)
44205+ goto out_unlock;
44206+ }
44207+
44208 vm_flags = VM_STACK_FLAGS;
44209
44210+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44211+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
44212+ vm_flags &= ~VM_EXEC;
44213+
44214+#ifdef CONFIG_PAX_MPROTECT
44215+ if (mm->pax_flags & MF_PAX_MPROTECT)
44216+ vm_flags &= ~VM_MAYEXEC;
44217+#endif
44218+
44219+ }
44220+#endif
44221+
44222 /*
44223 * Adjust stack execute permissions; explicitly enable for
44224 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
44225@@ -718,13 +757,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44226 goto out_unlock;
44227 BUG_ON(prev != vma);
44228
44229- /* Move stack pages down in memory. */
44230- if (stack_shift) {
44231- ret = shift_arg_pages(vma, stack_shift);
44232- if (ret)
44233- goto out_unlock;
44234- }
44235-
44236 /* mprotect_fixup is overkill to remove the temporary stack flags */
44237 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
44238
44239@@ -805,7 +837,7 @@ int kernel_read(struct file *file, loff_t offset,
44240 old_fs = get_fs();
44241 set_fs(get_ds());
44242 /* The cast to a user pointer is valid due to the set_fs() */
44243- result = vfs_read(file, (void __user *)addr, count, &pos);
44244+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
44245 set_fs(old_fs);
44246 return result;
44247 }
44248@@ -1067,6 +1099,21 @@ void set_task_comm(struct task_struct *tsk, char *buf)
44249 perf_event_comm(tsk);
44250 }
44251
44252+static void filename_to_taskname(char *tcomm, const char *fn, unsigned int len)
44253+{
44254+ int i, ch;
44255+
44256+ /* Copies the binary name from after last slash */
44257+ for (i = 0; (ch = *(fn++)) != '\0';) {
44258+ if (ch == '/')
44259+ i = 0; /* overwrite what we wrote */
44260+ else
44261+ if (i < len - 1)
44262+ tcomm[i++] = ch;
44263+ }
44264+ tcomm[i] = '\0';
44265+}
44266+
44267 int flush_old_exec(struct linux_binprm * bprm)
44268 {
44269 int retval;
44270@@ -1081,6 +1128,7 @@ int flush_old_exec(struct linux_binprm * bprm)
44271
44272 set_mm_exe_file(bprm->mm, bprm->file);
44273
44274+ filename_to_taskname(bprm->tcomm, bprm->filename, sizeof(bprm->tcomm));
44275 /*
44276 * Release all of the old mmap stuff
44277 */
44278@@ -1112,10 +1160,6 @@ EXPORT_SYMBOL(would_dump);
44279
44280 void setup_new_exec(struct linux_binprm * bprm)
44281 {
44282- int i, ch;
44283- const char *name;
44284- char tcomm[sizeof(current->comm)];
44285-
44286 arch_pick_mmap_layout(current->mm);
44287
44288 /* This is the point of no return */
44289@@ -1126,18 +1170,7 @@ void setup_new_exec(struct linux_binprm * bprm)
44290 else
44291 set_dumpable(current->mm, suid_dumpable);
44292
44293- name = bprm->filename;
44294-
44295- /* Copies the binary name from after last slash */
44296- for (i=0; (ch = *(name++)) != '\0';) {
44297- if (ch == '/')
44298- i = 0; /* overwrite what we wrote */
44299- else
44300- if (i < (sizeof(tcomm) - 1))
44301- tcomm[i++] = ch;
44302- }
44303- tcomm[i] = '\0';
44304- set_task_comm(current, tcomm);
44305+ set_task_comm(current, bprm->tcomm);
44306
44307 /* Set the new mm task size. We have to do that late because it may
44308 * depend on TIF_32BIT which is only updated in flush_thread() on
44309@@ -1247,7 +1280,7 @@ int check_unsafe_exec(struct linux_binprm *bprm)
44310 }
44311 rcu_read_unlock();
44312
44313- if (p->fs->users > n_fs) {
44314+ if (atomic_read(&p->fs->users) > n_fs) {
44315 bprm->unsafe |= LSM_UNSAFE_SHARE;
44316 } else {
44317 res = -EAGAIN;
44318@@ -1442,6 +1475,28 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
44319
44320 EXPORT_SYMBOL(search_binary_handler);
44321
44322+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44323+static DEFINE_PER_CPU(u64, exec_counter);
44324+static int __init init_exec_counters(void)
44325+{
44326+ unsigned int cpu;
44327+
44328+ for_each_possible_cpu(cpu) {
44329+ per_cpu(exec_counter, cpu) = (u64)cpu;
44330+ }
44331+
44332+ return 0;
44333+}
44334+early_initcall(init_exec_counters);
44335+static inline void increment_exec_counter(void)
44336+{
44337+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
44338+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
44339+}
44340+#else
44341+static inline void increment_exec_counter(void) {}
44342+#endif
44343+
44344 /*
44345 * sys_execve() executes a new program.
44346 */
44347@@ -1450,6 +1505,11 @@ static int do_execve_common(const char *filename,
44348 struct user_arg_ptr envp,
44349 struct pt_regs *regs)
44350 {
44351+#ifdef CONFIG_GRKERNSEC
44352+ struct file *old_exec_file;
44353+ struct acl_subject_label *old_acl;
44354+ struct rlimit old_rlim[RLIM_NLIMITS];
44355+#endif
44356 struct linux_binprm *bprm;
44357 struct file *file;
44358 struct files_struct *displaced;
44359@@ -1457,6 +1517,8 @@ static int do_execve_common(const char *filename,
44360 int retval;
44361 const struct cred *cred = current_cred();
44362
44363+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
44364+
44365 /*
44366 * We move the actual failure in case of RLIMIT_NPROC excess from
44367 * set*uid() to execve() because too many poorly written programs
44368@@ -1497,12 +1559,27 @@ static int do_execve_common(const char *filename,
44369 if (IS_ERR(file))
44370 goto out_unmark;
44371
44372+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
44373+ retval = -EPERM;
44374+ goto out_file;
44375+ }
44376+
44377 sched_exec();
44378
44379 bprm->file = file;
44380 bprm->filename = filename;
44381 bprm->interp = filename;
44382
44383+ if (gr_process_user_ban()) {
44384+ retval = -EPERM;
44385+ goto out_file;
44386+ }
44387+
44388+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
44389+ retval = -EACCES;
44390+ goto out_file;
44391+ }
44392+
44393 retval = bprm_mm_init(bprm);
44394 if (retval)
44395 goto out_file;
44396@@ -1519,24 +1596,65 @@ static int do_execve_common(const char *filename,
44397 if (retval < 0)
44398 goto out;
44399
44400+#ifdef CONFIG_GRKERNSEC
44401+ old_acl = current->acl;
44402+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
44403+ old_exec_file = current->exec_file;
44404+ get_file(file);
44405+ current->exec_file = file;
44406+#endif
44407+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44408+ /* limit suid stack to 8MB
44409+ we saved the old limits above and will restore them if this exec fails
44410+ */
44411+ if (((bprm->cred->euid != current_euid()) || (bprm->cred->egid != current_egid())) &&
44412+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
44413+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
44414+#endif
44415+
44416+ if (!gr_tpe_allow(file)) {
44417+ retval = -EACCES;
44418+ goto out_fail;
44419+ }
44420+
44421+ if (gr_check_crash_exec(file)) {
44422+ retval = -EACCES;
44423+ goto out_fail;
44424+ }
44425+
44426+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
44427+ bprm->unsafe);
44428+ if (retval < 0)
44429+ goto out_fail;
44430+
44431 retval = copy_strings_kernel(1, &bprm->filename, bprm);
44432 if (retval < 0)
44433- goto out;
44434+ goto out_fail;
44435
44436 bprm->exec = bprm->p;
44437 retval = copy_strings(bprm->envc, envp, bprm);
44438 if (retval < 0)
44439- goto out;
44440+ goto out_fail;
44441
44442 retval = copy_strings(bprm->argc, argv, bprm);
44443 if (retval < 0)
44444- goto out;
44445+ goto out_fail;
44446+
44447+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
44448+
44449+ gr_handle_exec_args(bprm, argv);
44450
44451 retval = search_binary_handler(bprm,regs);
44452 if (retval < 0)
44453- goto out;
44454+ goto out_fail;
44455+#ifdef CONFIG_GRKERNSEC
44456+ if (old_exec_file)
44457+ fput(old_exec_file);
44458+#endif
44459
44460 /* execve succeeded */
44461+
44462+ increment_exec_counter();
44463 current->fs->in_exec = 0;
44464 current->in_execve = 0;
44465 acct_update_integrals(current);
44466@@ -1545,6 +1663,14 @@ static int do_execve_common(const char *filename,
44467 put_files_struct(displaced);
44468 return retval;
44469
44470+out_fail:
44471+#ifdef CONFIG_GRKERNSEC
44472+ current->acl = old_acl;
44473+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
44474+ fput(current->exec_file);
44475+ current->exec_file = old_exec_file;
44476+#endif
44477+
44478 out:
44479 if (bprm->mm) {
44480 acct_arg_size(bprm, 0);
44481@@ -1618,7 +1744,7 @@ static int expand_corename(struct core_name *cn)
44482 {
44483 char *old_corename = cn->corename;
44484
44485- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
44486+ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
44487 cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
44488
44489 if (!cn->corename) {
44490@@ -1715,7 +1841,7 @@ static int format_corename(struct core_name *cn, long signr)
44491 int pid_in_pattern = 0;
44492 int err = 0;
44493
44494- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
44495+ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
44496 cn->corename = kmalloc(cn->size, GFP_KERNEL);
44497 cn->used = 0;
44498
44499@@ -1812,6 +1938,228 @@ out:
44500 return ispipe;
44501 }
44502
44503+int pax_check_flags(unsigned long *flags)
44504+{
44505+ int retval = 0;
44506+
44507+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
44508+ if (*flags & MF_PAX_SEGMEXEC)
44509+ {
44510+ *flags &= ~MF_PAX_SEGMEXEC;
44511+ retval = -EINVAL;
44512+ }
44513+#endif
44514+
44515+ if ((*flags & MF_PAX_PAGEEXEC)
44516+
44517+#ifdef CONFIG_PAX_PAGEEXEC
44518+ && (*flags & MF_PAX_SEGMEXEC)
44519+#endif
44520+
44521+ )
44522+ {
44523+ *flags &= ~MF_PAX_PAGEEXEC;
44524+ retval = -EINVAL;
44525+ }
44526+
44527+ if ((*flags & MF_PAX_MPROTECT)
44528+
44529+#ifdef CONFIG_PAX_MPROTECT
44530+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44531+#endif
44532+
44533+ )
44534+ {
44535+ *flags &= ~MF_PAX_MPROTECT;
44536+ retval = -EINVAL;
44537+ }
44538+
44539+ if ((*flags & MF_PAX_EMUTRAMP)
44540+
44541+#ifdef CONFIG_PAX_EMUTRAMP
44542+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44543+#endif
44544+
44545+ )
44546+ {
44547+ *flags &= ~MF_PAX_EMUTRAMP;
44548+ retval = -EINVAL;
44549+ }
44550+
44551+ return retval;
44552+}
44553+
44554+EXPORT_SYMBOL(pax_check_flags);
44555+
44556+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44557+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
44558+{
44559+ struct task_struct *tsk = current;
44560+ struct mm_struct *mm = current->mm;
44561+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
44562+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
44563+ char *path_exec = NULL;
44564+ char *path_fault = NULL;
44565+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
44566+
44567+ if (buffer_exec && buffer_fault) {
44568+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
44569+
44570+ down_read(&mm->mmap_sem);
44571+ vma = mm->mmap;
44572+ while (vma && (!vma_exec || !vma_fault)) {
44573+ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
44574+ vma_exec = vma;
44575+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
44576+ vma_fault = vma;
44577+ vma = vma->vm_next;
44578+ }
44579+ if (vma_exec) {
44580+ path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
44581+ if (IS_ERR(path_exec))
44582+ path_exec = "<path too long>";
44583+ else {
44584+ path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
44585+ if (path_exec) {
44586+ *path_exec = 0;
44587+ path_exec = buffer_exec;
44588+ } else
44589+ path_exec = "<path too long>";
44590+ }
44591+ }
44592+ if (vma_fault) {
44593+ start = vma_fault->vm_start;
44594+ end = vma_fault->vm_end;
44595+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
44596+ if (vma_fault->vm_file) {
44597+ path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
44598+ if (IS_ERR(path_fault))
44599+ path_fault = "<path too long>";
44600+ else {
44601+ path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
44602+ if (path_fault) {
44603+ *path_fault = 0;
44604+ path_fault = buffer_fault;
44605+ } else
44606+ path_fault = "<path too long>";
44607+ }
44608+ } else
44609+ path_fault = "<anonymous mapping>";
44610+ }
44611+ up_read(&mm->mmap_sem);
44612+ }
44613+ if (tsk->signal->curr_ip)
44614+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
44615+ else
44616+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
44617+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
44618+ "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
44619+ task_uid(tsk), task_euid(tsk), pc, sp);
44620+ free_page((unsigned long)buffer_exec);
44621+ free_page((unsigned long)buffer_fault);
44622+ pax_report_insns(regs, pc, sp);
44623+ do_coredump(SIGKILL, SIGKILL, regs);
44624+}
44625+#endif
44626+
44627+#ifdef CONFIG_PAX_REFCOUNT
44628+void pax_report_refcount_overflow(struct pt_regs *regs)
44629+{
44630+ if (current->signal->curr_ip)
44631+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44632+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
44633+ else
44634+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44635+ current->comm, task_pid_nr(current), current_uid(), current_euid());
44636+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
44637+ show_regs(regs);
44638+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
44639+}
44640+#endif
44641+
44642+#ifdef CONFIG_PAX_USERCOPY
44643+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
44644+int object_is_on_stack(const void *obj, unsigned long len)
44645+{
44646+ const void * const stack = task_stack_page(current);
44647+ const void * const stackend = stack + THREAD_SIZE;
44648+
44649+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44650+ const void *frame = NULL;
44651+ const void *oldframe;
44652+#endif
44653+
44654+ if (obj + len < obj)
44655+ return -1;
44656+
44657+ if (obj + len <= stack || stackend <= obj)
44658+ return 0;
44659+
44660+ if (obj < stack || stackend < obj + len)
44661+ return -1;
44662+
44663+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44664+ oldframe = __builtin_frame_address(1);
44665+ if (oldframe)
44666+ frame = __builtin_frame_address(2);
44667+ /*
44668+ low ----------------------------------------------> high
44669+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
44670+ ^----------------^
44671+ allow copies only within here
44672+ */
44673+ while (stack <= frame && frame < stackend) {
44674+ /* if obj + len extends past the last frame, this
44675+ check won't pass and the next frame will be 0,
44676+ causing us to bail out and correctly report
44677+ the copy as invalid
44678+ */
44679+ if (obj + len <= frame)
44680+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
44681+ oldframe = frame;
44682+ frame = *(const void * const *)frame;
44683+ }
44684+ return -1;
44685+#else
44686+ return 1;
44687+#endif
44688+}
44689+
44690+__noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
44691+{
44692+ if (current->signal->curr_ip)
44693+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44694+ &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44695+ else
44696+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44697+ to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44698+ dump_stack();
44699+ gr_handle_kernel_exploit();
44700+ do_group_exit(SIGKILL);
44701+}
44702+#endif
44703+
44704+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
44705+void pax_track_stack(void)
44706+{
44707+ unsigned long sp = (unsigned long)&sp;
44708+ if (sp < current_thread_info()->lowest_stack &&
44709+ sp > (unsigned long)task_stack_page(current))
44710+ current_thread_info()->lowest_stack = sp;
44711+}
44712+EXPORT_SYMBOL(pax_track_stack);
44713+#endif
44714+
44715+#ifdef CONFIG_PAX_SIZE_OVERFLOW
44716+void report_size_overflow(const char *file, unsigned int line, const char *func)
44717+{
44718+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u\n", func, file, line);
44719+ dump_stack();
44720+ do_group_exit(SIGKILL);
44721+}
44722+EXPORT_SYMBOL(report_size_overflow);
44723+#endif
44724+
44725 static int zap_process(struct task_struct *start, int exit_code)
44726 {
44727 struct task_struct *t;
44728@@ -2023,17 +2371,17 @@ static void wait_for_dump_helpers(struct file *file)
44729 pipe = file->f_path.dentry->d_inode->i_pipe;
44730
44731 pipe_lock(pipe);
44732- pipe->readers++;
44733- pipe->writers--;
44734+ atomic_inc(&pipe->readers);
44735+ atomic_dec(&pipe->writers);
44736
44737- while ((pipe->readers > 1) && (!signal_pending(current))) {
44738+ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
44739 wake_up_interruptible_sync(&pipe->wait);
44740 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
44741 pipe_wait(pipe);
44742 }
44743
44744- pipe->readers--;
44745- pipe->writers++;
44746+ atomic_dec(&pipe->readers);
44747+ atomic_inc(&pipe->writers);
44748 pipe_unlock(pipe);
44749
44750 }
44751@@ -2094,7 +2442,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44752 int retval = 0;
44753 int flag = 0;
44754 int ispipe;
44755- static atomic_t core_dump_count = ATOMIC_INIT(0);
44756+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
44757 struct coredump_params cprm = {
44758 .signr = signr,
44759 .regs = regs,
44760@@ -2109,6 +2457,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44761
44762 audit_core_dumps(signr);
44763
44764+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
44765+ gr_handle_brute_attach(current, cprm.mm_flags);
44766+
44767 binfmt = mm->binfmt;
44768 if (!binfmt || !binfmt->core_dump)
44769 goto fail;
44770@@ -2176,7 +2527,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44771 }
44772 cprm.limit = RLIM_INFINITY;
44773
44774- dump_count = atomic_inc_return(&core_dump_count);
44775+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
44776 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
44777 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
44778 task_tgid_vnr(current), current->comm);
44779@@ -2203,6 +2554,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44780 } else {
44781 struct inode *inode;
44782
44783+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
44784+
44785 if (cprm.limit < binfmt->min_coredump)
44786 goto fail_unlock;
44787
44788@@ -2246,7 +2599,7 @@ close_fail:
44789 filp_close(cprm.file, NULL);
44790 fail_dropcount:
44791 if (ispipe)
44792- atomic_dec(&core_dump_count);
44793+ atomic_dec_unchecked(&core_dump_count);
44794 fail_unlock:
44795 kfree(cn.corename);
44796 fail_corename:
44797@@ -2265,7 +2618,7 @@ fail:
44798 */
44799 int dump_write(struct file *file, const void *addr, int nr)
44800 {
44801- return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
44802+ return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
44803 }
44804 EXPORT_SYMBOL(dump_write);
44805
44806diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
44807index a8cbe1b..fed04cb 100644
44808--- a/fs/ext2/balloc.c
44809+++ b/fs/ext2/balloc.c
44810@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
44811
44812 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
44813 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
44814- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
44815+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
44816 sbi->s_resuid != current_fsuid() &&
44817 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
44818 return 0;
44819diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
44820index a203892..4e64db5 100644
44821--- a/fs/ext3/balloc.c
44822+++ b/fs/ext3/balloc.c
44823@@ -1446,9 +1446,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
44824
44825 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
44826 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
44827- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
44828+ if (free_blocks < root_blocks + 1 &&
44829 !use_reservation && sbi->s_resuid != current_fsuid() &&
44830- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
44831+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)) &&
44832+ !capable_nolog(CAP_SYS_RESOURCE)) {
44833 return 0;
44834 }
44835 return 1;
44836diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
44837index 12ccacd..a6035fce0 100644
44838--- a/fs/ext4/balloc.c
44839+++ b/fs/ext4/balloc.c
44840@@ -436,8 +436,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
44841 /* Hm, nope. Are (enough) root reserved clusters available? */
44842 if (sbi->s_resuid == current_fsuid() ||
44843 ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
44844- capable(CAP_SYS_RESOURCE) ||
44845- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
44846+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
44847+ capable_nolog(CAP_SYS_RESOURCE)) {
44848
44849 if (free_clusters >= (nclusters + dirty_clusters))
44850 return 1;
44851diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
44852index 5b0e26a..0aa002d 100644
44853--- a/fs/ext4/ext4.h
44854+++ b/fs/ext4/ext4.h
44855@@ -1208,19 +1208,19 @@ struct ext4_sb_info {
44856 unsigned long s_mb_last_start;
44857
44858 /* stats for buddy allocator */
44859- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
44860- atomic_t s_bal_success; /* we found long enough chunks */
44861- atomic_t s_bal_allocated; /* in blocks */
44862- atomic_t s_bal_ex_scanned; /* total extents scanned */
44863- atomic_t s_bal_goals; /* goal hits */
44864- atomic_t s_bal_breaks; /* too long searches */
44865- atomic_t s_bal_2orders; /* 2^order hits */
44866+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
44867+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
44868+ atomic_unchecked_t s_bal_allocated; /* in blocks */
44869+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
44870+ atomic_unchecked_t s_bal_goals; /* goal hits */
44871+ atomic_unchecked_t s_bal_breaks; /* too long searches */
44872+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
44873 spinlock_t s_bal_lock;
44874 unsigned long s_mb_buddies_generated;
44875 unsigned long long s_mb_generation_time;
44876- atomic_t s_mb_lost_chunks;
44877- atomic_t s_mb_preallocated;
44878- atomic_t s_mb_discarded;
44879+ atomic_unchecked_t s_mb_lost_chunks;
44880+ atomic_unchecked_t s_mb_preallocated;
44881+ atomic_unchecked_t s_mb_discarded;
44882 atomic_t s_lock_busy;
44883
44884 /* locality groups */
44885diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
44886index e2d8be8..c7f0ce9 100644
44887--- a/fs/ext4/mballoc.c
44888+++ b/fs/ext4/mballoc.c
44889@@ -1794,7 +1794,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
44890 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
44891
44892 if (EXT4_SB(sb)->s_mb_stats)
44893- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
44894+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
44895
44896 break;
44897 }
44898@@ -2088,7 +2088,7 @@ repeat:
44899 ac->ac_status = AC_STATUS_CONTINUE;
44900 ac->ac_flags |= EXT4_MB_HINT_FIRST;
44901 cr = 3;
44902- atomic_inc(&sbi->s_mb_lost_chunks);
44903+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
44904 goto repeat;
44905 }
44906 }
44907@@ -2592,25 +2592,25 @@ int ext4_mb_release(struct super_block *sb)
44908 if (sbi->s_mb_stats) {
44909 ext4_msg(sb, KERN_INFO,
44910 "mballoc: %u blocks %u reqs (%u success)",
44911- atomic_read(&sbi->s_bal_allocated),
44912- atomic_read(&sbi->s_bal_reqs),
44913- atomic_read(&sbi->s_bal_success));
44914+ atomic_read_unchecked(&sbi->s_bal_allocated),
44915+ atomic_read_unchecked(&sbi->s_bal_reqs),
44916+ atomic_read_unchecked(&sbi->s_bal_success));
44917 ext4_msg(sb, KERN_INFO,
44918 "mballoc: %u extents scanned, %u goal hits, "
44919 "%u 2^N hits, %u breaks, %u lost",
44920- atomic_read(&sbi->s_bal_ex_scanned),
44921- atomic_read(&sbi->s_bal_goals),
44922- atomic_read(&sbi->s_bal_2orders),
44923- atomic_read(&sbi->s_bal_breaks),
44924- atomic_read(&sbi->s_mb_lost_chunks));
44925+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
44926+ atomic_read_unchecked(&sbi->s_bal_goals),
44927+ atomic_read_unchecked(&sbi->s_bal_2orders),
44928+ atomic_read_unchecked(&sbi->s_bal_breaks),
44929+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
44930 ext4_msg(sb, KERN_INFO,
44931 "mballoc: %lu generated and it took %Lu",
44932 sbi->s_mb_buddies_generated,
44933 sbi->s_mb_generation_time);
44934 ext4_msg(sb, KERN_INFO,
44935 "mballoc: %u preallocated, %u discarded",
44936- atomic_read(&sbi->s_mb_preallocated),
44937- atomic_read(&sbi->s_mb_discarded));
44938+ atomic_read_unchecked(&sbi->s_mb_preallocated),
44939+ atomic_read_unchecked(&sbi->s_mb_discarded));
44940 }
44941
44942 free_percpu(sbi->s_locality_groups);
44943@@ -3096,16 +3096,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
44944 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
44945
44946 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
44947- atomic_inc(&sbi->s_bal_reqs);
44948- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
44949+ atomic_inc_unchecked(&sbi->s_bal_reqs);
44950+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
44951 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
44952- atomic_inc(&sbi->s_bal_success);
44953- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
44954+ atomic_inc_unchecked(&sbi->s_bal_success);
44955+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
44956 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
44957 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
44958- atomic_inc(&sbi->s_bal_goals);
44959+ atomic_inc_unchecked(&sbi->s_bal_goals);
44960 if (ac->ac_found > sbi->s_mb_max_to_scan)
44961- atomic_inc(&sbi->s_bal_breaks);
44962+ atomic_inc_unchecked(&sbi->s_bal_breaks);
44963 }
44964
44965 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
44966@@ -3509,7 +3509,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
44967 trace_ext4_mb_new_inode_pa(ac, pa);
44968
44969 ext4_mb_use_inode_pa(ac, pa);
44970- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
44971+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
44972
44973 ei = EXT4_I(ac->ac_inode);
44974 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
44975@@ -3569,7 +3569,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
44976 trace_ext4_mb_new_group_pa(ac, pa);
44977
44978 ext4_mb_use_group_pa(ac, pa);
44979- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
44980+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
44981
44982 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
44983 lg = ac->ac_lg;
44984@@ -3658,7 +3658,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
44985 * from the bitmap and continue.
44986 */
44987 }
44988- atomic_add(free, &sbi->s_mb_discarded);
44989+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
44990
44991 return err;
44992 }
44993@@ -3676,7 +3676,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
44994 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
44995 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
44996 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
44997- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
44998+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
44999 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
45000
45001 return 0;
45002diff --git a/fs/fcntl.c b/fs/fcntl.c
45003index 22764c7..86372c9 100644
45004--- a/fs/fcntl.c
45005+++ b/fs/fcntl.c
45006@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
45007 if (err)
45008 return err;
45009
45010+ if (gr_handle_chroot_fowner(pid, type))
45011+ return -ENOENT;
45012+ if (gr_check_protected_task_fowner(pid, type))
45013+ return -EACCES;
45014+
45015 f_modown(filp, pid, type, force);
45016 return 0;
45017 }
45018@@ -266,7 +271,7 @@ pid_t f_getown(struct file *filp)
45019
45020 static int f_setown_ex(struct file *filp, unsigned long arg)
45021 {
45022- struct f_owner_ex * __user owner_p = (void * __user)arg;
45023+ struct f_owner_ex __user *owner_p = (void __user *)arg;
45024 struct f_owner_ex owner;
45025 struct pid *pid;
45026 int type;
45027@@ -306,7 +311,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
45028
45029 static int f_getown_ex(struct file *filp, unsigned long arg)
45030 {
45031- struct f_owner_ex * __user owner_p = (void * __user)arg;
45032+ struct f_owner_ex __user *owner_p = (void __user *)arg;
45033 struct f_owner_ex owner;
45034 int ret = 0;
45035
45036@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
45037 switch (cmd) {
45038 case F_DUPFD:
45039 case F_DUPFD_CLOEXEC:
45040+ gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
45041 if (arg >= rlimit(RLIMIT_NOFILE))
45042 break;
45043 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
45044diff --git a/fs/fifo.c b/fs/fifo.c
45045index b1a524d..4ee270e 100644
45046--- a/fs/fifo.c
45047+++ b/fs/fifo.c
45048@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
45049 */
45050 filp->f_op = &read_pipefifo_fops;
45051 pipe->r_counter++;
45052- if (pipe->readers++ == 0)
45053+ if (atomic_inc_return(&pipe->readers) == 1)
45054 wake_up_partner(inode);
45055
45056- if (!pipe->writers) {
45057+ if (!atomic_read(&pipe->writers)) {
45058 if ((filp->f_flags & O_NONBLOCK)) {
45059 /* suppress POLLHUP until we have
45060 * seen a writer */
45061@@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
45062 * errno=ENXIO when there is no process reading the FIFO.
45063 */
45064 ret = -ENXIO;
45065- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
45066+ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
45067 goto err;
45068
45069 filp->f_op = &write_pipefifo_fops;
45070 pipe->w_counter++;
45071- if (!pipe->writers++)
45072+ if (atomic_inc_return(&pipe->writers) == 1)
45073 wake_up_partner(inode);
45074
45075- if (!pipe->readers) {
45076+ if (!atomic_read(&pipe->readers)) {
45077 wait_for_partner(inode, &pipe->r_counter);
45078 if (signal_pending(current))
45079 goto err_wr;
45080@@ -105,11 +105,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
45081 */
45082 filp->f_op = &rdwr_pipefifo_fops;
45083
45084- pipe->readers++;
45085- pipe->writers++;
45086+ atomic_inc(&pipe->readers);
45087+ atomic_inc(&pipe->writers);
45088 pipe->r_counter++;
45089 pipe->w_counter++;
45090- if (pipe->readers == 1 || pipe->writers == 1)
45091+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
45092 wake_up_partner(inode);
45093 break;
45094
45095@@ -123,19 +123,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
45096 return 0;
45097
45098 err_rd:
45099- if (!--pipe->readers)
45100+ if (atomic_dec_and_test(&pipe->readers))
45101 wake_up_interruptible(&pipe->wait);
45102 ret = -ERESTARTSYS;
45103 goto err;
45104
45105 err_wr:
45106- if (!--pipe->writers)
45107+ if (atomic_dec_and_test(&pipe->writers))
45108 wake_up_interruptible(&pipe->wait);
45109 ret = -ERESTARTSYS;
45110 goto err;
45111
45112 err:
45113- if (!pipe->readers && !pipe->writers)
45114+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
45115 free_pipe_info(inode);
45116
45117 err_nocleanup:
45118diff --git a/fs/file.c b/fs/file.c
45119index 4c6992d..104cdea 100644
45120--- a/fs/file.c
45121+++ b/fs/file.c
45122@@ -15,6 +15,7 @@
45123 #include <linux/slab.h>
45124 #include <linux/vmalloc.h>
45125 #include <linux/file.h>
45126+#include <linux/security.h>
45127 #include <linux/fdtable.h>
45128 #include <linux/bitops.h>
45129 #include <linux/interrupt.h>
45130@@ -254,6 +255,7 @@ int expand_files(struct files_struct *files, int nr)
45131 * N.B. For clone tasks sharing a files structure, this test
45132 * will limit the total number of files that can be opened.
45133 */
45134+ gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
45135 if (nr >= rlimit(RLIMIT_NOFILE))
45136 return -EMFILE;
45137
45138diff --git a/fs/filesystems.c b/fs/filesystems.c
45139index 0845f84..7b4ebef 100644
45140--- a/fs/filesystems.c
45141+++ b/fs/filesystems.c
45142@@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(const char *name)
45143 int len = dot ? dot - name : strlen(name);
45144
45145 fs = __get_fs_type(name, len);
45146+
45147+#ifdef CONFIG_GRKERNSEC_MODHARDEN
45148+ if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
45149+#else
45150 if (!fs && (request_module("%.*s", len, name) == 0))
45151+#endif
45152 fs = __get_fs_type(name, len);
45153
45154 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
45155diff --git a/fs/fs_struct.c b/fs/fs_struct.c
45156index 78b519c..a8b4979 100644
45157--- a/fs/fs_struct.c
45158+++ b/fs/fs_struct.c
45159@@ -4,6 +4,7 @@
45160 #include <linux/path.h>
45161 #include <linux/slab.h>
45162 #include <linux/fs_struct.h>
45163+#include <linux/grsecurity.h>
45164 #include "internal.h"
45165
45166 static inline void path_get_longterm(struct path *path)
45167@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
45168 old_root = fs->root;
45169 fs->root = *path;
45170 path_get_longterm(path);
45171+ gr_set_chroot_entries(current, path);
45172 write_seqcount_end(&fs->seq);
45173 spin_unlock(&fs->lock);
45174 if (old_root.dentry)
45175@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
45176 && fs->root.mnt == old_root->mnt) {
45177 path_get_longterm(new_root);
45178 fs->root = *new_root;
45179+ gr_set_chroot_entries(p, new_root);
45180 count++;
45181 }
45182 if (fs->pwd.dentry == old_root->dentry
45183@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk)
45184 spin_lock(&fs->lock);
45185 write_seqcount_begin(&fs->seq);
45186 tsk->fs = NULL;
45187- kill = !--fs->users;
45188+ gr_clear_chroot_entries(tsk);
45189+ kill = !atomic_dec_return(&fs->users);
45190 write_seqcount_end(&fs->seq);
45191 spin_unlock(&fs->lock);
45192 task_unlock(tsk);
45193@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45194 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
45195 /* We don't need to lock fs - think why ;-) */
45196 if (fs) {
45197- fs->users = 1;
45198+ atomic_set(&fs->users, 1);
45199 fs->in_exec = 0;
45200 spin_lock_init(&fs->lock);
45201 seqcount_init(&fs->seq);
45202@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45203 spin_lock(&old->lock);
45204 fs->root = old->root;
45205 path_get_longterm(&fs->root);
45206+ /* instead of calling gr_set_chroot_entries here,
45207+ we call it from every caller of this function
45208+ */
45209 fs->pwd = old->pwd;
45210 path_get_longterm(&fs->pwd);
45211 spin_unlock(&old->lock);
45212@@ -150,8 +157,9 @@ int unshare_fs_struct(void)
45213
45214 task_lock(current);
45215 spin_lock(&fs->lock);
45216- kill = !--fs->users;
45217+ kill = !atomic_dec_return(&fs->users);
45218 current->fs = new_fs;
45219+ gr_set_chroot_entries(current, &new_fs->root);
45220 spin_unlock(&fs->lock);
45221 task_unlock(current);
45222
45223@@ -164,13 +172,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
45224
45225 int current_umask(void)
45226 {
45227- return current->fs->umask;
45228+ return current->fs->umask | gr_acl_umask();
45229 }
45230 EXPORT_SYMBOL(current_umask);
45231
45232 /* to be mentioned only in INIT_TASK */
45233 struct fs_struct init_fs = {
45234- .users = 1,
45235+ .users = ATOMIC_INIT(1),
45236 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
45237 .seq = SEQCNT_ZERO,
45238 .umask = 0022,
45239@@ -186,12 +194,13 @@ void daemonize_fs_struct(void)
45240 task_lock(current);
45241
45242 spin_lock(&init_fs.lock);
45243- init_fs.users++;
45244+ atomic_inc(&init_fs.users);
45245 spin_unlock(&init_fs.lock);
45246
45247 spin_lock(&fs->lock);
45248 current->fs = &init_fs;
45249- kill = !--fs->users;
45250+ gr_set_chroot_entries(current, &current->fs->root);
45251+ kill = !atomic_dec_return(&fs->users);
45252 spin_unlock(&fs->lock);
45253
45254 task_unlock(current);
45255diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
45256index 9905350..02eaec4 100644
45257--- a/fs/fscache/cookie.c
45258+++ b/fs/fscache/cookie.c
45259@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
45260 parent ? (char *) parent->def->name : "<no-parent>",
45261 def->name, netfs_data);
45262
45263- fscache_stat(&fscache_n_acquires);
45264+ fscache_stat_unchecked(&fscache_n_acquires);
45265
45266 /* if there's no parent cookie, then we don't create one here either */
45267 if (!parent) {
45268- fscache_stat(&fscache_n_acquires_null);
45269+ fscache_stat_unchecked(&fscache_n_acquires_null);
45270 _leave(" [no parent]");
45271 return NULL;
45272 }
45273@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
45274 /* allocate and initialise a cookie */
45275 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
45276 if (!cookie) {
45277- fscache_stat(&fscache_n_acquires_oom);
45278+ fscache_stat_unchecked(&fscache_n_acquires_oom);
45279 _leave(" [ENOMEM]");
45280 return NULL;
45281 }
45282@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45283
45284 switch (cookie->def->type) {
45285 case FSCACHE_COOKIE_TYPE_INDEX:
45286- fscache_stat(&fscache_n_cookie_index);
45287+ fscache_stat_unchecked(&fscache_n_cookie_index);
45288 break;
45289 case FSCACHE_COOKIE_TYPE_DATAFILE:
45290- fscache_stat(&fscache_n_cookie_data);
45291+ fscache_stat_unchecked(&fscache_n_cookie_data);
45292 break;
45293 default:
45294- fscache_stat(&fscache_n_cookie_special);
45295+ fscache_stat_unchecked(&fscache_n_cookie_special);
45296 break;
45297 }
45298
45299@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45300 if (fscache_acquire_non_index_cookie(cookie) < 0) {
45301 atomic_dec(&parent->n_children);
45302 __fscache_cookie_put(cookie);
45303- fscache_stat(&fscache_n_acquires_nobufs);
45304+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
45305 _leave(" = NULL");
45306 return NULL;
45307 }
45308 }
45309
45310- fscache_stat(&fscache_n_acquires_ok);
45311+ fscache_stat_unchecked(&fscache_n_acquires_ok);
45312 _leave(" = %p", cookie);
45313 return cookie;
45314 }
45315@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
45316 cache = fscache_select_cache_for_object(cookie->parent);
45317 if (!cache) {
45318 up_read(&fscache_addremove_sem);
45319- fscache_stat(&fscache_n_acquires_no_cache);
45320+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
45321 _leave(" = -ENOMEDIUM [no cache]");
45322 return -ENOMEDIUM;
45323 }
45324@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
45325 object = cache->ops->alloc_object(cache, cookie);
45326 fscache_stat_d(&fscache_n_cop_alloc_object);
45327 if (IS_ERR(object)) {
45328- fscache_stat(&fscache_n_object_no_alloc);
45329+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
45330 ret = PTR_ERR(object);
45331 goto error;
45332 }
45333
45334- fscache_stat(&fscache_n_object_alloc);
45335+ fscache_stat_unchecked(&fscache_n_object_alloc);
45336
45337 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
45338
45339@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
45340 struct fscache_object *object;
45341 struct hlist_node *_p;
45342
45343- fscache_stat(&fscache_n_updates);
45344+ fscache_stat_unchecked(&fscache_n_updates);
45345
45346 if (!cookie) {
45347- fscache_stat(&fscache_n_updates_null);
45348+ fscache_stat_unchecked(&fscache_n_updates_null);
45349 _leave(" [no cookie]");
45350 return;
45351 }
45352@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45353 struct fscache_object *object;
45354 unsigned long event;
45355
45356- fscache_stat(&fscache_n_relinquishes);
45357+ fscache_stat_unchecked(&fscache_n_relinquishes);
45358 if (retire)
45359- fscache_stat(&fscache_n_relinquishes_retire);
45360+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
45361
45362 if (!cookie) {
45363- fscache_stat(&fscache_n_relinquishes_null);
45364+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
45365 _leave(" [no cookie]");
45366 return;
45367 }
45368@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45369
45370 /* wait for the cookie to finish being instantiated (or to fail) */
45371 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
45372- fscache_stat(&fscache_n_relinquishes_waitcrt);
45373+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
45374 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
45375 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
45376 }
45377diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
45378index f6aad48..88dcf26 100644
45379--- a/fs/fscache/internal.h
45380+++ b/fs/fscache/internal.h
45381@@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
45382 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
45383 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
45384
45385-extern atomic_t fscache_n_op_pend;
45386-extern atomic_t fscache_n_op_run;
45387-extern atomic_t fscache_n_op_enqueue;
45388-extern atomic_t fscache_n_op_deferred_release;
45389-extern atomic_t fscache_n_op_release;
45390-extern atomic_t fscache_n_op_gc;
45391-extern atomic_t fscache_n_op_cancelled;
45392-extern atomic_t fscache_n_op_rejected;
45393+extern atomic_unchecked_t fscache_n_op_pend;
45394+extern atomic_unchecked_t fscache_n_op_run;
45395+extern atomic_unchecked_t fscache_n_op_enqueue;
45396+extern atomic_unchecked_t fscache_n_op_deferred_release;
45397+extern atomic_unchecked_t fscache_n_op_release;
45398+extern atomic_unchecked_t fscache_n_op_gc;
45399+extern atomic_unchecked_t fscache_n_op_cancelled;
45400+extern atomic_unchecked_t fscache_n_op_rejected;
45401
45402-extern atomic_t fscache_n_attr_changed;
45403-extern atomic_t fscache_n_attr_changed_ok;
45404-extern atomic_t fscache_n_attr_changed_nobufs;
45405-extern atomic_t fscache_n_attr_changed_nomem;
45406-extern atomic_t fscache_n_attr_changed_calls;
45407+extern atomic_unchecked_t fscache_n_attr_changed;
45408+extern atomic_unchecked_t fscache_n_attr_changed_ok;
45409+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
45410+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
45411+extern atomic_unchecked_t fscache_n_attr_changed_calls;
45412
45413-extern atomic_t fscache_n_allocs;
45414-extern atomic_t fscache_n_allocs_ok;
45415-extern atomic_t fscache_n_allocs_wait;
45416-extern atomic_t fscache_n_allocs_nobufs;
45417-extern atomic_t fscache_n_allocs_intr;
45418-extern atomic_t fscache_n_allocs_object_dead;
45419-extern atomic_t fscache_n_alloc_ops;
45420-extern atomic_t fscache_n_alloc_op_waits;
45421+extern atomic_unchecked_t fscache_n_allocs;
45422+extern atomic_unchecked_t fscache_n_allocs_ok;
45423+extern atomic_unchecked_t fscache_n_allocs_wait;
45424+extern atomic_unchecked_t fscache_n_allocs_nobufs;
45425+extern atomic_unchecked_t fscache_n_allocs_intr;
45426+extern atomic_unchecked_t fscache_n_allocs_object_dead;
45427+extern atomic_unchecked_t fscache_n_alloc_ops;
45428+extern atomic_unchecked_t fscache_n_alloc_op_waits;
45429
45430-extern atomic_t fscache_n_retrievals;
45431-extern atomic_t fscache_n_retrievals_ok;
45432-extern atomic_t fscache_n_retrievals_wait;
45433-extern atomic_t fscache_n_retrievals_nodata;
45434-extern atomic_t fscache_n_retrievals_nobufs;
45435-extern atomic_t fscache_n_retrievals_intr;
45436-extern atomic_t fscache_n_retrievals_nomem;
45437-extern atomic_t fscache_n_retrievals_object_dead;
45438-extern atomic_t fscache_n_retrieval_ops;
45439-extern atomic_t fscache_n_retrieval_op_waits;
45440+extern atomic_unchecked_t fscache_n_retrievals;
45441+extern atomic_unchecked_t fscache_n_retrievals_ok;
45442+extern atomic_unchecked_t fscache_n_retrievals_wait;
45443+extern atomic_unchecked_t fscache_n_retrievals_nodata;
45444+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
45445+extern atomic_unchecked_t fscache_n_retrievals_intr;
45446+extern atomic_unchecked_t fscache_n_retrievals_nomem;
45447+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
45448+extern atomic_unchecked_t fscache_n_retrieval_ops;
45449+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
45450
45451-extern atomic_t fscache_n_stores;
45452-extern atomic_t fscache_n_stores_ok;
45453-extern atomic_t fscache_n_stores_again;
45454-extern atomic_t fscache_n_stores_nobufs;
45455-extern atomic_t fscache_n_stores_oom;
45456-extern atomic_t fscache_n_store_ops;
45457-extern atomic_t fscache_n_store_calls;
45458-extern atomic_t fscache_n_store_pages;
45459-extern atomic_t fscache_n_store_radix_deletes;
45460-extern atomic_t fscache_n_store_pages_over_limit;
45461+extern atomic_unchecked_t fscache_n_stores;
45462+extern atomic_unchecked_t fscache_n_stores_ok;
45463+extern atomic_unchecked_t fscache_n_stores_again;
45464+extern atomic_unchecked_t fscache_n_stores_nobufs;
45465+extern atomic_unchecked_t fscache_n_stores_oom;
45466+extern atomic_unchecked_t fscache_n_store_ops;
45467+extern atomic_unchecked_t fscache_n_store_calls;
45468+extern atomic_unchecked_t fscache_n_store_pages;
45469+extern atomic_unchecked_t fscache_n_store_radix_deletes;
45470+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
45471
45472-extern atomic_t fscache_n_store_vmscan_not_storing;
45473-extern atomic_t fscache_n_store_vmscan_gone;
45474-extern atomic_t fscache_n_store_vmscan_busy;
45475-extern atomic_t fscache_n_store_vmscan_cancelled;
45476+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
45477+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
45478+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
45479+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
45480
45481-extern atomic_t fscache_n_marks;
45482-extern atomic_t fscache_n_uncaches;
45483+extern atomic_unchecked_t fscache_n_marks;
45484+extern atomic_unchecked_t fscache_n_uncaches;
45485
45486-extern atomic_t fscache_n_acquires;
45487-extern atomic_t fscache_n_acquires_null;
45488-extern atomic_t fscache_n_acquires_no_cache;
45489-extern atomic_t fscache_n_acquires_ok;
45490-extern atomic_t fscache_n_acquires_nobufs;
45491-extern atomic_t fscache_n_acquires_oom;
45492+extern atomic_unchecked_t fscache_n_acquires;
45493+extern atomic_unchecked_t fscache_n_acquires_null;
45494+extern atomic_unchecked_t fscache_n_acquires_no_cache;
45495+extern atomic_unchecked_t fscache_n_acquires_ok;
45496+extern atomic_unchecked_t fscache_n_acquires_nobufs;
45497+extern atomic_unchecked_t fscache_n_acquires_oom;
45498
45499-extern atomic_t fscache_n_updates;
45500-extern atomic_t fscache_n_updates_null;
45501-extern atomic_t fscache_n_updates_run;
45502+extern atomic_unchecked_t fscache_n_updates;
45503+extern atomic_unchecked_t fscache_n_updates_null;
45504+extern atomic_unchecked_t fscache_n_updates_run;
45505
45506-extern atomic_t fscache_n_relinquishes;
45507-extern atomic_t fscache_n_relinquishes_null;
45508-extern atomic_t fscache_n_relinquishes_waitcrt;
45509-extern atomic_t fscache_n_relinquishes_retire;
45510+extern atomic_unchecked_t fscache_n_relinquishes;
45511+extern atomic_unchecked_t fscache_n_relinquishes_null;
45512+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
45513+extern atomic_unchecked_t fscache_n_relinquishes_retire;
45514
45515-extern atomic_t fscache_n_cookie_index;
45516-extern atomic_t fscache_n_cookie_data;
45517-extern atomic_t fscache_n_cookie_special;
45518+extern atomic_unchecked_t fscache_n_cookie_index;
45519+extern atomic_unchecked_t fscache_n_cookie_data;
45520+extern atomic_unchecked_t fscache_n_cookie_special;
45521
45522-extern atomic_t fscache_n_object_alloc;
45523-extern atomic_t fscache_n_object_no_alloc;
45524-extern atomic_t fscache_n_object_lookups;
45525-extern atomic_t fscache_n_object_lookups_negative;
45526-extern atomic_t fscache_n_object_lookups_positive;
45527-extern atomic_t fscache_n_object_lookups_timed_out;
45528-extern atomic_t fscache_n_object_created;
45529-extern atomic_t fscache_n_object_avail;
45530-extern atomic_t fscache_n_object_dead;
45531+extern atomic_unchecked_t fscache_n_object_alloc;
45532+extern atomic_unchecked_t fscache_n_object_no_alloc;
45533+extern atomic_unchecked_t fscache_n_object_lookups;
45534+extern atomic_unchecked_t fscache_n_object_lookups_negative;
45535+extern atomic_unchecked_t fscache_n_object_lookups_positive;
45536+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
45537+extern atomic_unchecked_t fscache_n_object_created;
45538+extern atomic_unchecked_t fscache_n_object_avail;
45539+extern atomic_unchecked_t fscache_n_object_dead;
45540
45541-extern atomic_t fscache_n_checkaux_none;
45542-extern atomic_t fscache_n_checkaux_okay;
45543-extern atomic_t fscache_n_checkaux_update;
45544-extern atomic_t fscache_n_checkaux_obsolete;
45545+extern atomic_unchecked_t fscache_n_checkaux_none;
45546+extern atomic_unchecked_t fscache_n_checkaux_okay;
45547+extern atomic_unchecked_t fscache_n_checkaux_update;
45548+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
45549
45550 extern atomic_t fscache_n_cop_alloc_object;
45551 extern atomic_t fscache_n_cop_lookup_object;
45552@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
45553 atomic_inc(stat);
45554 }
45555
45556+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
45557+{
45558+ atomic_inc_unchecked(stat);
45559+}
45560+
45561 static inline void fscache_stat_d(atomic_t *stat)
45562 {
45563 atomic_dec(stat);
45564@@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
45565
45566 #define __fscache_stat(stat) (NULL)
45567 #define fscache_stat(stat) do {} while (0)
45568+#define fscache_stat_unchecked(stat) do {} while (0)
45569 #define fscache_stat_d(stat) do {} while (0)
45570 #endif
45571
45572diff --git a/fs/fscache/object.c b/fs/fscache/object.c
45573index b6b897c..0ffff9c 100644
45574--- a/fs/fscache/object.c
45575+++ b/fs/fscache/object.c
45576@@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45577 /* update the object metadata on disk */
45578 case FSCACHE_OBJECT_UPDATING:
45579 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
45580- fscache_stat(&fscache_n_updates_run);
45581+ fscache_stat_unchecked(&fscache_n_updates_run);
45582 fscache_stat(&fscache_n_cop_update_object);
45583 object->cache->ops->update_object(object);
45584 fscache_stat_d(&fscache_n_cop_update_object);
45585@@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45586 spin_lock(&object->lock);
45587 object->state = FSCACHE_OBJECT_DEAD;
45588 spin_unlock(&object->lock);
45589- fscache_stat(&fscache_n_object_dead);
45590+ fscache_stat_unchecked(&fscache_n_object_dead);
45591 goto terminal_transit;
45592
45593 /* handle the parent cache of this object being withdrawn from
45594@@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45595 spin_lock(&object->lock);
45596 object->state = FSCACHE_OBJECT_DEAD;
45597 spin_unlock(&object->lock);
45598- fscache_stat(&fscache_n_object_dead);
45599+ fscache_stat_unchecked(&fscache_n_object_dead);
45600 goto terminal_transit;
45601
45602 /* complain about the object being woken up once it is
45603@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45604 parent->cookie->def->name, cookie->def->name,
45605 object->cache->tag->name);
45606
45607- fscache_stat(&fscache_n_object_lookups);
45608+ fscache_stat_unchecked(&fscache_n_object_lookups);
45609 fscache_stat(&fscache_n_cop_lookup_object);
45610 ret = object->cache->ops->lookup_object(object);
45611 fscache_stat_d(&fscache_n_cop_lookup_object);
45612@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45613 if (ret == -ETIMEDOUT) {
45614 /* probably stuck behind another object, so move this one to
45615 * the back of the queue */
45616- fscache_stat(&fscache_n_object_lookups_timed_out);
45617+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
45618 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45619 }
45620
45621@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
45622
45623 spin_lock(&object->lock);
45624 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45625- fscache_stat(&fscache_n_object_lookups_negative);
45626+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
45627
45628 /* transit here to allow write requests to begin stacking up
45629 * and read requests to begin returning ENODATA */
45630@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
45631 * result, in which case there may be data available */
45632 spin_lock(&object->lock);
45633 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45634- fscache_stat(&fscache_n_object_lookups_positive);
45635+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
45636
45637 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
45638
45639@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
45640 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45641 } else {
45642 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
45643- fscache_stat(&fscache_n_object_created);
45644+ fscache_stat_unchecked(&fscache_n_object_created);
45645
45646 object->state = FSCACHE_OBJECT_AVAILABLE;
45647 spin_unlock(&object->lock);
45648@@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
45649 fscache_enqueue_dependents(object);
45650
45651 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
45652- fscache_stat(&fscache_n_object_avail);
45653+ fscache_stat_unchecked(&fscache_n_object_avail);
45654
45655 _leave("");
45656 }
45657@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45658 enum fscache_checkaux result;
45659
45660 if (!object->cookie->def->check_aux) {
45661- fscache_stat(&fscache_n_checkaux_none);
45662+ fscache_stat_unchecked(&fscache_n_checkaux_none);
45663 return FSCACHE_CHECKAUX_OKAY;
45664 }
45665
45666@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45667 switch (result) {
45668 /* entry okay as is */
45669 case FSCACHE_CHECKAUX_OKAY:
45670- fscache_stat(&fscache_n_checkaux_okay);
45671+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
45672 break;
45673
45674 /* entry requires update */
45675 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
45676- fscache_stat(&fscache_n_checkaux_update);
45677+ fscache_stat_unchecked(&fscache_n_checkaux_update);
45678 break;
45679
45680 /* entry requires deletion */
45681 case FSCACHE_CHECKAUX_OBSOLETE:
45682- fscache_stat(&fscache_n_checkaux_obsolete);
45683+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
45684 break;
45685
45686 default:
45687diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
45688index 30afdfa..2256596 100644
45689--- a/fs/fscache/operation.c
45690+++ b/fs/fscache/operation.c
45691@@ -17,7 +17,7 @@
45692 #include <linux/slab.h>
45693 #include "internal.h"
45694
45695-atomic_t fscache_op_debug_id;
45696+atomic_unchecked_t fscache_op_debug_id;
45697 EXPORT_SYMBOL(fscache_op_debug_id);
45698
45699 /**
45700@@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
45701 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
45702 ASSERTCMP(atomic_read(&op->usage), >, 0);
45703
45704- fscache_stat(&fscache_n_op_enqueue);
45705+ fscache_stat_unchecked(&fscache_n_op_enqueue);
45706 switch (op->flags & FSCACHE_OP_TYPE) {
45707 case FSCACHE_OP_ASYNC:
45708 _debug("queue async");
45709@@ -69,7 +69,7 @@ static void fscache_run_op(struct fscache_object *object,
45710 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
45711 if (op->processor)
45712 fscache_enqueue_operation(op);
45713- fscache_stat(&fscache_n_op_run);
45714+ fscache_stat_unchecked(&fscache_n_op_run);
45715 }
45716
45717 /*
45718@@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
45719 if (object->n_ops > 1) {
45720 atomic_inc(&op->usage);
45721 list_add_tail(&op->pend_link, &object->pending_ops);
45722- fscache_stat(&fscache_n_op_pend);
45723+ fscache_stat_unchecked(&fscache_n_op_pend);
45724 } else if (!list_empty(&object->pending_ops)) {
45725 atomic_inc(&op->usage);
45726 list_add_tail(&op->pend_link, &object->pending_ops);
45727- fscache_stat(&fscache_n_op_pend);
45728+ fscache_stat_unchecked(&fscache_n_op_pend);
45729 fscache_start_operations(object);
45730 } else {
45731 ASSERTCMP(object->n_in_progress, ==, 0);
45732@@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
45733 object->n_exclusive++; /* reads and writes must wait */
45734 atomic_inc(&op->usage);
45735 list_add_tail(&op->pend_link, &object->pending_ops);
45736- fscache_stat(&fscache_n_op_pend);
45737+ fscache_stat_unchecked(&fscache_n_op_pend);
45738 ret = 0;
45739 } else {
45740 /* not allowed to submit ops in any other state */
45741@@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_object *object,
45742 if (object->n_exclusive > 0) {
45743 atomic_inc(&op->usage);
45744 list_add_tail(&op->pend_link, &object->pending_ops);
45745- fscache_stat(&fscache_n_op_pend);
45746+ fscache_stat_unchecked(&fscache_n_op_pend);
45747 } else if (!list_empty(&object->pending_ops)) {
45748 atomic_inc(&op->usage);
45749 list_add_tail(&op->pend_link, &object->pending_ops);
45750- fscache_stat(&fscache_n_op_pend);
45751+ fscache_stat_unchecked(&fscache_n_op_pend);
45752 fscache_start_operations(object);
45753 } else {
45754 ASSERTCMP(object->n_exclusive, ==, 0);
45755@@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_object *object,
45756 object->n_ops++;
45757 atomic_inc(&op->usage);
45758 list_add_tail(&op->pend_link, &object->pending_ops);
45759- fscache_stat(&fscache_n_op_pend);
45760+ fscache_stat_unchecked(&fscache_n_op_pend);
45761 ret = 0;
45762 } else if (object->state == FSCACHE_OBJECT_DYING ||
45763 object->state == FSCACHE_OBJECT_LC_DYING ||
45764 object->state == FSCACHE_OBJECT_WITHDRAWING) {
45765- fscache_stat(&fscache_n_op_rejected);
45766+ fscache_stat_unchecked(&fscache_n_op_rejected);
45767 ret = -ENOBUFS;
45768 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
45769 fscache_report_unexpected_submission(object, op, ostate);
45770@@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_operation *op)
45771
45772 ret = -EBUSY;
45773 if (!list_empty(&op->pend_link)) {
45774- fscache_stat(&fscache_n_op_cancelled);
45775+ fscache_stat_unchecked(&fscache_n_op_cancelled);
45776 list_del_init(&op->pend_link);
45777 object->n_ops--;
45778 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
45779@@ -331,7 +331,7 @@ void fscache_put_operation(struct fscache_operation *op)
45780 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
45781 BUG();
45782
45783- fscache_stat(&fscache_n_op_release);
45784+ fscache_stat_unchecked(&fscache_n_op_release);
45785
45786 if (op->release) {
45787 op->release(op);
45788@@ -348,7 +348,7 @@ void fscache_put_operation(struct fscache_operation *op)
45789 * lock, and defer it otherwise */
45790 if (!spin_trylock(&object->lock)) {
45791 _debug("defer put");
45792- fscache_stat(&fscache_n_op_deferred_release);
45793+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
45794
45795 cache = object->cache;
45796 spin_lock(&cache->op_gc_list_lock);
45797@@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_struct *work)
45798
45799 _debug("GC DEFERRED REL OBJ%x OP%x",
45800 object->debug_id, op->debug_id);
45801- fscache_stat(&fscache_n_op_gc);
45802+ fscache_stat_unchecked(&fscache_n_op_gc);
45803
45804 ASSERTCMP(atomic_read(&op->usage), ==, 0);
45805
45806diff --git a/fs/fscache/page.c b/fs/fscache/page.c
45807index 3f7a59b..cf196cc 100644
45808--- a/fs/fscache/page.c
45809+++ b/fs/fscache/page.c
45810@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
45811 val = radix_tree_lookup(&cookie->stores, page->index);
45812 if (!val) {
45813 rcu_read_unlock();
45814- fscache_stat(&fscache_n_store_vmscan_not_storing);
45815+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
45816 __fscache_uncache_page(cookie, page);
45817 return true;
45818 }
45819@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
45820 spin_unlock(&cookie->stores_lock);
45821
45822 if (xpage) {
45823- fscache_stat(&fscache_n_store_vmscan_cancelled);
45824- fscache_stat(&fscache_n_store_radix_deletes);
45825+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
45826+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
45827 ASSERTCMP(xpage, ==, page);
45828 } else {
45829- fscache_stat(&fscache_n_store_vmscan_gone);
45830+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
45831 }
45832
45833 wake_up_bit(&cookie->flags, 0);
45834@@ -107,7 +107,7 @@ page_busy:
45835 /* we might want to wait here, but that could deadlock the allocator as
45836 * the work threads writing to the cache may all end up sleeping
45837 * on memory allocation */
45838- fscache_stat(&fscache_n_store_vmscan_busy);
45839+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
45840 return false;
45841 }
45842 EXPORT_SYMBOL(__fscache_maybe_release_page);
45843@@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
45844 FSCACHE_COOKIE_STORING_TAG);
45845 if (!radix_tree_tag_get(&cookie->stores, page->index,
45846 FSCACHE_COOKIE_PENDING_TAG)) {
45847- fscache_stat(&fscache_n_store_radix_deletes);
45848+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
45849 xpage = radix_tree_delete(&cookie->stores, page->index);
45850 }
45851 spin_unlock(&cookie->stores_lock);
45852@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
45853
45854 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
45855
45856- fscache_stat(&fscache_n_attr_changed_calls);
45857+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
45858
45859 if (fscache_object_is_active(object)) {
45860 fscache_stat(&fscache_n_cop_attr_changed);
45861@@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
45862
45863 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
45864
45865- fscache_stat(&fscache_n_attr_changed);
45866+ fscache_stat_unchecked(&fscache_n_attr_changed);
45867
45868 op = kzalloc(sizeof(*op), GFP_KERNEL);
45869 if (!op) {
45870- fscache_stat(&fscache_n_attr_changed_nomem);
45871+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
45872 _leave(" = -ENOMEM");
45873 return -ENOMEM;
45874 }
45875@@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
45876 if (fscache_submit_exclusive_op(object, op) < 0)
45877 goto nobufs;
45878 spin_unlock(&cookie->lock);
45879- fscache_stat(&fscache_n_attr_changed_ok);
45880+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
45881 fscache_put_operation(op);
45882 _leave(" = 0");
45883 return 0;
45884@@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
45885 nobufs:
45886 spin_unlock(&cookie->lock);
45887 kfree(op);
45888- fscache_stat(&fscache_n_attr_changed_nobufs);
45889+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
45890 _leave(" = %d", -ENOBUFS);
45891 return -ENOBUFS;
45892 }
45893@@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
45894 /* allocate a retrieval operation and attempt to submit it */
45895 op = kzalloc(sizeof(*op), GFP_NOIO);
45896 if (!op) {
45897- fscache_stat(&fscache_n_retrievals_nomem);
45898+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
45899 return NULL;
45900 }
45901
45902@@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
45903 return 0;
45904 }
45905
45906- fscache_stat(&fscache_n_retrievals_wait);
45907+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
45908
45909 jif = jiffies;
45910 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
45911 fscache_wait_bit_interruptible,
45912 TASK_INTERRUPTIBLE) != 0) {
45913- fscache_stat(&fscache_n_retrievals_intr);
45914+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
45915 _leave(" = -ERESTARTSYS");
45916 return -ERESTARTSYS;
45917 }
45918@@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
45919 */
45920 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
45921 struct fscache_retrieval *op,
45922- atomic_t *stat_op_waits,
45923- atomic_t *stat_object_dead)
45924+ atomic_unchecked_t *stat_op_waits,
45925+ atomic_unchecked_t *stat_object_dead)
45926 {
45927 int ret;
45928
45929@@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
45930 goto check_if_dead;
45931
45932 _debug(">>> WT");
45933- fscache_stat(stat_op_waits);
45934+ fscache_stat_unchecked(stat_op_waits);
45935 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
45936 fscache_wait_bit_interruptible,
45937 TASK_INTERRUPTIBLE) < 0) {
45938@@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
45939
45940 check_if_dead:
45941 if (unlikely(fscache_object_is_dead(object))) {
45942- fscache_stat(stat_object_dead);
45943+ fscache_stat_unchecked(stat_object_dead);
45944 return -ENOBUFS;
45945 }
45946 return 0;
45947@@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
45948
45949 _enter("%p,%p,,,", cookie, page);
45950
45951- fscache_stat(&fscache_n_retrievals);
45952+ fscache_stat_unchecked(&fscache_n_retrievals);
45953
45954 if (hlist_empty(&cookie->backing_objects))
45955 goto nobufs;
45956@@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
45957 goto nobufs_unlock;
45958 spin_unlock(&cookie->lock);
45959
45960- fscache_stat(&fscache_n_retrieval_ops);
45961+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
45962
45963 /* pin the netfs read context in case we need to do the actual netfs
45964 * read because we've encountered a cache read failure */
45965@@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
45966
45967 error:
45968 if (ret == -ENOMEM)
45969- fscache_stat(&fscache_n_retrievals_nomem);
45970+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
45971 else if (ret == -ERESTARTSYS)
45972- fscache_stat(&fscache_n_retrievals_intr);
45973+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
45974 else if (ret == -ENODATA)
45975- fscache_stat(&fscache_n_retrievals_nodata);
45976+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
45977 else if (ret < 0)
45978- fscache_stat(&fscache_n_retrievals_nobufs);
45979+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
45980 else
45981- fscache_stat(&fscache_n_retrievals_ok);
45982+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
45983
45984 fscache_put_retrieval(op);
45985 _leave(" = %d", ret);
45986@@ -429,7 +429,7 @@ nobufs_unlock:
45987 spin_unlock(&cookie->lock);
45988 kfree(op);
45989 nobufs:
45990- fscache_stat(&fscache_n_retrievals_nobufs);
45991+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
45992 _leave(" = -ENOBUFS");
45993 return -ENOBUFS;
45994 }
45995@@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
45996
45997 _enter("%p,,%d,,,", cookie, *nr_pages);
45998
45999- fscache_stat(&fscache_n_retrievals);
46000+ fscache_stat_unchecked(&fscache_n_retrievals);
46001
46002 if (hlist_empty(&cookie->backing_objects))
46003 goto nobufs;
46004@@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46005 goto nobufs_unlock;
46006 spin_unlock(&cookie->lock);
46007
46008- fscache_stat(&fscache_n_retrieval_ops);
46009+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
46010
46011 /* pin the netfs read context in case we need to do the actual netfs
46012 * read because we've encountered a cache read failure */
46013@@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46014
46015 error:
46016 if (ret == -ENOMEM)
46017- fscache_stat(&fscache_n_retrievals_nomem);
46018+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46019 else if (ret == -ERESTARTSYS)
46020- fscache_stat(&fscache_n_retrievals_intr);
46021+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
46022 else if (ret == -ENODATA)
46023- fscache_stat(&fscache_n_retrievals_nodata);
46024+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
46025 else if (ret < 0)
46026- fscache_stat(&fscache_n_retrievals_nobufs);
46027+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46028 else
46029- fscache_stat(&fscache_n_retrievals_ok);
46030+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
46031
46032 fscache_put_retrieval(op);
46033 _leave(" = %d", ret);
46034@@ -545,7 +545,7 @@ nobufs_unlock:
46035 spin_unlock(&cookie->lock);
46036 kfree(op);
46037 nobufs:
46038- fscache_stat(&fscache_n_retrievals_nobufs);
46039+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46040 _leave(" = -ENOBUFS");
46041 return -ENOBUFS;
46042 }
46043@@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46044
46045 _enter("%p,%p,,,", cookie, page);
46046
46047- fscache_stat(&fscache_n_allocs);
46048+ fscache_stat_unchecked(&fscache_n_allocs);
46049
46050 if (hlist_empty(&cookie->backing_objects))
46051 goto nobufs;
46052@@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46053 goto nobufs_unlock;
46054 spin_unlock(&cookie->lock);
46055
46056- fscache_stat(&fscache_n_alloc_ops);
46057+ fscache_stat_unchecked(&fscache_n_alloc_ops);
46058
46059 ret = fscache_wait_for_retrieval_activation(
46060 object, op,
46061@@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46062
46063 error:
46064 if (ret == -ERESTARTSYS)
46065- fscache_stat(&fscache_n_allocs_intr);
46066+ fscache_stat_unchecked(&fscache_n_allocs_intr);
46067 else if (ret < 0)
46068- fscache_stat(&fscache_n_allocs_nobufs);
46069+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46070 else
46071- fscache_stat(&fscache_n_allocs_ok);
46072+ fscache_stat_unchecked(&fscache_n_allocs_ok);
46073
46074 fscache_put_retrieval(op);
46075 _leave(" = %d", ret);
46076@@ -625,7 +625,7 @@ nobufs_unlock:
46077 spin_unlock(&cookie->lock);
46078 kfree(op);
46079 nobufs:
46080- fscache_stat(&fscache_n_allocs_nobufs);
46081+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46082 _leave(" = -ENOBUFS");
46083 return -ENOBUFS;
46084 }
46085@@ -666,7 +666,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46086
46087 spin_lock(&cookie->stores_lock);
46088
46089- fscache_stat(&fscache_n_store_calls);
46090+ fscache_stat_unchecked(&fscache_n_store_calls);
46091
46092 /* find a page to store */
46093 page = NULL;
46094@@ -677,7 +677,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46095 page = results[0];
46096 _debug("gang %d [%lx]", n, page->index);
46097 if (page->index > op->store_limit) {
46098- fscache_stat(&fscache_n_store_pages_over_limit);
46099+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
46100 goto superseded;
46101 }
46102
46103@@ -689,7 +689,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46104 spin_unlock(&cookie->stores_lock);
46105 spin_unlock(&object->lock);
46106
46107- fscache_stat(&fscache_n_store_pages);
46108+ fscache_stat_unchecked(&fscache_n_store_pages);
46109 fscache_stat(&fscache_n_cop_write_page);
46110 ret = object->cache->ops->write_page(op, page);
46111 fscache_stat_d(&fscache_n_cop_write_page);
46112@@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46113 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46114 ASSERT(PageFsCache(page));
46115
46116- fscache_stat(&fscache_n_stores);
46117+ fscache_stat_unchecked(&fscache_n_stores);
46118
46119 op = kzalloc(sizeof(*op), GFP_NOIO);
46120 if (!op)
46121@@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46122 spin_unlock(&cookie->stores_lock);
46123 spin_unlock(&object->lock);
46124
46125- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
46126+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
46127 op->store_limit = object->store_limit;
46128
46129 if (fscache_submit_op(object, &op->op) < 0)
46130@@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46131
46132 spin_unlock(&cookie->lock);
46133 radix_tree_preload_end();
46134- fscache_stat(&fscache_n_store_ops);
46135- fscache_stat(&fscache_n_stores_ok);
46136+ fscache_stat_unchecked(&fscache_n_store_ops);
46137+ fscache_stat_unchecked(&fscache_n_stores_ok);
46138
46139 /* the work queue now carries its own ref on the object */
46140 fscache_put_operation(&op->op);
46141@@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46142 return 0;
46143
46144 already_queued:
46145- fscache_stat(&fscache_n_stores_again);
46146+ fscache_stat_unchecked(&fscache_n_stores_again);
46147 already_pending:
46148 spin_unlock(&cookie->stores_lock);
46149 spin_unlock(&object->lock);
46150 spin_unlock(&cookie->lock);
46151 radix_tree_preload_end();
46152 kfree(op);
46153- fscache_stat(&fscache_n_stores_ok);
46154+ fscache_stat_unchecked(&fscache_n_stores_ok);
46155 _leave(" = 0");
46156 return 0;
46157
46158@@ -851,14 +851,14 @@ nobufs:
46159 spin_unlock(&cookie->lock);
46160 radix_tree_preload_end();
46161 kfree(op);
46162- fscache_stat(&fscache_n_stores_nobufs);
46163+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
46164 _leave(" = -ENOBUFS");
46165 return -ENOBUFS;
46166
46167 nomem_free:
46168 kfree(op);
46169 nomem:
46170- fscache_stat(&fscache_n_stores_oom);
46171+ fscache_stat_unchecked(&fscache_n_stores_oom);
46172 _leave(" = -ENOMEM");
46173 return -ENOMEM;
46174 }
46175@@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
46176 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46177 ASSERTCMP(page, !=, NULL);
46178
46179- fscache_stat(&fscache_n_uncaches);
46180+ fscache_stat_unchecked(&fscache_n_uncaches);
46181
46182 /* cache withdrawal may beat us to it */
46183 if (!PageFsCache(page))
46184@@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
46185 unsigned long loop;
46186
46187 #ifdef CONFIG_FSCACHE_STATS
46188- atomic_add(pagevec->nr, &fscache_n_marks);
46189+ atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
46190 #endif
46191
46192 for (loop = 0; loop < pagevec->nr; loop++) {
46193diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
46194index 4765190..2a067f2 100644
46195--- a/fs/fscache/stats.c
46196+++ b/fs/fscache/stats.c
46197@@ -18,95 +18,95 @@
46198 /*
46199 * operation counters
46200 */
46201-atomic_t fscache_n_op_pend;
46202-atomic_t fscache_n_op_run;
46203-atomic_t fscache_n_op_enqueue;
46204-atomic_t fscache_n_op_requeue;
46205-atomic_t fscache_n_op_deferred_release;
46206-atomic_t fscache_n_op_release;
46207-atomic_t fscache_n_op_gc;
46208-atomic_t fscache_n_op_cancelled;
46209-atomic_t fscache_n_op_rejected;
46210+atomic_unchecked_t fscache_n_op_pend;
46211+atomic_unchecked_t fscache_n_op_run;
46212+atomic_unchecked_t fscache_n_op_enqueue;
46213+atomic_unchecked_t fscache_n_op_requeue;
46214+atomic_unchecked_t fscache_n_op_deferred_release;
46215+atomic_unchecked_t fscache_n_op_release;
46216+atomic_unchecked_t fscache_n_op_gc;
46217+atomic_unchecked_t fscache_n_op_cancelled;
46218+atomic_unchecked_t fscache_n_op_rejected;
46219
46220-atomic_t fscache_n_attr_changed;
46221-atomic_t fscache_n_attr_changed_ok;
46222-atomic_t fscache_n_attr_changed_nobufs;
46223-atomic_t fscache_n_attr_changed_nomem;
46224-atomic_t fscache_n_attr_changed_calls;
46225+atomic_unchecked_t fscache_n_attr_changed;
46226+atomic_unchecked_t fscache_n_attr_changed_ok;
46227+atomic_unchecked_t fscache_n_attr_changed_nobufs;
46228+atomic_unchecked_t fscache_n_attr_changed_nomem;
46229+atomic_unchecked_t fscache_n_attr_changed_calls;
46230
46231-atomic_t fscache_n_allocs;
46232-atomic_t fscache_n_allocs_ok;
46233-atomic_t fscache_n_allocs_wait;
46234-atomic_t fscache_n_allocs_nobufs;
46235-atomic_t fscache_n_allocs_intr;
46236-atomic_t fscache_n_allocs_object_dead;
46237-atomic_t fscache_n_alloc_ops;
46238-atomic_t fscache_n_alloc_op_waits;
46239+atomic_unchecked_t fscache_n_allocs;
46240+atomic_unchecked_t fscache_n_allocs_ok;
46241+atomic_unchecked_t fscache_n_allocs_wait;
46242+atomic_unchecked_t fscache_n_allocs_nobufs;
46243+atomic_unchecked_t fscache_n_allocs_intr;
46244+atomic_unchecked_t fscache_n_allocs_object_dead;
46245+atomic_unchecked_t fscache_n_alloc_ops;
46246+atomic_unchecked_t fscache_n_alloc_op_waits;
46247
46248-atomic_t fscache_n_retrievals;
46249-atomic_t fscache_n_retrievals_ok;
46250-atomic_t fscache_n_retrievals_wait;
46251-atomic_t fscache_n_retrievals_nodata;
46252-atomic_t fscache_n_retrievals_nobufs;
46253-atomic_t fscache_n_retrievals_intr;
46254-atomic_t fscache_n_retrievals_nomem;
46255-atomic_t fscache_n_retrievals_object_dead;
46256-atomic_t fscache_n_retrieval_ops;
46257-atomic_t fscache_n_retrieval_op_waits;
46258+atomic_unchecked_t fscache_n_retrievals;
46259+atomic_unchecked_t fscache_n_retrievals_ok;
46260+atomic_unchecked_t fscache_n_retrievals_wait;
46261+atomic_unchecked_t fscache_n_retrievals_nodata;
46262+atomic_unchecked_t fscache_n_retrievals_nobufs;
46263+atomic_unchecked_t fscache_n_retrievals_intr;
46264+atomic_unchecked_t fscache_n_retrievals_nomem;
46265+atomic_unchecked_t fscache_n_retrievals_object_dead;
46266+atomic_unchecked_t fscache_n_retrieval_ops;
46267+atomic_unchecked_t fscache_n_retrieval_op_waits;
46268
46269-atomic_t fscache_n_stores;
46270-atomic_t fscache_n_stores_ok;
46271-atomic_t fscache_n_stores_again;
46272-atomic_t fscache_n_stores_nobufs;
46273-atomic_t fscache_n_stores_oom;
46274-atomic_t fscache_n_store_ops;
46275-atomic_t fscache_n_store_calls;
46276-atomic_t fscache_n_store_pages;
46277-atomic_t fscache_n_store_radix_deletes;
46278-atomic_t fscache_n_store_pages_over_limit;
46279+atomic_unchecked_t fscache_n_stores;
46280+atomic_unchecked_t fscache_n_stores_ok;
46281+atomic_unchecked_t fscache_n_stores_again;
46282+atomic_unchecked_t fscache_n_stores_nobufs;
46283+atomic_unchecked_t fscache_n_stores_oom;
46284+atomic_unchecked_t fscache_n_store_ops;
46285+atomic_unchecked_t fscache_n_store_calls;
46286+atomic_unchecked_t fscache_n_store_pages;
46287+atomic_unchecked_t fscache_n_store_radix_deletes;
46288+atomic_unchecked_t fscache_n_store_pages_over_limit;
46289
46290-atomic_t fscache_n_store_vmscan_not_storing;
46291-atomic_t fscache_n_store_vmscan_gone;
46292-atomic_t fscache_n_store_vmscan_busy;
46293-atomic_t fscache_n_store_vmscan_cancelled;
46294+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
46295+atomic_unchecked_t fscache_n_store_vmscan_gone;
46296+atomic_unchecked_t fscache_n_store_vmscan_busy;
46297+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
46298
46299-atomic_t fscache_n_marks;
46300-atomic_t fscache_n_uncaches;
46301+atomic_unchecked_t fscache_n_marks;
46302+atomic_unchecked_t fscache_n_uncaches;
46303
46304-atomic_t fscache_n_acquires;
46305-atomic_t fscache_n_acquires_null;
46306-atomic_t fscache_n_acquires_no_cache;
46307-atomic_t fscache_n_acquires_ok;
46308-atomic_t fscache_n_acquires_nobufs;
46309-atomic_t fscache_n_acquires_oom;
46310+atomic_unchecked_t fscache_n_acquires;
46311+atomic_unchecked_t fscache_n_acquires_null;
46312+atomic_unchecked_t fscache_n_acquires_no_cache;
46313+atomic_unchecked_t fscache_n_acquires_ok;
46314+atomic_unchecked_t fscache_n_acquires_nobufs;
46315+atomic_unchecked_t fscache_n_acquires_oom;
46316
46317-atomic_t fscache_n_updates;
46318-atomic_t fscache_n_updates_null;
46319-atomic_t fscache_n_updates_run;
46320+atomic_unchecked_t fscache_n_updates;
46321+atomic_unchecked_t fscache_n_updates_null;
46322+atomic_unchecked_t fscache_n_updates_run;
46323
46324-atomic_t fscache_n_relinquishes;
46325-atomic_t fscache_n_relinquishes_null;
46326-atomic_t fscache_n_relinquishes_waitcrt;
46327-atomic_t fscache_n_relinquishes_retire;
46328+atomic_unchecked_t fscache_n_relinquishes;
46329+atomic_unchecked_t fscache_n_relinquishes_null;
46330+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
46331+atomic_unchecked_t fscache_n_relinquishes_retire;
46332
46333-atomic_t fscache_n_cookie_index;
46334-atomic_t fscache_n_cookie_data;
46335-atomic_t fscache_n_cookie_special;
46336+atomic_unchecked_t fscache_n_cookie_index;
46337+atomic_unchecked_t fscache_n_cookie_data;
46338+atomic_unchecked_t fscache_n_cookie_special;
46339
46340-atomic_t fscache_n_object_alloc;
46341-atomic_t fscache_n_object_no_alloc;
46342-atomic_t fscache_n_object_lookups;
46343-atomic_t fscache_n_object_lookups_negative;
46344-atomic_t fscache_n_object_lookups_positive;
46345-atomic_t fscache_n_object_lookups_timed_out;
46346-atomic_t fscache_n_object_created;
46347-atomic_t fscache_n_object_avail;
46348-atomic_t fscache_n_object_dead;
46349+atomic_unchecked_t fscache_n_object_alloc;
46350+atomic_unchecked_t fscache_n_object_no_alloc;
46351+atomic_unchecked_t fscache_n_object_lookups;
46352+atomic_unchecked_t fscache_n_object_lookups_negative;
46353+atomic_unchecked_t fscache_n_object_lookups_positive;
46354+atomic_unchecked_t fscache_n_object_lookups_timed_out;
46355+atomic_unchecked_t fscache_n_object_created;
46356+atomic_unchecked_t fscache_n_object_avail;
46357+atomic_unchecked_t fscache_n_object_dead;
46358
46359-atomic_t fscache_n_checkaux_none;
46360-atomic_t fscache_n_checkaux_okay;
46361-atomic_t fscache_n_checkaux_update;
46362-atomic_t fscache_n_checkaux_obsolete;
46363+atomic_unchecked_t fscache_n_checkaux_none;
46364+atomic_unchecked_t fscache_n_checkaux_okay;
46365+atomic_unchecked_t fscache_n_checkaux_update;
46366+atomic_unchecked_t fscache_n_checkaux_obsolete;
46367
46368 atomic_t fscache_n_cop_alloc_object;
46369 atomic_t fscache_n_cop_lookup_object;
46370@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
46371 seq_puts(m, "FS-Cache statistics\n");
46372
46373 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
46374- atomic_read(&fscache_n_cookie_index),
46375- atomic_read(&fscache_n_cookie_data),
46376- atomic_read(&fscache_n_cookie_special));
46377+ atomic_read_unchecked(&fscache_n_cookie_index),
46378+ atomic_read_unchecked(&fscache_n_cookie_data),
46379+ atomic_read_unchecked(&fscache_n_cookie_special));
46380
46381 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
46382- atomic_read(&fscache_n_object_alloc),
46383- atomic_read(&fscache_n_object_no_alloc),
46384- atomic_read(&fscache_n_object_avail),
46385- atomic_read(&fscache_n_object_dead));
46386+ atomic_read_unchecked(&fscache_n_object_alloc),
46387+ atomic_read_unchecked(&fscache_n_object_no_alloc),
46388+ atomic_read_unchecked(&fscache_n_object_avail),
46389+ atomic_read_unchecked(&fscache_n_object_dead));
46390 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
46391- atomic_read(&fscache_n_checkaux_none),
46392- atomic_read(&fscache_n_checkaux_okay),
46393- atomic_read(&fscache_n_checkaux_update),
46394- atomic_read(&fscache_n_checkaux_obsolete));
46395+ atomic_read_unchecked(&fscache_n_checkaux_none),
46396+ atomic_read_unchecked(&fscache_n_checkaux_okay),
46397+ atomic_read_unchecked(&fscache_n_checkaux_update),
46398+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
46399
46400 seq_printf(m, "Pages : mrk=%u unc=%u\n",
46401- atomic_read(&fscache_n_marks),
46402- atomic_read(&fscache_n_uncaches));
46403+ atomic_read_unchecked(&fscache_n_marks),
46404+ atomic_read_unchecked(&fscache_n_uncaches));
46405
46406 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
46407 " oom=%u\n",
46408- atomic_read(&fscache_n_acquires),
46409- atomic_read(&fscache_n_acquires_null),
46410- atomic_read(&fscache_n_acquires_no_cache),
46411- atomic_read(&fscache_n_acquires_ok),
46412- atomic_read(&fscache_n_acquires_nobufs),
46413- atomic_read(&fscache_n_acquires_oom));
46414+ atomic_read_unchecked(&fscache_n_acquires),
46415+ atomic_read_unchecked(&fscache_n_acquires_null),
46416+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
46417+ atomic_read_unchecked(&fscache_n_acquires_ok),
46418+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
46419+ atomic_read_unchecked(&fscache_n_acquires_oom));
46420
46421 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
46422- atomic_read(&fscache_n_object_lookups),
46423- atomic_read(&fscache_n_object_lookups_negative),
46424- atomic_read(&fscache_n_object_lookups_positive),
46425- atomic_read(&fscache_n_object_created),
46426- atomic_read(&fscache_n_object_lookups_timed_out));
46427+ atomic_read_unchecked(&fscache_n_object_lookups),
46428+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
46429+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
46430+ atomic_read_unchecked(&fscache_n_object_created),
46431+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
46432
46433 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
46434- atomic_read(&fscache_n_updates),
46435- atomic_read(&fscache_n_updates_null),
46436- atomic_read(&fscache_n_updates_run));
46437+ atomic_read_unchecked(&fscache_n_updates),
46438+ atomic_read_unchecked(&fscache_n_updates_null),
46439+ atomic_read_unchecked(&fscache_n_updates_run));
46440
46441 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
46442- atomic_read(&fscache_n_relinquishes),
46443- atomic_read(&fscache_n_relinquishes_null),
46444- atomic_read(&fscache_n_relinquishes_waitcrt),
46445- atomic_read(&fscache_n_relinquishes_retire));
46446+ atomic_read_unchecked(&fscache_n_relinquishes),
46447+ atomic_read_unchecked(&fscache_n_relinquishes_null),
46448+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
46449+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
46450
46451 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
46452- atomic_read(&fscache_n_attr_changed),
46453- atomic_read(&fscache_n_attr_changed_ok),
46454- atomic_read(&fscache_n_attr_changed_nobufs),
46455- atomic_read(&fscache_n_attr_changed_nomem),
46456- atomic_read(&fscache_n_attr_changed_calls));
46457+ atomic_read_unchecked(&fscache_n_attr_changed),
46458+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
46459+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
46460+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
46461+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
46462
46463 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
46464- atomic_read(&fscache_n_allocs),
46465- atomic_read(&fscache_n_allocs_ok),
46466- atomic_read(&fscache_n_allocs_wait),
46467- atomic_read(&fscache_n_allocs_nobufs),
46468- atomic_read(&fscache_n_allocs_intr));
46469+ atomic_read_unchecked(&fscache_n_allocs),
46470+ atomic_read_unchecked(&fscache_n_allocs_ok),
46471+ atomic_read_unchecked(&fscache_n_allocs_wait),
46472+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
46473+ atomic_read_unchecked(&fscache_n_allocs_intr));
46474 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
46475- atomic_read(&fscache_n_alloc_ops),
46476- atomic_read(&fscache_n_alloc_op_waits),
46477- atomic_read(&fscache_n_allocs_object_dead));
46478+ atomic_read_unchecked(&fscache_n_alloc_ops),
46479+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
46480+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
46481
46482 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
46483 " int=%u oom=%u\n",
46484- atomic_read(&fscache_n_retrievals),
46485- atomic_read(&fscache_n_retrievals_ok),
46486- atomic_read(&fscache_n_retrievals_wait),
46487- atomic_read(&fscache_n_retrievals_nodata),
46488- atomic_read(&fscache_n_retrievals_nobufs),
46489- atomic_read(&fscache_n_retrievals_intr),
46490- atomic_read(&fscache_n_retrievals_nomem));
46491+ atomic_read_unchecked(&fscache_n_retrievals),
46492+ atomic_read_unchecked(&fscache_n_retrievals_ok),
46493+ atomic_read_unchecked(&fscache_n_retrievals_wait),
46494+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
46495+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
46496+ atomic_read_unchecked(&fscache_n_retrievals_intr),
46497+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
46498 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
46499- atomic_read(&fscache_n_retrieval_ops),
46500- atomic_read(&fscache_n_retrieval_op_waits),
46501- atomic_read(&fscache_n_retrievals_object_dead));
46502+ atomic_read_unchecked(&fscache_n_retrieval_ops),
46503+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
46504+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
46505
46506 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
46507- atomic_read(&fscache_n_stores),
46508- atomic_read(&fscache_n_stores_ok),
46509- atomic_read(&fscache_n_stores_again),
46510- atomic_read(&fscache_n_stores_nobufs),
46511- atomic_read(&fscache_n_stores_oom));
46512+ atomic_read_unchecked(&fscache_n_stores),
46513+ atomic_read_unchecked(&fscache_n_stores_ok),
46514+ atomic_read_unchecked(&fscache_n_stores_again),
46515+ atomic_read_unchecked(&fscache_n_stores_nobufs),
46516+ atomic_read_unchecked(&fscache_n_stores_oom));
46517 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
46518- atomic_read(&fscache_n_store_ops),
46519- atomic_read(&fscache_n_store_calls),
46520- atomic_read(&fscache_n_store_pages),
46521- atomic_read(&fscache_n_store_radix_deletes),
46522- atomic_read(&fscache_n_store_pages_over_limit));
46523+ atomic_read_unchecked(&fscache_n_store_ops),
46524+ atomic_read_unchecked(&fscache_n_store_calls),
46525+ atomic_read_unchecked(&fscache_n_store_pages),
46526+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
46527+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
46528
46529 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
46530- atomic_read(&fscache_n_store_vmscan_not_storing),
46531- atomic_read(&fscache_n_store_vmscan_gone),
46532- atomic_read(&fscache_n_store_vmscan_busy),
46533- atomic_read(&fscache_n_store_vmscan_cancelled));
46534+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
46535+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
46536+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
46537+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
46538
46539 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
46540- atomic_read(&fscache_n_op_pend),
46541- atomic_read(&fscache_n_op_run),
46542- atomic_read(&fscache_n_op_enqueue),
46543- atomic_read(&fscache_n_op_cancelled),
46544- atomic_read(&fscache_n_op_rejected));
46545+ atomic_read_unchecked(&fscache_n_op_pend),
46546+ atomic_read_unchecked(&fscache_n_op_run),
46547+ atomic_read_unchecked(&fscache_n_op_enqueue),
46548+ atomic_read_unchecked(&fscache_n_op_cancelled),
46549+ atomic_read_unchecked(&fscache_n_op_rejected));
46550 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
46551- atomic_read(&fscache_n_op_deferred_release),
46552- atomic_read(&fscache_n_op_release),
46553- atomic_read(&fscache_n_op_gc));
46554+ atomic_read_unchecked(&fscache_n_op_deferred_release),
46555+ atomic_read_unchecked(&fscache_n_op_release),
46556+ atomic_read_unchecked(&fscache_n_op_gc));
46557
46558 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
46559 atomic_read(&fscache_n_cop_alloc_object),
46560diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
46561index 3426521..3b75162 100644
46562--- a/fs/fuse/cuse.c
46563+++ b/fs/fuse/cuse.c
46564@@ -587,10 +587,12 @@ static int __init cuse_init(void)
46565 INIT_LIST_HEAD(&cuse_conntbl[i]);
46566
46567 /* inherit and extend fuse_dev_operations */
46568- cuse_channel_fops = fuse_dev_operations;
46569- cuse_channel_fops.owner = THIS_MODULE;
46570- cuse_channel_fops.open = cuse_channel_open;
46571- cuse_channel_fops.release = cuse_channel_release;
46572+ pax_open_kernel();
46573+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
46574+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
46575+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
46576+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
46577+ pax_close_kernel();
46578
46579 cuse_class = class_create(THIS_MODULE, "cuse");
46580 if (IS_ERR(cuse_class))
46581diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
46582index 2aaf3ea..8e50863 100644
46583--- a/fs/fuse/dev.c
46584+++ b/fs/fuse/dev.c
46585@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
46586 ret = 0;
46587 pipe_lock(pipe);
46588
46589- if (!pipe->readers) {
46590+ if (!atomic_read(&pipe->readers)) {
46591 send_sig(SIGPIPE, current, 0);
46592 if (!ret)
46593 ret = -EPIPE;
46594diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
46595index 9f63e49..d8a64c0 100644
46596--- a/fs/fuse/dir.c
46597+++ b/fs/fuse/dir.c
46598@@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *dentry)
46599 return link;
46600 }
46601
46602-static void free_link(char *link)
46603+static void free_link(const char *link)
46604 {
46605 if (!IS_ERR(link))
46606 free_page((unsigned long) link);
46607diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
46608index cfd4959..a780959 100644
46609--- a/fs/gfs2/inode.c
46610+++ b/fs/gfs2/inode.c
46611@@ -1490,7 +1490,7 @@ out:
46612
46613 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
46614 {
46615- char *s = nd_get_link(nd);
46616+ const char *s = nd_get_link(nd);
46617 if (!IS_ERR(s))
46618 kfree(s);
46619 }
46620diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
46621index 0be5a78..9cfb853 100644
46622--- a/fs/hugetlbfs/inode.c
46623+++ b/fs/hugetlbfs/inode.c
46624@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs_fs_type = {
46625 .kill_sb = kill_litter_super,
46626 };
46627
46628-static struct vfsmount *hugetlbfs_vfsmount;
46629+struct vfsmount *hugetlbfs_vfsmount;
46630
46631 static int can_do_hugetlb_shm(void)
46632 {
46633diff --git a/fs/inode.c b/fs/inode.c
46634index ee4e66b..0451521 100644
46635--- a/fs/inode.c
46636+++ b/fs/inode.c
46637@@ -787,8 +787,8 @@ unsigned int get_next_ino(void)
46638
46639 #ifdef CONFIG_SMP
46640 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
46641- static atomic_t shared_last_ino;
46642- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
46643+ static atomic_unchecked_t shared_last_ino;
46644+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
46645
46646 res = next - LAST_INO_BATCH;
46647 }
46648diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
46649index e513f19..2ab1351 100644
46650--- a/fs/jffs2/erase.c
46651+++ b/fs/jffs2/erase.c
46652@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
46653 struct jffs2_unknown_node marker = {
46654 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
46655 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
46656- .totlen = cpu_to_je32(c->cleanmarker_size)
46657+ .totlen = cpu_to_je32(c->cleanmarker_size),
46658+ .hdr_crc = cpu_to_je32(0)
46659 };
46660
46661 jffs2_prealloc_raw_node_refs(c, jeb, 1);
46662diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
46663index b09e51d..e482afa 100644
46664--- a/fs/jffs2/wbuf.c
46665+++ b/fs/jffs2/wbuf.c
46666@@ -1011,7 +1011,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
46667 {
46668 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
46669 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
46670- .totlen = constant_cpu_to_je32(8)
46671+ .totlen = constant_cpu_to_je32(8),
46672+ .hdr_crc = constant_cpu_to_je32(0)
46673 };
46674
46675 /*
46676diff --git a/fs/jfs/super.c b/fs/jfs/super.c
46677index a44eff0..462e07d 100644
46678--- a/fs/jfs/super.c
46679+++ b/fs/jfs/super.c
46680@@ -802,7 +802,7 @@ static int __init init_jfs_fs(void)
46681
46682 jfs_inode_cachep =
46683 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
46684- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
46685+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
46686 init_once);
46687 if (jfs_inode_cachep == NULL)
46688 return -ENOMEM;
46689diff --git a/fs/libfs.c b/fs/libfs.c
46690index f6d411e..e82a08d 100644
46691--- a/fs/libfs.c
46692+++ b/fs/libfs.c
46693@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
46694
46695 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
46696 struct dentry *next;
46697+ char d_name[sizeof(next->d_iname)];
46698+ const unsigned char *name;
46699+
46700 next = list_entry(p, struct dentry, d_u.d_child);
46701 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
46702 if (!simple_positive(next)) {
46703@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
46704
46705 spin_unlock(&next->d_lock);
46706 spin_unlock(&dentry->d_lock);
46707- if (filldir(dirent, next->d_name.name,
46708+ name = next->d_name.name;
46709+ if (name == next->d_iname) {
46710+ memcpy(d_name, name, next->d_name.len);
46711+ name = d_name;
46712+ }
46713+ if (filldir(dirent, name,
46714 next->d_name.len, filp->f_pos,
46715 next->d_inode->i_ino,
46716 dt_type(next->d_inode)) < 0)
46717diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
46718index 8392cb8..80d6193 100644
46719--- a/fs/lockd/clntproc.c
46720+++ b/fs/lockd/clntproc.c
46721@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
46722 /*
46723 * Cookie counter for NLM requests
46724 */
46725-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
46726+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
46727
46728 void nlmclnt_next_cookie(struct nlm_cookie *c)
46729 {
46730- u32 cookie = atomic_inc_return(&nlm_cookie);
46731+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
46732
46733 memcpy(c->data, &cookie, 4);
46734 c->len=4;
46735diff --git a/fs/locks.c b/fs/locks.c
46736index 637694b..f84a121 100644
46737--- a/fs/locks.c
46738+++ b/fs/locks.c
46739@@ -2074,16 +2074,16 @@ void locks_remove_flock(struct file *filp)
46740 return;
46741
46742 if (filp->f_op && filp->f_op->flock) {
46743- struct file_lock fl = {
46744+ struct file_lock flock = {
46745 .fl_pid = current->tgid,
46746 .fl_file = filp,
46747 .fl_flags = FL_FLOCK,
46748 .fl_type = F_UNLCK,
46749 .fl_end = OFFSET_MAX,
46750 };
46751- filp->f_op->flock(filp, F_SETLKW, &fl);
46752- if (fl.fl_ops && fl.fl_ops->fl_release_private)
46753- fl.fl_ops->fl_release_private(&fl);
46754+ filp->f_op->flock(filp, F_SETLKW, &flock);
46755+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
46756+ flock.fl_ops->fl_release_private(&flock);
46757 }
46758
46759 lock_flocks();
46760diff --git a/fs/namei.c b/fs/namei.c
46761index 744e942..24ef47f 100644
46762--- a/fs/namei.c
46763+++ b/fs/namei.c
46764@@ -279,16 +279,32 @@ int generic_permission(struct inode *inode, int mask)
46765 if (ret != -EACCES)
46766 return ret;
46767
46768+#ifdef CONFIG_GRKERNSEC
46769+ /* we'll block if we have to log due to a denied capability use */
46770+ if (mask & MAY_NOT_BLOCK)
46771+ return -ECHILD;
46772+#endif
46773+
46774 if (S_ISDIR(inode->i_mode)) {
46775 /* DACs are overridable for directories */
46776- if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46777- return 0;
46778 if (!(mask & MAY_WRITE))
46779- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46780+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
46781+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46782 return 0;
46783+ if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46784+ return 0;
46785 return -EACCES;
46786 }
46787 /*
46788+ * Searching includes executable on directories, else just read.
46789+ */
46790+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
46791+ if (mask == MAY_READ)
46792+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
46793+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46794+ return 0;
46795+
46796+ /*
46797 * Read/write DACs are always overridable.
46798 * Executable DACs are overridable when there is
46799 * at least one exec bit set.
46800@@ -297,14 +313,6 @@ int generic_permission(struct inode *inode, int mask)
46801 if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46802 return 0;
46803
46804- /*
46805- * Searching includes executable on directories, else just read.
46806- */
46807- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
46808- if (mask == MAY_READ)
46809- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46810- return 0;
46811-
46812 return -EACCES;
46813 }
46814
46815@@ -653,11 +661,19 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
46816 return error;
46817 }
46818
46819+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
46820+ dentry->d_inode, dentry, nd->path.mnt)) {
46821+ error = -EACCES;
46822+ *p = ERR_PTR(error); /* no ->put_link(), please */
46823+ path_put(&nd->path);
46824+ return error;
46825+ }
46826+
46827 nd->last_type = LAST_BIND;
46828 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
46829 error = PTR_ERR(*p);
46830 if (!IS_ERR(*p)) {
46831- char *s = nd_get_link(nd);
46832+ const char *s = nd_get_link(nd);
46833 error = 0;
46834 if (s)
46835 error = __vfs_follow_link(nd, s);
46836@@ -1624,6 +1640,21 @@ static int path_lookupat(int dfd, const char *name,
46837 if (!err)
46838 err = complete_walk(nd);
46839
46840+ if (!(nd->flags & LOOKUP_PARENT)) {
46841+#ifdef CONFIG_GRKERNSEC
46842+ if (flags & LOOKUP_RCU) {
46843+ if (!err)
46844+ path_put(&nd->path);
46845+ err = -ECHILD;
46846+ } else
46847+#endif
46848+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
46849+ if (!err)
46850+ path_put(&nd->path);
46851+ err = -ENOENT;
46852+ }
46853+ }
46854+
46855 if (!err && nd->flags & LOOKUP_DIRECTORY) {
46856 if (!nd->inode->i_op->lookup) {
46857 path_put(&nd->path);
46858@@ -1651,6 +1682,15 @@ static int do_path_lookup(int dfd, const char *name,
46859 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
46860
46861 if (likely(!retval)) {
46862+ if (*name != '/' && nd->path.dentry && nd->inode) {
46863+#ifdef CONFIG_GRKERNSEC
46864+ if (flags & LOOKUP_RCU)
46865+ return -ECHILD;
46866+#endif
46867+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
46868+ return -ENOENT;
46869+ }
46870+
46871 if (unlikely(!audit_dummy_context())) {
46872 if (nd->path.dentry && nd->inode)
46873 audit_inode(name, nd->path.dentry);
46874@@ -2048,6 +2088,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
46875 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
46876 return -EPERM;
46877
46878+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
46879+ return -EPERM;
46880+ if (gr_handle_rawio(inode))
46881+ return -EPERM;
46882+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
46883+ return -EACCES;
46884+
46885 return 0;
46886 }
46887
46888@@ -2109,6 +2156,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46889 error = complete_walk(nd);
46890 if (error)
46891 return ERR_PTR(error);
46892+#ifdef CONFIG_GRKERNSEC
46893+ if (nd->flags & LOOKUP_RCU) {
46894+ error = -ECHILD;
46895+ goto exit;
46896+ }
46897+#endif
46898+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
46899+ error = -ENOENT;
46900+ goto exit;
46901+ }
46902 audit_inode(pathname, nd->path.dentry);
46903 if (open_flag & O_CREAT) {
46904 error = -EISDIR;
46905@@ -2119,6 +2176,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46906 error = complete_walk(nd);
46907 if (error)
46908 return ERR_PTR(error);
46909+#ifdef CONFIG_GRKERNSEC
46910+ if (nd->flags & LOOKUP_RCU) {
46911+ error = -ECHILD;
46912+ goto exit;
46913+ }
46914+#endif
46915+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
46916+ error = -ENOENT;
46917+ goto exit;
46918+ }
46919 audit_inode(pathname, dir);
46920 goto ok;
46921 }
46922@@ -2140,6 +2207,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46923 error = complete_walk(nd);
46924 if (error)
46925 return ERR_PTR(-ECHILD);
46926+#ifdef CONFIG_GRKERNSEC
46927+ if (nd->flags & LOOKUP_RCU) {
46928+ error = -ECHILD;
46929+ goto exit;
46930+ }
46931+#endif
46932+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
46933+ error = -ENOENT;
46934+ goto exit;
46935+ }
46936
46937 error = -ENOTDIR;
46938 if (nd->flags & LOOKUP_DIRECTORY) {
46939@@ -2180,6 +2257,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46940 /* Negative dentry, just create the file */
46941 if (!dentry->d_inode) {
46942 int mode = op->mode;
46943+
46944+ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
46945+ error = -EACCES;
46946+ goto exit_mutex_unlock;
46947+ }
46948+
46949 if (!IS_POSIXACL(dir->d_inode))
46950 mode &= ~current_umask();
46951 /*
46952@@ -2203,6 +2286,8 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46953 error = vfs_create(dir->d_inode, dentry, mode, nd);
46954 if (error)
46955 goto exit_mutex_unlock;
46956+ else
46957+ gr_handle_create(path->dentry, path->mnt);
46958 mutex_unlock(&dir->d_inode->i_mutex);
46959 dput(nd->path.dentry);
46960 nd->path.dentry = dentry;
46961@@ -2212,6 +2297,19 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46962 /*
46963 * It already exists.
46964 */
46965+
46966+ if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
46967+ error = -ENOENT;
46968+ goto exit_mutex_unlock;
46969+ }
46970+
46971+ /* only check if O_CREAT is specified, all other checks need to go
46972+ into may_open */
46973+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
46974+ error = -EACCES;
46975+ goto exit_mutex_unlock;
46976+ }
46977+
46978 mutex_unlock(&dir->d_inode->i_mutex);
46979 audit_inode(pathname, path->dentry);
46980
46981@@ -2424,6 +2522,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
46982 *path = nd.path;
46983 return dentry;
46984 eexist:
46985+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
46986+ dput(dentry);
46987+ dentry = ERR_PTR(-ENOENT);
46988+ goto fail;
46989+ }
46990 dput(dentry);
46991 dentry = ERR_PTR(-EEXIST);
46992 fail:
46993@@ -2446,6 +2549,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
46994 }
46995 EXPORT_SYMBOL(user_path_create);
46996
46997+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
46998+{
46999+ char *tmp = getname(pathname);
47000+ struct dentry *res;
47001+ if (IS_ERR(tmp))
47002+ return ERR_CAST(tmp);
47003+ res = kern_path_create(dfd, tmp, path, is_dir);
47004+ if (IS_ERR(res))
47005+ putname(tmp);
47006+ else
47007+ *to = tmp;
47008+ return res;
47009+}
47010+
47011 int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
47012 {
47013 int error = may_create(dir, dentry);
47014@@ -2513,6 +2630,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
47015 error = mnt_want_write(path.mnt);
47016 if (error)
47017 goto out_dput;
47018+
47019+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
47020+ error = -EPERM;
47021+ goto out_drop_write;
47022+ }
47023+
47024+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
47025+ error = -EACCES;
47026+ goto out_drop_write;
47027+ }
47028+
47029 error = security_path_mknod(&path, dentry, mode, dev);
47030 if (error)
47031 goto out_drop_write;
47032@@ -2530,6 +2658,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
47033 }
47034 out_drop_write:
47035 mnt_drop_write(path.mnt);
47036+
47037+ if (!error)
47038+ gr_handle_create(dentry, path.mnt);
47039 out_dput:
47040 dput(dentry);
47041 mutex_unlock(&path.dentry->d_inode->i_mutex);
47042@@ -2579,12 +2710,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
47043 error = mnt_want_write(path.mnt);
47044 if (error)
47045 goto out_dput;
47046+
47047+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
47048+ error = -EACCES;
47049+ goto out_drop_write;
47050+ }
47051+
47052 error = security_path_mkdir(&path, dentry, mode);
47053 if (error)
47054 goto out_drop_write;
47055 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
47056 out_drop_write:
47057 mnt_drop_write(path.mnt);
47058+
47059+ if (!error)
47060+ gr_handle_create(dentry, path.mnt);
47061 out_dput:
47062 dput(dentry);
47063 mutex_unlock(&path.dentry->d_inode->i_mutex);
47064@@ -2664,6 +2804,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
47065 char * name;
47066 struct dentry *dentry;
47067 struct nameidata nd;
47068+ ino_t saved_ino = 0;
47069+ dev_t saved_dev = 0;
47070
47071 error = user_path_parent(dfd, pathname, &nd, &name);
47072 if (error)
47073@@ -2692,6 +2834,15 @@ static long do_rmdir(int dfd, const char __user *pathname)
47074 error = -ENOENT;
47075 goto exit3;
47076 }
47077+
47078+ saved_ino = dentry->d_inode->i_ino;
47079+ saved_dev = gr_get_dev_from_dentry(dentry);
47080+
47081+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
47082+ error = -EACCES;
47083+ goto exit3;
47084+ }
47085+
47086 error = mnt_want_write(nd.path.mnt);
47087 if (error)
47088 goto exit3;
47089@@ -2699,6 +2850,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
47090 if (error)
47091 goto exit4;
47092 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
47093+ if (!error && (saved_dev || saved_ino))
47094+ gr_handle_delete(saved_ino, saved_dev);
47095 exit4:
47096 mnt_drop_write(nd.path.mnt);
47097 exit3:
47098@@ -2761,6 +2914,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47099 struct dentry *dentry;
47100 struct nameidata nd;
47101 struct inode *inode = NULL;
47102+ ino_t saved_ino = 0;
47103+ dev_t saved_dev = 0;
47104
47105 error = user_path_parent(dfd, pathname, &nd, &name);
47106 if (error)
47107@@ -2783,6 +2938,16 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47108 if (!inode)
47109 goto slashes;
47110 ihold(inode);
47111+
47112+ if (inode->i_nlink <= 1) {
47113+ saved_ino = inode->i_ino;
47114+ saved_dev = gr_get_dev_from_dentry(dentry);
47115+ }
47116+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
47117+ error = -EACCES;
47118+ goto exit2;
47119+ }
47120+
47121 error = mnt_want_write(nd.path.mnt);
47122 if (error)
47123 goto exit2;
47124@@ -2790,6 +2955,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47125 if (error)
47126 goto exit3;
47127 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
47128+ if (!error && (saved_ino || saved_dev))
47129+ gr_handle_delete(saved_ino, saved_dev);
47130 exit3:
47131 mnt_drop_write(nd.path.mnt);
47132 exit2:
47133@@ -2865,10 +3032,18 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
47134 error = mnt_want_write(path.mnt);
47135 if (error)
47136 goto out_dput;
47137+
47138+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
47139+ error = -EACCES;
47140+ goto out_drop_write;
47141+ }
47142+
47143 error = security_path_symlink(&path, dentry, from);
47144 if (error)
47145 goto out_drop_write;
47146 error = vfs_symlink(path.dentry->d_inode, dentry, from);
47147+ if (!error)
47148+ gr_handle_create(dentry, path.mnt);
47149 out_drop_write:
47150 mnt_drop_write(path.mnt);
47151 out_dput:
47152@@ -2940,6 +3115,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47153 {
47154 struct dentry *new_dentry;
47155 struct path old_path, new_path;
47156+ char *to = NULL;
47157 int how = 0;
47158 int error;
47159
47160@@ -2963,7 +3139,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47161 if (error)
47162 return error;
47163
47164- new_dentry = user_path_create(newdfd, newname, &new_path, 0);
47165+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
47166 error = PTR_ERR(new_dentry);
47167 if (IS_ERR(new_dentry))
47168 goto out;
47169@@ -2974,13 +3150,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47170 error = mnt_want_write(new_path.mnt);
47171 if (error)
47172 goto out_dput;
47173+
47174+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
47175+ old_path.dentry->d_inode,
47176+ old_path.dentry->d_inode->i_mode, to)) {
47177+ error = -EACCES;
47178+ goto out_drop_write;
47179+ }
47180+
47181+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
47182+ old_path.dentry, old_path.mnt, to)) {
47183+ error = -EACCES;
47184+ goto out_drop_write;
47185+ }
47186+
47187 error = security_path_link(old_path.dentry, &new_path, new_dentry);
47188 if (error)
47189 goto out_drop_write;
47190 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
47191+ if (!error)
47192+ gr_handle_create(new_dentry, new_path.mnt);
47193 out_drop_write:
47194 mnt_drop_write(new_path.mnt);
47195 out_dput:
47196+ putname(to);
47197 dput(new_dentry);
47198 mutex_unlock(&new_path.dentry->d_inode->i_mutex);
47199 path_put(&new_path);
47200@@ -3208,6 +3401,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47201 if (new_dentry == trap)
47202 goto exit5;
47203
47204+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
47205+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
47206+ to);
47207+ if (error)
47208+ goto exit5;
47209+
47210 error = mnt_want_write(oldnd.path.mnt);
47211 if (error)
47212 goto exit5;
47213@@ -3217,6 +3416,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47214 goto exit6;
47215 error = vfs_rename(old_dir->d_inode, old_dentry,
47216 new_dir->d_inode, new_dentry);
47217+ if (!error)
47218+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
47219+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
47220 exit6:
47221 mnt_drop_write(oldnd.path.mnt);
47222 exit5:
47223@@ -3242,6 +3444,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
47224
47225 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
47226 {
47227+ char tmpbuf[64];
47228+ const char *newlink;
47229 int len;
47230
47231 len = PTR_ERR(link);
47232@@ -3251,7 +3455,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
47233 len = strlen(link);
47234 if (len > (unsigned) buflen)
47235 len = buflen;
47236- if (copy_to_user(buffer, link, len))
47237+
47238+ if (len < sizeof(tmpbuf)) {
47239+ memcpy(tmpbuf, link, len);
47240+ newlink = tmpbuf;
47241+ } else
47242+ newlink = link;
47243+
47244+ if (copy_to_user(buffer, newlink, len))
47245 len = -EFAULT;
47246 out:
47247 return len;
47248diff --git a/fs/namespace.c b/fs/namespace.c
47249index cfc6d44..b4632a5 100644
47250--- a/fs/namespace.c
47251+++ b/fs/namespace.c
47252@@ -1326,6 +1326,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
47253 if (!(sb->s_flags & MS_RDONLY))
47254 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
47255 up_write(&sb->s_umount);
47256+
47257+ gr_log_remount(mnt->mnt_devname, retval);
47258+
47259 return retval;
47260 }
47261
47262@@ -1345,6 +1348,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
47263 br_write_unlock(vfsmount_lock);
47264 up_write(&namespace_sem);
47265 release_mounts(&umount_list);
47266+
47267+ gr_log_unmount(mnt->mnt_devname, retval);
47268+
47269 return retval;
47270 }
47271
47272@@ -2336,6 +2342,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47273 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
47274 MS_STRICTATIME);
47275
47276+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
47277+ retval = -EPERM;
47278+ goto dput_out;
47279+ }
47280+
47281+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
47282+ retval = -EPERM;
47283+ goto dput_out;
47284+ }
47285+
47286 if (flags & MS_REMOUNT)
47287 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
47288 data_page);
47289@@ -2350,6 +2366,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47290 dev_name, data_page);
47291 dput_out:
47292 path_put(&path);
47293+
47294+ gr_log_mount(dev_name, dir_name, retval);
47295+
47296 return retval;
47297 }
47298
47299@@ -2605,6 +2624,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
47300 if (error)
47301 goto out2;
47302
47303+ if (gr_handle_chroot_pivot()) {
47304+ error = -EPERM;
47305+ goto out2;
47306+ }
47307+
47308 get_fs_root(current->fs, &root);
47309 error = lock_mount(&old);
47310 if (error)
47311diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h
47312index 09881e6..308ff20 100644
47313--- a/fs/ncpfs/ncplib_kernel.h
47314+++ b/fs/ncpfs/ncplib_kernel.h
47315@@ -130,7 +130,7 @@ static inline int ncp_is_nfs_extras(struct ncp_server* server, unsigned int voln
47316 int ncp__io2vol(struct ncp_server *, unsigned char *, unsigned int *,
47317 const unsigned char *, unsigned int, int);
47318 int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *,
47319- const unsigned char *, unsigned int, int);
47320+ const unsigned char *, unsigned int, int) __size_overflow(5);
47321
47322 #define NCP_ESC ':'
47323 #define NCP_IO_TABLE(sb) (NCP_SBP(sb)->nls_io)
47324@@ -146,7 +146,7 @@ int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *,
47325 int ncp__io2vol(unsigned char *, unsigned int *,
47326 const unsigned char *, unsigned int, int);
47327 int ncp__vol2io(unsigned char *, unsigned int *,
47328- const unsigned char *, unsigned int, int);
47329+ const unsigned char *, unsigned int, int) __size_overflow(5);
47330
47331 #define NCP_IO_TABLE(sb) NULL
47332 #define ncp_tolower(t, c) tolower(c)
47333diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
47334index 3db6b82..a57597e 100644
47335--- a/fs/nfs/blocklayout/blocklayout.c
47336+++ b/fs/nfs/blocklayout/blocklayout.c
47337@@ -90,7 +90,7 @@ static int is_writable(struct pnfs_block_extent *be, sector_t isect)
47338 */
47339 struct parallel_io {
47340 struct kref refcnt;
47341- struct rpc_call_ops call_ops;
47342+ rpc_call_ops_no_const call_ops;
47343 void (*pnfs_callback) (void *data);
47344 void *data;
47345 };
47346diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
47347index 50a15fa..ca113f9 100644
47348--- a/fs/nfs/inode.c
47349+++ b/fs/nfs/inode.c
47350@@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
47351 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
47352 nfsi->attrtimeo_timestamp = jiffies;
47353
47354- memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
47355+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
47356 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
47357 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
47358 else
47359@@ -1002,16 +1002,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
47360 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
47361 }
47362
47363-static atomic_long_t nfs_attr_generation_counter;
47364+static atomic_long_unchecked_t nfs_attr_generation_counter;
47365
47366 static unsigned long nfs_read_attr_generation_counter(void)
47367 {
47368- return atomic_long_read(&nfs_attr_generation_counter);
47369+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
47370 }
47371
47372 unsigned long nfs_inc_attr_generation_counter(void)
47373 {
47374- return atomic_long_inc_return(&nfs_attr_generation_counter);
47375+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
47376 }
47377
47378 void nfs_fattr_init(struct nfs_fattr *fattr)
47379diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
47380index 7a2e442..8e544cc 100644
47381--- a/fs/nfsd/vfs.c
47382+++ b/fs/nfsd/vfs.c
47383@@ -914,7 +914,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47384 } else {
47385 oldfs = get_fs();
47386 set_fs(KERNEL_DS);
47387- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
47388+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
47389 set_fs(oldfs);
47390 }
47391
47392@@ -1018,7 +1018,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47393
47394 /* Write the data. */
47395 oldfs = get_fs(); set_fs(KERNEL_DS);
47396- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
47397+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
47398 set_fs(oldfs);
47399 if (host_err < 0)
47400 goto out_nfserr;
47401@@ -1553,7 +1553,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
47402 */
47403
47404 oldfs = get_fs(); set_fs(KERNEL_DS);
47405- host_err = inode->i_op->readlink(dentry, buf, *lenp);
47406+ host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
47407 set_fs(oldfs);
47408
47409 if (host_err < 0)
47410diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
47411index 9fde1c0..14e8827 100644
47412--- a/fs/notify/fanotify/fanotify_user.c
47413+++ b/fs/notify/fanotify/fanotify_user.c
47414@@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
47415 goto out_close_fd;
47416
47417 ret = -EFAULT;
47418- if (copy_to_user(buf, &fanotify_event_metadata,
47419+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
47420+ copy_to_user(buf, &fanotify_event_metadata,
47421 fanotify_event_metadata.event_len))
47422 goto out_kill_access_response;
47423
47424diff --git a/fs/notify/notification.c b/fs/notify/notification.c
47425index ee18815..7aa5d01 100644
47426--- a/fs/notify/notification.c
47427+++ b/fs/notify/notification.c
47428@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
47429 * get set to 0 so it will never get 'freed'
47430 */
47431 static struct fsnotify_event *q_overflow_event;
47432-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47433+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47434
47435 /**
47436 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
47437@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47438 */
47439 u32 fsnotify_get_cookie(void)
47440 {
47441- return atomic_inc_return(&fsnotify_sync_cookie);
47442+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
47443 }
47444 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
47445
47446diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
47447index 99e3610..02c1068 100644
47448--- a/fs/ntfs/dir.c
47449+++ b/fs/ntfs/dir.c
47450@@ -1329,7 +1329,7 @@ find_next_index_buffer:
47451 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
47452 ~(s64)(ndir->itype.index.block_size - 1)));
47453 /* Bounds checks. */
47454- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47455+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47456 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
47457 "inode 0x%lx or driver bug.", vdir->i_ino);
47458 goto err_out;
47459diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
47460index c587e2d..3641eaa 100644
47461--- a/fs/ntfs/file.c
47462+++ b/fs/ntfs/file.c
47463@@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_inode_ops = {
47464 #endif /* NTFS_RW */
47465 };
47466
47467-const struct file_operations ntfs_empty_file_ops = {};
47468+const struct file_operations ntfs_empty_file_ops __read_only;
47469
47470-const struct inode_operations ntfs_empty_inode_ops = {};
47471+const struct inode_operations ntfs_empty_inode_ops __read_only;
47472diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
47473index 210c352..a174f83 100644
47474--- a/fs/ocfs2/localalloc.c
47475+++ b/fs/ocfs2/localalloc.c
47476@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
47477 goto bail;
47478 }
47479
47480- atomic_inc(&osb->alloc_stats.moves);
47481+ atomic_inc_unchecked(&osb->alloc_stats.moves);
47482
47483 bail:
47484 if (handle)
47485diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
47486index d355e6e..578d905 100644
47487--- a/fs/ocfs2/ocfs2.h
47488+++ b/fs/ocfs2/ocfs2.h
47489@@ -235,11 +235,11 @@ enum ocfs2_vol_state
47490
47491 struct ocfs2_alloc_stats
47492 {
47493- atomic_t moves;
47494- atomic_t local_data;
47495- atomic_t bitmap_data;
47496- atomic_t bg_allocs;
47497- atomic_t bg_extends;
47498+ atomic_unchecked_t moves;
47499+ atomic_unchecked_t local_data;
47500+ atomic_unchecked_t bitmap_data;
47501+ atomic_unchecked_t bg_allocs;
47502+ atomic_unchecked_t bg_extends;
47503 };
47504
47505 enum ocfs2_local_alloc_state
47506diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
47507index ba5d97e..c77db25 100644
47508--- a/fs/ocfs2/suballoc.c
47509+++ b/fs/ocfs2/suballoc.c
47510@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
47511 mlog_errno(status);
47512 goto bail;
47513 }
47514- atomic_inc(&osb->alloc_stats.bg_extends);
47515+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
47516
47517 /* You should never ask for this much metadata */
47518 BUG_ON(bits_wanted >
47519@@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handle,
47520 mlog_errno(status);
47521 goto bail;
47522 }
47523- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47524+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47525
47526 *suballoc_loc = res.sr_bg_blkno;
47527 *suballoc_bit_start = res.sr_bit_offset;
47528@@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
47529 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
47530 res->sr_bits);
47531
47532- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47533+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47534
47535 BUG_ON(res->sr_bits != 1);
47536
47537@@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
47538 mlog_errno(status);
47539 goto bail;
47540 }
47541- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47542+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47543
47544 BUG_ON(res.sr_bits != 1);
47545
47546@@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47547 cluster_start,
47548 num_clusters);
47549 if (!status)
47550- atomic_inc(&osb->alloc_stats.local_data);
47551+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
47552 } else {
47553 if (min_clusters > (osb->bitmap_cpg - 1)) {
47554 /* The only paths asking for contiguousness
47555@@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47556 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
47557 res.sr_bg_blkno,
47558 res.sr_bit_offset);
47559- atomic_inc(&osb->alloc_stats.bitmap_data);
47560+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
47561 *num_clusters = res.sr_bits;
47562 }
47563 }
47564diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
47565index 4994f8b..eaab8eb 100644
47566--- a/fs/ocfs2/super.c
47567+++ b/fs/ocfs2/super.c
47568@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
47569 "%10s => GlobalAllocs: %d LocalAllocs: %d "
47570 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
47571 "Stats",
47572- atomic_read(&osb->alloc_stats.bitmap_data),
47573- atomic_read(&osb->alloc_stats.local_data),
47574- atomic_read(&osb->alloc_stats.bg_allocs),
47575- atomic_read(&osb->alloc_stats.moves),
47576- atomic_read(&osb->alloc_stats.bg_extends));
47577+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
47578+ atomic_read_unchecked(&osb->alloc_stats.local_data),
47579+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
47580+ atomic_read_unchecked(&osb->alloc_stats.moves),
47581+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
47582
47583 out += snprintf(buf + out, len - out,
47584 "%10s => State: %u Descriptor: %llu Size: %u bits "
47585@@ -2119,11 +2119,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
47586 spin_lock_init(&osb->osb_xattr_lock);
47587 ocfs2_init_steal_slots(osb);
47588
47589- atomic_set(&osb->alloc_stats.moves, 0);
47590- atomic_set(&osb->alloc_stats.local_data, 0);
47591- atomic_set(&osb->alloc_stats.bitmap_data, 0);
47592- atomic_set(&osb->alloc_stats.bg_allocs, 0);
47593- atomic_set(&osb->alloc_stats.bg_extends, 0);
47594+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
47595+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
47596+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
47597+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
47598+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
47599
47600 /* Copy the blockcheck stats from the superblock probe */
47601 osb->osb_ecc_stats = *stats;
47602diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
47603index 5d22872..523db20 100644
47604--- a/fs/ocfs2/symlink.c
47605+++ b/fs/ocfs2/symlink.c
47606@@ -142,7 +142,7 @@ bail:
47607
47608 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
47609 {
47610- char *link = nd_get_link(nd);
47611+ const char *link = nd_get_link(nd);
47612 if (!IS_ERR(link))
47613 kfree(link);
47614 }
47615diff --git a/fs/open.c b/fs/open.c
47616index 22c41b5..78894cf 100644
47617--- a/fs/open.c
47618+++ b/fs/open.c
47619@@ -112,6 +112,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
47620 error = locks_verify_truncate(inode, NULL, length);
47621 if (!error)
47622 error = security_path_truncate(&path);
47623+
47624+ if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
47625+ error = -EACCES;
47626+
47627 if (!error)
47628 error = do_truncate(path.dentry, length, 0, NULL);
47629
47630@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
47631 if (__mnt_is_readonly(path.mnt))
47632 res = -EROFS;
47633
47634+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
47635+ res = -EACCES;
47636+
47637 out_path_release:
47638 path_put(&path);
47639 out:
47640@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
47641 if (error)
47642 goto dput_and_out;
47643
47644+ gr_log_chdir(path.dentry, path.mnt);
47645+
47646 set_fs_pwd(current->fs, &path);
47647
47648 dput_and_out:
47649@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
47650 goto out_putf;
47651
47652 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
47653+
47654+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
47655+ error = -EPERM;
47656+
47657+ if (!error)
47658+ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
47659+
47660 if (!error)
47661 set_fs_pwd(current->fs, &file->f_path);
47662 out_putf:
47663@@ -438,7 +454,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
47664 if (error)
47665 goto dput_and_out;
47666
47667+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
47668+ goto dput_and_out;
47669+
47670 set_fs_root(current->fs, &path);
47671+
47672+ gr_handle_chroot_chdir(&path);
47673+
47674 error = 0;
47675 dput_and_out:
47676 path_put(&path);
47677@@ -456,6 +478,16 @@ static int chmod_common(struct path *path, umode_t mode)
47678 if (error)
47679 return error;
47680 mutex_lock(&inode->i_mutex);
47681+
47682+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
47683+ error = -EACCES;
47684+ goto out_unlock;
47685+ }
47686+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
47687+ error = -EACCES;
47688+ goto out_unlock;
47689+ }
47690+
47691 error = security_path_chmod(path->dentry, path->mnt, mode);
47692 if (error)
47693 goto out_unlock;
47694@@ -506,6 +538,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
47695 int error;
47696 struct iattr newattrs;
47697
47698+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
47699+ return -EACCES;
47700+
47701 newattrs.ia_valid = ATTR_CTIME;
47702 if (user != (uid_t) -1) {
47703 newattrs.ia_valid |= ATTR_UID;
47704diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
47705index 6296b40..417c00f 100644
47706--- a/fs/partitions/efi.c
47707+++ b/fs/partitions/efi.c
47708@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
47709 if (!gpt)
47710 return NULL;
47711
47712+ if (!le32_to_cpu(gpt->num_partition_entries))
47713+ return NULL;
47714+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
47715+ if (!pte)
47716+ return NULL;
47717+
47718 count = le32_to_cpu(gpt->num_partition_entries) *
47719 le32_to_cpu(gpt->sizeof_partition_entry);
47720- if (!count)
47721- return NULL;
47722- pte = kzalloc(count, GFP_KERNEL);
47723- if (!pte)
47724- return NULL;
47725-
47726 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
47727 (u8 *) pte,
47728 count) < count) {
47729diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
47730index bd8ae78..539d250 100644
47731--- a/fs/partitions/ldm.c
47732+++ b/fs/partitions/ldm.c
47733@@ -1324,7 +1324,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
47734 goto found;
47735 }
47736
47737- f = kmalloc (sizeof (*f) + size*num, GFP_KERNEL);
47738+ f = kmalloc (size*num + sizeof (*f), GFP_KERNEL);
47739 if (!f) {
47740 ldm_crit ("Out of memory.");
47741 return false;
47742diff --git a/fs/pipe.c b/fs/pipe.c
47743index 4065f07..68c0706 100644
47744--- a/fs/pipe.c
47745+++ b/fs/pipe.c
47746@@ -420,9 +420,9 @@ redo:
47747 }
47748 if (bufs) /* More to do? */
47749 continue;
47750- if (!pipe->writers)
47751+ if (!atomic_read(&pipe->writers))
47752 break;
47753- if (!pipe->waiting_writers) {
47754+ if (!atomic_read(&pipe->waiting_writers)) {
47755 /* syscall merging: Usually we must not sleep
47756 * if O_NONBLOCK is set, or if we got some data.
47757 * But if a writer sleeps in kernel space, then
47758@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
47759 mutex_lock(&inode->i_mutex);
47760 pipe = inode->i_pipe;
47761
47762- if (!pipe->readers) {
47763+ if (!atomic_read(&pipe->readers)) {
47764 send_sig(SIGPIPE, current, 0);
47765 ret = -EPIPE;
47766 goto out;
47767@@ -530,7 +530,7 @@ redo1:
47768 for (;;) {
47769 int bufs;
47770
47771- if (!pipe->readers) {
47772+ if (!atomic_read(&pipe->readers)) {
47773 send_sig(SIGPIPE, current, 0);
47774 if (!ret)
47775 ret = -EPIPE;
47776@@ -616,9 +616,9 @@ redo2:
47777 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
47778 do_wakeup = 0;
47779 }
47780- pipe->waiting_writers++;
47781+ atomic_inc(&pipe->waiting_writers);
47782 pipe_wait(pipe);
47783- pipe->waiting_writers--;
47784+ atomic_dec(&pipe->waiting_writers);
47785 }
47786 out:
47787 mutex_unlock(&inode->i_mutex);
47788@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table *wait)
47789 mask = 0;
47790 if (filp->f_mode & FMODE_READ) {
47791 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
47792- if (!pipe->writers && filp->f_version != pipe->w_counter)
47793+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
47794 mask |= POLLHUP;
47795 }
47796
47797@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table *wait)
47798 * Most Unices do not set POLLERR for FIFOs but on Linux they
47799 * behave exactly like pipes for poll().
47800 */
47801- if (!pipe->readers)
47802+ if (!atomic_read(&pipe->readers))
47803 mask |= POLLERR;
47804 }
47805
47806@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int decr, int decw)
47807
47808 mutex_lock(&inode->i_mutex);
47809 pipe = inode->i_pipe;
47810- pipe->readers -= decr;
47811- pipe->writers -= decw;
47812+ atomic_sub(decr, &pipe->readers);
47813+ atomic_sub(decw, &pipe->writers);
47814
47815- if (!pipe->readers && !pipe->writers) {
47816+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
47817 free_pipe_info(inode);
47818 } else {
47819 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
47820@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
47821
47822 if (inode->i_pipe) {
47823 ret = 0;
47824- inode->i_pipe->readers++;
47825+ atomic_inc(&inode->i_pipe->readers);
47826 }
47827
47828 mutex_unlock(&inode->i_mutex);
47829@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
47830
47831 if (inode->i_pipe) {
47832 ret = 0;
47833- inode->i_pipe->writers++;
47834+ atomic_inc(&inode->i_pipe->writers);
47835 }
47836
47837 mutex_unlock(&inode->i_mutex);
47838@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
47839 if (inode->i_pipe) {
47840 ret = 0;
47841 if (filp->f_mode & FMODE_READ)
47842- inode->i_pipe->readers++;
47843+ atomic_inc(&inode->i_pipe->readers);
47844 if (filp->f_mode & FMODE_WRITE)
47845- inode->i_pipe->writers++;
47846+ atomic_inc(&inode->i_pipe->writers);
47847 }
47848
47849 mutex_unlock(&inode->i_mutex);
47850@@ -931,7 +931,7 @@ void free_pipe_info(struct inode *inode)
47851 inode->i_pipe = NULL;
47852 }
47853
47854-static struct vfsmount *pipe_mnt __read_mostly;
47855+struct vfsmount *pipe_mnt __read_mostly;
47856
47857 /*
47858 * pipefs_dname() is called from d_path().
47859@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(void)
47860 goto fail_iput;
47861 inode->i_pipe = pipe;
47862
47863- pipe->readers = pipe->writers = 1;
47864+ atomic_set(&pipe->readers, 1);
47865+ atomic_set(&pipe->writers, 1);
47866 inode->i_fop = &rdwr_pipefifo_fops;
47867
47868 /*
47869diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
47870index 15af622..0e9f4467 100644
47871--- a/fs/proc/Kconfig
47872+++ b/fs/proc/Kconfig
47873@@ -30,12 +30,12 @@ config PROC_FS
47874
47875 config PROC_KCORE
47876 bool "/proc/kcore support" if !ARM
47877- depends on PROC_FS && MMU
47878+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
47879
47880 config PROC_VMCORE
47881 bool "/proc/vmcore support"
47882- depends on PROC_FS && CRASH_DUMP
47883- default y
47884+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
47885+ default n
47886 help
47887 Exports the dump image of crashed kernel in ELF format.
47888
47889@@ -59,8 +59,8 @@ config PROC_SYSCTL
47890 limited in memory.
47891
47892 config PROC_PAGE_MONITOR
47893- default y
47894- depends on PROC_FS && MMU
47895+ default n
47896+ depends on PROC_FS && MMU && !GRKERNSEC
47897 bool "Enable /proc page monitoring" if EXPERT
47898 help
47899 Various /proc files exist to monitor process memory utilization:
47900diff --git a/fs/proc/array.c b/fs/proc/array.c
47901index 3a1dafd..bf1bd84 100644
47902--- a/fs/proc/array.c
47903+++ b/fs/proc/array.c
47904@@ -60,6 +60,7 @@
47905 #include <linux/tty.h>
47906 #include <linux/string.h>
47907 #include <linux/mman.h>
47908+#include <linux/grsecurity.h>
47909 #include <linux/proc_fs.h>
47910 #include <linux/ioport.h>
47911 #include <linux/uaccess.h>
47912@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
47913 seq_putc(m, '\n');
47914 }
47915
47916+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
47917+static inline void task_pax(struct seq_file *m, struct task_struct *p)
47918+{
47919+ if (p->mm)
47920+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
47921+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
47922+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
47923+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
47924+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
47925+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
47926+ else
47927+ seq_printf(m, "PaX:\t-----\n");
47928+}
47929+#endif
47930+
47931 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
47932 struct pid *pid, struct task_struct *task)
47933 {
47934@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
47935 task_cpus_allowed(m, task);
47936 cpuset_task_status_allowed(m, task);
47937 task_context_switch_counts(m, task);
47938+
47939+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
47940+ task_pax(m, task);
47941+#endif
47942+
47943+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
47944+ task_grsec_rbac(m, task);
47945+#endif
47946+
47947 return 0;
47948 }
47949
47950+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47951+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
47952+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
47953+ _mm->pax_flags & MF_PAX_SEGMEXEC))
47954+#endif
47955+
47956 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
47957 struct pid *pid, struct task_struct *task, int whole)
47958 {
47959@@ -378,6 +409,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
47960 char tcomm[sizeof(task->comm)];
47961 unsigned long flags;
47962
47963+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47964+ if (current->exec_id != m->exec_id) {
47965+ gr_log_badprocpid("stat");
47966+ return 0;
47967+ }
47968+#endif
47969+
47970 state = *get_task_state(task);
47971 vsize = eip = esp = 0;
47972 permitted = ptrace_may_access(task, PTRACE_MODE_READ);
47973@@ -449,6 +487,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
47974 gtime = task->gtime;
47975 }
47976
47977+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47978+ if (PAX_RAND_FLAGS(mm)) {
47979+ eip = 0;
47980+ esp = 0;
47981+ wchan = 0;
47982+ }
47983+#endif
47984+#ifdef CONFIG_GRKERNSEC_HIDESYM
47985+ wchan = 0;
47986+ eip =0;
47987+ esp =0;
47988+#endif
47989+
47990 /* scale priority and nice values from timeslices to -20..20 */
47991 /* to make it look like a "normal" Unix priority/nice value */
47992 priority = task_prio(task);
47993@@ -489,9 +540,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
47994 vsize,
47995 mm ? get_mm_rss(mm) : 0,
47996 rsslim,
47997+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47998+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
47999+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
48000+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
48001+#else
48002 mm ? (permitted ? mm->start_code : 1) : 0,
48003 mm ? (permitted ? mm->end_code : 1) : 0,
48004 (permitted && mm) ? mm->start_stack : 0,
48005+#endif
48006 esp,
48007 eip,
48008 /* The signal information here is obsolete.
48009@@ -533,8 +590,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48010 struct pid *pid, struct task_struct *task)
48011 {
48012 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
48013- struct mm_struct *mm = get_task_mm(task);
48014+ struct mm_struct *mm;
48015
48016+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48017+ if (current->exec_id != m->exec_id) {
48018+ gr_log_badprocpid("statm");
48019+ return 0;
48020+ }
48021+#endif
48022+ mm = get_task_mm(task);
48023 if (mm) {
48024 size = task_statm(mm, &shared, &text, &data, &resident);
48025 mmput(mm);
48026@@ -544,3 +608,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48027
48028 return 0;
48029 }
48030+
48031+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48032+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
48033+{
48034+ u32 curr_ip = 0;
48035+ unsigned long flags;
48036+
48037+ if (lock_task_sighand(task, &flags)) {
48038+ curr_ip = task->signal->curr_ip;
48039+ unlock_task_sighand(task, &flags);
48040+ }
48041+
48042+ return sprintf(buffer, "%pI4\n", &curr_ip);
48043+}
48044+#endif
48045diff --git a/fs/proc/base.c b/fs/proc/base.c
48046index 1ace83d..f5e575d 100644
48047--- a/fs/proc/base.c
48048+++ b/fs/proc/base.c
48049@@ -107,6 +107,22 @@ struct pid_entry {
48050 union proc_op op;
48051 };
48052
48053+struct getdents_callback {
48054+ struct linux_dirent __user * current_dir;
48055+ struct linux_dirent __user * previous;
48056+ struct file * file;
48057+ int count;
48058+ int error;
48059+};
48060+
48061+static int gr_fake_filldir(void * __buf, const char *name, int namlen,
48062+ loff_t offset, u64 ino, unsigned int d_type)
48063+{
48064+ struct getdents_callback * buf = (struct getdents_callback *) __buf;
48065+ buf->error = -EINVAL;
48066+ return 0;
48067+}
48068+
48069 #define NOD(NAME, MODE, IOP, FOP, OP) { \
48070 .name = (NAME), \
48071 .len = sizeof(NAME) - 1, \
48072@@ -194,26 +210,6 @@ static int proc_root_link(struct inode *inode, struct path *path)
48073 return result;
48074 }
48075
48076-static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
48077-{
48078- struct mm_struct *mm;
48079- int err;
48080-
48081- err = mutex_lock_killable(&task->signal->cred_guard_mutex);
48082- if (err)
48083- return ERR_PTR(err);
48084-
48085- mm = get_task_mm(task);
48086- if (mm && mm != current->mm &&
48087- !ptrace_may_access(task, mode)) {
48088- mmput(mm);
48089- mm = ERR_PTR(-EACCES);
48090- }
48091- mutex_unlock(&task->signal->cred_guard_mutex);
48092-
48093- return mm;
48094-}
48095-
48096 struct mm_struct *mm_for_maps(struct task_struct *task)
48097 {
48098 return mm_access(task, PTRACE_MODE_READ);
48099@@ -229,6 +225,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
48100 if (!mm->arg_end)
48101 goto out_mm; /* Shh! No looking before we're done */
48102
48103+ if (gr_acl_handle_procpidmem(task))
48104+ goto out_mm;
48105+
48106 len = mm->arg_end - mm->arg_start;
48107
48108 if (len > PAGE_SIZE)
48109@@ -256,12 +255,28 @@ out:
48110 return res;
48111 }
48112
48113+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48114+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48115+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48116+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48117+#endif
48118+
48119 static int proc_pid_auxv(struct task_struct *task, char *buffer)
48120 {
48121 struct mm_struct *mm = mm_for_maps(task);
48122 int res = PTR_ERR(mm);
48123 if (mm && !IS_ERR(mm)) {
48124 unsigned int nwords = 0;
48125+
48126+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48127+ /* allow if we're currently ptracing this task */
48128+ if (PAX_RAND_FLAGS(mm) &&
48129+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
48130+ mmput(mm);
48131+ return 0;
48132+ }
48133+#endif
48134+
48135 do {
48136 nwords += 2;
48137 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
48138@@ -275,7 +290,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
48139 }
48140
48141
48142-#ifdef CONFIG_KALLSYMS
48143+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48144 /*
48145 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
48146 * Returns the resolved symbol. If that fails, simply return the address.
48147@@ -314,7 +329,7 @@ static void unlock_trace(struct task_struct *task)
48148 mutex_unlock(&task->signal->cred_guard_mutex);
48149 }
48150
48151-#ifdef CONFIG_STACKTRACE
48152+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48153
48154 #define MAX_STACK_TRACE_DEPTH 64
48155
48156@@ -505,7 +520,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
48157 return count;
48158 }
48159
48160-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48161+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48162 static int proc_pid_syscall(struct task_struct *task, char *buffer)
48163 {
48164 long nr;
48165@@ -534,7 +549,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
48166 /************************************************************************/
48167
48168 /* permission checks */
48169-static int proc_fd_access_allowed(struct inode *inode)
48170+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
48171 {
48172 struct task_struct *task;
48173 int allowed = 0;
48174@@ -544,7 +559,10 @@ static int proc_fd_access_allowed(struct inode *inode)
48175 */
48176 task = get_proc_task(inode);
48177 if (task) {
48178- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48179+ if (log)
48180+ allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
48181+ else
48182+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48183 put_task_struct(task);
48184 }
48185 return allowed;
48186@@ -786,6 +804,10 @@ static int mem_open(struct inode* inode, struct file* file)
48187 file->f_mode |= FMODE_UNSIGNED_OFFSET;
48188 file->private_data = mm;
48189
48190+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48191+ file->f_version = current->exec_id;
48192+#endif
48193+
48194 return 0;
48195 }
48196
48197@@ -797,6 +819,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
48198 ssize_t copied;
48199 char *page;
48200
48201+#ifdef CONFIG_GRKERNSEC
48202+ if (write)
48203+ return -EPERM;
48204+#endif
48205+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48206+ if (file->f_version != current->exec_id) {
48207+ gr_log_badprocpid("mem");
48208+ return 0;
48209+ }
48210+#endif
48211+
48212 if (!mm)
48213 return 0;
48214
48215@@ -897,6 +930,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
48216 if (!task)
48217 goto out_no_task;
48218
48219+ if (gr_acl_handle_procpidmem(task))
48220+ goto out;
48221+
48222 ret = -ENOMEM;
48223 page = (char *)__get_free_page(GFP_TEMPORARY);
48224 if (!page)
48225@@ -1519,7 +1555,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
48226 path_put(&nd->path);
48227
48228 /* Are we allowed to snoop on the tasks file descriptors? */
48229- if (!proc_fd_access_allowed(inode))
48230+ if (!proc_fd_access_allowed(inode,0))
48231 goto out;
48232
48233 error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
48234@@ -1558,8 +1594,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
48235 struct path path;
48236
48237 /* Are we allowed to snoop on the tasks file descriptors? */
48238- if (!proc_fd_access_allowed(inode))
48239- goto out;
48240+ /* logging this is needed for learning on chromium to work properly,
48241+ but we don't want to flood the logs from 'ps' which does a readlink
48242+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
48243+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
48244+ */
48245+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
48246+ if (!proc_fd_access_allowed(inode,0))
48247+ goto out;
48248+ } else {
48249+ if (!proc_fd_access_allowed(inode,1))
48250+ goto out;
48251+ }
48252
48253 error = PROC_I(inode)->op.proc_get_link(inode, &path);
48254 if (error)
48255@@ -1624,7 +1670,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
48256 rcu_read_lock();
48257 cred = __task_cred(task);
48258 inode->i_uid = cred->euid;
48259+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48260+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48261+#else
48262 inode->i_gid = cred->egid;
48263+#endif
48264 rcu_read_unlock();
48265 }
48266 security_task_to_inode(task, inode);
48267@@ -1642,6 +1692,9 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
48268 struct inode *inode = dentry->d_inode;
48269 struct task_struct *task;
48270 const struct cred *cred;
48271+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48272+ const struct cred *tmpcred = current_cred();
48273+#endif
48274
48275 generic_fillattr(inode, stat);
48276
48277@@ -1649,13 +1702,41 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
48278 stat->uid = 0;
48279 stat->gid = 0;
48280 task = pid_task(proc_pid(inode), PIDTYPE_PID);
48281+
48282+ if (task && (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))) {
48283+ rcu_read_unlock();
48284+ return -ENOENT;
48285+ }
48286+
48287 if (task) {
48288+ cred = __task_cred(task);
48289+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48290+ if (!tmpcred->uid || (tmpcred->uid == cred->uid)
48291+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48292+ || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48293+#endif
48294+ ) {
48295+#endif
48296 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48297+#ifdef CONFIG_GRKERNSEC_PROC_USER
48298+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48299+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48300+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48301+#endif
48302 task_dumpable(task)) {
48303- cred = __task_cred(task);
48304 stat->uid = cred->euid;
48305+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48306+ stat->gid = CONFIG_GRKERNSEC_PROC_GID;
48307+#else
48308 stat->gid = cred->egid;
48309+#endif
48310 }
48311+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48312+ } else {
48313+ rcu_read_unlock();
48314+ return -ENOENT;
48315+ }
48316+#endif
48317 }
48318 rcu_read_unlock();
48319 return 0;
48320@@ -1692,11 +1773,20 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
48321
48322 if (task) {
48323 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48324+#ifdef CONFIG_GRKERNSEC_PROC_USER
48325+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48326+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48327+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48328+#endif
48329 task_dumpable(task)) {
48330 rcu_read_lock();
48331 cred = __task_cred(task);
48332 inode->i_uid = cred->euid;
48333+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48334+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48335+#else
48336 inode->i_gid = cred->egid;
48337+#endif
48338 rcu_read_unlock();
48339 } else {
48340 inode->i_uid = 0;
48341@@ -1814,7 +1904,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
48342 int fd = proc_fd(inode);
48343
48344 if (task) {
48345- files = get_files_struct(task);
48346+ if (!gr_acl_handle_procpidmem(task))
48347+ files = get_files_struct(task);
48348 put_task_struct(task);
48349 }
48350 if (files) {
48351@@ -2082,11 +2173,21 @@ static const struct file_operations proc_fd_operations = {
48352 */
48353 static int proc_fd_permission(struct inode *inode, int mask)
48354 {
48355+ struct task_struct *task;
48356 int rv = generic_permission(inode, mask);
48357- if (rv == 0)
48358- return 0;
48359+
48360 if (task_pid(current) == proc_pid(inode))
48361 rv = 0;
48362+
48363+ task = get_proc_task(inode);
48364+ if (task == NULL)
48365+ return rv;
48366+
48367+ if (gr_acl_handle_procpidmem(task))
48368+ rv = -EACCES;
48369+
48370+ put_task_struct(task);
48371+
48372 return rv;
48373 }
48374
48375@@ -2196,6 +2297,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
48376 if (!task)
48377 goto out_no_task;
48378
48379+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48380+ goto out;
48381+
48382 /*
48383 * Yes, it does not scale. And it should not. Don't add
48384 * new entries into /proc/<tgid>/ without very good reasons.
48385@@ -2240,6 +2344,9 @@ static int proc_pident_readdir(struct file *filp,
48386 if (!task)
48387 goto out_no_task;
48388
48389+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48390+ goto out;
48391+
48392 ret = 0;
48393 i = filp->f_pos;
48394 switch (i) {
48395@@ -2510,7 +2617,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
48396 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
48397 void *cookie)
48398 {
48399- char *s = nd_get_link(nd);
48400+ const char *s = nd_get_link(nd);
48401 if (!IS_ERR(s))
48402 __putname(s);
48403 }
48404@@ -2708,7 +2815,7 @@ static const struct pid_entry tgid_base_stuff[] = {
48405 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
48406 #endif
48407 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48408-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48409+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48410 INF("syscall", S_IRUGO, proc_pid_syscall),
48411 #endif
48412 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48413@@ -2733,10 +2840,10 @@ static const struct pid_entry tgid_base_stuff[] = {
48414 #ifdef CONFIG_SECURITY
48415 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48416 #endif
48417-#ifdef CONFIG_KALLSYMS
48418+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48419 INF("wchan", S_IRUGO, proc_pid_wchan),
48420 #endif
48421-#ifdef CONFIG_STACKTRACE
48422+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48423 ONE("stack", S_IRUGO, proc_pid_stack),
48424 #endif
48425 #ifdef CONFIG_SCHEDSTATS
48426@@ -2770,6 +2877,9 @@ static const struct pid_entry tgid_base_stuff[] = {
48427 #ifdef CONFIG_HARDWALL
48428 INF("hardwall", S_IRUGO, proc_pid_hardwall),
48429 #endif
48430+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48431+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
48432+#endif
48433 };
48434
48435 static int proc_tgid_base_readdir(struct file * filp,
48436@@ -2895,7 +3005,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
48437 if (!inode)
48438 goto out;
48439
48440+#ifdef CONFIG_GRKERNSEC_PROC_USER
48441+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
48442+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48443+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48444+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
48445+#else
48446 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
48447+#endif
48448 inode->i_op = &proc_tgid_base_inode_operations;
48449 inode->i_fop = &proc_tgid_base_operations;
48450 inode->i_flags|=S_IMMUTABLE;
48451@@ -2937,7 +3054,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
48452 if (!task)
48453 goto out;
48454
48455+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48456+ goto out_put_task;
48457+
48458 result = proc_pid_instantiate(dir, dentry, task, NULL);
48459+out_put_task:
48460 put_task_struct(task);
48461 out:
48462 return result;
48463@@ -3002,6 +3123,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
48464 {
48465 unsigned int nr;
48466 struct task_struct *reaper;
48467+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48468+ const struct cred *tmpcred = current_cred();
48469+ const struct cred *itercred;
48470+#endif
48471+ filldir_t __filldir = filldir;
48472 struct tgid_iter iter;
48473 struct pid_namespace *ns;
48474
48475@@ -3025,8 +3151,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
48476 for (iter = next_tgid(ns, iter);
48477 iter.task;
48478 iter.tgid += 1, iter = next_tgid(ns, iter)) {
48479+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48480+ rcu_read_lock();
48481+ itercred = __task_cred(iter.task);
48482+#endif
48483+ if (gr_pid_is_chrooted(iter.task) || gr_check_hidden_task(iter.task)
48484+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48485+ || (tmpcred->uid && (itercred->uid != tmpcred->uid)
48486+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48487+ && !in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48488+#endif
48489+ )
48490+#endif
48491+ )
48492+ __filldir = &gr_fake_filldir;
48493+ else
48494+ __filldir = filldir;
48495+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48496+ rcu_read_unlock();
48497+#endif
48498 filp->f_pos = iter.tgid + TGID_OFFSET;
48499- if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
48500+ if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
48501 put_task_struct(iter.task);
48502 goto out;
48503 }
48504@@ -3054,7 +3199,7 @@ static const struct pid_entry tid_base_stuff[] = {
48505 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
48506 #endif
48507 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48508-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48509+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48510 INF("syscall", S_IRUGO, proc_pid_syscall),
48511 #endif
48512 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48513@@ -3078,10 +3223,10 @@ static const struct pid_entry tid_base_stuff[] = {
48514 #ifdef CONFIG_SECURITY
48515 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48516 #endif
48517-#ifdef CONFIG_KALLSYMS
48518+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48519 INF("wchan", S_IRUGO, proc_pid_wchan),
48520 #endif
48521-#ifdef CONFIG_STACKTRACE
48522+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48523 ONE("stack", S_IRUGO, proc_pid_stack),
48524 #endif
48525 #ifdef CONFIG_SCHEDSTATS
48526diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
48527index 82676e3..5f8518a 100644
48528--- a/fs/proc/cmdline.c
48529+++ b/fs/proc/cmdline.c
48530@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
48531
48532 static int __init proc_cmdline_init(void)
48533 {
48534+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48535+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
48536+#else
48537 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
48538+#endif
48539 return 0;
48540 }
48541 module_init(proc_cmdline_init);
48542diff --git a/fs/proc/devices.c b/fs/proc/devices.c
48543index b143471..bb105e5 100644
48544--- a/fs/proc/devices.c
48545+++ b/fs/proc/devices.c
48546@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
48547
48548 static int __init proc_devices_init(void)
48549 {
48550+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48551+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
48552+#else
48553 proc_create("devices", 0, NULL, &proc_devinfo_operations);
48554+#endif
48555 return 0;
48556 }
48557 module_init(proc_devices_init);
48558diff --git a/fs/proc/inode.c b/fs/proc/inode.c
48559index 7737c54..7172574 100644
48560--- a/fs/proc/inode.c
48561+++ b/fs/proc/inode.c
48562@@ -18,12 +18,18 @@
48563 #include <linux/module.h>
48564 #include <linux/sysctl.h>
48565 #include <linux/slab.h>
48566+#include <linux/grsecurity.h>
48567
48568 #include <asm/system.h>
48569 #include <asm/uaccess.h>
48570
48571 #include "internal.h"
48572
48573+#ifdef CONFIG_PROC_SYSCTL
48574+extern const struct inode_operations proc_sys_inode_operations;
48575+extern const struct inode_operations proc_sys_dir_operations;
48576+#endif
48577+
48578 static void proc_evict_inode(struct inode *inode)
48579 {
48580 struct proc_dir_entry *de;
48581@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
48582 ns_ops = PROC_I(inode)->ns_ops;
48583 if (ns_ops && ns_ops->put)
48584 ns_ops->put(PROC_I(inode)->ns);
48585+
48586+#ifdef CONFIG_PROC_SYSCTL
48587+ if (inode->i_op == &proc_sys_inode_operations ||
48588+ inode->i_op == &proc_sys_dir_operations)
48589+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
48590+#endif
48591+
48592 }
48593
48594 static struct kmem_cache * proc_inode_cachep;
48595@@ -440,7 +453,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
48596 if (de->mode) {
48597 inode->i_mode = de->mode;
48598 inode->i_uid = de->uid;
48599+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48600+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48601+#else
48602 inode->i_gid = de->gid;
48603+#endif
48604 }
48605 if (de->size)
48606 inode->i_size = de->size;
48607diff --git a/fs/proc/internal.h b/fs/proc/internal.h
48608index 7838e5c..ff92cbc 100644
48609--- a/fs/proc/internal.h
48610+++ b/fs/proc/internal.h
48611@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48612 struct pid *pid, struct task_struct *task);
48613 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48614 struct pid *pid, struct task_struct *task);
48615+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48616+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
48617+#endif
48618 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
48619
48620 extern const struct file_operations proc_maps_operations;
48621diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
48622index d245cb2..f4e8498 100644
48623--- a/fs/proc/kcore.c
48624+++ b/fs/proc/kcore.c
48625@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48626 * the addresses in the elf_phdr on our list.
48627 */
48628 start = kc_offset_to_vaddr(*fpos - elf_buflen);
48629- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
48630+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
48631+ if (tsz > buflen)
48632 tsz = buflen;
48633-
48634+
48635 while (buflen) {
48636 struct kcore_list *m;
48637
48638@@ -509,20 +510,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48639 kfree(elf_buf);
48640 } else {
48641 if (kern_addr_valid(start)) {
48642- unsigned long n;
48643+ char *elf_buf;
48644+ mm_segment_t oldfs;
48645
48646- n = copy_to_user(buffer, (char *)start, tsz);
48647- /*
48648- * We cannot distingush between fault on source
48649- * and fault on destination. When this happens
48650- * we clear too and hope it will trigger the
48651- * EFAULT again.
48652- */
48653- if (n) {
48654- if (clear_user(buffer + tsz - n,
48655- n))
48656+ elf_buf = kmalloc(tsz, GFP_KERNEL);
48657+ if (!elf_buf)
48658+ return -ENOMEM;
48659+ oldfs = get_fs();
48660+ set_fs(KERNEL_DS);
48661+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
48662+ set_fs(oldfs);
48663+ if (copy_to_user(buffer, elf_buf, tsz)) {
48664+ kfree(elf_buf);
48665 return -EFAULT;
48666+ }
48667 }
48668+ set_fs(oldfs);
48669+ kfree(elf_buf);
48670 } else {
48671 if (clear_user(buffer, tsz))
48672 return -EFAULT;
48673@@ -542,6 +546,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48674
48675 static int open_kcore(struct inode *inode, struct file *filp)
48676 {
48677+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
48678+ return -EPERM;
48679+#endif
48680 if (!capable(CAP_SYS_RAWIO))
48681 return -EPERM;
48682 if (kcore_need_update)
48683diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
48684index 80e4645..53e5fcf 100644
48685--- a/fs/proc/meminfo.c
48686+++ b/fs/proc/meminfo.c
48687@@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
48688 vmi.used >> 10,
48689 vmi.largest_chunk >> 10
48690 #ifdef CONFIG_MEMORY_FAILURE
48691- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
48692+ ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
48693 #endif
48694 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
48695 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
48696diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
48697index b1822dd..df622cb 100644
48698--- a/fs/proc/nommu.c
48699+++ b/fs/proc/nommu.c
48700@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
48701 if (len < 1)
48702 len = 1;
48703 seq_printf(m, "%*c", len, ' ');
48704- seq_path(m, &file->f_path, "");
48705+ seq_path(m, &file->f_path, "\n\\");
48706 }
48707
48708 seq_putc(m, '\n');
48709diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
48710index f738024..876984a 100644
48711--- a/fs/proc/proc_net.c
48712+++ b/fs/proc/proc_net.c
48713@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
48714 struct task_struct *task;
48715 struct nsproxy *ns;
48716 struct net *net = NULL;
48717+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48718+ const struct cred *cred = current_cred();
48719+#endif
48720+
48721+#ifdef CONFIG_GRKERNSEC_PROC_USER
48722+ if (cred->fsuid)
48723+ return net;
48724+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48725+ if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
48726+ return net;
48727+#endif
48728
48729 rcu_read_lock();
48730 task = pid_task(proc_pid(dir), PIDTYPE_PID);
48731diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
48732index a6b6217..1e0579d 100644
48733--- a/fs/proc/proc_sysctl.c
48734+++ b/fs/proc/proc_sysctl.c
48735@@ -9,11 +9,13 @@
48736 #include <linux/namei.h>
48737 #include "internal.h"
48738
48739+extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
48740+
48741 static const struct dentry_operations proc_sys_dentry_operations;
48742 static const struct file_operations proc_sys_file_operations;
48743-static const struct inode_operations proc_sys_inode_operations;
48744+const struct inode_operations proc_sys_inode_operations;
48745 static const struct file_operations proc_sys_dir_file_operations;
48746-static const struct inode_operations proc_sys_dir_operations;
48747+const struct inode_operations proc_sys_dir_operations;
48748
48749 void proc_sys_poll_notify(struct ctl_table_poll *poll)
48750 {
48751@@ -131,8 +133,14 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
48752
48753 err = NULL;
48754 d_set_d_op(dentry, &proc_sys_dentry_operations);
48755+
48756+ gr_handle_proc_create(dentry, inode);
48757+
48758 d_add(dentry, inode);
48759
48760+ if (gr_handle_sysctl(p, MAY_EXEC))
48761+ err = ERR_PTR(-ENOENT);
48762+
48763 out:
48764 sysctl_head_finish(head);
48765 return err;
48766@@ -163,6 +171,12 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
48767 if (!table->proc_handler)
48768 goto out;
48769
48770+#ifdef CONFIG_GRKERNSEC
48771+ error = -EPERM;
48772+ if (write && !capable(CAP_SYS_ADMIN))
48773+ goto out;
48774+#endif
48775+
48776 /* careful: calling conventions are nasty here */
48777 res = count;
48778 error = table->proc_handler(table, write, buf, &res, ppos);
48779@@ -245,6 +259,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
48780 return -ENOMEM;
48781 } else {
48782 d_set_d_op(child, &proc_sys_dentry_operations);
48783+
48784+ gr_handle_proc_create(child, inode);
48785+
48786 d_add(child, inode);
48787 }
48788 } else {
48789@@ -273,6 +290,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
48790 if (*pos < file->f_pos)
48791 continue;
48792
48793+ if (gr_handle_sysctl(table, 0))
48794+ continue;
48795+
48796 res = proc_sys_fill_cache(file, dirent, filldir, head, table);
48797 if (res)
48798 return res;
48799@@ -398,6 +418,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
48800 if (IS_ERR(head))
48801 return PTR_ERR(head);
48802
48803+ if (table && gr_handle_sysctl(table, MAY_EXEC))
48804+ return -ENOENT;
48805+
48806 generic_fillattr(inode, stat);
48807 if (table)
48808 stat->mode = (stat->mode & S_IFMT) | table->mode;
48809@@ -420,13 +443,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
48810 .llseek = generic_file_llseek,
48811 };
48812
48813-static const struct inode_operations proc_sys_inode_operations = {
48814+const struct inode_operations proc_sys_inode_operations = {
48815 .permission = proc_sys_permission,
48816 .setattr = proc_sys_setattr,
48817 .getattr = proc_sys_getattr,
48818 };
48819
48820-static const struct inode_operations proc_sys_dir_operations = {
48821+const struct inode_operations proc_sys_dir_operations = {
48822 .lookup = proc_sys_lookup,
48823 .permission = proc_sys_permission,
48824 .setattr = proc_sys_setattr,
48825diff --git a/fs/proc/root.c b/fs/proc/root.c
48826index 03102d9..4ae347e 100644
48827--- a/fs/proc/root.c
48828+++ b/fs/proc/root.c
48829@@ -121,7 +121,15 @@ void __init proc_root_init(void)
48830 #ifdef CONFIG_PROC_DEVICETREE
48831 proc_device_tree_init();
48832 #endif
48833+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48834+#ifdef CONFIG_GRKERNSEC_PROC_USER
48835+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
48836+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48837+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
48838+#endif
48839+#else
48840 proc_mkdir("bus", NULL);
48841+#endif
48842 proc_sys_init();
48843 }
48844
48845diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
48846index 7dcd2a2..b2f410e 100644
48847--- a/fs/proc/task_mmu.c
48848+++ b/fs/proc/task_mmu.c
48849@@ -11,6 +11,7 @@
48850 #include <linux/rmap.h>
48851 #include <linux/swap.h>
48852 #include <linux/swapops.h>
48853+#include <linux/grsecurity.h>
48854
48855 #include <asm/elf.h>
48856 #include <asm/uaccess.h>
48857@@ -52,8 +53,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
48858 "VmExe:\t%8lu kB\n"
48859 "VmLib:\t%8lu kB\n"
48860 "VmPTE:\t%8lu kB\n"
48861- "VmSwap:\t%8lu kB\n",
48862- hiwater_vm << (PAGE_SHIFT-10),
48863+ "VmSwap:\t%8lu kB\n"
48864+
48865+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
48866+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
48867+#endif
48868+
48869+ ,hiwater_vm << (PAGE_SHIFT-10),
48870 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
48871 mm->locked_vm << (PAGE_SHIFT-10),
48872 mm->pinned_vm << (PAGE_SHIFT-10),
48873@@ -62,7 +68,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
48874 data << (PAGE_SHIFT-10),
48875 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
48876 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
48877- swap << (PAGE_SHIFT-10));
48878+ swap << (PAGE_SHIFT-10)
48879+
48880+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
48881+ , mm->context.user_cs_base, mm->context.user_cs_limit
48882+#endif
48883+
48884+ );
48885 }
48886
48887 unsigned long task_vsize(struct mm_struct *mm)
48888@@ -209,6 +221,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
48889 return ret;
48890 }
48891
48892+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48893+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48894+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48895+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48896+#endif
48897+
48898 static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48899 {
48900 struct mm_struct *mm = vma->vm_mm;
48901@@ -227,13 +245,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48902 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
48903 }
48904
48905- /* We don't show the stack guard page in /proc/maps */
48906+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48907+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
48908+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
48909+#else
48910 start = vma->vm_start;
48911- if (stack_guard_page_start(vma, start))
48912- start += PAGE_SIZE;
48913 end = vma->vm_end;
48914- if (stack_guard_page_end(vma, end))
48915- end -= PAGE_SIZE;
48916+#endif
48917
48918 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
48919 start,
48920@@ -242,7 +260,11 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48921 flags & VM_WRITE ? 'w' : '-',
48922 flags & VM_EXEC ? 'x' : '-',
48923 flags & VM_MAYSHARE ? 's' : 'p',
48924+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48925+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
48926+#else
48927 pgoff,
48928+#endif
48929 MAJOR(dev), MINOR(dev), ino, &len);
48930
48931 /*
48932@@ -251,7 +273,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48933 */
48934 if (file) {
48935 pad_len_spaces(m, len);
48936- seq_path(m, &file->f_path, "\n");
48937+ seq_path(m, &file->f_path, "\n\\");
48938 } else {
48939 const char *name = arch_vma_name(vma);
48940 if (!name) {
48941@@ -259,8 +281,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48942 if (vma->vm_start <= mm->brk &&
48943 vma->vm_end >= mm->start_brk) {
48944 name = "[heap]";
48945- } else if (vma->vm_start <= mm->start_stack &&
48946- vma->vm_end >= mm->start_stack) {
48947+ } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
48948+ (vma->vm_start <= mm->start_stack &&
48949+ vma->vm_end >= mm->start_stack)) {
48950 name = "[stack]";
48951 }
48952 } else {
48953@@ -281,6 +304,13 @@ static int show_map(struct seq_file *m, void *v)
48954 struct proc_maps_private *priv = m->private;
48955 struct task_struct *task = priv->task;
48956
48957+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48958+ if (current->exec_id != m->exec_id) {
48959+ gr_log_badprocpid("maps");
48960+ return 0;
48961+ }
48962+#endif
48963+
48964 show_map_vma(m, vma);
48965
48966 if (m->count < m->size) /* vma is copied successfully */
48967@@ -434,12 +464,23 @@ static int show_smap(struct seq_file *m, void *v)
48968 .private = &mss,
48969 };
48970
48971+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48972+ if (current->exec_id != m->exec_id) {
48973+ gr_log_badprocpid("smaps");
48974+ return 0;
48975+ }
48976+#endif
48977 memset(&mss, 0, sizeof mss);
48978- mss.vma = vma;
48979- /* mmap_sem is held in m_start */
48980- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
48981- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
48982-
48983+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48984+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
48985+#endif
48986+ mss.vma = vma;
48987+ /* mmap_sem is held in m_start */
48988+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
48989+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
48990+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48991+ }
48992+#endif
48993 show_map_vma(m, vma);
48994
48995 seq_printf(m,
48996@@ -457,7 +498,11 @@ static int show_smap(struct seq_file *m, void *v)
48997 "KernelPageSize: %8lu kB\n"
48998 "MMUPageSize: %8lu kB\n"
48999 "Locked: %8lu kB\n",
49000+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49001+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
49002+#else
49003 (vma->vm_end - vma->vm_start) >> 10,
49004+#endif
49005 mss.resident >> 10,
49006 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
49007 mss.shared_clean >> 10,
49008@@ -1015,6 +1060,13 @@ static int show_numa_map(struct seq_file *m, void *v)
49009 int n;
49010 char buffer[50];
49011
49012+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49013+ if (current->exec_id != m->exec_id) {
49014+ gr_log_badprocpid("numa_maps");
49015+ return 0;
49016+ }
49017+#endif
49018+
49019 if (!mm)
49020 return 0;
49021
49022@@ -1032,11 +1084,15 @@ static int show_numa_map(struct seq_file *m, void *v)
49023 mpol_to_str(buffer, sizeof(buffer), pol, 0);
49024 mpol_cond_put(pol);
49025
49026+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49027+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
49028+#else
49029 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
49030+#endif
49031
49032 if (file) {
49033 seq_printf(m, " file=");
49034- seq_path(m, &file->f_path, "\n\t= ");
49035+ seq_path(m, &file->f_path, "\n\t\\= ");
49036 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
49037 seq_printf(m, " heap");
49038 } else if (vma->vm_start <= mm->start_stack &&
49039diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
49040index 980de54..2a4db5f 100644
49041--- a/fs/proc/task_nommu.c
49042+++ b/fs/proc/task_nommu.c
49043@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
49044 else
49045 bytes += kobjsize(mm);
49046
49047- if (current->fs && current->fs->users > 1)
49048+ if (current->fs && atomic_read(&current->fs->users) > 1)
49049 sbytes += kobjsize(current->fs);
49050 else
49051 bytes += kobjsize(current->fs);
49052@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
49053
49054 if (file) {
49055 pad_len_spaces(m, len);
49056- seq_path(m, &file->f_path, "");
49057+ seq_path(m, &file->f_path, "\n\\");
49058 } else if (mm) {
49059 if (vma->vm_start <= mm->start_stack &&
49060 vma->vm_end >= mm->start_stack) {
49061diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
49062index d67908b..d13f6a6 100644
49063--- a/fs/quota/netlink.c
49064+++ b/fs/quota/netlink.c
49065@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
49066 void quota_send_warning(short type, unsigned int id, dev_t dev,
49067 const char warntype)
49068 {
49069- static atomic_t seq;
49070+ static atomic_unchecked_t seq;
49071 struct sk_buff *skb;
49072 void *msg_head;
49073 int ret;
49074@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
49075 "VFS: Not enough memory to send quota warning.\n");
49076 return;
49077 }
49078- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
49079+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
49080 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
49081 if (!msg_head) {
49082 printk(KERN_ERR
49083diff --git a/fs/readdir.c b/fs/readdir.c
49084index 356f715..c918d38 100644
49085--- a/fs/readdir.c
49086+++ b/fs/readdir.c
49087@@ -17,6 +17,7 @@
49088 #include <linux/security.h>
49089 #include <linux/syscalls.h>
49090 #include <linux/unistd.h>
49091+#include <linux/namei.h>
49092
49093 #include <asm/uaccess.h>
49094
49095@@ -67,6 +68,7 @@ struct old_linux_dirent {
49096
49097 struct readdir_callback {
49098 struct old_linux_dirent __user * dirent;
49099+ struct file * file;
49100 int result;
49101 };
49102
49103@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
49104 buf->result = -EOVERFLOW;
49105 return -EOVERFLOW;
49106 }
49107+
49108+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49109+ return 0;
49110+
49111 buf->result++;
49112 dirent = buf->dirent;
49113 if (!access_ok(VERIFY_WRITE, dirent,
49114@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
49115
49116 buf.result = 0;
49117 buf.dirent = dirent;
49118+ buf.file = file;
49119
49120 error = vfs_readdir(file, fillonedir, &buf);
49121 if (buf.result)
49122@@ -142,6 +149,7 @@ struct linux_dirent {
49123 struct getdents_callback {
49124 struct linux_dirent __user * current_dir;
49125 struct linux_dirent __user * previous;
49126+ struct file * file;
49127 int count;
49128 int error;
49129 };
49130@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
49131 buf->error = -EOVERFLOW;
49132 return -EOVERFLOW;
49133 }
49134+
49135+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49136+ return 0;
49137+
49138 dirent = buf->previous;
49139 if (dirent) {
49140 if (__put_user(offset, &dirent->d_off))
49141@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
49142 buf.previous = NULL;
49143 buf.count = count;
49144 buf.error = 0;
49145+ buf.file = file;
49146
49147 error = vfs_readdir(file, filldir, &buf);
49148 if (error >= 0)
49149@@ -229,6 +242,7 @@ out:
49150 struct getdents_callback64 {
49151 struct linux_dirent64 __user * current_dir;
49152 struct linux_dirent64 __user * previous;
49153+ struct file *file;
49154 int count;
49155 int error;
49156 };
49157@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
49158 buf->error = -EINVAL; /* only used if we fail.. */
49159 if (reclen > buf->count)
49160 return -EINVAL;
49161+
49162+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49163+ return 0;
49164+
49165 dirent = buf->previous;
49166 if (dirent) {
49167 if (__put_user(offset, &dirent->d_off))
49168@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
49169
49170 buf.current_dir = dirent;
49171 buf.previous = NULL;
49172+ buf.file = file;
49173 buf.count = count;
49174 buf.error = 0;
49175
49176@@ -299,7 +318,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
49177 error = buf.error;
49178 lastdirent = buf.previous;
49179 if (lastdirent) {
49180- typeof(lastdirent->d_off) d_off = file->f_pos;
49181+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
49182 if (__put_user(d_off, &lastdirent->d_off))
49183 error = -EFAULT;
49184 else
49185diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
49186index 60c0804..d814f98 100644
49187--- a/fs/reiserfs/do_balan.c
49188+++ b/fs/reiserfs/do_balan.c
49189@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
49190 return;
49191 }
49192
49193- atomic_inc(&(fs_generation(tb->tb_sb)));
49194+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
49195 do_balance_starts(tb);
49196
49197 /* balance leaf returns 0 except if combining L R and S into
49198diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
49199index 7a99811..a7c96c4 100644
49200--- a/fs/reiserfs/procfs.c
49201+++ b/fs/reiserfs/procfs.c
49202@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
49203 "SMALL_TAILS " : "NO_TAILS ",
49204 replay_only(sb) ? "REPLAY_ONLY " : "",
49205 convert_reiserfs(sb) ? "CONV " : "",
49206- atomic_read(&r->s_generation_counter),
49207+ atomic_read_unchecked(&r->s_generation_counter),
49208 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
49209 SF(s_do_balance), SF(s_unneeded_left_neighbor),
49210 SF(s_good_search_by_key_reada), SF(s_bmaps),
49211diff --git a/fs/select.c b/fs/select.c
49212index d33418f..2a5345e 100644
49213--- a/fs/select.c
49214+++ b/fs/select.c
49215@@ -20,6 +20,7 @@
49216 #include <linux/module.h>
49217 #include <linux/slab.h>
49218 #include <linux/poll.h>
49219+#include <linux/security.h>
49220 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
49221 #include <linux/file.h>
49222 #include <linux/fdtable.h>
49223@@ -837,6 +838,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
49224 struct poll_list *walk = head;
49225 unsigned long todo = nfds;
49226
49227+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
49228 if (nfds > rlimit(RLIMIT_NOFILE))
49229 return -EINVAL;
49230
49231diff --git a/fs/seq_file.c b/fs/seq_file.c
49232index dba43c3..4b3f701 100644
49233--- a/fs/seq_file.c
49234+++ b/fs/seq_file.c
49235@@ -9,6 +9,7 @@
49236 #include <linux/module.h>
49237 #include <linux/seq_file.h>
49238 #include <linux/slab.h>
49239+#include <linux/sched.h>
49240
49241 #include <asm/uaccess.h>
49242 #include <asm/page.h>
49243@@ -40,6 +41,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
49244 memset(p, 0, sizeof(*p));
49245 mutex_init(&p->lock);
49246 p->op = op;
49247+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49248+ p->exec_id = current->exec_id;
49249+#endif
49250
49251 /*
49252 * Wrappers around seq_open(e.g. swaps_open) need to be
49253@@ -549,7 +553,7 @@ static void single_stop(struct seq_file *p, void *v)
49254 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
49255 void *data)
49256 {
49257- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
49258+ seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
49259 int res = -ENOMEM;
49260
49261 if (op) {
49262diff --git a/fs/splice.c b/fs/splice.c
49263index fa2defa..8601650 100644
49264--- a/fs/splice.c
49265+++ b/fs/splice.c
49266@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49267 pipe_lock(pipe);
49268
49269 for (;;) {
49270- if (!pipe->readers) {
49271+ if (!atomic_read(&pipe->readers)) {
49272 send_sig(SIGPIPE, current, 0);
49273 if (!ret)
49274 ret = -EPIPE;
49275@@ -248,9 +248,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49276 do_wakeup = 0;
49277 }
49278
49279- pipe->waiting_writers++;
49280+ atomic_inc(&pipe->waiting_writers);
49281 pipe_wait(pipe);
49282- pipe->waiting_writers--;
49283+ atomic_dec(&pipe->waiting_writers);
49284 }
49285
49286 pipe_unlock(pipe);
49287@@ -560,7 +560,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
49288 old_fs = get_fs();
49289 set_fs(get_ds());
49290 /* The cast to a user pointer is valid due to the set_fs() */
49291- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
49292+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
49293 set_fs(old_fs);
49294
49295 return res;
49296@@ -575,7 +575,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
49297 old_fs = get_fs();
49298 set_fs(get_ds());
49299 /* The cast to a user pointer is valid due to the set_fs() */
49300- res = vfs_write(file, (const char __user *)buf, count, &pos);
49301+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
49302 set_fs(old_fs);
49303
49304 return res;
49305@@ -626,7 +626,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
49306 goto err;
49307
49308 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
49309- vec[i].iov_base = (void __user *) page_address(page);
49310+ vec[i].iov_base = (void __force_user *) page_address(page);
49311 vec[i].iov_len = this_len;
49312 spd.pages[i] = page;
49313 spd.nr_pages++;
49314@@ -846,10 +846,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
49315 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
49316 {
49317 while (!pipe->nrbufs) {
49318- if (!pipe->writers)
49319+ if (!atomic_read(&pipe->writers))
49320 return 0;
49321
49322- if (!pipe->waiting_writers && sd->num_spliced)
49323+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
49324 return 0;
49325
49326 if (sd->flags & SPLICE_F_NONBLOCK)
49327@@ -1182,7 +1182,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
49328 * out of the pipe right after the splice_to_pipe(). So set
49329 * PIPE_READERS appropriately.
49330 */
49331- pipe->readers = 1;
49332+ atomic_set(&pipe->readers, 1);
49333
49334 current->splice_pipe = pipe;
49335 }
49336@@ -1734,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49337 ret = -ERESTARTSYS;
49338 break;
49339 }
49340- if (!pipe->writers)
49341+ if (!atomic_read(&pipe->writers))
49342 break;
49343- if (!pipe->waiting_writers) {
49344+ if (!atomic_read(&pipe->waiting_writers)) {
49345 if (flags & SPLICE_F_NONBLOCK) {
49346 ret = -EAGAIN;
49347 break;
49348@@ -1768,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49349 pipe_lock(pipe);
49350
49351 while (pipe->nrbufs >= pipe->buffers) {
49352- if (!pipe->readers) {
49353+ if (!atomic_read(&pipe->readers)) {
49354 send_sig(SIGPIPE, current, 0);
49355 ret = -EPIPE;
49356 break;
49357@@ -1781,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49358 ret = -ERESTARTSYS;
49359 break;
49360 }
49361- pipe->waiting_writers++;
49362+ atomic_inc(&pipe->waiting_writers);
49363 pipe_wait(pipe);
49364- pipe->waiting_writers--;
49365+ atomic_dec(&pipe->waiting_writers);
49366 }
49367
49368 pipe_unlock(pipe);
49369@@ -1819,14 +1819,14 @@ retry:
49370 pipe_double_lock(ipipe, opipe);
49371
49372 do {
49373- if (!opipe->readers) {
49374+ if (!atomic_read(&opipe->readers)) {
49375 send_sig(SIGPIPE, current, 0);
49376 if (!ret)
49377 ret = -EPIPE;
49378 break;
49379 }
49380
49381- if (!ipipe->nrbufs && !ipipe->writers)
49382+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
49383 break;
49384
49385 /*
49386@@ -1923,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49387 pipe_double_lock(ipipe, opipe);
49388
49389 do {
49390- if (!opipe->readers) {
49391+ if (!atomic_read(&opipe->readers)) {
49392 send_sig(SIGPIPE, current, 0);
49393 if (!ret)
49394 ret = -EPIPE;
49395@@ -1968,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49396 * return EAGAIN if we have the potential of some data in the
49397 * future, otherwise just return 0
49398 */
49399- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
49400+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
49401 ret = -EAGAIN;
49402
49403 pipe_unlock(ipipe);
49404diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
49405index a475983..9c6a1f0 100644
49406--- a/fs/sysfs/bin.c
49407+++ b/fs/sysfs/bin.c
49408@@ -67,6 +67,8 @@ fill_read(struct file *file, char *buffer, loff_t off, size_t count)
49409 }
49410
49411 static ssize_t
49412+read(struct file *file, char __user *userbuf, size_t bytes, loff_t *off) __size_overflow(3);
49413+static ssize_t
49414 read(struct file *file, char __user *userbuf, size_t bytes, loff_t *off)
49415 {
49416 struct bin_buffer *bb = file->private_data;
49417diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
49418index 7fdf6a7..e6cd8ad 100644
49419--- a/fs/sysfs/dir.c
49420+++ b/fs/sysfs/dir.c
49421@@ -642,6 +642,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
49422 struct sysfs_dirent *sd;
49423 int rc;
49424
49425+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
49426+ const char *parent_name = parent_sd->s_name;
49427+
49428+ mode = S_IFDIR | S_IRWXU;
49429+
49430+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
49431+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
49432+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse"))) ||
49433+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
49434+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
49435+#endif
49436+
49437 /* allocate */
49438 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
49439 if (!sd)
49440diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
49441index 779789a..f58193c 100644
49442--- a/fs/sysfs/file.c
49443+++ b/fs/sysfs/file.c
49444@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
49445
49446 struct sysfs_open_dirent {
49447 atomic_t refcnt;
49448- atomic_t event;
49449+ atomic_unchecked_t event;
49450 wait_queue_head_t poll;
49451 struct list_head buffers; /* goes through sysfs_buffer.list */
49452 };
49453@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
49454 if (!sysfs_get_active(attr_sd))
49455 return -ENODEV;
49456
49457- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
49458+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
49459 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
49460
49461 sysfs_put_active(attr_sd);
49462@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
49463 return -ENOMEM;
49464
49465 atomic_set(&new_od->refcnt, 0);
49466- atomic_set(&new_od->event, 1);
49467+ atomic_set_unchecked(&new_od->event, 1);
49468 init_waitqueue_head(&new_od->poll);
49469 INIT_LIST_HEAD(&new_od->buffers);
49470 goto retry;
49471@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
49472
49473 sysfs_put_active(attr_sd);
49474
49475- if (buffer->event != atomic_read(&od->event))
49476+ if (buffer->event != atomic_read_unchecked(&od->event))
49477 goto trigger;
49478
49479 return DEFAULT_POLLMASK;
49480@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
49481
49482 od = sd->s_attr.open;
49483 if (od) {
49484- atomic_inc(&od->event);
49485+ atomic_inc_unchecked(&od->event);
49486 wake_up_interruptible(&od->poll);
49487 }
49488
49489diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
49490index a7ac78f..02158e1 100644
49491--- a/fs/sysfs/symlink.c
49492+++ b/fs/sysfs/symlink.c
49493@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
49494
49495 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
49496 {
49497- char *page = nd_get_link(nd);
49498+ const char *page = nd_get_link(nd);
49499 if (!IS_ERR(page))
49500 free_page((unsigned long)page);
49501 }
49502diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
49503index b09ba2d..1cad1a8 100644
49504--- a/fs/ubifs/debug.c
49505+++ b/fs/ubifs/debug.c
49506@@ -2817,6 +2817,7 @@ static ssize_t dfs_file_read(struct file *file, char __user *u, size_t count,
49507 * debugfs file. Returns %0 or %1 in case of success and a negative error code
49508 * in case of failure.
49509 */
49510+static int interpret_user_input(const char __user *u, size_t count) __size_overflow(2);
49511 static int interpret_user_input(const char __user *u, size_t count)
49512 {
49513 size_t buf_size;
49514@@ -2835,6 +2836,8 @@ static int interpret_user_input(const char __user *u, size_t count)
49515 }
49516
49517 static ssize_t dfs_file_write(struct file *file, const char __user *u,
49518+ size_t count, loff_t *ppos) __size_overflow(3);
49519+static ssize_t dfs_file_write(struct file *file, const char __user *u,
49520 size_t count, loff_t *ppos)
49521 {
49522 struct ubifs_info *c = file->private_data;
49523diff --git a/fs/udf/misc.c b/fs/udf/misc.c
49524index c175b4d..8f36a16 100644
49525--- a/fs/udf/misc.c
49526+++ b/fs/udf/misc.c
49527@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
49528
49529 u8 udf_tag_checksum(const struct tag *t)
49530 {
49531- u8 *data = (u8 *)t;
49532+ const u8 *data = (const u8 *)t;
49533 u8 checksum = 0;
49534 int i;
49535 for (i = 0; i < sizeof(struct tag); ++i)
49536diff --git a/fs/utimes.c b/fs/utimes.c
49537index ba653f3..06ea4b1 100644
49538--- a/fs/utimes.c
49539+++ b/fs/utimes.c
49540@@ -1,6 +1,7 @@
49541 #include <linux/compiler.h>
49542 #include <linux/file.h>
49543 #include <linux/fs.h>
49544+#include <linux/security.h>
49545 #include <linux/linkage.h>
49546 #include <linux/mount.h>
49547 #include <linux/namei.h>
49548@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
49549 goto mnt_drop_write_and_out;
49550 }
49551 }
49552+
49553+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
49554+ error = -EACCES;
49555+ goto mnt_drop_write_and_out;
49556+ }
49557+
49558 mutex_lock(&inode->i_mutex);
49559 error = notify_change(path->dentry, &newattrs);
49560 mutex_unlock(&inode->i_mutex);
49561diff --git a/fs/xattr.c b/fs/xattr.c
49562index 67583de..c5aad14 100644
49563--- a/fs/xattr.c
49564+++ b/fs/xattr.c
49565@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
49566 * Extended attribute SET operations
49567 */
49568 static long
49569-setxattr(struct dentry *d, const char __user *name, const void __user *value,
49570+setxattr(struct path *path, const char __user *name, const void __user *value,
49571 size_t size, int flags)
49572 {
49573 int error;
49574@@ -339,7 +339,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
49575 return PTR_ERR(kvalue);
49576 }
49577
49578- error = vfs_setxattr(d, kname, kvalue, size, flags);
49579+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
49580+ error = -EACCES;
49581+ goto out;
49582+ }
49583+
49584+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
49585+out:
49586 kfree(kvalue);
49587 return error;
49588 }
49589@@ -356,7 +362,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
49590 return error;
49591 error = mnt_want_write(path.mnt);
49592 if (!error) {
49593- error = setxattr(path.dentry, name, value, size, flags);
49594+ error = setxattr(&path, name, value, size, flags);
49595 mnt_drop_write(path.mnt);
49596 }
49597 path_put(&path);
49598@@ -375,7 +381,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
49599 return error;
49600 error = mnt_want_write(path.mnt);
49601 if (!error) {
49602- error = setxattr(path.dentry, name, value, size, flags);
49603+ error = setxattr(&path, name, value, size, flags);
49604 mnt_drop_write(path.mnt);
49605 }
49606 path_put(&path);
49607@@ -386,17 +392,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
49608 const void __user *,value, size_t, size, int, flags)
49609 {
49610 struct file *f;
49611- struct dentry *dentry;
49612 int error = -EBADF;
49613
49614 f = fget(fd);
49615 if (!f)
49616 return error;
49617- dentry = f->f_path.dentry;
49618- audit_inode(NULL, dentry);
49619+ audit_inode(NULL, f->f_path.dentry);
49620 error = mnt_want_write_file(f);
49621 if (!error) {
49622- error = setxattr(dentry, name, value, size, flags);
49623+ error = setxattr(&f->f_path, name, value, size, flags);
49624 mnt_drop_write(f->f_path.mnt);
49625 }
49626 fput(f);
49627diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
49628index 8d5a506..7f62712 100644
49629--- a/fs/xattr_acl.c
49630+++ b/fs/xattr_acl.c
49631@@ -17,8 +17,8 @@
49632 struct posix_acl *
49633 posix_acl_from_xattr(const void *value, size_t size)
49634 {
49635- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
49636- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
49637+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
49638+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
49639 int count;
49640 struct posix_acl *acl;
49641 struct posix_acl_entry *acl_e;
49642diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
49643index d0ab788..827999b 100644
49644--- a/fs/xfs/xfs_bmap.c
49645+++ b/fs/xfs/xfs_bmap.c
49646@@ -190,7 +190,7 @@ xfs_bmap_validate_ret(
49647 int nmap,
49648 int ret_nmap);
49649 #else
49650-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
49651+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
49652 #endif /* DEBUG */
49653
49654 STATIC int
49655diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
49656index 79d05e8..e3e5861 100644
49657--- a/fs/xfs/xfs_dir2_sf.c
49658+++ b/fs/xfs/xfs_dir2_sf.c
49659@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
49660 }
49661
49662 ino = xfs_dir2_sfe_get_ino(sfp, sfep);
49663- if (filldir(dirent, (char *)sfep->name, sfep->namelen,
49664+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
49665+ char name[sfep->namelen];
49666+ memcpy(name, sfep->name, sfep->namelen);
49667+ if (filldir(dirent, name, sfep->namelen,
49668+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
49669+ *offset = off & 0x7fffffff;
49670+ return 0;
49671+ }
49672+ } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
49673 off & 0x7fffffff, ino, DT_UNKNOWN)) {
49674 *offset = off & 0x7fffffff;
49675 return 0;
49676diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
49677index d99a905..9f88202 100644
49678--- a/fs/xfs/xfs_ioctl.c
49679+++ b/fs/xfs/xfs_ioctl.c
49680@@ -128,7 +128,7 @@ xfs_find_handle(
49681 }
49682
49683 error = -EFAULT;
49684- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
49685+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
49686 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
49687 goto out_put;
49688
49689diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
49690index 23ce927..e274cc1 100644
49691--- a/fs/xfs/xfs_iops.c
49692+++ b/fs/xfs/xfs_iops.c
49693@@ -447,7 +447,7 @@ xfs_vn_put_link(
49694 struct nameidata *nd,
49695 void *p)
49696 {
49697- char *s = nd_get_link(nd);
49698+ const char *s = nd_get_link(nd);
49699
49700 if (!IS_ERR(s))
49701 kfree(s);
49702diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
49703new file mode 100644
49704index 0000000..4089e05
49705--- /dev/null
49706+++ b/grsecurity/Kconfig
49707@@ -0,0 +1,1078 @@
49708+#
49709+# grecurity configuration
49710+#
49711+
49712+menu "Grsecurity"
49713+
49714+config GRKERNSEC
49715+ bool "Grsecurity"
49716+ select CRYPTO
49717+ select CRYPTO_SHA256
49718+ help
49719+ If you say Y here, you will be able to configure many features
49720+ that will enhance the security of your system. It is highly
49721+ recommended that you say Y here and read through the help
49722+ for each option so that you fully understand the features and
49723+ can evaluate their usefulness for your machine.
49724+
49725+choice
49726+ prompt "Security Level"
49727+ depends on GRKERNSEC
49728+ default GRKERNSEC_CUSTOM
49729+
49730+config GRKERNSEC_LOW
49731+ bool "Low"
49732+ select GRKERNSEC_LINK
49733+ select GRKERNSEC_FIFO
49734+ select GRKERNSEC_RANDNET
49735+ select GRKERNSEC_DMESG
49736+ select GRKERNSEC_CHROOT
49737+ select GRKERNSEC_CHROOT_CHDIR
49738+
49739+ help
49740+ If you choose this option, several of the grsecurity options will
49741+ be enabled that will give you greater protection against a number
49742+ of attacks, while assuring that none of your software will have any
49743+ conflicts with the additional security measures. If you run a lot
49744+ of unusual software, or you are having problems with the higher
49745+ security levels, you should say Y here. With this option, the
49746+ following features are enabled:
49747+
49748+ - Linking restrictions
49749+ - FIFO restrictions
49750+ - Restricted dmesg
49751+ - Enforced chdir("/") on chroot
49752+ - Runtime module disabling
49753+
49754+config GRKERNSEC_MEDIUM
49755+ bool "Medium"
49756+ select PAX
49757+ select PAX_EI_PAX
49758+ select PAX_PT_PAX_FLAGS
49759+ select PAX_HAVE_ACL_FLAGS
49760+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
49761+ select GRKERNSEC_CHROOT
49762+ select GRKERNSEC_CHROOT_SYSCTL
49763+ select GRKERNSEC_LINK
49764+ select GRKERNSEC_FIFO
49765+ select GRKERNSEC_DMESG
49766+ select GRKERNSEC_RANDNET
49767+ select GRKERNSEC_FORKFAIL
49768+ select GRKERNSEC_TIME
49769+ select GRKERNSEC_SIGNAL
49770+ select GRKERNSEC_CHROOT
49771+ select GRKERNSEC_CHROOT_UNIX
49772+ select GRKERNSEC_CHROOT_MOUNT
49773+ select GRKERNSEC_CHROOT_PIVOT
49774+ select GRKERNSEC_CHROOT_DOUBLE
49775+ select GRKERNSEC_CHROOT_CHDIR
49776+ select GRKERNSEC_CHROOT_MKNOD
49777+ select GRKERNSEC_PROC
49778+ select GRKERNSEC_PROC_USERGROUP
49779+ select PAX_RANDUSTACK
49780+ select PAX_ASLR
49781+ select PAX_RANDMMAP
49782+ select PAX_REFCOUNT if (X86 || SPARC64)
49783+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
49784+
49785+ help
49786+ If you say Y here, several features in addition to those included
49787+ in the low additional security level will be enabled. These
49788+ features provide even more security to your system, though in rare
49789+ cases they may be incompatible with very old or poorly written
49790+ software. If you enable this option, make sure that your auth
49791+ service (identd) is running as gid 1001. With this option,
49792+ the following features (in addition to those provided in the
49793+ low additional security level) will be enabled:
49794+
49795+ - Failed fork logging
49796+ - Time change logging
49797+ - Signal logging
49798+ - Deny mounts in chroot
49799+ - Deny double chrooting
49800+ - Deny sysctl writes in chroot
49801+ - Deny mknod in chroot
49802+ - Deny access to abstract AF_UNIX sockets out of chroot
49803+ - Deny pivot_root in chroot
49804+ - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
49805+ - /proc restrictions with special GID set to 10 (usually wheel)
49806+ - Address Space Layout Randomization (ASLR)
49807+ - Prevent exploitation of most refcount overflows
49808+ - Bounds checking of copying between the kernel and userland
49809+
49810+config GRKERNSEC_HIGH
49811+ bool "High"
49812+ select GRKERNSEC_LINK
49813+ select GRKERNSEC_FIFO
49814+ select GRKERNSEC_DMESG
49815+ select GRKERNSEC_FORKFAIL
49816+ select GRKERNSEC_TIME
49817+ select GRKERNSEC_SIGNAL
49818+ select GRKERNSEC_CHROOT
49819+ select GRKERNSEC_CHROOT_SHMAT
49820+ select GRKERNSEC_CHROOT_UNIX
49821+ select GRKERNSEC_CHROOT_MOUNT
49822+ select GRKERNSEC_CHROOT_FCHDIR
49823+ select GRKERNSEC_CHROOT_PIVOT
49824+ select GRKERNSEC_CHROOT_DOUBLE
49825+ select GRKERNSEC_CHROOT_CHDIR
49826+ select GRKERNSEC_CHROOT_MKNOD
49827+ select GRKERNSEC_CHROOT_CAPS
49828+ select GRKERNSEC_CHROOT_SYSCTL
49829+ select GRKERNSEC_CHROOT_FINDTASK
49830+ select GRKERNSEC_SYSFS_RESTRICT
49831+ select GRKERNSEC_PROC
49832+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
49833+ select GRKERNSEC_HIDESYM
49834+ select GRKERNSEC_BRUTE
49835+ select GRKERNSEC_PROC_USERGROUP
49836+ select GRKERNSEC_KMEM
49837+ select GRKERNSEC_RESLOG
49838+ select GRKERNSEC_RANDNET
49839+ select GRKERNSEC_PROC_ADD
49840+ select GRKERNSEC_CHROOT_CHMOD
49841+ select GRKERNSEC_CHROOT_NICE
49842+ select GRKERNSEC_SETXID
49843+ select GRKERNSEC_AUDIT_MOUNT
49844+ select GRKERNSEC_MODHARDEN if (MODULES)
49845+ select GRKERNSEC_HARDEN_PTRACE
49846+ select GRKERNSEC_PTRACE_READEXEC
49847+ select GRKERNSEC_VM86 if (X86_32)
49848+ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
49849+ select PAX
49850+ select PAX_RANDUSTACK
49851+ select PAX_ASLR
49852+ select PAX_RANDMMAP
49853+ select PAX_NOEXEC
49854+ select PAX_MPROTECT
49855+ select PAX_EI_PAX
49856+ select PAX_PT_PAX_FLAGS
49857+ select PAX_HAVE_ACL_FLAGS
49858+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
49859+ select PAX_MEMORY_UDEREF if (X86 && !XEN)
49860+ select PAX_RANDKSTACK if (X86_TSC && X86)
49861+ select PAX_SEGMEXEC if (X86_32)
49862+ select PAX_PAGEEXEC
49863+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
49864+ select PAX_EMUTRAMP if (PARISC)
49865+ select PAX_EMUSIGRT if (PARISC)
49866+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
49867+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
49868+ select PAX_REFCOUNT if (X86 || SPARC64)
49869+ select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
49870+ help
49871+ If you say Y here, many of the features of grsecurity will be
49872+ enabled, which will protect you against many kinds of attacks
49873+ against your system. The heightened security comes at a cost
49874+ of an increased chance of incompatibilities with rare software
49875+ on your machine. Since this security level enables PaX, you should
49876+ view <http://pax.grsecurity.net> and read about the PaX
49877+ project. While you are there, download chpax and run it on
49878+ binaries that cause problems with PaX. Also remember that
49879+ since the /proc restrictions are enabled, you must run your
49880+ identd as gid 1001. This security level enables the following
49881+ features in addition to those listed in the low and medium
49882+ security levels:
49883+
49884+ - Additional /proc restrictions
49885+ - Chmod restrictions in chroot
49886+ - No signals, ptrace, or viewing of processes outside of chroot
49887+ - Capability restrictions in chroot
49888+ - Deny fchdir out of chroot
49889+ - Priority restrictions in chroot
49890+ - Segmentation-based implementation of PaX
49891+ - Mprotect restrictions
49892+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
49893+ - Kernel stack randomization
49894+ - Mount/unmount/remount logging
49895+ - Kernel symbol hiding
49896+ - Hardening of module auto-loading
49897+ - Ptrace restrictions
49898+ - Restricted vm86 mode
49899+ - Restricted sysfs/debugfs
49900+ - Active kernel exploit response
49901+
49902+config GRKERNSEC_CUSTOM
49903+ bool "Custom"
49904+ help
49905+ If you say Y here, you will be able to configure every grsecurity
49906+ option, which allows you to enable many more features that aren't
49907+ covered in the basic security levels. These additional features
49908+ include TPE, socket restrictions, and the sysctl system for
49909+ grsecurity. It is advised that you read through the help for
49910+ each option to determine its usefulness in your situation.
49911+
49912+endchoice
49913+
49914+menu "Memory Protections"
49915+depends on GRKERNSEC
49916+
49917+config GRKERNSEC_KMEM
49918+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
49919+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
49920+ help
49921+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
49922+ be written to or read from to modify or leak the contents of the running
49923+ kernel. /dev/port will also not be allowed to be opened. If you have module
49924+ support disabled, enabling this will close up four ways that are
49925+ currently used to insert malicious code into the running kernel.
49926+ Even with all these features enabled, we still highly recommend that
49927+ you use the RBAC system, as it is still possible for an attacker to
49928+ modify the running kernel through privileged I/O granted by ioperm/iopl.
49929+ If you are not using XFree86, you may be able to stop this additional
49930+ case by enabling the 'Disable privileged I/O' option. Though nothing
49931+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
49932+ but only to video memory, which is the only writing we allow in this
49933+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
49934+ not be allowed to mprotect it with PROT_WRITE later.
49935+ It is highly recommended that you say Y here if you meet all the
49936+ conditions above.
49937+
49938+config GRKERNSEC_VM86
49939+ bool "Restrict VM86 mode"
49940+ depends on X86_32
49941+
49942+ help
49943+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
49944+ make use of a special execution mode on 32bit x86 processors called
49945+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
49946+ video cards and will still work with this option enabled. The purpose
49947+ of the option is to prevent exploitation of emulation errors in
49948+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
49949+ Nearly all users should be able to enable this option.
49950+
49951+config GRKERNSEC_IO
49952+ bool "Disable privileged I/O"
49953+ depends on X86
49954+ select RTC_CLASS
49955+ select RTC_INTF_DEV
49956+ select RTC_DRV_CMOS
49957+
49958+ help
49959+ If you say Y here, all ioperm and iopl calls will return an error.
49960+ Ioperm and iopl can be used to modify the running kernel.
49961+ Unfortunately, some programs need this access to operate properly,
49962+ the most notable of which are XFree86 and hwclock. hwclock can be
49963+ remedied by having RTC support in the kernel, so real-time
49964+ clock support is enabled if this option is enabled, to ensure
49965+ that hwclock operates correctly. XFree86 still will not
49966+ operate correctly with this option enabled, so DO NOT CHOOSE Y
49967+ IF YOU USE XFree86. If you use XFree86 and you still want to
49968+ protect your kernel against modification, use the RBAC system.
49969+
49970+config GRKERNSEC_PROC_MEMMAP
49971+ bool "Harden ASLR against information leaks and entropy reduction"
49972+ default y if (PAX_NOEXEC || PAX_ASLR)
49973+ depends on PAX_NOEXEC || PAX_ASLR
49974+ help
49975+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
49976+ give no information about the addresses of its mappings if
49977+ PaX features that rely on random addresses are enabled on the task.
49978+ In addition to sanitizing this information and disabling other
49979+ dangerous sources of information, this option causes reads of sensitive
49980+ /proc/<pid> entries where the file descriptor was opened in a different
49981+ task than the one performing the read. Such attempts are logged.
49982+ This option also limits argv/env strings for suid/sgid binaries
49983+ to 512KB to prevent a complete exhaustion of the stack entropy provided
49984+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
49985+ binaries to prevent alternative mmap layouts from being abused.
49986+
49987+ If you use PaX it is essential that you say Y here as it closes up
49988+ several holes that make full ASLR useless locally.
49989+
49990+config GRKERNSEC_BRUTE
49991+ bool "Deter exploit bruteforcing"
49992+ help
49993+ If you say Y here, attempts to bruteforce exploits against forking
49994+ daemons such as apache or sshd, as well as against suid/sgid binaries
49995+ will be deterred. When a child of a forking daemon is killed by PaX
49996+ or crashes due to an illegal instruction or other suspicious signal,
49997+ the parent process will be delayed 30 seconds upon every subsequent
49998+ fork until the administrator is able to assess the situation and
49999+ restart the daemon.
50000+ In the suid/sgid case, the attempt is logged, the user has all their
50001+ processes terminated, and they are prevented from executing any further
50002+ processes for 15 minutes.
50003+ It is recommended that you also enable signal logging in the auditing
50004+ section so that logs are generated when a process triggers a suspicious
50005+ signal.
50006+ If the sysctl option is enabled, a sysctl option with name
50007+ "deter_bruteforce" is created.
50008+
50009+
50010+config GRKERNSEC_MODHARDEN
50011+ bool "Harden module auto-loading"
50012+ depends on MODULES
50013+ help
50014+ If you say Y here, module auto-loading in response to use of some
50015+ feature implemented by an unloaded module will be restricted to
50016+ root users. Enabling this option helps defend against attacks
50017+ by unprivileged users who abuse the auto-loading behavior to
50018+ cause a vulnerable module to load that is then exploited.
50019+
50020+ If this option prevents a legitimate use of auto-loading for a
50021+ non-root user, the administrator can execute modprobe manually
50022+ with the exact name of the module mentioned in the alert log.
50023+ Alternatively, the administrator can add the module to the list
50024+ of modules loaded at boot by modifying init scripts.
50025+
50026+ Modification of init scripts will most likely be needed on
50027+ Ubuntu servers with encrypted home directory support enabled,
50028+ as the first non-root user logging in will cause the ecb(aes),
50029+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
50030+
50031+config GRKERNSEC_HIDESYM
50032+ bool "Hide kernel symbols"
50033+ help
50034+ If you say Y here, getting information on loaded modules, and
50035+ displaying all kernel symbols through a syscall will be restricted
50036+ to users with CAP_SYS_MODULE. For software compatibility reasons,
50037+ /proc/kallsyms will be restricted to the root user. The RBAC
50038+ system can hide that entry even from root.
50039+
50040+ This option also prevents leaking of kernel addresses through
50041+ several /proc entries.
50042+
50043+ Note that this option is only effective provided the following
50044+ conditions are met:
50045+ 1) The kernel using grsecurity is not precompiled by some distribution
50046+ 2) You have also enabled GRKERNSEC_DMESG
50047+ 3) You are using the RBAC system and hiding other files such as your
50048+ kernel image and System.map. Alternatively, enabling this option
50049+ causes the permissions on /boot, /lib/modules, and the kernel
50050+ source directory to change at compile time to prevent
50051+ reading by non-root users.
50052+ If the above conditions are met, this option will aid in providing a
50053+ useful protection against local kernel exploitation of overflows
50054+ and arbitrary read/write vulnerabilities.
50055+
50056+config GRKERNSEC_KERN_LOCKOUT
50057+ bool "Active kernel exploit response"
50058+ depends on X86 || ARM || PPC || SPARC
50059+ help
50060+ If you say Y here, when a PaX alert is triggered due to suspicious
50061+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
50062+ or an OOPs occurs due to bad memory accesses, instead of just
50063+ terminating the offending process (and potentially allowing
50064+ a subsequent exploit from the same user), we will take one of two
50065+ actions:
50066+ If the user was root, we will panic the system
50067+ If the user was non-root, we will log the attempt, terminate
50068+ all processes owned by the user, then prevent them from creating
50069+ any new processes until the system is restarted
50070+ This deters repeated kernel exploitation/bruteforcing attempts
50071+ and is useful for later forensics.
50072+
50073+endmenu
50074+menu "Role Based Access Control Options"
50075+depends on GRKERNSEC
50076+
50077+config GRKERNSEC_RBAC_DEBUG
50078+ bool
50079+
50080+config GRKERNSEC_NO_RBAC
50081+ bool "Disable RBAC system"
50082+ help
50083+ If you say Y here, the /dev/grsec device will be removed from the kernel,
50084+ preventing the RBAC system from being enabled. You should only say Y
50085+ here if you have no intention of using the RBAC system, so as to prevent
50086+ an attacker with root access from misusing the RBAC system to hide files
50087+ and processes when loadable module support and /dev/[k]mem have been
50088+ locked down.
50089+
50090+config GRKERNSEC_ACL_HIDEKERN
50091+ bool "Hide kernel processes"
50092+ help
50093+ If you say Y here, all kernel threads will be hidden to all
50094+ processes but those whose subject has the "view hidden processes"
50095+ flag.
50096+
50097+config GRKERNSEC_ACL_MAXTRIES
50098+ int "Maximum tries before password lockout"
50099+ default 3
50100+ help
50101+ This option enforces the maximum number of times a user can attempt
50102+ to authorize themselves with the grsecurity RBAC system before being
50103+ denied the ability to attempt authorization again for a specified time.
50104+ The lower the number, the harder it will be to brute-force a password.
50105+
50106+config GRKERNSEC_ACL_TIMEOUT
50107+ int "Time to wait after max password tries, in seconds"
50108+ default 30
50109+ help
50110+ This option specifies the time the user must wait after attempting to
50111+ authorize to the RBAC system with the maximum number of invalid
50112+ passwords. The higher the number, the harder it will be to brute-force
50113+ a password.
50114+
50115+endmenu
50116+menu "Filesystem Protections"
50117+depends on GRKERNSEC
50118+
50119+config GRKERNSEC_PROC
50120+ bool "Proc restrictions"
50121+ help
50122+ If you say Y here, the permissions of the /proc filesystem
50123+ will be altered to enhance system security and privacy. You MUST
50124+ choose either a user only restriction or a user and group restriction.
50125+ Depending upon the option you choose, you can either restrict users to
50126+ see only the processes they themselves run, or choose a group that can
50127+ view all processes and files normally restricted to root if you choose
50128+ the "restrict to user only" option. NOTE: If you're running identd or
50129+ ntpd as a non-root user, you will have to run it as the group you
50130+ specify here.
50131+
50132+config GRKERNSEC_PROC_USER
50133+ bool "Restrict /proc to user only"
50134+ depends on GRKERNSEC_PROC
50135+ help
50136+ If you say Y here, non-root users will only be able to view their own
50137+ processes, and restricts them from viewing network-related information,
50138+ and viewing kernel symbol and module information.
50139+
50140+config GRKERNSEC_PROC_USERGROUP
50141+ bool "Allow special group"
50142+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
50143+ help
50144+ If you say Y here, you will be able to select a group that will be
50145+ able to view all processes and network-related information. If you've
50146+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
50147+ remain hidden. This option is useful if you want to run identd as
50148+ a non-root user.
50149+
50150+config GRKERNSEC_PROC_GID
50151+ int "GID for special group"
50152+ depends on GRKERNSEC_PROC_USERGROUP
50153+ default 1001
50154+
50155+config GRKERNSEC_PROC_ADD
50156+ bool "Additional restrictions"
50157+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
50158+ help
50159+ If you say Y here, additional restrictions will be placed on
50160+ /proc that keep normal users from viewing device information and
50161+ slabinfo information that could be useful for exploits.
50162+
50163+config GRKERNSEC_LINK
50164+ bool "Linking restrictions"
50165+ help
50166+ If you say Y here, /tmp race exploits will be prevented, since users
50167+ will no longer be able to follow symlinks owned by other users in
50168+ world-writable +t directories (e.g. /tmp), unless the owner of the
50169+ symlink is the owner of the directory. users will also not be
50170+ able to hardlink to files they do not own. If the sysctl option is
50171+ enabled, a sysctl option with name "linking_restrictions" is created.
50172+
50173+config GRKERNSEC_FIFO
50174+ bool "FIFO restrictions"
50175+ help
50176+ If you say Y here, users will not be able to write to FIFOs they don't
50177+ own in world-writable +t directories (e.g. /tmp), unless the owner of
50178+ the FIFO is the same owner of the directory it's held in. If the sysctl
50179+ option is enabled, a sysctl option with name "fifo_restrictions" is
50180+ created.
50181+
50182+config GRKERNSEC_SYSFS_RESTRICT
50183+ bool "Sysfs/debugfs restriction"
50184+ depends on SYSFS
50185+ help
50186+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
50187+ any filesystem normally mounted under it (e.g. debugfs) will be
50188+ mostly accessible only by root. These filesystems generally provide access
50189+ to hardware and debug information that isn't appropriate for unprivileged
50190+ users of the system. Sysfs and debugfs have also become a large source
50191+ of new vulnerabilities, ranging from infoleaks to local compromise.
50192+ There has been very little oversight with an eye toward security involved
50193+ in adding new exporters of information to these filesystems, so their
50194+ use is discouraged.
50195+ For reasons of compatibility, a few directories have been whitelisted
50196+ for access by non-root users:
50197+ /sys/fs/selinux
50198+ /sys/fs/fuse
50199+ /sys/devices/system/cpu
50200+
50201+config GRKERNSEC_ROFS
50202+ bool "Runtime read-only mount protection"
50203+ help
50204+ If you say Y here, a sysctl option with name "romount_protect" will
50205+ be created. By setting this option to 1 at runtime, filesystems
50206+ will be protected in the following ways:
50207+ * No new writable mounts will be allowed
50208+ * Existing read-only mounts won't be able to be remounted read/write
50209+ * Write operations will be denied on all block devices
50210+ This option acts independently of grsec_lock: once it is set to 1,
50211+ it cannot be turned off. Therefore, please be mindful of the resulting
50212+ behavior if this option is enabled in an init script on a read-only
50213+ filesystem. This feature is mainly intended for secure embedded systems.
50214+
50215+config GRKERNSEC_CHROOT
50216+ bool "Chroot jail restrictions"
50217+ help
50218+ If you say Y here, you will be able to choose several options that will
50219+ make breaking out of a chrooted jail much more difficult. If you
50220+ encounter no software incompatibilities with the following options, it
50221+ is recommended that you enable each one.
50222+
50223+config GRKERNSEC_CHROOT_MOUNT
50224+ bool "Deny mounts"
50225+ depends on GRKERNSEC_CHROOT
50226+ help
50227+ If you say Y here, processes inside a chroot will not be able to
50228+ mount or remount filesystems. If the sysctl option is enabled, a
50229+ sysctl option with name "chroot_deny_mount" is created.
50230+
50231+config GRKERNSEC_CHROOT_DOUBLE
50232+ bool "Deny double-chroots"
50233+ depends on GRKERNSEC_CHROOT
50234+ help
50235+ If you say Y here, processes inside a chroot will not be able to chroot
50236+ again outside the chroot. This is a widely used method of breaking
50237+ out of a chroot jail and should not be allowed. If the sysctl
50238+ option is enabled, a sysctl option with name
50239+ "chroot_deny_chroot" is created.
50240+
50241+config GRKERNSEC_CHROOT_PIVOT
50242+ bool "Deny pivot_root in chroot"
50243+ depends on GRKERNSEC_CHROOT
50244+ help
50245+ If you say Y here, processes inside a chroot will not be able to use
50246+ a function called pivot_root() that was introduced in Linux 2.3.41. It
50247+ works similar to chroot in that it changes the root filesystem. This
50248+ function could be misused in a chrooted process to attempt to break out
50249+ of the chroot, and therefore should not be allowed. If the sysctl
50250+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
50251+ created.
50252+
50253+config GRKERNSEC_CHROOT_CHDIR
50254+ bool "Enforce chdir(\"/\") on all chroots"
50255+ depends on GRKERNSEC_CHROOT
50256+ help
50257+ If you say Y here, the current working directory of all newly-chrooted
50258+ applications will be set to the the root directory of the chroot.
50259+ The man page on chroot(2) states:
50260+ Note that this call does not change the current working
50261+ directory, so that `.' can be outside the tree rooted at
50262+ `/'. In particular, the super-user can escape from a
50263+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
50264+
50265+ It is recommended that you say Y here, since it's not known to break
50266+ any software. If the sysctl option is enabled, a sysctl option with
50267+ name "chroot_enforce_chdir" is created.
50268+
50269+config GRKERNSEC_CHROOT_CHMOD
50270+ bool "Deny (f)chmod +s"
50271+ depends on GRKERNSEC_CHROOT
50272+ help
50273+ If you say Y here, processes inside a chroot will not be able to chmod
50274+ or fchmod files to make them have suid or sgid bits. This protects
50275+ against another published method of breaking a chroot. If the sysctl
50276+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
50277+ created.
50278+
50279+config GRKERNSEC_CHROOT_FCHDIR
50280+ bool "Deny fchdir out of chroot"
50281+ depends on GRKERNSEC_CHROOT
50282+ help
50283+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
50284+ to a file descriptor of the chrooting process that points to a directory
50285+ outside the filesystem will be stopped. If the sysctl option
50286+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
50287+
50288+config GRKERNSEC_CHROOT_MKNOD
50289+ bool "Deny mknod"
50290+ depends on GRKERNSEC_CHROOT
50291+ help
50292+ If you say Y here, processes inside a chroot will not be allowed to
50293+ mknod. The problem with using mknod inside a chroot is that it
50294+ would allow an attacker to create a device entry that is the same
50295+ as one on the physical root of your system, which could range from
50296+ anything from the console device to a device for your harddrive (which
50297+ they could then use to wipe the drive or steal data). It is recommended
50298+ that you say Y here, unless you run into software incompatibilities.
50299+ If the sysctl option is enabled, a sysctl option with name
50300+ "chroot_deny_mknod" is created.
50301+
50302+config GRKERNSEC_CHROOT_SHMAT
50303+ bool "Deny shmat() out of chroot"
50304+ depends on GRKERNSEC_CHROOT
50305+ help
50306+ If you say Y here, processes inside a chroot will not be able to attach
50307+ to shared memory segments that were created outside of the chroot jail.
50308+ It is recommended that you say Y here. If the sysctl option is enabled,
50309+ a sysctl option with name "chroot_deny_shmat" is created.
50310+
50311+config GRKERNSEC_CHROOT_UNIX
50312+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
50313+ depends on GRKERNSEC_CHROOT
50314+ help
50315+ If you say Y here, processes inside a chroot will not be able to
50316+ connect to abstract (meaning not belonging to a filesystem) Unix
50317+ domain sockets that were bound outside of a chroot. It is recommended
50318+ that you say Y here. If the sysctl option is enabled, a sysctl option
50319+ with name "chroot_deny_unix" is created.
50320+
50321+config GRKERNSEC_CHROOT_FINDTASK
50322+ bool "Protect outside processes"
50323+ depends on GRKERNSEC_CHROOT
50324+ help
50325+ If you say Y here, processes inside a chroot will not be able to
50326+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
50327+ getsid, or view any process outside of the chroot. If the sysctl
50328+ option is enabled, a sysctl option with name "chroot_findtask" is
50329+ created.
50330+
50331+config GRKERNSEC_CHROOT_NICE
50332+ bool "Restrict priority changes"
50333+ depends on GRKERNSEC_CHROOT
50334+ help
50335+ If you say Y here, processes inside a chroot will not be able to raise
50336+ the priority of processes in the chroot, or alter the priority of
50337+ processes outside the chroot. This provides more security than simply
50338+ removing CAP_SYS_NICE from the process' capability set. If the
50339+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
50340+ is created.
50341+
50342+config GRKERNSEC_CHROOT_SYSCTL
50343+ bool "Deny sysctl writes"
50344+ depends on GRKERNSEC_CHROOT
50345+ help
50346+ If you say Y here, an attacker in a chroot will not be able to
50347+ write to sysctl entries, either by sysctl(2) or through a /proc
50348+ interface. It is strongly recommended that you say Y here. If the
50349+ sysctl option is enabled, a sysctl option with name
50350+ "chroot_deny_sysctl" is created.
50351+
50352+config GRKERNSEC_CHROOT_CAPS
50353+ bool "Capability restrictions"
50354+ depends on GRKERNSEC_CHROOT
50355+ help
50356+ If you say Y here, the capabilities on all processes within a
50357+ chroot jail will be lowered to stop module insertion, raw i/o,
50358+ system and net admin tasks, rebooting the system, modifying immutable
50359+ files, modifying IPC owned by another, and changing the system time.
50360+ This is left an option because it can break some apps. Disable this
50361+ if your chrooted apps are having problems performing those kinds of
50362+ tasks. If the sysctl option is enabled, a sysctl option with
50363+ name "chroot_caps" is created.
50364+
50365+endmenu
50366+menu "Kernel Auditing"
50367+depends on GRKERNSEC
50368+
50369+config GRKERNSEC_AUDIT_GROUP
50370+ bool "Single group for auditing"
50371+ help
50372+ If you say Y here, the exec, chdir, and (un)mount logging features
50373+ will only operate on a group you specify. This option is recommended
50374+ if you only want to watch certain users instead of having a large
50375+ amount of logs from the entire system. If the sysctl option is enabled,
50376+ a sysctl option with name "audit_group" is created.
50377+
50378+config GRKERNSEC_AUDIT_GID
50379+ int "GID for auditing"
50380+ depends on GRKERNSEC_AUDIT_GROUP
50381+ default 1007
50382+
50383+config GRKERNSEC_EXECLOG
50384+ bool "Exec logging"
50385+ help
50386+ If you say Y here, all execve() calls will be logged (since the
50387+ other exec*() calls are frontends to execve(), all execution
50388+ will be logged). Useful for shell-servers that like to keep track
50389+ of their users. If the sysctl option is enabled, a sysctl option with
50390+ name "exec_logging" is created.
50391+ WARNING: This option when enabled will produce a LOT of logs, especially
50392+ on an active system.
50393+
50394+config GRKERNSEC_RESLOG
50395+ bool "Resource logging"
50396+ help
50397+ If you say Y here, all attempts to overstep resource limits will
50398+ be logged with the resource name, the requested size, and the current
50399+ limit. It is highly recommended that you say Y here. If the sysctl
50400+ option is enabled, a sysctl option with name "resource_logging" is
50401+ created. If the RBAC system is enabled, the sysctl value is ignored.
50402+
50403+config GRKERNSEC_CHROOT_EXECLOG
50404+ bool "Log execs within chroot"
50405+ help
50406+ If you say Y here, all executions inside a chroot jail will be logged
50407+ to syslog. This can cause a large amount of logs if certain
50408+ applications (eg. djb's daemontools) are installed on the system, and
50409+ is therefore left as an option. If the sysctl option is enabled, a
50410+ sysctl option with name "chroot_execlog" is created.
50411+
50412+config GRKERNSEC_AUDIT_PTRACE
50413+ bool "Ptrace logging"
50414+ help
50415+ If you say Y here, all attempts to attach to a process via ptrace
50416+ will be logged. If the sysctl option is enabled, a sysctl option
50417+ with name "audit_ptrace" is created.
50418+
50419+config GRKERNSEC_AUDIT_CHDIR
50420+ bool "Chdir logging"
50421+ help
50422+ If you say Y here, all chdir() calls will be logged. If the sysctl
50423+ option is enabled, a sysctl option with name "audit_chdir" is created.
50424+
50425+config GRKERNSEC_AUDIT_MOUNT
50426+ bool "(Un)Mount logging"
50427+ help
50428+ If you say Y here, all mounts and unmounts will be logged. If the
50429+ sysctl option is enabled, a sysctl option with name "audit_mount" is
50430+ created.
50431+
50432+config GRKERNSEC_SIGNAL
50433+ bool "Signal logging"
50434+ help
50435+ If you say Y here, certain important signals will be logged, such as
50436+ SIGSEGV, which will as a result inform you of when a error in a program
50437+ occurred, which in some cases could mean a possible exploit attempt.
50438+ If the sysctl option is enabled, a sysctl option with name
50439+ "signal_logging" is created.
50440+
50441+config GRKERNSEC_FORKFAIL
50442+ bool "Fork failure logging"
50443+ help
50444+ If you say Y here, all failed fork() attempts will be logged.
50445+ This could suggest a fork bomb, or someone attempting to overstep
50446+ their process limit. If the sysctl option is enabled, a sysctl option
50447+ with name "forkfail_logging" is created.
50448+
50449+config GRKERNSEC_TIME
50450+ bool "Time change logging"
50451+ help
50452+ If you say Y here, any changes of the system clock will be logged.
50453+ If the sysctl option is enabled, a sysctl option with name
50454+ "timechange_logging" is created.
50455+
50456+config GRKERNSEC_PROC_IPADDR
50457+ bool "/proc/<pid>/ipaddr support"
50458+ help
50459+ If you say Y here, a new entry will be added to each /proc/<pid>
50460+ directory that contains the IP address of the person using the task.
50461+ The IP is carried across local TCP and AF_UNIX stream sockets.
50462+ This information can be useful for IDS/IPSes to perform remote response
50463+ to a local attack. The entry is readable by only the owner of the
50464+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
50465+ the RBAC system), and thus does not create privacy concerns.
50466+
50467+config GRKERNSEC_RWXMAP_LOG
50468+ bool 'Denied RWX mmap/mprotect logging'
50469+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
50470+ help
50471+ If you say Y here, calls to mmap() and mprotect() with explicit
50472+ usage of PROT_WRITE and PROT_EXEC together will be logged when
50473+ denied by the PAX_MPROTECT feature. If the sysctl option is
50474+ enabled, a sysctl option with name "rwxmap_logging" is created.
50475+
50476+config GRKERNSEC_AUDIT_TEXTREL
50477+ bool 'ELF text relocations logging (READ HELP)'
50478+ depends on PAX_MPROTECT
50479+ help
50480+ If you say Y here, text relocations will be logged with the filename
50481+ of the offending library or binary. The purpose of the feature is
50482+ to help Linux distribution developers get rid of libraries and
50483+ binaries that need text relocations which hinder the future progress
50484+ of PaX. Only Linux distribution developers should say Y here, and
50485+ never on a production machine, as this option creates an information
50486+ leak that could aid an attacker in defeating the randomization of
50487+ a single memory region. If the sysctl option is enabled, a sysctl
50488+ option with name "audit_textrel" is created.
50489+
50490+endmenu
50491+
50492+menu "Executable Protections"
50493+depends on GRKERNSEC
50494+
50495+config GRKERNSEC_DMESG
50496+ bool "Dmesg(8) restriction"
50497+ help
50498+ If you say Y here, non-root users will not be able to use dmesg(8)
50499+ to view up to the last 4kb of messages in the kernel's log buffer.
50500+ The kernel's log buffer often contains kernel addresses and other
50501+ identifying information useful to an attacker in fingerprinting a
50502+ system for a targeted exploit.
50503+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
50504+ created.
50505+
50506+config GRKERNSEC_HARDEN_PTRACE
50507+ bool "Deter ptrace-based process snooping"
50508+ help
50509+ If you say Y here, TTY sniffers and other malicious monitoring
50510+ programs implemented through ptrace will be defeated. If you
50511+ have been using the RBAC system, this option has already been
50512+ enabled for several years for all users, with the ability to make
50513+ fine-grained exceptions.
50514+
50515+ This option only affects the ability of non-root users to ptrace
50516+ processes that are not a descendent of the ptracing process.
50517+ This means that strace ./binary and gdb ./binary will still work,
50518+ but attaching to arbitrary processes will not. If the sysctl
50519+ option is enabled, a sysctl option with name "harden_ptrace" is
50520+ created.
50521+
50522+config GRKERNSEC_PTRACE_READEXEC
50523+ bool "Require read access to ptrace sensitive binaries"
50524+ help
50525+ If you say Y here, unprivileged users will not be able to ptrace unreadable
50526+ binaries. This option is useful in environments that
50527+ remove the read bits (e.g. file mode 4711) from suid binaries to
50528+ prevent infoleaking of their contents. This option adds
50529+ consistency to the use of that file mode, as the binary could normally
50530+ be read out when run without privileges while ptracing.
50531+
50532+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
50533+ is created.
50534+
50535+config GRKERNSEC_SETXID
50536+ bool "Enforce consistent multithreaded privileges"
50537+ help
50538+ If you say Y here, a change from a root uid to a non-root uid
50539+ in a multithreaded application will cause the resulting uids,
50540+ gids, supplementary groups, and capabilities in that thread
50541+ to be propagated to the other threads of the process. In most
50542+ cases this is unnecessary, as glibc will emulate this behavior
50543+ on behalf of the application. Other libcs do not act in the
50544+ same way, allowing the other threads of the process to continue
50545+ running with root privileges. If the sysctl option is enabled,
50546+ a sysctl option with name "consistent_setxid" is created.
50547+
50548+config GRKERNSEC_TPE
50549+ bool "Trusted Path Execution (TPE)"
50550+ help
50551+ If you say Y here, you will be able to choose a gid to add to the
50552+ supplementary groups of users you want to mark as "untrusted."
50553+ These users will not be able to execute any files that are not in
50554+ root-owned directories writable only by root. If the sysctl option
50555+ is enabled, a sysctl option with name "tpe" is created.
50556+
50557+config GRKERNSEC_TPE_ALL
50558+ bool "Partially restrict all non-root users"
50559+ depends on GRKERNSEC_TPE
50560+ help
50561+ If you say Y here, all non-root users will be covered under
50562+ a weaker TPE restriction. This is separate from, and in addition to,
50563+ the main TPE options that you have selected elsewhere. Thus, if a
50564+ "trusted" GID is chosen, this restriction applies to even that GID.
50565+ Under this restriction, all non-root users will only be allowed to
50566+ execute files in directories they own that are not group or
50567+ world-writable, or in directories owned by root and writable only by
50568+ root. If the sysctl option is enabled, a sysctl option with name
50569+ "tpe_restrict_all" is created.
50570+
50571+config GRKERNSEC_TPE_INVERT
50572+ bool "Invert GID option"
50573+ depends on GRKERNSEC_TPE
50574+ help
50575+ If you say Y here, the group you specify in the TPE configuration will
50576+ decide what group TPE restrictions will be *disabled* for. This
50577+ option is useful if you want TPE restrictions to be applied to most
50578+ users on the system. If the sysctl option is enabled, a sysctl option
50579+ with name "tpe_invert" is created. Unlike other sysctl options, this
50580+ entry will default to on for backward-compatibility.
50581+
50582+config GRKERNSEC_TPE_GID
50583+ int "GID for untrusted users"
50584+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
50585+ default 1005
50586+ help
50587+ Setting this GID determines what group TPE restrictions will be
50588+ *enabled* for. If the sysctl option is enabled, a sysctl option
50589+ with name "tpe_gid" is created.
50590+
50591+config GRKERNSEC_TPE_GID
50592+ int "GID for trusted users"
50593+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
50594+ default 1005
50595+ help
50596+ Setting this GID determines what group TPE restrictions will be
50597+ *disabled* for. If the sysctl option is enabled, a sysctl option
50598+ with name "tpe_gid" is created.
50599+
50600+endmenu
50601+menu "Network Protections"
50602+depends on GRKERNSEC
50603+
50604+config GRKERNSEC_RANDNET
50605+ bool "Larger entropy pools"
50606+ help
50607+ If you say Y here, the entropy pools used for many features of Linux
50608+ and grsecurity will be doubled in size. Since several grsecurity
50609+ features use additional randomness, it is recommended that you say Y
50610+ here. Saying Y here has a similar effect as modifying
50611+ /proc/sys/kernel/random/poolsize.
50612+
50613+config GRKERNSEC_BLACKHOLE
50614+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
50615+ depends on NET
50616+ help
50617+ If you say Y here, neither TCP resets nor ICMP
50618+ destination-unreachable packets will be sent in response to packets
50619+ sent to ports for which no associated listening process exists.
50620+ This feature supports both IPV4 and IPV6 and exempts the
50621+ loopback interface from blackholing. Enabling this feature
50622+ makes a host more resilient to DoS attacks and reduces network
50623+ visibility against scanners.
50624+
50625+ The blackhole feature as-implemented is equivalent to the FreeBSD
50626+ blackhole feature, as it prevents RST responses to all packets, not
50627+ just SYNs. Under most application behavior this causes no
50628+ problems, but applications (like haproxy) may not close certain
50629+ connections in a way that cleanly terminates them on the remote
50630+ end, leaving the remote host in LAST_ACK state. Because of this
50631+ side-effect and to prevent intentional LAST_ACK DoSes, this
50632+ feature also adds automatic mitigation against such attacks.
50633+ The mitigation drastically reduces the amount of time a socket
50634+ can spend in LAST_ACK state. If you're using haproxy and not
50635+ all servers it connects to have this option enabled, consider
50636+ disabling this feature on the haproxy host.
50637+
50638+ If the sysctl option is enabled, two sysctl options with names
50639+ "ip_blackhole" and "lastack_retries" will be created.
50640+ While "ip_blackhole" takes the standard zero/non-zero on/off
50641+ toggle, "lastack_retries" uses the same kinds of values as
50642+ "tcp_retries1" and "tcp_retries2". The default value of 4
50643+ prevents a socket from lasting more than 45 seconds in LAST_ACK
50644+ state.
50645+
50646+config GRKERNSEC_SOCKET
50647+ bool "Socket restrictions"
50648+ depends on NET
50649+ help
50650+ If you say Y here, you will be able to choose from several options.
50651+ If you assign a GID on your system and add it to the supplementary
50652+ groups of users you want to restrict socket access to, this patch
50653+ will perform up to three things, based on the option(s) you choose.
50654+
50655+config GRKERNSEC_SOCKET_ALL
50656+ bool "Deny any sockets to group"
50657+ depends on GRKERNSEC_SOCKET
50658+ help
50659+ If you say Y here, you will be able to choose a GID of whose users will
50660+ be unable to connect to other hosts from your machine or run server
50661+ applications from your machine. If the sysctl option is enabled, a
50662+ sysctl option with name "socket_all" is created.
50663+
50664+config GRKERNSEC_SOCKET_ALL_GID
50665+ int "GID to deny all sockets for"
50666+ depends on GRKERNSEC_SOCKET_ALL
50667+ default 1004
50668+ help
50669+ Here you can choose the GID to disable socket access for. Remember to
50670+ add the users you want socket access disabled for to the GID
50671+ specified here. If the sysctl option is enabled, a sysctl option
50672+ with name "socket_all_gid" is created.
50673+
50674+config GRKERNSEC_SOCKET_CLIENT
50675+ bool "Deny client sockets to group"
50676+ depends on GRKERNSEC_SOCKET
50677+ help
50678+ If you say Y here, you will be able to choose a GID of whose users will
50679+ be unable to connect to other hosts from your machine, but will be
50680+ able to run servers. If this option is enabled, all users in the group
50681+ you specify will have to use passive mode when initiating ftp transfers
50682+ from the shell on your machine. If the sysctl option is enabled, a
50683+ sysctl option with name "socket_client" is created.
50684+
50685+config GRKERNSEC_SOCKET_CLIENT_GID
50686+ int "GID to deny client sockets for"
50687+ depends on GRKERNSEC_SOCKET_CLIENT
50688+ default 1003
50689+ help
50690+ Here you can choose the GID to disable client socket access for.
50691+ Remember to add the users you want client socket access disabled for to
50692+ the GID specified here. If the sysctl option is enabled, a sysctl
50693+ option with name "socket_client_gid" is created.
50694+
50695+config GRKERNSEC_SOCKET_SERVER
50696+ bool "Deny server sockets to group"
50697+ depends on GRKERNSEC_SOCKET
50698+ help
50699+ If you say Y here, you will be able to choose a GID of whose users will
50700+ be unable to run server applications from your machine. If the sysctl
50701+ option is enabled, a sysctl option with name "socket_server" is created.
50702+
50703+config GRKERNSEC_SOCKET_SERVER_GID
50704+ int "GID to deny server sockets for"
50705+ depends on GRKERNSEC_SOCKET_SERVER
50706+ default 1002
50707+ help
50708+ Here you can choose the GID to disable server socket access for.
50709+ Remember to add the users you want server socket access disabled for to
50710+ the GID specified here. If the sysctl option is enabled, a sysctl
50711+ option with name "socket_server_gid" is created.
50712+
50713+endmenu
50714+menu "Sysctl support"
50715+depends on GRKERNSEC && SYSCTL
50716+
50717+config GRKERNSEC_SYSCTL
50718+ bool "Sysctl support"
50719+ help
50720+ If you say Y here, you will be able to change the options that
50721+ grsecurity runs with at bootup, without having to recompile your
50722+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
50723+ to enable (1) or disable (0) various features. All the sysctl entries
50724+ are mutable until the "grsec_lock" entry is set to a non-zero value.
50725+ All features enabled in the kernel configuration are disabled at boot
50726+ if you do not say Y to the "Turn on features by default" option.
50727+ All options should be set at startup, and the grsec_lock entry should
50728+ be set to a non-zero value after all the options are set.
50729+ *THIS IS EXTREMELY IMPORTANT*
50730+
50731+config GRKERNSEC_SYSCTL_DISTRO
50732+ bool "Extra sysctl support for distro makers (READ HELP)"
50733+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
50734+ help
50735+ If you say Y here, additional sysctl options will be created
50736+ for features that affect processes running as root. Therefore,
50737+ it is critical when using this option that the grsec_lock entry be
50738+ enabled after boot. Only distros with prebuilt kernel packages
50739+ with this option enabled that can ensure grsec_lock is enabled
50740+ after boot should use this option.
50741+ *Failure to set grsec_lock after boot makes all grsec features
50742+ this option covers useless*
50743+
50744+ Currently this option creates the following sysctl entries:
50745+ "Disable Privileged I/O": "disable_priv_io"
50746+
50747+config GRKERNSEC_SYSCTL_ON
50748+ bool "Turn on features by default"
50749+ depends on GRKERNSEC_SYSCTL
50750+ help
50751+ If you say Y here, instead of having all features enabled in the
50752+ kernel configuration disabled at boot time, the features will be
50753+ enabled at boot time. It is recommended you say Y here unless
50754+ there is some reason you would want all sysctl-tunable features to
50755+ be disabled by default. As mentioned elsewhere, it is important
50756+ to enable the grsec_lock entry once you have finished modifying
50757+ the sysctl entries.
50758+
50759+endmenu
50760+menu "Logging Options"
50761+depends on GRKERNSEC
50762+
50763+config GRKERNSEC_FLOODTIME
50764+ int "Seconds in between log messages (minimum)"
50765+ default 10
50766+ help
50767+ This option allows you to enforce the number of seconds between
50768+ grsecurity log messages. The default should be suitable for most
50769+ people, however, if you choose to change it, choose a value small enough
50770+ to allow informative logs to be produced, but large enough to
50771+ prevent flooding.
50772+
50773+config GRKERNSEC_FLOODBURST
50774+ int "Number of messages in a burst (maximum)"
50775+ default 6
50776+ help
50777+ This option allows you to choose the maximum number of messages allowed
50778+ within the flood time interval you chose in a separate option. The
50779+ default should be suitable for most people, however if you find that
50780+ many of your logs are being interpreted as flooding, you may want to
50781+ raise this value.
50782+
50783+endmenu
50784+
50785+endmenu
50786diff --git a/grsecurity/Makefile b/grsecurity/Makefile
50787new file mode 100644
50788index 0000000..1b9afa9
50789--- /dev/null
50790+++ b/grsecurity/Makefile
50791@@ -0,0 +1,38 @@
50792+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
50793+# during 2001-2009 it has been completely redesigned by Brad Spengler
50794+# into an RBAC system
50795+#
50796+# All code in this directory and various hooks inserted throughout the kernel
50797+# are copyright Brad Spengler - Open Source Security, Inc., and released
50798+# under the GPL v2 or higher
50799+
50800+KBUILD_CFLAGS += -Werror
50801+
50802+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
50803+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
50804+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
50805+
50806+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
50807+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
50808+ gracl_learn.o grsec_log.o
50809+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
50810+
50811+ifdef CONFIG_NET
50812+obj-y += grsec_sock.o
50813+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
50814+endif
50815+
50816+ifndef CONFIG_GRKERNSEC
50817+obj-y += grsec_disabled.o
50818+endif
50819+
50820+ifdef CONFIG_GRKERNSEC_HIDESYM
50821+extra-y := grsec_hidesym.o
50822+$(obj)/grsec_hidesym.o:
50823+ @-chmod -f 500 /boot
50824+ @-chmod -f 500 /lib/modules
50825+ @-chmod -f 500 /lib64/modules
50826+ @-chmod -f 500 /lib32/modules
50827+ @-chmod -f 700 .
50828+ @echo ' grsec: protected kernel image paths'
50829+endif
50830diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
50831new file mode 100644
50832index 0000000..2733872
50833--- /dev/null
50834+++ b/grsecurity/gracl.c
50835@@ -0,0 +1,4163 @@
50836+#include <linux/kernel.h>
50837+#include <linux/module.h>
50838+#include <linux/sched.h>
50839+#include <linux/mm.h>
50840+#include <linux/file.h>
50841+#include <linux/fs.h>
50842+#include <linux/namei.h>
50843+#include <linux/mount.h>
50844+#include <linux/tty.h>
50845+#include <linux/proc_fs.h>
50846+#include <linux/lglock.h>
50847+#include <linux/slab.h>
50848+#include <linux/vmalloc.h>
50849+#include <linux/types.h>
50850+#include <linux/sysctl.h>
50851+#include <linux/netdevice.h>
50852+#include <linux/ptrace.h>
50853+#include <linux/gracl.h>
50854+#include <linux/gralloc.h>
50855+#include <linux/security.h>
50856+#include <linux/grinternal.h>
50857+#include <linux/pid_namespace.h>
50858+#include <linux/fdtable.h>
50859+#include <linux/percpu.h>
50860+
50861+#include <asm/uaccess.h>
50862+#include <asm/errno.h>
50863+#include <asm/mman.h>
50864+
50865+static struct acl_role_db acl_role_set;
50866+static struct name_db name_set;
50867+static struct inodev_db inodev_set;
50868+
50869+/* for keeping track of userspace pointers used for subjects, so we
50870+ can share references in the kernel as well
50871+*/
50872+
50873+static struct path real_root;
50874+
50875+static struct acl_subj_map_db subj_map_set;
50876+
50877+static struct acl_role_label *default_role;
50878+
50879+static struct acl_role_label *role_list;
50880+
50881+static u16 acl_sp_role_value;
50882+
50883+extern char *gr_shared_page[4];
50884+static DEFINE_MUTEX(gr_dev_mutex);
50885+DEFINE_RWLOCK(gr_inode_lock);
50886+
50887+struct gr_arg *gr_usermode;
50888+
50889+static unsigned int gr_status __read_only = GR_STATUS_INIT;
50890+
50891+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
50892+extern void gr_clear_learn_entries(void);
50893+
50894+#ifdef CONFIG_GRKERNSEC_RESLOG
50895+extern void gr_log_resource(const struct task_struct *task,
50896+ const int res, const unsigned long wanted, const int gt);
50897+#endif
50898+
50899+unsigned char *gr_system_salt;
50900+unsigned char *gr_system_sum;
50901+
50902+static struct sprole_pw **acl_special_roles = NULL;
50903+static __u16 num_sprole_pws = 0;
50904+
50905+static struct acl_role_label *kernel_role = NULL;
50906+
50907+static unsigned int gr_auth_attempts = 0;
50908+static unsigned long gr_auth_expires = 0UL;
50909+
50910+#ifdef CONFIG_NET
50911+extern struct vfsmount *sock_mnt;
50912+#endif
50913+
50914+extern struct vfsmount *pipe_mnt;
50915+extern struct vfsmount *shm_mnt;
50916+#ifdef CONFIG_HUGETLBFS
50917+extern struct vfsmount *hugetlbfs_vfsmount;
50918+#endif
50919+
50920+static struct acl_object_label *fakefs_obj_rw;
50921+static struct acl_object_label *fakefs_obj_rwx;
50922+
50923+extern int gr_init_uidset(void);
50924+extern void gr_free_uidset(void);
50925+extern void gr_remove_uid(uid_t uid);
50926+extern int gr_find_uid(uid_t uid);
50927+
50928+DECLARE_BRLOCK(vfsmount_lock);
50929+
50930+__inline__ int
50931+gr_acl_is_enabled(void)
50932+{
50933+ return (gr_status & GR_READY);
50934+}
50935+
50936+#ifdef CONFIG_BTRFS_FS
50937+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
50938+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
50939+#endif
50940+
50941+static inline dev_t __get_dev(const struct dentry *dentry)
50942+{
50943+#ifdef CONFIG_BTRFS_FS
50944+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
50945+ return get_btrfs_dev_from_inode(dentry->d_inode);
50946+ else
50947+#endif
50948+ return dentry->d_inode->i_sb->s_dev;
50949+}
50950+
50951+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
50952+{
50953+ return __get_dev(dentry);
50954+}
50955+
50956+static char gr_task_roletype_to_char(struct task_struct *task)
50957+{
50958+ switch (task->role->roletype &
50959+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
50960+ GR_ROLE_SPECIAL)) {
50961+ case GR_ROLE_DEFAULT:
50962+ return 'D';
50963+ case GR_ROLE_USER:
50964+ return 'U';
50965+ case GR_ROLE_GROUP:
50966+ return 'G';
50967+ case GR_ROLE_SPECIAL:
50968+ return 'S';
50969+ }
50970+
50971+ return 'X';
50972+}
50973+
50974+char gr_roletype_to_char(void)
50975+{
50976+ return gr_task_roletype_to_char(current);
50977+}
50978+
50979+__inline__ int
50980+gr_acl_tpe_check(void)
50981+{
50982+ if (unlikely(!(gr_status & GR_READY)))
50983+ return 0;
50984+ if (current->role->roletype & GR_ROLE_TPE)
50985+ return 1;
50986+ else
50987+ return 0;
50988+}
50989+
50990+int
50991+gr_handle_rawio(const struct inode *inode)
50992+{
50993+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
50994+ if (inode && S_ISBLK(inode->i_mode) &&
50995+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
50996+ !capable(CAP_SYS_RAWIO))
50997+ return 1;
50998+#endif
50999+ return 0;
51000+}
51001+
51002+static int
51003+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
51004+{
51005+ if (likely(lena != lenb))
51006+ return 0;
51007+
51008+ return !memcmp(a, b, lena);
51009+}
51010+
51011+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
51012+{
51013+ *buflen -= namelen;
51014+ if (*buflen < 0)
51015+ return -ENAMETOOLONG;
51016+ *buffer -= namelen;
51017+ memcpy(*buffer, str, namelen);
51018+ return 0;
51019+}
51020+
51021+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
51022+{
51023+ return prepend(buffer, buflen, name->name, name->len);
51024+}
51025+
51026+static int prepend_path(const struct path *path, struct path *root,
51027+ char **buffer, int *buflen)
51028+{
51029+ struct dentry *dentry = path->dentry;
51030+ struct vfsmount *vfsmnt = path->mnt;
51031+ bool slash = false;
51032+ int error = 0;
51033+
51034+ while (dentry != root->dentry || vfsmnt != root->mnt) {
51035+ struct dentry * parent;
51036+
51037+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
51038+ /* Global root? */
51039+ if (vfsmnt->mnt_parent == vfsmnt) {
51040+ goto out;
51041+ }
51042+ dentry = vfsmnt->mnt_mountpoint;
51043+ vfsmnt = vfsmnt->mnt_parent;
51044+ continue;
51045+ }
51046+ parent = dentry->d_parent;
51047+ prefetch(parent);
51048+ spin_lock(&dentry->d_lock);
51049+ error = prepend_name(buffer, buflen, &dentry->d_name);
51050+ spin_unlock(&dentry->d_lock);
51051+ if (!error)
51052+ error = prepend(buffer, buflen, "/", 1);
51053+ if (error)
51054+ break;
51055+
51056+ slash = true;
51057+ dentry = parent;
51058+ }
51059+
51060+out:
51061+ if (!error && !slash)
51062+ error = prepend(buffer, buflen, "/", 1);
51063+
51064+ return error;
51065+}
51066+
51067+/* this must be called with vfsmount_lock and rename_lock held */
51068+
51069+static char *__our_d_path(const struct path *path, struct path *root,
51070+ char *buf, int buflen)
51071+{
51072+ char *res = buf + buflen;
51073+ int error;
51074+
51075+ prepend(&res, &buflen, "\0", 1);
51076+ error = prepend_path(path, root, &res, &buflen);
51077+ if (error)
51078+ return ERR_PTR(error);
51079+
51080+ return res;
51081+}
51082+
51083+static char *
51084+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
51085+{
51086+ char *retval;
51087+
51088+ retval = __our_d_path(path, root, buf, buflen);
51089+ if (unlikely(IS_ERR(retval)))
51090+ retval = strcpy(buf, "<path too long>");
51091+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
51092+ retval[1] = '\0';
51093+
51094+ return retval;
51095+}
51096+
51097+static char *
51098+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
51099+ char *buf, int buflen)
51100+{
51101+ struct path path;
51102+ char *res;
51103+
51104+ path.dentry = (struct dentry *)dentry;
51105+ path.mnt = (struct vfsmount *)vfsmnt;
51106+
51107+ /* we can use real_root.dentry, real_root.mnt, because this is only called
51108+ by the RBAC system */
51109+ res = gen_full_path(&path, &real_root, buf, buflen);
51110+
51111+ return res;
51112+}
51113+
51114+static char *
51115+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
51116+ char *buf, int buflen)
51117+{
51118+ char *res;
51119+ struct path path;
51120+ struct path root;
51121+ struct task_struct *reaper = &init_task;
51122+
51123+ path.dentry = (struct dentry *)dentry;
51124+ path.mnt = (struct vfsmount *)vfsmnt;
51125+
51126+ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
51127+ get_fs_root(reaper->fs, &root);
51128+
51129+ write_seqlock(&rename_lock);
51130+ br_read_lock(vfsmount_lock);
51131+ res = gen_full_path(&path, &root, buf, buflen);
51132+ br_read_unlock(vfsmount_lock);
51133+ write_sequnlock(&rename_lock);
51134+
51135+ path_put(&root);
51136+ return res;
51137+}
51138+
51139+static char *
51140+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
51141+{
51142+ char *ret;
51143+ write_seqlock(&rename_lock);
51144+ br_read_lock(vfsmount_lock);
51145+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
51146+ PAGE_SIZE);
51147+ br_read_unlock(vfsmount_lock);
51148+ write_sequnlock(&rename_lock);
51149+ return ret;
51150+}
51151+
51152+static char *
51153+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
51154+{
51155+ char *ret;
51156+ char *buf;
51157+ int buflen;
51158+
51159+ write_seqlock(&rename_lock);
51160+ br_read_lock(vfsmount_lock);
51161+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
51162+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
51163+ buflen = (int)(ret - buf);
51164+ if (buflen >= 5)
51165+ prepend(&ret, &buflen, "/proc", 5);
51166+ else
51167+ ret = strcpy(buf, "<path too long>");
51168+ br_read_unlock(vfsmount_lock);
51169+ write_sequnlock(&rename_lock);
51170+ return ret;
51171+}
51172+
51173+char *
51174+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
51175+{
51176+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
51177+ PAGE_SIZE);
51178+}
51179+
51180+char *
51181+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
51182+{
51183+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
51184+ PAGE_SIZE);
51185+}
51186+
51187+char *
51188+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
51189+{
51190+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
51191+ PAGE_SIZE);
51192+}
51193+
51194+char *
51195+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
51196+{
51197+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
51198+ PAGE_SIZE);
51199+}
51200+
51201+char *
51202+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
51203+{
51204+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
51205+ PAGE_SIZE);
51206+}
51207+
51208+__inline__ __u32
51209+to_gr_audit(const __u32 reqmode)
51210+{
51211+ /* masks off auditable permission flags, then shifts them to create
51212+ auditing flags, and adds the special case of append auditing if
51213+ we're requesting write */
51214+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
51215+}
51216+
51217+struct acl_subject_label *
51218+lookup_subject_map(const struct acl_subject_label *userp)
51219+{
51220+ unsigned int index = shash(userp, subj_map_set.s_size);
51221+ struct subject_map *match;
51222+
51223+ match = subj_map_set.s_hash[index];
51224+
51225+ while (match && match->user != userp)
51226+ match = match->next;
51227+
51228+ if (match != NULL)
51229+ return match->kernel;
51230+ else
51231+ return NULL;
51232+}
51233+
51234+static void
51235+insert_subj_map_entry(struct subject_map *subjmap)
51236+{
51237+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
51238+ struct subject_map **curr;
51239+
51240+ subjmap->prev = NULL;
51241+
51242+ curr = &subj_map_set.s_hash[index];
51243+ if (*curr != NULL)
51244+ (*curr)->prev = subjmap;
51245+
51246+ subjmap->next = *curr;
51247+ *curr = subjmap;
51248+
51249+ return;
51250+}
51251+
51252+static struct acl_role_label *
51253+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
51254+ const gid_t gid)
51255+{
51256+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
51257+ struct acl_role_label *match;
51258+ struct role_allowed_ip *ipp;
51259+ unsigned int x;
51260+ u32 curr_ip = task->signal->curr_ip;
51261+
51262+ task->signal->saved_ip = curr_ip;
51263+
51264+ match = acl_role_set.r_hash[index];
51265+
51266+ while (match) {
51267+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
51268+ for (x = 0; x < match->domain_child_num; x++) {
51269+ if (match->domain_children[x] == uid)
51270+ goto found;
51271+ }
51272+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
51273+ break;
51274+ match = match->next;
51275+ }
51276+found:
51277+ if (match == NULL) {
51278+ try_group:
51279+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
51280+ match = acl_role_set.r_hash[index];
51281+
51282+ while (match) {
51283+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
51284+ for (x = 0; x < match->domain_child_num; x++) {
51285+ if (match->domain_children[x] == gid)
51286+ goto found2;
51287+ }
51288+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
51289+ break;
51290+ match = match->next;
51291+ }
51292+found2:
51293+ if (match == NULL)
51294+ match = default_role;
51295+ if (match->allowed_ips == NULL)
51296+ return match;
51297+ else {
51298+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51299+ if (likely
51300+ ((ntohl(curr_ip) & ipp->netmask) ==
51301+ (ntohl(ipp->addr) & ipp->netmask)))
51302+ return match;
51303+ }
51304+ match = default_role;
51305+ }
51306+ } else if (match->allowed_ips == NULL) {
51307+ return match;
51308+ } else {
51309+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51310+ if (likely
51311+ ((ntohl(curr_ip) & ipp->netmask) ==
51312+ (ntohl(ipp->addr) & ipp->netmask)))
51313+ return match;
51314+ }
51315+ goto try_group;
51316+ }
51317+
51318+ return match;
51319+}
51320+
51321+struct acl_subject_label *
51322+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
51323+ const struct acl_role_label *role)
51324+{
51325+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51326+ struct acl_subject_label *match;
51327+
51328+ match = role->subj_hash[index];
51329+
51330+ while (match && (match->inode != ino || match->device != dev ||
51331+ (match->mode & GR_DELETED))) {
51332+ match = match->next;
51333+ }
51334+
51335+ if (match && !(match->mode & GR_DELETED))
51336+ return match;
51337+ else
51338+ return NULL;
51339+}
51340+
51341+struct acl_subject_label *
51342+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
51343+ const struct acl_role_label *role)
51344+{
51345+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51346+ struct acl_subject_label *match;
51347+
51348+ match = role->subj_hash[index];
51349+
51350+ while (match && (match->inode != ino || match->device != dev ||
51351+ !(match->mode & GR_DELETED))) {
51352+ match = match->next;
51353+ }
51354+
51355+ if (match && (match->mode & GR_DELETED))
51356+ return match;
51357+ else
51358+ return NULL;
51359+}
51360+
51361+static struct acl_object_label *
51362+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
51363+ const struct acl_subject_label *subj)
51364+{
51365+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51366+ struct acl_object_label *match;
51367+
51368+ match = subj->obj_hash[index];
51369+
51370+ while (match && (match->inode != ino || match->device != dev ||
51371+ (match->mode & GR_DELETED))) {
51372+ match = match->next;
51373+ }
51374+
51375+ if (match && !(match->mode & GR_DELETED))
51376+ return match;
51377+ else
51378+ return NULL;
51379+}
51380+
51381+static struct acl_object_label *
51382+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
51383+ const struct acl_subject_label *subj)
51384+{
51385+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51386+ struct acl_object_label *match;
51387+
51388+ match = subj->obj_hash[index];
51389+
51390+ while (match && (match->inode != ino || match->device != dev ||
51391+ !(match->mode & GR_DELETED))) {
51392+ match = match->next;
51393+ }
51394+
51395+ if (match && (match->mode & GR_DELETED))
51396+ return match;
51397+
51398+ match = subj->obj_hash[index];
51399+
51400+ while (match && (match->inode != ino || match->device != dev ||
51401+ (match->mode & GR_DELETED))) {
51402+ match = match->next;
51403+ }
51404+
51405+ if (match && !(match->mode & GR_DELETED))
51406+ return match;
51407+ else
51408+ return NULL;
51409+}
51410+
51411+static struct name_entry *
51412+lookup_name_entry(const char *name)
51413+{
51414+ unsigned int len = strlen(name);
51415+ unsigned int key = full_name_hash(name, len);
51416+ unsigned int index = key % name_set.n_size;
51417+ struct name_entry *match;
51418+
51419+ match = name_set.n_hash[index];
51420+
51421+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
51422+ match = match->next;
51423+
51424+ return match;
51425+}
51426+
51427+static struct name_entry *
51428+lookup_name_entry_create(const char *name)
51429+{
51430+ unsigned int len = strlen(name);
51431+ unsigned int key = full_name_hash(name, len);
51432+ unsigned int index = key % name_set.n_size;
51433+ struct name_entry *match;
51434+
51435+ match = name_set.n_hash[index];
51436+
51437+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51438+ !match->deleted))
51439+ match = match->next;
51440+
51441+ if (match && match->deleted)
51442+ return match;
51443+
51444+ match = name_set.n_hash[index];
51445+
51446+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51447+ match->deleted))
51448+ match = match->next;
51449+
51450+ if (match && !match->deleted)
51451+ return match;
51452+ else
51453+ return NULL;
51454+}
51455+
51456+static struct inodev_entry *
51457+lookup_inodev_entry(const ino_t ino, const dev_t dev)
51458+{
51459+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
51460+ struct inodev_entry *match;
51461+
51462+ match = inodev_set.i_hash[index];
51463+
51464+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
51465+ match = match->next;
51466+
51467+ return match;
51468+}
51469+
51470+static void
51471+insert_inodev_entry(struct inodev_entry *entry)
51472+{
51473+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
51474+ inodev_set.i_size);
51475+ struct inodev_entry **curr;
51476+
51477+ entry->prev = NULL;
51478+
51479+ curr = &inodev_set.i_hash[index];
51480+ if (*curr != NULL)
51481+ (*curr)->prev = entry;
51482+
51483+ entry->next = *curr;
51484+ *curr = entry;
51485+
51486+ return;
51487+}
51488+
51489+static void
51490+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
51491+{
51492+ unsigned int index =
51493+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
51494+ struct acl_role_label **curr;
51495+ struct acl_role_label *tmp;
51496+
51497+ curr = &acl_role_set.r_hash[index];
51498+
51499+ /* if role was already inserted due to domains and already has
51500+ a role in the same bucket as it attached, then we need to
51501+ combine these two buckets
51502+ */
51503+ if (role->next) {
51504+ tmp = role->next;
51505+ while (tmp->next)
51506+ tmp = tmp->next;
51507+ tmp->next = *curr;
51508+ } else
51509+ role->next = *curr;
51510+ *curr = role;
51511+
51512+ return;
51513+}
51514+
51515+static void
51516+insert_acl_role_label(struct acl_role_label *role)
51517+{
51518+ int i;
51519+
51520+ if (role_list == NULL) {
51521+ role_list = role;
51522+ role->prev = NULL;
51523+ } else {
51524+ role->prev = role_list;
51525+ role_list = role;
51526+ }
51527+
51528+ /* used for hash chains */
51529+ role->next = NULL;
51530+
51531+ if (role->roletype & GR_ROLE_DOMAIN) {
51532+ for (i = 0; i < role->domain_child_num; i++)
51533+ __insert_acl_role_label(role, role->domain_children[i]);
51534+ } else
51535+ __insert_acl_role_label(role, role->uidgid);
51536+}
51537+
51538+static int
51539+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
51540+{
51541+ struct name_entry **curr, *nentry;
51542+ struct inodev_entry *ientry;
51543+ unsigned int len = strlen(name);
51544+ unsigned int key = full_name_hash(name, len);
51545+ unsigned int index = key % name_set.n_size;
51546+
51547+ curr = &name_set.n_hash[index];
51548+
51549+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
51550+ curr = &((*curr)->next);
51551+
51552+ if (*curr != NULL)
51553+ return 1;
51554+
51555+ nentry = acl_alloc(sizeof (struct name_entry));
51556+ if (nentry == NULL)
51557+ return 0;
51558+ ientry = acl_alloc(sizeof (struct inodev_entry));
51559+ if (ientry == NULL)
51560+ return 0;
51561+ ientry->nentry = nentry;
51562+
51563+ nentry->key = key;
51564+ nentry->name = name;
51565+ nentry->inode = inode;
51566+ nentry->device = device;
51567+ nentry->len = len;
51568+ nentry->deleted = deleted;
51569+
51570+ nentry->prev = NULL;
51571+ curr = &name_set.n_hash[index];
51572+ if (*curr != NULL)
51573+ (*curr)->prev = nentry;
51574+ nentry->next = *curr;
51575+ *curr = nentry;
51576+
51577+ /* insert us into the table searchable by inode/dev */
51578+ insert_inodev_entry(ientry);
51579+
51580+ return 1;
51581+}
51582+
51583+static void
51584+insert_acl_obj_label(struct acl_object_label *obj,
51585+ struct acl_subject_label *subj)
51586+{
51587+ unsigned int index =
51588+ fhash(obj->inode, obj->device, subj->obj_hash_size);
51589+ struct acl_object_label **curr;
51590+
51591+
51592+ obj->prev = NULL;
51593+
51594+ curr = &subj->obj_hash[index];
51595+ if (*curr != NULL)
51596+ (*curr)->prev = obj;
51597+
51598+ obj->next = *curr;
51599+ *curr = obj;
51600+
51601+ return;
51602+}
51603+
51604+static void
51605+insert_acl_subj_label(struct acl_subject_label *obj,
51606+ struct acl_role_label *role)
51607+{
51608+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
51609+ struct acl_subject_label **curr;
51610+
51611+ obj->prev = NULL;
51612+
51613+ curr = &role->subj_hash[index];
51614+ if (*curr != NULL)
51615+ (*curr)->prev = obj;
51616+
51617+ obj->next = *curr;
51618+ *curr = obj;
51619+
51620+ return;
51621+}
51622+
51623+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
51624+
51625+static void *
51626+create_table(__u32 * len, int elementsize)
51627+{
51628+ unsigned int table_sizes[] = {
51629+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
51630+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
51631+ 4194301, 8388593, 16777213, 33554393, 67108859
51632+ };
51633+ void *newtable = NULL;
51634+ unsigned int pwr = 0;
51635+
51636+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
51637+ table_sizes[pwr] <= *len)
51638+ pwr++;
51639+
51640+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
51641+ return newtable;
51642+
51643+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
51644+ newtable =
51645+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
51646+ else
51647+ newtable = vmalloc(table_sizes[pwr] * elementsize);
51648+
51649+ *len = table_sizes[pwr];
51650+
51651+ return newtable;
51652+}
51653+
51654+static int
51655+init_variables(const struct gr_arg *arg)
51656+{
51657+ struct task_struct *reaper = &init_task;
51658+ unsigned int stacksize;
51659+
51660+ subj_map_set.s_size = arg->role_db.num_subjects;
51661+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
51662+ name_set.n_size = arg->role_db.num_objects;
51663+ inodev_set.i_size = arg->role_db.num_objects;
51664+
51665+ if (!subj_map_set.s_size || !acl_role_set.r_size ||
51666+ !name_set.n_size || !inodev_set.i_size)
51667+ return 1;
51668+
51669+ if (!gr_init_uidset())
51670+ return 1;
51671+
51672+ /* set up the stack that holds allocation info */
51673+
51674+ stacksize = arg->role_db.num_pointers + 5;
51675+
51676+ if (!acl_alloc_stack_init(stacksize))
51677+ return 1;
51678+
51679+ /* grab reference for the real root dentry and vfsmount */
51680+ get_fs_root(reaper->fs, &real_root);
51681+
51682+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51683+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
51684+#endif
51685+
51686+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
51687+ if (fakefs_obj_rw == NULL)
51688+ return 1;
51689+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
51690+
51691+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
51692+ if (fakefs_obj_rwx == NULL)
51693+ return 1;
51694+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
51695+
51696+ subj_map_set.s_hash =
51697+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
51698+ acl_role_set.r_hash =
51699+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
51700+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
51701+ inodev_set.i_hash =
51702+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
51703+
51704+ if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
51705+ !name_set.n_hash || !inodev_set.i_hash)
51706+ return 1;
51707+
51708+ memset(subj_map_set.s_hash, 0,
51709+ sizeof(struct subject_map *) * subj_map_set.s_size);
51710+ memset(acl_role_set.r_hash, 0,
51711+ sizeof (struct acl_role_label *) * acl_role_set.r_size);
51712+ memset(name_set.n_hash, 0,
51713+ sizeof (struct name_entry *) * name_set.n_size);
51714+ memset(inodev_set.i_hash, 0,
51715+ sizeof (struct inodev_entry *) * inodev_set.i_size);
51716+
51717+ return 0;
51718+}
51719+
51720+/* free information not needed after startup
51721+ currently contains user->kernel pointer mappings for subjects
51722+*/
51723+
51724+static void
51725+free_init_variables(void)
51726+{
51727+ __u32 i;
51728+
51729+ if (subj_map_set.s_hash) {
51730+ for (i = 0; i < subj_map_set.s_size; i++) {
51731+ if (subj_map_set.s_hash[i]) {
51732+ kfree(subj_map_set.s_hash[i]);
51733+ subj_map_set.s_hash[i] = NULL;
51734+ }
51735+ }
51736+
51737+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
51738+ PAGE_SIZE)
51739+ kfree(subj_map_set.s_hash);
51740+ else
51741+ vfree(subj_map_set.s_hash);
51742+ }
51743+
51744+ return;
51745+}
51746+
51747+static void
51748+free_variables(void)
51749+{
51750+ struct acl_subject_label *s;
51751+ struct acl_role_label *r;
51752+ struct task_struct *task, *task2;
51753+ unsigned int x;
51754+
51755+ gr_clear_learn_entries();
51756+
51757+ read_lock(&tasklist_lock);
51758+ do_each_thread(task2, task) {
51759+ task->acl_sp_role = 0;
51760+ task->acl_role_id = 0;
51761+ task->acl = NULL;
51762+ task->role = NULL;
51763+ } while_each_thread(task2, task);
51764+ read_unlock(&tasklist_lock);
51765+
51766+ /* release the reference to the real root dentry and vfsmount */
51767+ path_put(&real_root);
51768+
51769+ /* free all object hash tables */
51770+
51771+ FOR_EACH_ROLE_START(r)
51772+ if (r->subj_hash == NULL)
51773+ goto next_role;
51774+ FOR_EACH_SUBJECT_START(r, s, x)
51775+ if (s->obj_hash == NULL)
51776+ break;
51777+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
51778+ kfree(s->obj_hash);
51779+ else
51780+ vfree(s->obj_hash);
51781+ FOR_EACH_SUBJECT_END(s, x)
51782+ FOR_EACH_NESTED_SUBJECT_START(r, s)
51783+ if (s->obj_hash == NULL)
51784+ break;
51785+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
51786+ kfree(s->obj_hash);
51787+ else
51788+ vfree(s->obj_hash);
51789+ FOR_EACH_NESTED_SUBJECT_END(s)
51790+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
51791+ kfree(r->subj_hash);
51792+ else
51793+ vfree(r->subj_hash);
51794+ r->subj_hash = NULL;
51795+next_role:
51796+ FOR_EACH_ROLE_END(r)
51797+
51798+ acl_free_all();
51799+
51800+ if (acl_role_set.r_hash) {
51801+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
51802+ PAGE_SIZE)
51803+ kfree(acl_role_set.r_hash);
51804+ else
51805+ vfree(acl_role_set.r_hash);
51806+ }
51807+ if (name_set.n_hash) {
51808+ if ((name_set.n_size * sizeof (struct name_entry *)) <=
51809+ PAGE_SIZE)
51810+ kfree(name_set.n_hash);
51811+ else
51812+ vfree(name_set.n_hash);
51813+ }
51814+
51815+ if (inodev_set.i_hash) {
51816+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
51817+ PAGE_SIZE)
51818+ kfree(inodev_set.i_hash);
51819+ else
51820+ vfree(inodev_set.i_hash);
51821+ }
51822+
51823+ gr_free_uidset();
51824+
51825+ memset(&name_set, 0, sizeof (struct name_db));
51826+ memset(&inodev_set, 0, sizeof (struct inodev_db));
51827+ memset(&acl_role_set, 0, sizeof (struct acl_role_db));
51828+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
51829+
51830+ default_role = NULL;
51831+ role_list = NULL;
51832+
51833+ return;
51834+}
51835+
51836+static __u32
51837+count_user_objs(struct acl_object_label *userp)
51838+{
51839+ struct acl_object_label o_tmp;
51840+ __u32 num = 0;
51841+
51842+ while (userp) {
51843+ if (copy_from_user(&o_tmp, userp,
51844+ sizeof (struct acl_object_label)))
51845+ break;
51846+
51847+ userp = o_tmp.prev;
51848+ num++;
51849+ }
51850+
51851+ return num;
51852+}
51853+
51854+static struct acl_subject_label *
51855+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
51856+
51857+static int
51858+copy_user_glob(struct acl_object_label *obj)
51859+{
51860+ struct acl_object_label *g_tmp, **guser;
51861+ unsigned int len;
51862+ char *tmp;
51863+
51864+ if (obj->globbed == NULL)
51865+ return 0;
51866+
51867+ guser = &obj->globbed;
51868+ while (*guser) {
51869+ g_tmp = (struct acl_object_label *)
51870+ acl_alloc(sizeof (struct acl_object_label));
51871+ if (g_tmp == NULL)
51872+ return -ENOMEM;
51873+
51874+ if (copy_from_user(g_tmp, *guser,
51875+ sizeof (struct acl_object_label)))
51876+ return -EFAULT;
51877+
51878+ len = strnlen_user(g_tmp->filename, PATH_MAX);
51879+
51880+ if (!len || len >= PATH_MAX)
51881+ return -EINVAL;
51882+
51883+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51884+ return -ENOMEM;
51885+
51886+ if (copy_from_user(tmp, g_tmp->filename, len))
51887+ return -EFAULT;
51888+ tmp[len-1] = '\0';
51889+ g_tmp->filename = tmp;
51890+
51891+ *guser = g_tmp;
51892+ guser = &(g_tmp->next);
51893+ }
51894+
51895+ return 0;
51896+}
51897+
51898+static int
51899+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
51900+ struct acl_role_label *role)
51901+{
51902+ struct acl_object_label *o_tmp;
51903+ unsigned int len;
51904+ int ret;
51905+ char *tmp;
51906+
51907+ while (userp) {
51908+ if ((o_tmp = (struct acl_object_label *)
51909+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
51910+ return -ENOMEM;
51911+
51912+ if (copy_from_user(o_tmp, userp,
51913+ sizeof (struct acl_object_label)))
51914+ return -EFAULT;
51915+
51916+ userp = o_tmp->prev;
51917+
51918+ len = strnlen_user(o_tmp->filename, PATH_MAX);
51919+
51920+ if (!len || len >= PATH_MAX)
51921+ return -EINVAL;
51922+
51923+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51924+ return -ENOMEM;
51925+
51926+ if (copy_from_user(tmp, o_tmp->filename, len))
51927+ return -EFAULT;
51928+ tmp[len-1] = '\0';
51929+ o_tmp->filename = tmp;
51930+
51931+ insert_acl_obj_label(o_tmp, subj);
51932+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
51933+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
51934+ return -ENOMEM;
51935+
51936+ ret = copy_user_glob(o_tmp);
51937+ if (ret)
51938+ return ret;
51939+
51940+ if (o_tmp->nested) {
51941+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
51942+ if (IS_ERR(o_tmp->nested))
51943+ return PTR_ERR(o_tmp->nested);
51944+
51945+ /* insert into nested subject list */
51946+ o_tmp->nested->next = role->hash->first;
51947+ role->hash->first = o_tmp->nested;
51948+ }
51949+ }
51950+
51951+ return 0;
51952+}
51953+
51954+static __u32
51955+count_user_subjs(struct acl_subject_label *userp)
51956+{
51957+ struct acl_subject_label s_tmp;
51958+ __u32 num = 0;
51959+
51960+ while (userp) {
51961+ if (copy_from_user(&s_tmp, userp,
51962+ sizeof (struct acl_subject_label)))
51963+ break;
51964+
51965+ userp = s_tmp.prev;
51966+ /* do not count nested subjects against this count, since
51967+ they are not included in the hash table, but are
51968+ attached to objects. We have already counted
51969+ the subjects in userspace for the allocation
51970+ stack
51971+ */
51972+ if (!(s_tmp.mode & GR_NESTED))
51973+ num++;
51974+ }
51975+
51976+ return num;
51977+}
51978+
51979+static int
51980+copy_user_allowedips(struct acl_role_label *rolep)
51981+{
51982+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
51983+
51984+ ruserip = rolep->allowed_ips;
51985+
51986+ while (ruserip) {
51987+ rlast = rtmp;
51988+
51989+ if ((rtmp = (struct role_allowed_ip *)
51990+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
51991+ return -ENOMEM;
51992+
51993+ if (copy_from_user(rtmp, ruserip,
51994+ sizeof (struct role_allowed_ip)))
51995+ return -EFAULT;
51996+
51997+ ruserip = rtmp->prev;
51998+
51999+ if (!rlast) {
52000+ rtmp->prev = NULL;
52001+ rolep->allowed_ips = rtmp;
52002+ } else {
52003+ rlast->next = rtmp;
52004+ rtmp->prev = rlast;
52005+ }
52006+
52007+ if (!ruserip)
52008+ rtmp->next = NULL;
52009+ }
52010+
52011+ return 0;
52012+}
52013+
52014+static int
52015+copy_user_transitions(struct acl_role_label *rolep)
52016+{
52017+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
52018+
52019+ unsigned int len;
52020+ char *tmp;
52021+
52022+ rusertp = rolep->transitions;
52023+
52024+ while (rusertp) {
52025+ rlast = rtmp;
52026+
52027+ if ((rtmp = (struct role_transition *)
52028+ acl_alloc(sizeof (struct role_transition))) == NULL)
52029+ return -ENOMEM;
52030+
52031+ if (copy_from_user(rtmp, rusertp,
52032+ sizeof (struct role_transition)))
52033+ return -EFAULT;
52034+
52035+ rusertp = rtmp->prev;
52036+
52037+ len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
52038+
52039+ if (!len || len >= GR_SPROLE_LEN)
52040+ return -EINVAL;
52041+
52042+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52043+ return -ENOMEM;
52044+
52045+ if (copy_from_user(tmp, rtmp->rolename, len))
52046+ return -EFAULT;
52047+ tmp[len-1] = '\0';
52048+ rtmp->rolename = tmp;
52049+
52050+ if (!rlast) {
52051+ rtmp->prev = NULL;
52052+ rolep->transitions = rtmp;
52053+ } else {
52054+ rlast->next = rtmp;
52055+ rtmp->prev = rlast;
52056+ }
52057+
52058+ if (!rusertp)
52059+ rtmp->next = NULL;
52060+ }
52061+
52062+ return 0;
52063+}
52064+
52065+static struct acl_subject_label *
52066+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
52067+{
52068+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
52069+ unsigned int len;
52070+ char *tmp;
52071+ __u32 num_objs;
52072+ struct acl_ip_label **i_tmp, *i_utmp2;
52073+ struct gr_hash_struct ghash;
52074+ struct subject_map *subjmap;
52075+ unsigned int i_num;
52076+ int err;
52077+
52078+ s_tmp = lookup_subject_map(userp);
52079+
52080+ /* we've already copied this subject into the kernel, just return
52081+ the reference to it, and don't copy it over again
52082+ */
52083+ if (s_tmp)
52084+ return(s_tmp);
52085+
52086+ if ((s_tmp = (struct acl_subject_label *)
52087+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
52088+ return ERR_PTR(-ENOMEM);
52089+
52090+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
52091+ if (subjmap == NULL)
52092+ return ERR_PTR(-ENOMEM);
52093+
52094+ subjmap->user = userp;
52095+ subjmap->kernel = s_tmp;
52096+ insert_subj_map_entry(subjmap);
52097+
52098+ if (copy_from_user(s_tmp, userp,
52099+ sizeof (struct acl_subject_label)))
52100+ return ERR_PTR(-EFAULT);
52101+
52102+ len = strnlen_user(s_tmp->filename, PATH_MAX);
52103+
52104+ if (!len || len >= PATH_MAX)
52105+ return ERR_PTR(-EINVAL);
52106+
52107+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52108+ return ERR_PTR(-ENOMEM);
52109+
52110+ if (copy_from_user(tmp, s_tmp->filename, len))
52111+ return ERR_PTR(-EFAULT);
52112+ tmp[len-1] = '\0';
52113+ s_tmp->filename = tmp;
52114+
52115+ if (!strcmp(s_tmp->filename, "/"))
52116+ role->root_label = s_tmp;
52117+
52118+ if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
52119+ return ERR_PTR(-EFAULT);
52120+
52121+ /* copy user and group transition tables */
52122+
52123+ if (s_tmp->user_trans_num) {
52124+ uid_t *uidlist;
52125+
52126+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
52127+ if (uidlist == NULL)
52128+ return ERR_PTR(-ENOMEM);
52129+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
52130+ return ERR_PTR(-EFAULT);
52131+
52132+ s_tmp->user_transitions = uidlist;
52133+ }
52134+
52135+ if (s_tmp->group_trans_num) {
52136+ gid_t *gidlist;
52137+
52138+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
52139+ if (gidlist == NULL)
52140+ return ERR_PTR(-ENOMEM);
52141+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
52142+ return ERR_PTR(-EFAULT);
52143+
52144+ s_tmp->group_transitions = gidlist;
52145+ }
52146+
52147+ /* set up object hash table */
52148+ num_objs = count_user_objs(ghash.first);
52149+
52150+ s_tmp->obj_hash_size = num_objs;
52151+ s_tmp->obj_hash =
52152+ (struct acl_object_label **)
52153+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
52154+
52155+ if (!s_tmp->obj_hash)
52156+ return ERR_PTR(-ENOMEM);
52157+
52158+ memset(s_tmp->obj_hash, 0,
52159+ s_tmp->obj_hash_size *
52160+ sizeof (struct acl_object_label *));
52161+
52162+ /* add in objects */
52163+ err = copy_user_objs(ghash.first, s_tmp, role);
52164+
52165+ if (err)
52166+ return ERR_PTR(err);
52167+
52168+ /* set pointer for parent subject */
52169+ if (s_tmp->parent_subject) {
52170+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
52171+
52172+ if (IS_ERR(s_tmp2))
52173+ return s_tmp2;
52174+
52175+ s_tmp->parent_subject = s_tmp2;
52176+ }
52177+
52178+ /* add in ip acls */
52179+
52180+ if (!s_tmp->ip_num) {
52181+ s_tmp->ips = NULL;
52182+ goto insert;
52183+ }
52184+
52185+ i_tmp =
52186+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
52187+ sizeof (struct acl_ip_label *));
52188+
52189+ if (!i_tmp)
52190+ return ERR_PTR(-ENOMEM);
52191+
52192+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
52193+ *(i_tmp + i_num) =
52194+ (struct acl_ip_label *)
52195+ acl_alloc(sizeof (struct acl_ip_label));
52196+ if (!*(i_tmp + i_num))
52197+ return ERR_PTR(-ENOMEM);
52198+
52199+ if (copy_from_user
52200+ (&i_utmp2, s_tmp->ips + i_num,
52201+ sizeof (struct acl_ip_label *)))
52202+ return ERR_PTR(-EFAULT);
52203+
52204+ if (copy_from_user
52205+ (*(i_tmp + i_num), i_utmp2,
52206+ sizeof (struct acl_ip_label)))
52207+ return ERR_PTR(-EFAULT);
52208+
52209+ if ((*(i_tmp + i_num))->iface == NULL)
52210+ continue;
52211+
52212+ len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
52213+ if (!len || len >= IFNAMSIZ)
52214+ return ERR_PTR(-EINVAL);
52215+ tmp = acl_alloc(len);
52216+ if (tmp == NULL)
52217+ return ERR_PTR(-ENOMEM);
52218+ if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
52219+ return ERR_PTR(-EFAULT);
52220+ (*(i_tmp + i_num))->iface = tmp;
52221+ }
52222+
52223+ s_tmp->ips = i_tmp;
52224+
52225+insert:
52226+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
52227+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
52228+ return ERR_PTR(-ENOMEM);
52229+
52230+ return s_tmp;
52231+}
52232+
52233+static int
52234+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
52235+{
52236+ struct acl_subject_label s_pre;
52237+ struct acl_subject_label * ret;
52238+ int err;
52239+
52240+ while (userp) {
52241+ if (copy_from_user(&s_pre, userp,
52242+ sizeof (struct acl_subject_label)))
52243+ return -EFAULT;
52244+
52245+ /* do not add nested subjects here, add
52246+ while parsing objects
52247+ */
52248+
52249+ if (s_pre.mode & GR_NESTED) {
52250+ userp = s_pre.prev;
52251+ continue;
52252+ }
52253+
52254+ ret = do_copy_user_subj(userp, role);
52255+
52256+ err = PTR_ERR(ret);
52257+ if (IS_ERR(ret))
52258+ return err;
52259+
52260+ insert_acl_subj_label(ret, role);
52261+
52262+ userp = s_pre.prev;
52263+ }
52264+
52265+ return 0;
52266+}
52267+
52268+static int
52269+copy_user_acl(struct gr_arg *arg)
52270+{
52271+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
52272+ struct sprole_pw *sptmp;
52273+ struct gr_hash_struct *ghash;
52274+ uid_t *domainlist;
52275+ unsigned int r_num;
52276+ unsigned int len;
52277+ char *tmp;
52278+ int err = 0;
52279+ __u16 i;
52280+ __u32 num_subjs;
52281+
52282+ /* we need a default and kernel role */
52283+ if (arg->role_db.num_roles < 2)
52284+ return -EINVAL;
52285+
52286+ /* copy special role authentication info from userspace */
52287+
52288+ num_sprole_pws = arg->num_sprole_pws;
52289+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
52290+
52291+ if (!acl_special_roles) {
52292+ err = -ENOMEM;
52293+ goto cleanup;
52294+ }
52295+
52296+ for (i = 0; i < num_sprole_pws; i++) {
52297+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
52298+ if (!sptmp) {
52299+ err = -ENOMEM;
52300+ goto cleanup;
52301+ }
52302+ if (copy_from_user(sptmp, arg->sprole_pws + i,
52303+ sizeof (struct sprole_pw))) {
52304+ err = -EFAULT;
52305+ goto cleanup;
52306+ }
52307+
52308+ len =
52309+ strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
52310+
52311+ if (!len || len >= GR_SPROLE_LEN) {
52312+ err = -EINVAL;
52313+ goto cleanup;
52314+ }
52315+
52316+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
52317+ err = -ENOMEM;
52318+ goto cleanup;
52319+ }
52320+
52321+ if (copy_from_user(tmp, sptmp->rolename, len)) {
52322+ err = -EFAULT;
52323+ goto cleanup;
52324+ }
52325+ tmp[len-1] = '\0';
52326+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
52327+ printk(KERN_ALERT "Copying special role %s\n", tmp);
52328+#endif
52329+ sptmp->rolename = tmp;
52330+ acl_special_roles[i] = sptmp;
52331+ }
52332+
52333+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
52334+
52335+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
52336+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
52337+
52338+ if (!r_tmp) {
52339+ err = -ENOMEM;
52340+ goto cleanup;
52341+ }
52342+
52343+ if (copy_from_user(&r_utmp2, r_utmp + r_num,
52344+ sizeof (struct acl_role_label *))) {
52345+ err = -EFAULT;
52346+ goto cleanup;
52347+ }
52348+
52349+ if (copy_from_user(r_tmp, r_utmp2,
52350+ sizeof (struct acl_role_label))) {
52351+ err = -EFAULT;
52352+ goto cleanup;
52353+ }
52354+
52355+ len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
52356+
52357+ if (!len || len >= PATH_MAX) {
52358+ err = -EINVAL;
52359+ goto cleanup;
52360+ }
52361+
52362+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
52363+ err = -ENOMEM;
52364+ goto cleanup;
52365+ }
52366+ if (copy_from_user(tmp, r_tmp->rolename, len)) {
52367+ err = -EFAULT;
52368+ goto cleanup;
52369+ }
52370+ tmp[len-1] = '\0';
52371+ r_tmp->rolename = tmp;
52372+
52373+ if (!strcmp(r_tmp->rolename, "default")
52374+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
52375+ default_role = r_tmp;
52376+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
52377+ kernel_role = r_tmp;
52378+ }
52379+
52380+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) {
52381+ err = -ENOMEM;
52382+ goto cleanup;
52383+ }
52384+ if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct))) {
52385+ err = -EFAULT;
52386+ goto cleanup;
52387+ }
52388+
52389+ r_tmp->hash = ghash;
52390+
52391+ num_subjs = count_user_subjs(r_tmp->hash->first);
52392+
52393+ r_tmp->subj_hash_size = num_subjs;
52394+ r_tmp->subj_hash =
52395+ (struct acl_subject_label **)
52396+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
52397+
52398+ if (!r_tmp->subj_hash) {
52399+ err = -ENOMEM;
52400+ goto cleanup;
52401+ }
52402+
52403+ err = copy_user_allowedips(r_tmp);
52404+ if (err)
52405+ goto cleanup;
52406+
52407+ /* copy domain info */
52408+ if (r_tmp->domain_children != NULL) {
52409+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
52410+ if (domainlist == NULL) {
52411+ err = -ENOMEM;
52412+ goto cleanup;
52413+ }
52414+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) {
52415+ err = -EFAULT;
52416+ goto cleanup;
52417+ }
52418+ r_tmp->domain_children = domainlist;
52419+ }
52420+
52421+ err = copy_user_transitions(r_tmp);
52422+ if (err)
52423+ goto cleanup;
52424+
52425+ memset(r_tmp->subj_hash, 0,
52426+ r_tmp->subj_hash_size *
52427+ sizeof (struct acl_subject_label *));
52428+
52429+ err = copy_user_subjs(r_tmp->hash->first, r_tmp);
52430+
52431+ if (err)
52432+ goto cleanup;
52433+
52434+ /* set nested subject list to null */
52435+ r_tmp->hash->first = NULL;
52436+
52437+ insert_acl_role_label(r_tmp);
52438+ }
52439+
52440+ goto return_err;
52441+ cleanup:
52442+ free_variables();
52443+ return_err:
52444+ return err;
52445+
52446+}
52447+
52448+static int
52449+gracl_init(struct gr_arg *args)
52450+{
52451+ int error = 0;
52452+
52453+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
52454+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
52455+
52456+ if (init_variables(args)) {
52457+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
52458+ error = -ENOMEM;
52459+ free_variables();
52460+ goto out;
52461+ }
52462+
52463+ error = copy_user_acl(args);
52464+ free_init_variables();
52465+ if (error) {
52466+ free_variables();
52467+ goto out;
52468+ }
52469+
52470+ if ((error = gr_set_acls(0))) {
52471+ free_variables();
52472+ goto out;
52473+ }
52474+
52475+ pax_open_kernel();
52476+ gr_status |= GR_READY;
52477+ pax_close_kernel();
52478+
52479+ out:
52480+ return error;
52481+}
52482+
52483+/* derived from glibc fnmatch() 0: match, 1: no match*/
52484+
52485+static int
52486+glob_match(const char *p, const char *n)
52487+{
52488+ char c;
52489+
52490+ while ((c = *p++) != '\0') {
52491+ switch (c) {
52492+ case '?':
52493+ if (*n == '\0')
52494+ return 1;
52495+ else if (*n == '/')
52496+ return 1;
52497+ break;
52498+ case '\\':
52499+ if (*n != c)
52500+ return 1;
52501+ break;
52502+ case '*':
52503+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
52504+ if (*n == '/')
52505+ return 1;
52506+ else if (c == '?') {
52507+ if (*n == '\0')
52508+ return 1;
52509+ else
52510+ ++n;
52511+ }
52512+ }
52513+ if (c == '\0') {
52514+ return 0;
52515+ } else {
52516+ const char *endp;
52517+
52518+ if ((endp = strchr(n, '/')) == NULL)
52519+ endp = n + strlen(n);
52520+
52521+ if (c == '[') {
52522+ for (--p; n < endp; ++n)
52523+ if (!glob_match(p, n))
52524+ return 0;
52525+ } else if (c == '/') {
52526+ while (*n != '\0' && *n != '/')
52527+ ++n;
52528+ if (*n == '/' && !glob_match(p, n + 1))
52529+ return 0;
52530+ } else {
52531+ for (--p; n < endp; ++n)
52532+ if (*n == c && !glob_match(p, n))
52533+ return 0;
52534+ }
52535+
52536+ return 1;
52537+ }
52538+ case '[':
52539+ {
52540+ int not;
52541+ char cold;
52542+
52543+ if (*n == '\0' || *n == '/')
52544+ return 1;
52545+
52546+ not = (*p == '!' || *p == '^');
52547+ if (not)
52548+ ++p;
52549+
52550+ c = *p++;
52551+ for (;;) {
52552+ unsigned char fn = (unsigned char)*n;
52553+
52554+ if (c == '\0')
52555+ return 1;
52556+ else {
52557+ if (c == fn)
52558+ goto matched;
52559+ cold = c;
52560+ c = *p++;
52561+
52562+ if (c == '-' && *p != ']') {
52563+ unsigned char cend = *p++;
52564+
52565+ if (cend == '\0')
52566+ return 1;
52567+
52568+ if (cold <= fn && fn <= cend)
52569+ goto matched;
52570+
52571+ c = *p++;
52572+ }
52573+ }
52574+
52575+ if (c == ']')
52576+ break;
52577+ }
52578+ if (!not)
52579+ return 1;
52580+ break;
52581+ matched:
52582+ while (c != ']') {
52583+ if (c == '\0')
52584+ return 1;
52585+
52586+ c = *p++;
52587+ }
52588+ if (not)
52589+ return 1;
52590+ }
52591+ break;
52592+ default:
52593+ if (c != *n)
52594+ return 1;
52595+ }
52596+
52597+ ++n;
52598+ }
52599+
52600+ if (*n == '\0')
52601+ return 0;
52602+
52603+ if (*n == '/')
52604+ return 0;
52605+
52606+ return 1;
52607+}
52608+
52609+static struct acl_object_label *
52610+chk_glob_label(struct acl_object_label *globbed,
52611+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
52612+{
52613+ struct acl_object_label *tmp;
52614+
52615+ if (*path == NULL)
52616+ *path = gr_to_filename_nolock(dentry, mnt);
52617+
52618+ tmp = globbed;
52619+
52620+ while (tmp) {
52621+ if (!glob_match(tmp->filename, *path))
52622+ return tmp;
52623+ tmp = tmp->next;
52624+ }
52625+
52626+ return NULL;
52627+}
52628+
52629+static struct acl_object_label *
52630+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52631+ const ino_t curr_ino, const dev_t curr_dev,
52632+ const struct acl_subject_label *subj, char **path, const int checkglob)
52633+{
52634+ struct acl_subject_label *tmpsubj;
52635+ struct acl_object_label *retval;
52636+ struct acl_object_label *retval2;
52637+
52638+ tmpsubj = (struct acl_subject_label *) subj;
52639+ read_lock(&gr_inode_lock);
52640+ do {
52641+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
52642+ if (retval) {
52643+ if (checkglob && retval->globbed) {
52644+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
52645+ if (retval2)
52646+ retval = retval2;
52647+ }
52648+ break;
52649+ }
52650+ } while ((tmpsubj = tmpsubj->parent_subject));
52651+ read_unlock(&gr_inode_lock);
52652+
52653+ return retval;
52654+}
52655+
52656+static __inline__ struct acl_object_label *
52657+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52658+ struct dentry *curr_dentry,
52659+ const struct acl_subject_label *subj, char **path, const int checkglob)
52660+{
52661+ int newglob = checkglob;
52662+ ino_t inode;
52663+ dev_t device;
52664+
52665+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
52666+ as we don't want a / * rule to match instead of the / object
52667+ don't do this for create lookups that call this function though, since they're looking up
52668+ on the parent and thus need globbing checks on all paths
52669+ */
52670+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
52671+ newglob = GR_NO_GLOB;
52672+
52673+ spin_lock(&curr_dentry->d_lock);
52674+ inode = curr_dentry->d_inode->i_ino;
52675+ device = __get_dev(curr_dentry);
52676+ spin_unlock(&curr_dentry->d_lock);
52677+
52678+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
52679+}
52680+
52681+static struct acl_object_label *
52682+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52683+ const struct acl_subject_label *subj, char *path, const int checkglob)
52684+{
52685+ struct dentry *dentry = (struct dentry *) l_dentry;
52686+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52687+ struct acl_object_label *retval;
52688+ struct dentry *parent;
52689+
52690+ write_seqlock(&rename_lock);
52691+ br_read_lock(vfsmount_lock);
52692+
52693+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
52694+#ifdef CONFIG_NET
52695+ mnt == sock_mnt ||
52696+#endif
52697+#ifdef CONFIG_HUGETLBFS
52698+ (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
52699+#endif
52700+ /* ignore Eric Biederman */
52701+ IS_PRIVATE(l_dentry->d_inode))) {
52702+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
52703+ goto out;
52704+ }
52705+
52706+ for (;;) {
52707+ if (dentry == real_root.dentry && mnt == real_root.mnt)
52708+ break;
52709+
52710+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52711+ if (mnt->mnt_parent == mnt)
52712+ break;
52713+
52714+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52715+ if (retval != NULL)
52716+ goto out;
52717+
52718+ dentry = mnt->mnt_mountpoint;
52719+ mnt = mnt->mnt_parent;
52720+ continue;
52721+ }
52722+
52723+ parent = dentry->d_parent;
52724+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52725+ if (retval != NULL)
52726+ goto out;
52727+
52728+ dentry = parent;
52729+ }
52730+
52731+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52732+
52733+ /* real_root is pinned so we don't have to hold a reference */
52734+ if (retval == NULL)
52735+ retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
52736+out:
52737+ br_read_unlock(vfsmount_lock);
52738+ write_sequnlock(&rename_lock);
52739+
52740+ BUG_ON(retval == NULL);
52741+
52742+ return retval;
52743+}
52744+
52745+static __inline__ struct acl_object_label *
52746+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52747+ const struct acl_subject_label *subj)
52748+{
52749+ char *path = NULL;
52750+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
52751+}
52752+
52753+static __inline__ struct acl_object_label *
52754+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52755+ const struct acl_subject_label *subj)
52756+{
52757+ char *path = NULL;
52758+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
52759+}
52760+
52761+static __inline__ struct acl_object_label *
52762+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52763+ const struct acl_subject_label *subj, char *path)
52764+{
52765+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
52766+}
52767+
52768+static struct acl_subject_label *
52769+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52770+ const struct acl_role_label *role)
52771+{
52772+ struct dentry *dentry = (struct dentry *) l_dentry;
52773+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52774+ struct acl_subject_label *retval;
52775+ struct dentry *parent;
52776+
52777+ write_seqlock(&rename_lock);
52778+ br_read_lock(vfsmount_lock);
52779+
52780+ for (;;) {
52781+ if (dentry == real_root.dentry && mnt == real_root.mnt)
52782+ break;
52783+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52784+ if (mnt->mnt_parent == mnt)
52785+ break;
52786+
52787+ spin_lock(&dentry->d_lock);
52788+ read_lock(&gr_inode_lock);
52789+ retval =
52790+ lookup_acl_subj_label(dentry->d_inode->i_ino,
52791+ __get_dev(dentry), role);
52792+ read_unlock(&gr_inode_lock);
52793+ spin_unlock(&dentry->d_lock);
52794+ if (retval != NULL)
52795+ goto out;
52796+
52797+ dentry = mnt->mnt_mountpoint;
52798+ mnt = mnt->mnt_parent;
52799+ continue;
52800+ }
52801+
52802+ spin_lock(&dentry->d_lock);
52803+ read_lock(&gr_inode_lock);
52804+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
52805+ __get_dev(dentry), role);
52806+ read_unlock(&gr_inode_lock);
52807+ parent = dentry->d_parent;
52808+ spin_unlock(&dentry->d_lock);
52809+
52810+ if (retval != NULL)
52811+ goto out;
52812+
52813+ dentry = parent;
52814+ }
52815+
52816+ spin_lock(&dentry->d_lock);
52817+ read_lock(&gr_inode_lock);
52818+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
52819+ __get_dev(dentry), role);
52820+ read_unlock(&gr_inode_lock);
52821+ spin_unlock(&dentry->d_lock);
52822+
52823+ if (unlikely(retval == NULL)) {
52824+ /* real_root is pinned, we don't need to hold a reference */
52825+ read_lock(&gr_inode_lock);
52826+ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
52827+ __get_dev(real_root.dentry), role);
52828+ read_unlock(&gr_inode_lock);
52829+ }
52830+out:
52831+ br_read_unlock(vfsmount_lock);
52832+ write_sequnlock(&rename_lock);
52833+
52834+ BUG_ON(retval == NULL);
52835+
52836+ return retval;
52837+}
52838+
52839+static void
52840+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
52841+{
52842+ struct task_struct *task = current;
52843+ const struct cred *cred = current_cred();
52844+
52845+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
52846+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52847+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52848+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
52849+
52850+ return;
52851+}
52852+
52853+static void
52854+gr_log_learn_sysctl(const char *path, const __u32 mode)
52855+{
52856+ struct task_struct *task = current;
52857+ const struct cred *cred = current_cred();
52858+
52859+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
52860+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52861+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52862+ 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
52863+
52864+ return;
52865+}
52866+
52867+static void
52868+gr_log_learn_id_change(const char type, const unsigned int real,
52869+ const unsigned int effective, const unsigned int fs)
52870+{
52871+ struct task_struct *task = current;
52872+ const struct cred *cred = current_cred();
52873+
52874+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
52875+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52876+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52877+ type, real, effective, fs, &task->signal->saved_ip);
52878+
52879+ return;
52880+}
52881+
52882+__u32
52883+gr_search_file(const struct dentry * dentry, const __u32 mode,
52884+ const struct vfsmount * mnt)
52885+{
52886+ __u32 retval = mode;
52887+ struct acl_subject_label *curracl;
52888+ struct acl_object_label *currobj;
52889+
52890+ if (unlikely(!(gr_status & GR_READY)))
52891+ return (mode & ~GR_AUDITS);
52892+
52893+ curracl = current->acl;
52894+
52895+ currobj = chk_obj_label(dentry, mnt, curracl);
52896+ retval = currobj->mode & mode;
52897+
52898+ /* if we're opening a specified transfer file for writing
52899+ (e.g. /dev/initctl), then transfer our role to init
52900+ */
52901+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
52902+ current->role->roletype & GR_ROLE_PERSIST)) {
52903+ struct task_struct *task = init_pid_ns.child_reaper;
52904+
52905+ if (task->role != current->role) {
52906+ task->acl_sp_role = 0;
52907+ task->acl_role_id = current->acl_role_id;
52908+ task->role = current->role;
52909+ rcu_read_lock();
52910+ read_lock(&grsec_exec_file_lock);
52911+ gr_apply_subject_to_task(task);
52912+ read_unlock(&grsec_exec_file_lock);
52913+ rcu_read_unlock();
52914+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
52915+ }
52916+ }
52917+
52918+ if (unlikely
52919+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
52920+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
52921+ __u32 new_mode = mode;
52922+
52923+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
52924+
52925+ retval = new_mode;
52926+
52927+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
52928+ new_mode |= GR_INHERIT;
52929+
52930+ if (!(mode & GR_NOLEARN))
52931+ gr_log_learn(dentry, mnt, new_mode);
52932+ }
52933+
52934+ return retval;
52935+}
52936+
52937+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
52938+ const struct dentry *parent,
52939+ const struct vfsmount *mnt)
52940+{
52941+ struct name_entry *match;
52942+ struct acl_object_label *matchpo;
52943+ struct acl_subject_label *curracl;
52944+ char *path;
52945+
52946+ if (unlikely(!(gr_status & GR_READY)))
52947+ return NULL;
52948+
52949+ preempt_disable();
52950+ path = gr_to_filename_rbac(new_dentry, mnt);
52951+ match = lookup_name_entry_create(path);
52952+
52953+ curracl = current->acl;
52954+
52955+ if (match) {
52956+ read_lock(&gr_inode_lock);
52957+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
52958+ read_unlock(&gr_inode_lock);
52959+
52960+ if (matchpo) {
52961+ preempt_enable();
52962+ return matchpo;
52963+ }
52964+ }
52965+
52966+ // lookup parent
52967+
52968+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
52969+
52970+ preempt_enable();
52971+ return matchpo;
52972+}
52973+
52974+__u32
52975+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
52976+ const struct vfsmount * mnt, const __u32 mode)
52977+{
52978+ struct acl_object_label *matchpo;
52979+ __u32 retval;
52980+
52981+ if (unlikely(!(gr_status & GR_READY)))
52982+ return (mode & ~GR_AUDITS);
52983+
52984+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
52985+
52986+ retval = matchpo->mode & mode;
52987+
52988+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
52989+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
52990+ __u32 new_mode = mode;
52991+
52992+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
52993+
52994+ gr_log_learn(new_dentry, mnt, new_mode);
52995+ return new_mode;
52996+ }
52997+
52998+ return retval;
52999+}
53000+
53001+__u32
53002+gr_check_link(const struct dentry * new_dentry,
53003+ const struct dentry * parent_dentry,
53004+ const struct vfsmount * parent_mnt,
53005+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
53006+{
53007+ struct acl_object_label *obj;
53008+ __u32 oldmode, newmode;
53009+ __u32 needmode;
53010+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
53011+ GR_DELETE | GR_INHERIT;
53012+
53013+ if (unlikely(!(gr_status & GR_READY)))
53014+ return (GR_CREATE | GR_LINK);
53015+
53016+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
53017+ oldmode = obj->mode;
53018+
53019+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
53020+ newmode = obj->mode;
53021+
53022+ needmode = newmode & checkmodes;
53023+
53024+ // old name for hardlink must have at least the permissions of the new name
53025+ if ((oldmode & needmode) != needmode)
53026+ goto bad;
53027+
53028+ // if old name had restrictions/auditing, make sure the new name does as well
53029+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
53030+
53031+ // don't allow hardlinking of suid/sgid files without permission
53032+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
53033+ needmode |= GR_SETID;
53034+
53035+ if ((newmode & needmode) != needmode)
53036+ goto bad;
53037+
53038+ // enforce minimum permissions
53039+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
53040+ return newmode;
53041+bad:
53042+ needmode = oldmode;
53043+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
53044+ needmode |= GR_SETID;
53045+
53046+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
53047+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
53048+ return (GR_CREATE | GR_LINK);
53049+ } else if (newmode & GR_SUPPRESS)
53050+ return GR_SUPPRESS;
53051+ else
53052+ return 0;
53053+}
53054+
53055+int
53056+gr_check_hidden_task(const struct task_struct *task)
53057+{
53058+ if (unlikely(!(gr_status & GR_READY)))
53059+ return 0;
53060+
53061+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
53062+ return 1;
53063+
53064+ return 0;
53065+}
53066+
53067+int
53068+gr_check_protected_task(const struct task_struct *task)
53069+{
53070+ if (unlikely(!(gr_status & GR_READY) || !task))
53071+ return 0;
53072+
53073+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
53074+ task->acl != current->acl)
53075+ return 1;
53076+
53077+ return 0;
53078+}
53079+
53080+int
53081+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
53082+{
53083+ struct task_struct *p;
53084+ int ret = 0;
53085+
53086+ if (unlikely(!(gr_status & GR_READY) || !pid))
53087+ return ret;
53088+
53089+ read_lock(&tasklist_lock);
53090+ do_each_pid_task(pid, type, p) {
53091+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
53092+ p->acl != current->acl) {
53093+ ret = 1;
53094+ goto out;
53095+ }
53096+ } while_each_pid_task(pid, type, p);
53097+out:
53098+ read_unlock(&tasklist_lock);
53099+
53100+ return ret;
53101+}
53102+
53103+void
53104+gr_copy_label(struct task_struct *tsk)
53105+{
53106+ /* plain copying of fields is already done by dup_task_struct */
53107+ tsk->signal->used_accept = 0;
53108+ tsk->acl_sp_role = 0;
53109+ //tsk->acl_role_id = current->acl_role_id;
53110+ //tsk->acl = current->acl;
53111+ //tsk->role = current->role;
53112+ tsk->signal->curr_ip = current->signal->curr_ip;
53113+ tsk->signal->saved_ip = current->signal->saved_ip;
53114+ if (current->exec_file)
53115+ get_file(current->exec_file);
53116+ //tsk->exec_file = current->exec_file;
53117+ //tsk->is_writable = current->is_writable;
53118+ if (unlikely(current->signal->used_accept)) {
53119+ current->signal->curr_ip = 0;
53120+ current->signal->saved_ip = 0;
53121+ }
53122+
53123+ return;
53124+}
53125+
53126+static void
53127+gr_set_proc_res(struct task_struct *task)
53128+{
53129+ struct acl_subject_label *proc;
53130+ unsigned short i;
53131+
53132+ proc = task->acl;
53133+
53134+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
53135+ return;
53136+
53137+ for (i = 0; i < RLIM_NLIMITS; i++) {
53138+ if (!(proc->resmask & (1 << i)))
53139+ continue;
53140+
53141+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
53142+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
53143+ }
53144+
53145+ return;
53146+}
53147+
53148+extern int __gr_process_user_ban(struct user_struct *user);
53149+
53150+int
53151+gr_check_user_change(int real, int effective, int fs)
53152+{
53153+ unsigned int i;
53154+ __u16 num;
53155+ uid_t *uidlist;
53156+ int curuid;
53157+ int realok = 0;
53158+ int effectiveok = 0;
53159+ int fsok = 0;
53160+
53161+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
53162+ struct user_struct *user;
53163+
53164+ if (real == -1)
53165+ goto skipit;
53166+
53167+ user = find_user(real);
53168+ if (user == NULL)
53169+ goto skipit;
53170+
53171+ if (__gr_process_user_ban(user)) {
53172+ /* for find_user */
53173+ free_uid(user);
53174+ return 1;
53175+ }
53176+
53177+ /* for find_user */
53178+ free_uid(user);
53179+
53180+skipit:
53181+#endif
53182+
53183+ if (unlikely(!(gr_status & GR_READY)))
53184+ return 0;
53185+
53186+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53187+ gr_log_learn_id_change('u', real, effective, fs);
53188+
53189+ num = current->acl->user_trans_num;
53190+ uidlist = current->acl->user_transitions;
53191+
53192+ if (uidlist == NULL)
53193+ return 0;
53194+
53195+ if (real == -1)
53196+ realok = 1;
53197+ if (effective == -1)
53198+ effectiveok = 1;
53199+ if (fs == -1)
53200+ fsok = 1;
53201+
53202+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
53203+ for (i = 0; i < num; i++) {
53204+ curuid = (int)uidlist[i];
53205+ if (real == curuid)
53206+ realok = 1;
53207+ if (effective == curuid)
53208+ effectiveok = 1;
53209+ if (fs == curuid)
53210+ fsok = 1;
53211+ }
53212+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
53213+ for (i = 0; i < num; i++) {
53214+ curuid = (int)uidlist[i];
53215+ if (real == curuid)
53216+ break;
53217+ if (effective == curuid)
53218+ break;
53219+ if (fs == curuid)
53220+ break;
53221+ }
53222+ /* not in deny list */
53223+ if (i == num) {
53224+ realok = 1;
53225+ effectiveok = 1;
53226+ fsok = 1;
53227+ }
53228+ }
53229+
53230+ if (realok && effectiveok && fsok)
53231+ return 0;
53232+ else {
53233+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53234+ return 1;
53235+ }
53236+}
53237+
53238+int
53239+gr_check_group_change(int real, int effective, int fs)
53240+{
53241+ unsigned int i;
53242+ __u16 num;
53243+ gid_t *gidlist;
53244+ int curgid;
53245+ int realok = 0;
53246+ int effectiveok = 0;
53247+ int fsok = 0;
53248+
53249+ if (unlikely(!(gr_status & GR_READY)))
53250+ return 0;
53251+
53252+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53253+ gr_log_learn_id_change('g', real, effective, fs);
53254+
53255+ num = current->acl->group_trans_num;
53256+ gidlist = current->acl->group_transitions;
53257+
53258+ if (gidlist == NULL)
53259+ return 0;
53260+
53261+ if (real == -1)
53262+ realok = 1;
53263+ if (effective == -1)
53264+ effectiveok = 1;
53265+ if (fs == -1)
53266+ fsok = 1;
53267+
53268+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
53269+ for (i = 0; i < num; i++) {
53270+ curgid = (int)gidlist[i];
53271+ if (real == curgid)
53272+ realok = 1;
53273+ if (effective == curgid)
53274+ effectiveok = 1;
53275+ if (fs == curgid)
53276+ fsok = 1;
53277+ }
53278+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
53279+ for (i = 0; i < num; i++) {
53280+ curgid = (int)gidlist[i];
53281+ if (real == curgid)
53282+ break;
53283+ if (effective == curgid)
53284+ break;
53285+ if (fs == curgid)
53286+ break;
53287+ }
53288+ /* not in deny list */
53289+ if (i == num) {
53290+ realok = 1;
53291+ effectiveok = 1;
53292+ fsok = 1;
53293+ }
53294+ }
53295+
53296+ if (realok && effectiveok && fsok)
53297+ return 0;
53298+ else {
53299+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53300+ return 1;
53301+ }
53302+}
53303+
53304+extern int gr_acl_is_capable(const int cap);
53305+
53306+void
53307+gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
53308+{
53309+ struct acl_role_label *role = task->role;
53310+ struct acl_subject_label *subj = NULL;
53311+ struct acl_object_label *obj;
53312+ struct file *filp;
53313+
53314+ if (unlikely(!(gr_status & GR_READY)))
53315+ return;
53316+
53317+ filp = task->exec_file;
53318+
53319+ /* kernel process, we'll give them the kernel role */
53320+ if (unlikely(!filp)) {
53321+ task->role = kernel_role;
53322+ task->acl = kernel_role->root_label;
53323+ return;
53324+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
53325+ role = lookup_acl_role_label(task, uid, gid);
53326+
53327+ /* don't change the role if we're not a privileged process */
53328+ if (role && task->role != role &&
53329+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
53330+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
53331+ return;
53332+
53333+ /* perform subject lookup in possibly new role
53334+ we can use this result below in the case where role == task->role
53335+ */
53336+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
53337+
53338+ /* if we changed uid/gid, but result in the same role
53339+ and are using inheritance, don't lose the inherited subject
53340+ if current subject is other than what normal lookup
53341+ would result in, we arrived via inheritance, don't
53342+ lose subject
53343+ */
53344+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
53345+ (subj == task->acl)))
53346+ task->acl = subj;
53347+
53348+ task->role = role;
53349+
53350+ task->is_writable = 0;
53351+
53352+ /* ignore additional mmap checks for processes that are writable
53353+ by the default ACL */
53354+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53355+ if (unlikely(obj->mode & GR_WRITE))
53356+ task->is_writable = 1;
53357+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
53358+ if (unlikely(obj->mode & GR_WRITE))
53359+ task->is_writable = 1;
53360+
53361+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53362+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53363+#endif
53364+
53365+ gr_set_proc_res(task);
53366+
53367+ return;
53368+}
53369+
53370+int
53371+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
53372+ const int unsafe_flags)
53373+{
53374+ struct task_struct *task = current;
53375+ struct acl_subject_label *newacl;
53376+ struct acl_object_label *obj;
53377+ __u32 retmode;
53378+
53379+ if (unlikely(!(gr_status & GR_READY)))
53380+ return 0;
53381+
53382+ newacl = chk_subj_label(dentry, mnt, task->role);
53383+
53384+ task_lock(task);
53385+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
53386+ !(task->role->roletype & GR_ROLE_GOD) &&
53387+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
53388+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
53389+ task_unlock(task);
53390+ if (unsafe_flags & LSM_UNSAFE_SHARE)
53391+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
53392+ else
53393+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
53394+ return -EACCES;
53395+ }
53396+ task_unlock(task);
53397+
53398+ obj = chk_obj_label(dentry, mnt, task->acl);
53399+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
53400+
53401+ if (!(task->acl->mode & GR_INHERITLEARN) &&
53402+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
53403+ if (obj->nested)
53404+ task->acl = obj->nested;
53405+ else
53406+ task->acl = newacl;
53407+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
53408+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
53409+
53410+ task->is_writable = 0;
53411+
53412+ /* ignore additional mmap checks for processes that are writable
53413+ by the default ACL */
53414+ obj = chk_obj_label(dentry, mnt, default_role->root_label);
53415+ if (unlikely(obj->mode & GR_WRITE))
53416+ task->is_writable = 1;
53417+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
53418+ if (unlikely(obj->mode & GR_WRITE))
53419+ task->is_writable = 1;
53420+
53421+ gr_set_proc_res(task);
53422+
53423+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53424+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53425+#endif
53426+ return 0;
53427+}
53428+
53429+/* always called with valid inodev ptr */
53430+static void
53431+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
53432+{
53433+ struct acl_object_label *matchpo;
53434+ struct acl_subject_label *matchps;
53435+ struct acl_subject_label *subj;
53436+ struct acl_role_label *role;
53437+ unsigned int x;
53438+
53439+ FOR_EACH_ROLE_START(role)
53440+ FOR_EACH_SUBJECT_START(role, subj, x)
53441+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
53442+ matchpo->mode |= GR_DELETED;
53443+ FOR_EACH_SUBJECT_END(subj,x)
53444+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53445+ if (subj->inode == ino && subj->device == dev)
53446+ subj->mode |= GR_DELETED;
53447+ FOR_EACH_NESTED_SUBJECT_END(subj)
53448+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
53449+ matchps->mode |= GR_DELETED;
53450+ FOR_EACH_ROLE_END(role)
53451+
53452+ inodev->nentry->deleted = 1;
53453+
53454+ return;
53455+}
53456+
53457+void
53458+gr_handle_delete(const ino_t ino, const dev_t dev)
53459+{
53460+ struct inodev_entry *inodev;
53461+
53462+ if (unlikely(!(gr_status & GR_READY)))
53463+ return;
53464+
53465+ write_lock(&gr_inode_lock);
53466+ inodev = lookup_inodev_entry(ino, dev);
53467+ if (inodev != NULL)
53468+ do_handle_delete(inodev, ino, dev);
53469+ write_unlock(&gr_inode_lock);
53470+
53471+ return;
53472+}
53473+
53474+static void
53475+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
53476+ const ino_t newinode, const dev_t newdevice,
53477+ struct acl_subject_label *subj)
53478+{
53479+ unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
53480+ struct acl_object_label *match;
53481+
53482+ match = subj->obj_hash[index];
53483+
53484+ while (match && (match->inode != oldinode ||
53485+ match->device != olddevice ||
53486+ !(match->mode & GR_DELETED)))
53487+ match = match->next;
53488+
53489+ if (match && (match->inode == oldinode)
53490+ && (match->device == olddevice)
53491+ && (match->mode & GR_DELETED)) {
53492+ if (match->prev == NULL) {
53493+ subj->obj_hash[index] = match->next;
53494+ if (match->next != NULL)
53495+ match->next->prev = NULL;
53496+ } else {
53497+ match->prev->next = match->next;
53498+ if (match->next != NULL)
53499+ match->next->prev = match->prev;
53500+ }
53501+ match->prev = NULL;
53502+ match->next = NULL;
53503+ match->inode = newinode;
53504+ match->device = newdevice;
53505+ match->mode &= ~GR_DELETED;
53506+
53507+ insert_acl_obj_label(match, subj);
53508+ }
53509+
53510+ return;
53511+}
53512+
53513+static void
53514+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
53515+ const ino_t newinode, const dev_t newdevice,
53516+ struct acl_role_label *role)
53517+{
53518+ unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
53519+ struct acl_subject_label *match;
53520+
53521+ match = role->subj_hash[index];
53522+
53523+ while (match && (match->inode != oldinode ||
53524+ match->device != olddevice ||
53525+ !(match->mode & GR_DELETED)))
53526+ match = match->next;
53527+
53528+ if (match && (match->inode == oldinode)
53529+ && (match->device == olddevice)
53530+ && (match->mode & GR_DELETED)) {
53531+ if (match->prev == NULL) {
53532+ role->subj_hash[index] = match->next;
53533+ if (match->next != NULL)
53534+ match->next->prev = NULL;
53535+ } else {
53536+ match->prev->next = match->next;
53537+ if (match->next != NULL)
53538+ match->next->prev = match->prev;
53539+ }
53540+ match->prev = NULL;
53541+ match->next = NULL;
53542+ match->inode = newinode;
53543+ match->device = newdevice;
53544+ match->mode &= ~GR_DELETED;
53545+
53546+ insert_acl_subj_label(match, role);
53547+ }
53548+
53549+ return;
53550+}
53551+
53552+static void
53553+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
53554+ const ino_t newinode, const dev_t newdevice)
53555+{
53556+ unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
53557+ struct inodev_entry *match;
53558+
53559+ match = inodev_set.i_hash[index];
53560+
53561+ while (match && (match->nentry->inode != oldinode ||
53562+ match->nentry->device != olddevice || !match->nentry->deleted))
53563+ match = match->next;
53564+
53565+ if (match && (match->nentry->inode == oldinode)
53566+ && (match->nentry->device == olddevice) &&
53567+ match->nentry->deleted) {
53568+ if (match->prev == NULL) {
53569+ inodev_set.i_hash[index] = match->next;
53570+ if (match->next != NULL)
53571+ match->next->prev = NULL;
53572+ } else {
53573+ match->prev->next = match->next;
53574+ if (match->next != NULL)
53575+ match->next->prev = match->prev;
53576+ }
53577+ match->prev = NULL;
53578+ match->next = NULL;
53579+ match->nentry->inode = newinode;
53580+ match->nentry->device = newdevice;
53581+ match->nentry->deleted = 0;
53582+
53583+ insert_inodev_entry(match);
53584+ }
53585+
53586+ return;
53587+}
53588+
53589+static void
53590+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
53591+{
53592+ struct acl_subject_label *subj;
53593+ struct acl_role_label *role;
53594+ unsigned int x;
53595+
53596+ FOR_EACH_ROLE_START(role)
53597+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
53598+
53599+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53600+ if ((subj->inode == ino) && (subj->device == dev)) {
53601+ subj->inode = ino;
53602+ subj->device = dev;
53603+ }
53604+ FOR_EACH_NESTED_SUBJECT_END(subj)
53605+ FOR_EACH_SUBJECT_START(role, subj, x)
53606+ update_acl_obj_label(matchn->inode, matchn->device,
53607+ ino, dev, subj);
53608+ FOR_EACH_SUBJECT_END(subj,x)
53609+ FOR_EACH_ROLE_END(role)
53610+
53611+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
53612+
53613+ return;
53614+}
53615+
53616+static void
53617+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
53618+ const struct vfsmount *mnt)
53619+{
53620+ ino_t ino = dentry->d_inode->i_ino;
53621+ dev_t dev = __get_dev(dentry);
53622+
53623+ __do_handle_create(matchn, ino, dev);
53624+
53625+ return;
53626+}
53627+
53628+void
53629+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
53630+{
53631+ struct name_entry *matchn;
53632+
53633+ if (unlikely(!(gr_status & GR_READY)))
53634+ return;
53635+
53636+ preempt_disable();
53637+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
53638+
53639+ if (unlikely((unsigned long)matchn)) {
53640+ write_lock(&gr_inode_lock);
53641+ do_handle_create(matchn, dentry, mnt);
53642+ write_unlock(&gr_inode_lock);
53643+ }
53644+ preempt_enable();
53645+
53646+ return;
53647+}
53648+
53649+void
53650+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
53651+{
53652+ struct name_entry *matchn;
53653+
53654+ if (unlikely(!(gr_status & GR_READY)))
53655+ return;
53656+
53657+ preempt_disable();
53658+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
53659+
53660+ if (unlikely((unsigned long)matchn)) {
53661+ write_lock(&gr_inode_lock);
53662+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
53663+ write_unlock(&gr_inode_lock);
53664+ }
53665+ preempt_enable();
53666+
53667+ return;
53668+}
53669+
53670+void
53671+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
53672+ struct dentry *old_dentry,
53673+ struct dentry *new_dentry,
53674+ struct vfsmount *mnt, const __u8 replace)
53675+{
53676+ struct name_entry *matchn;
53677+ struct inodev_entry *inodev;
53678+ struct inode *inode = new_dentry->d_inode;
53679+ ino_t old_ino = old_dentry->d_inode->i_ino;
53680+ dev_t old_dev = __get_dev(old_dentry);
53681+
53682+ /* vfs_rename swaps the name and parent link for old_dentry and
53683+ new_dentry
53684+ at this point, old_dentry has the new name, parent link, and inode
53685+ for the renamed file
53686+ if a file is being replaced by a rename, new_dentry has the inode
53687+ and name for the replaced file
53688+ */
53689+
53690+ if (unlikely(!(gr_status & GR_READY)))
53691+ return;
53692+
53693+ preempt_disable();
53694+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
53695+
53696+ /* we wouldn't have to check d_inode if it weren't for
53697+ NFS silly-renaming
53698+ */
53699+
53700+ write_lock(&gr_inode_lock);
53701+ if (unlikely(replace && inode)) {
53702+ ino_t new_ino = inode->i_ino;
53703+ dev_t new_dev = __get_dev(new_dentry);
53704+
53705+ inodev = lookup_inodev_entry(new_ino, new_dev);
53706+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
53707+ do_handle_delete(inodev, new_ino, new_dev);
53708+ }
53709+
53710+ inodev = lookup_inodev_entry(old_ino, old_dev);
53711+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
53712+ do_handle_delete(inodev, old_ino, old_dev);
53713+
53714+ if (unlikely((unsigned long)matchn))
53715+ do_handle_create(matchn, old_dentry, mnt);
53716+
53717+ write_unlock(&gr_inode_lock);
53718+ preempt_enable();
53719+
53720+ return;
53721+}
53722+
53723+static int
53724+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
53725+ unsigned char **sum)
53726+{
53727+ struct acl_role_label *r;
53728+ struct role_allowed_ip *ipp;
53729+ struct role_transition *trans;
53730+ unsigned int i;
53731+ int found = 0;
53732+ u32 curr_ip = current->signal->curr_ip;
53733+
53734+ current->signal->saved_ip = curr_ip;
53735+
53736+ /* check transition table */
53737+
53738+ for (trans = current->role->transitions; trans; trans = trans->next) {
53739+ if (!strcmp(rolename, trans->rolename)) {
53740+ found = 1;
53741+ break;
53742+ }
53743+ }
53744+
53745+ if (!found)
53746+ return 0;
53747+
53748+ /* handle special roles that do not require authentication
53749+ and check ip */
53750+
53751+ FOR_EACH_ROLE_START(r)
53752+ if (!strcmp(rolename, r->rolename) &&
53753+ (r->roletype & GR_ROLE_SPECIAL)) {
53754+ found = 0;
53755+ if (r->allowed_ips != NULL) {
53756+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
53757+ if ((ntohl(curr_ip) & ipp->netmask) ==
53758+ (ntohl(ipp->addr) & ipp->netmask))
53759+ found = 1;
53760+ }
53761+ } else
53762+ found = 2;
53763+ if (!found)
53764+ return 0;
53765+
53766+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
53767+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
53768+ *salt = NULL;
53769+ *sum = NULL;
53770+ return 1;
53771+ }
53772+ }
53773+ FOR_EACH_ROLE_END(r)
53774+
53775+ for (i = 0; i < num_sprole_pws; i++) {
53776+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
53777+ *salt = acl_special_roles[i]->salt;
53778+ *sum = acl_special_roles[i]->sum;
53779+ return 1;
53780+ }
53781+ }
53782+
53783+ return 0;
53784+}
53785+
53786+static void
53787+assign_special_role(char *rolename)
53788+{
53789+ struct acl_object_label *obj;
53790+ struct acl_role_label *r;
53791+ struct acl_role_label *assigned = NULL;
53792+ struct task_struct *tsk;
53793+ struct file *filp;
53794+
53795+ FOR_EACH_ROLE_START(r)
53796+ if (!strcmp(rolename, r->rolename) &&
53797+ (r->roletype & GR_ROLE_SPECIAL)) {
53798+ assigned = r;
53799+ break;
53800+ }
53801+ FOR_EACH_ROLE_END(r)
53802+
53803+ if (!assigned)
53804+ return;
53805+
53806+ read_lock(&tasklist_lock);
53807+ read_lock(&grsec_exec_file_lock);
53808+
53809+ tsk = current->real_parent;
53810+ if (tsk == NULL)
53811+ goto out_unlock;
53812+
53813+ filp = tsk->exec_file;
53814+ if (filp == NULL)
53815+ goto out_unlock;
53816+
53817+ tsk->is_writable = 0;
53818+
53819+ tsk->acl_sp_role = 1;
53820+ tsk->acl_role_id = ++acl_sp_role_value;
53821+ tsk->role = assigned;
53822+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
53823+
53824+ /* ignore additional mmap checks for processes that are writable
53825+ by the default ACL */
53826+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53827+ if (unlikely(obj->mode & GR_WRITE))
53828+ tsk->is_writable = 1;
53829+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
53830+ if (unlikely(obj->mode & GR_WRITE))
53831+ tsk->is_writable = 1;
53832+
53833+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53834+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
53835+#endif
53836+
53837+out_unlock:
53838+ read_unlock(&grsec_exec_file_lock);
53839+ read_unlock(&tasklist_lock);
53840+ return;
53841+}
53842+
53843+int gr_check_secure_terminal(struct task_struct *task)
53844+{
53845+ struct task_struct *p, *p2, *p3;
53846+ struct files_struct *files;
53847+ struct fdtable *fdt;
53848+ struct file *our_file = NULL, *file;
53849+ int i;
53850+
53851+ if (task->signal->tty == NULL)
53852+ return 1;
53853+
53854+ files = get_files_struct(task);
53855+ if (files != NULL) {
53856+ rcu_read_lock();
53857+ fdt = files_fdtable(files);
53858+ for (i=0; i < fdt->max_fds; i++) {
53859+ file = fcheck_files(files, i);
53860+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
53861+ get_file(file);
53862+ our_file = file;
53863+ }
53864+ }
53865+ rcu_read_unlock();
53866+ put_files_struct(files);
53867+ }
53868+
53869+ if (our_file == NULL)
53870+ return 1;
53871+
53872+ read_lock(&tasklist_lock);
53873+ do_each_thread(p2, p) {
53874+ files = get_files_struct(p);
53875+ if (files == NULL ||
53876+ (p->signal && p->signal->tty == task->signal->tty)) {
53877+ if (files != NULL)
53878+ put_files_struct(files);
53879+ continue;
53880+ }
53881+ rcu_read_lock();
53882+ fdt = files_fdtable(files);
53883+ for (i=0; i < fdt->max_fds; i++) {
53884+ file = fcheck_files(files, i);
53885+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
53886+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
53887+ p3 = task;
53888+ while (p3->pid > 0) {
53889+ if (p3 == p)
53890+ break;
53891+ p3 = p3->real_parent;
53892+ }
53893+ if (p3 == p)
53894+ break;
53895+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
53896+ gr_handle_alertkill(p);
53897+ rcu_read_unlock();
53898+ put_files_struct(files);
53899+ read_unlock(&tasklist_lock);
53900+ fput(our_file);
53901+ return 0;
53902+ }
53903+ }
53904+ rcu_read_unlock();
53905+ put_files_struct(files);
53906+ } while_each_thread(p2, p);
53907+ read_unlock(&tasklist_lock);
53908+
53909+ fput(our_file);
53910+ return 1;
53911+}
53912+
53913+ssize_t
53914+write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
53915+{
53916+ struct gr_arg_wrapper uwrap;
53917+ unsigned char *sprole_salt = NULL;
53918+ unsigned char *sprole_sum = NULL;
53919+ int error = sizeof (struct gr_arg_wrapper);
53920+ int error2 = 0;
53921+
53922+ mutex_lock(&gr_dev_mutex);
53923+
53924+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
53925+ error = -EPERM;
53926+ goto out;
53927+ }
53928+
53929+ if (count != sizeof (struct gr_arg_wrapper)) {
53930+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
53931+ error = -EINVAL;
53932+ goto out;
53933+ }
53934+
53935+
53936+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
53937+ gr_auth_expires = 0;
53938+ gr_auth_attempts = 0;
53939+ }
53940+
53941+ if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
53942+ error = -EFAULT;
53943+ goto out;
53944+ }
53945+
53946+ if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
53947+ error = -EINVAL;
53948+ goto out;
53949+ }
53950+
53951+ if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
53952+ error = -EFAULT;
53953+ goto out;
53954+ }
53955+
53956+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
53957+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
53958+ time_after(gr_auth_expires, get_seconds())) {
53959+ error = -EBUSY;
53960+ goto out;
53961+ }
53962+
53963+ /* if non-root trying to do anything other than use a special role,
53964+ do not attempt authentication, do not count towards authentication
53965+ locking
53966+ */
53967+
53968+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
53969+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
53970+ current_uid()) {
53971+ error = -EPERM;
53972+ goto out;
53973+ }
53974+
53975+ /* ensure pw and special role name are null terminated */
53976+
53977+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
53978+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
53979+
53980+ /* Okay.
53981+ * We have our enough of the argument structure..(we have yet
53982+ * to copy_from_user the tables themselves) . Copy the tables
53983+ * only if we need them, i.e. for loading operations. */
53984+
53985+ switch (gr_usermode->mode) {
53986+ case GR_STATUS:
53987+ if (gr_status & GR_READY) {
53988+ error = 1;
53989+ if (!gr_check_secure_terminal(current))
53990+ error = 3;
53991+ } else
53992+ error = 2;
53993+ goto out;
53994+ case GR_SHUTDOWN:
53995+ if ((gr_status & GR_READY)
53996+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
53997+ pax_open_kernel();
53998+ gr_status &= ~GR_READY;
53999+ pax_close_kernel();
54000+
54001+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
54002+ free_variables();
54003+ memset(gr_usermode, 0, sizeof (struct gr_arg));
54004+ memset(gr_system_salt, 0, GR_SALT_LEN);
54005+ memset(gr_system_sum, 0, GR_SHA_LEN);
54006+ } else if (gr_status & GR_READY) {
54007+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
54008+ error = -EPERM;
54009+ } else {
54010+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
54011+ error = -EAGAIN;
54012+ }
54013+ break;
54014+ case GR_ENABLE:
54015+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
54016+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
54017+ else {
54018+ if (gr_status & GR_READY)
54019+ error = -EAGAIN;
54020+ else
54021+ error = error2;
54022+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
54023+ }
54024+ break;
54025+ case GR_RELOAD:
54026+ if (!(gr_status & GR_READY)) {
54027+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
54028+ error = -EAGAIN;
54029+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54030+ preempt_disable();
54031+
54032+ pax_open_kernel();
54033+ gr_status &= ~GR_READY;
54034+ pax_close_kernel();
54035+
54036+ free_variables();
54037+ if (!(error2 = gracl_init(gr_usermode))) {
54038+ preempt_enable();
54039+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
54040+ } else {
54041+ preempt_enable();
54042+ error = error2;
54043+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
54044+ }
54045+ } else {
54046+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
54047+ error = -EPERM;
54048+ }
54049+ break;
54050+ case GR_SEGVMOD:
54051+ if (unlikely(!(gr_status & GR_READY))) {
54052+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
54053+ error = -EAGAIN;
54054+ break;
54055+ }
54056+
54057+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54058+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
54059+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
54060+ struct acl_subject_label *segvacl;
54061+ segvacl =
54062+ lookup_acl_subj_label(gr_usermode->segv_inode,
54063+ gr_usermode->segv_device,
54064+ current->role);
54065+ if (segvacl) {
54066+ segvacl->crashes = 0;
54067+ segvacl->expires = 0;
54068+ }
54069+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
54070+ gr_remove_uid(gr_usermode->segv_uid);
54071+ }
54072+ } else {
54073+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
54074+ error = -EPERM;
54075+ }
54076+ break;
54077+ case GR_SPROLE:
54078+ case GR_SPROLEPAM:
54079+ if (unlikely(!(gr_status & GR_READY))) {
54080+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
54081+ error = -EAGAIN;
54082+ break;
54083+ }
54084+
54085+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
54086+ current->role->expires = 0;
54087+ current->role->auth_attempts = 0;
54088+ }
54089+
54090+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
54091+ time_after(current->role->expires, get_seconds())) {
54092+ error = -EBUSY;
54093+ goto out;
54094+ }
54095+
54096+ if (lookup_special_role_auth
54097+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
54098+ && ((!sprole_salt && !sprole_sum)
54099+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
54100+ char *p = "";
54101+ assign_special_role(gr_usermode->sp_role);
54102+ read_lock(&tasklist_lock);
54103+ if (current->real_parent)
54104+ p = current->real_parent->role->rolename;
54105+ read_unlock(&tasklist_lock);
54106+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
54107+ p, acl_sp_role_value);
54108+ } else {
54109+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
54110+ error = -EPERM;
54111+ if(!(current->role->auth_attempts++))
54112+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
54113+
54114+ goto out;
54115+ }
54116+ break;
54117+ case GR_UNSPROLE:
54118+ if (unlikely(!(gr_status & GR_READY))) {
54119+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
54120+ error = -EAGAIN;
54121+ break;
54122+ }
54123+
54124+ if (current->role->roletype & GR_ROLE_SPECIAL) {
54125+ char *p = "";
54126+ int i = 0;
54127+
54128+ read_lock(&tasklist_lock);
54129+ if (current->real_parent) {
54130+ p = current->real_parent->role->rolename;
54131+ i = current->real_parent->acl_role_id;
54132+ }
54133+ read_unlock(&tasklist_lock);
54134+
54135+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
54136+ gr_set_acls(1);
54137+ } else {
54138+ error = -EPERM;
54139+ goto out;
54140+ }
54141+ break;
54142+ default:
54143+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
54144+ error = -EINVAL;
54145+ break;
54146+ }
54147+
54148+ if (error != -EPERM)
54149+ goto out;
54150+
54151+ if(!(gr_auth_attempts++))
54152+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
54153+
54154+ out:
54155+ mutex_unlock(&gr_dev_mutex);
54156+ return error;
54157+}
54158+
54159+/* must be called with
54160+ rcu_read_lock();
54161+ read_lock(&tasklist_lock);
54162+ read_lock(&grsec_exec_file_lock);
54163+*/
54164+int gr_apply_subject_to_task(struct task_struct *task)
54165+{
54166+ struct acl_object_label *obj;
54167+ char *tmpname;
54168+ struct acl_subject_label *tmpsubj;
54169+ struct file *filp;
54170+ struct name_entry *nmatch;
54171+
54172+ filp = task->exec_file;
54173+ if (filp == NULL)
54174+ return 0;
54175+
54176+ /* the following is to apply the correct subject
54177+ on binaries running when the RBAC system
54178+ is enabled, when the binaries have been
54179+ replaced or deleted since their execution
54180+ -----
54181+ when the RBAC system starts, the inode/dev
54182+ from exec_file will be one the RBAC system
54183+ is unaware of. It only knows the inode/dev
54184+ of the present file on disk, or the absence
54185+ of it.
54186+ */
54187+ preempt_disable();
54188+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
54189+
54190+ nmatch = lookup_name_entry(tmpname);
54191+ preempt_enable();
54192+ tmpsubj = NULL;
54193+ if (nmatch) {
54194+ if (nmatch->deleted)
54195+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
54196+ else
54197+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
54198+ if (tmpsubj != NULL)
54199+ task->acl = tmpsubj;
54200+ }
54201+ if (tmpsubj == NULL)
54202+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
54203+ task->role);
54204+ if (task->acl) {
54205+ task->is_writable = 0;
54206+ /* ignore additional mmap checks for processes that are writable
54207+ by the default ACL */
54208+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54209+ if (unlikely(obj->mode & GR_WRITE))
54210+ task->is_writable = 1;
54211+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
54212+ if (unlikely(obj->mode & GR_WRITE))
54213+ task->is_writable = 1;
54214+
54215+ gr_set_proc_res(task);
54216+
54217+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
54218+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
54219+#endif
54220+ } else {
54221+ return 1;
54222+ }
54223+
54224+ return 0;
54225+}
54226+
54227+int
54228+gr_set_acls(const int type)
54229+{
54230+ struct task_struct *task, *task2;
54231+ struct acl_role_label *role = current->role;
54232+ __u16 acl_role_id = current->acl_role_id;
54233+ const struct cred *cred;
54234+ int ret;
54235+
54236+ rcu_read_lock();
54237+ read_lock(&tasklist_lock);
54238+ read_lock(&grsec_exec_file_lock);
54239+ do_each_thread(task2, task) {
54240+ /* check to see if we're called from the exit handler,
54241+ if so, only replace ACLs that have inherited the admin
54242+ ACL */
54243+
54244+ if (type && (task->role != role ||
54245+ task->acl_role_id != acl_role_id))
54246+ continue;
54247+
54248+ task->acl_role_id = 0;
54249+ task->acl_sp_role = 0;
54250+
54251+ if (task->exec_file) {
54252+ cred = __task_cred(task);
54253+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
54254+ ret = gr_apply_subject_to_task(task);
54255+ if (ret) {
54256+ read_unlock(&grsec_exec_file_lock);
54257+ read_unlock(&tasklist_lock);
54258+ rcu_read_unlock();
54259+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
54260+ return ret;
54261+ }
54262+ } else {
54263+ // it's a kernel process
54264+ task->role = kernel_role;
54265+ task->acl = kernel_role->root_label;
54266+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
54267+ task->acl->mode &= ~GR_PROCFIND;
54268+#endif
54269+ }
54270+ } while_each_thread(task2, task);
54271+ read_unlock(&grsec_exec_file_lock);
54272+ read_unlock(&tasklist_lock);
54273+ rcu_read_unlock();
54274+
54275+ return 0;
54276+}
54277+
54278+void
54279+gr_learn_resource(const struct task_struct *task,
54280+ const int res, const unsigned long wanted, const int gt)
54281+{
54282+ struct acl_subject_label *acl;
54283+ const struct cred *cred;
54284+
54285+ if (unlikely((gr_status & GR_READY) &&
54286+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
54287+ goto skip_reslog;
54288+
54289+#ifdef CONFIG_GRKERNSEC_RESLOG
54290+ gr_log_resource(task, res, wanted, gt);
54291+#endif
54292+ skip_reslog:
54293+
54294+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
54295+ return;
54296+
54297+ acl = task->acl;
54298+
54299+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
54300+ !(acl->resmask & (1 << (unsigned short) res))))
54301+ return;
54302+
54303+ if (wanted >= acl->res[res].rlim_cur) {
54304+ unsigned long res_add;
54305+
54306+ res_add = wanted;
54307+ switch (res) {
54308+ case RLIMIT_CPU:
54309+ res_add += GR_RLIM_CPU_BUMP;
54310+ break;
54311+ case RLIMIT_FSIZE:
54312+ res_add += GR_RLIM_FSIZE_BUMP;
54313+ break;
54314+ case RLIMIT_DATA:
54315+ res_add += GR_RLIM_DATA_BUMP;
54316+ break;
54317+ case RLIMIT_STACK:
54318+ res_add += GR_RLIM_STACK_BUMP;
54319+ break;
54320+ case RLIMIT_CORE:
54321+ res_add += GR_RLIM_CORE_BUMP;
54322+ break;
54323+ case RLIMIT_RSS:
54324+ res_add += GR_RLIM_RSS_BUMP;
54325+ break;
54326+ case RLIMIT_NPROC:
54327+ res_add += GR_RLIM_NPROC_BUMP;
54328+ break;
54329+ case RLIMIT_NOFILE:
54330+ res_add += GR_RLIM_NOFILE_BUMP;
54331+ break;
54332+ case RLIMIT_MEMLOCK:
54333+ res_add += GR_RLIM_MEMLOCK_BUMP;
54334+ break;
54335+ case RLIMIT_AS:
54336+ res_add += GR_RLIM_AS_BUMP;
54337+ break;
54338+ case RLIMIT_LOCKS:
54339+ res_add += GR_RLIM_LOCKS_BUMP;
54340+ break;
54341+ case RLIMIT_SIGPENDING:
54342+ res_add += GR_RLIM_SIGPENDING_BUMP;
54343+ break;
54344+ case RLIMIT_MSGQUEUE:
54345+ res_add += GR_RLIM_MSGQUEUE_BUMP;
54346+ break;
54347+ case RLIMIT_NICE:
54348+ res_add += GR_RLIM_NICE_BUMP;
54349+ break;
54350+ case RLIMIT_RTPRIO:
54351+ res_add += GR_RLIM_RTPRIO_BUMP;
54352+ break;
54353+ case RLIMIT_RTTIME:
54354+ res_add += GR_RLIM_RTTIME_BUMP;
54355+ break;
54356+ }
54357+
54358+ acl->res[res].rlim_cur = res_add;
54359+
54360+ if (wanted > acl->res[res].rlim_max)
54361+ acl->res[res].rlim_max = res_add;
54362+
54363+ /* only log the subject filename, since resource logging is supported for
54364+ single-subject learning only */
54365+ rcu_read_lock();
54366+ cred = __task_cred(task);
54367+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
54368+ task->role->roletype, cred->uid, cred->gid, acl->filename,
54369+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
54370+ "", (unsigned long) res, &task->signal->saved_ip);
54371+ rcu_read_unlock();
54372+ }
54373+
54374+ return;
54375+}
54376+
54377+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
54378+void
54379+pax_set_initial_flags(struct linux_binprm *bprm)
54380+{
54381+ struct task_struct *task = current;
54382+ struct acl_subject_label *proc;
54383+ unsigned long flags;
54384+
54385+ if (unlikely(!(gr_status & GR_READY)))
54386+ return;
54387+
54388+ flags = pax_get_flags(task);
54389+
54390+ proc = task->acl;
54391+
54392+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
54393+ flags &= ~MF_PAX_PAGEEXEC;
54394+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
54395+ flags &= ~MF_PAX_SEGMEXEC;
54396+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
54397+ flags &= ~MF_PAX_RANDMMAP;
54398+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
54399+ flags &= ~MF_PAX_EMUTRAMP;
54400+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
54401+ flags &= ~MF_PAX_MPROTECT;
54402+
54403+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
54404+ flags |= MF_PAX_PAGEEXEC;
54405+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
54406+ flags |= MF_PAX_SEGMEXEC;
54407+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
54408+ flags |= MF_PAX_RANDMMAP;
54409+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
54410+ flags |= MF_PAX_EMUTRAMP;
54411+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
54412+ flags |= MF_PAX_MPROTECT;
54413+
54414+ pax_set_flags(task, flags);
54415+
54416+ return;
54417+}
54418+#endif
54419+
54420+#ifdef CONFIG_SYSCTL
54421+/* Eric Biederman likes breaking userland ABI and every inode-based security
54422+ system to save 35kb of memory */
54423+
54424+/* we modify the passed in filename, but adjust it back before returning */
54425+static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
54426+{
54427+ struct name_entry *nmatch;
54428+ char *p, *lastp = NULL;
54429+ struct acl_object_label *obj = NULL, *tmp;
54430+ struct acl_subject_label *tmpsubj;
54431+ char c = '\0';
54432+
54433+ read_lock(&gr_inode_lock);
54434+
54435+ p = name + len - 1;
54436+ do {
54437+ nmatch = lookup_name_entry(name);
54438+ if (lastp != NULL)
54439+ *lastp = c;
54440+
54441+ if (nmatch == NULL)
54442+ goto next_component;
54443+ tmpsubj = current->acl;
54444+ do {
54445+ obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
54446+ if (obj != NULL) {
54447+ tmp = obj->globbed;
54448+ while (tmp) {
54449+ if (!glob_match(tmp->filename, name)) {
54450+ obj = tmp;
54451+ goto found_obj;
54452+ }
54453+ tmp = tmp->next;
54454+ }
54455+ goto found_obj;
54456+ }
54457+ } while ((tmpsubj = tmpsubj->parent_subject));
54458+next_component:
54459+ /* end case */
54460+ if (p == name)
54461+ break;
54462+
54463+ while (*p != '/')
54464+ p--;
54465+ if (p == name)
54466+ lastp = p + 1;
54467+ else {
54468+ lastp = p;
54469+ p--;
54470+ }
54471+ c = *lastp;
54472+ *lastp = '\0';
54473+ } while (1);
54474+found_obj:
54475+ read_unlock(&gr_inode_lock);
54476+ /* obj returned will always be non-null */
54477+ return obj;
54478+}
54479+
54480+/* returns 0 when allowing, non-zero on error
54481+ op of 0 is used for readdir, so we don't log the names of hidden files
54482+*/
54483+__u32
54484+gr_handle_sysctl(const struct ctl_table *table, const int op)
54485+{
54486+ struct ctl_table *tmp;
54487+ const char *proc_sys = "/proc/sys";
54488+ char *path;
54489+ struct acl_object_label *obj;
54490+ unsigned short len = 0, pos = 0, depth = 0, i;
54491+ __u32 err = 0;
54492+ __u32 mode = 0;
54493+
54494+ if (unlikely(!(gr_status & GR_READY)))
54495+ return 0;
54496+
54497+ /* for now, ignore operations on non-sysctl entries if it's not a
54498+ readdir*/
54499+ if (table->child != NULL && op != 0)
54500+ return 0;
54501+
54502+ mode |= GR_FIND;
54503+ /* it's only a read if it's an entry, read on dirs is for readdir */
54504+ if (op & MAY_READ)
54505+ mode |= GR_READ;
54506+ if (op & MAY_WRITE)
54507+ mode |= GR_WRITE;
54508+
54509+ preempt_disable();
54510+
54511+ path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
54512+
54513+ /* it's only a read/write if it's an actual entry, not a dir
54514+ (which are opened for readdir)
54515+ */
54516+
54517+ /* convert the requested sysctl entry into a pathname */
54518+
54519+ for (tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54520+ len += strlen(tmp->procname);
54521+ len++;
54522+ depth++;
54523+ }
54524+
54525+ if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
54526+ /* deny */
54527+ goto out;
54528+ }
54529+
54530+ memset(path, 0, PAGE_SIZE);
54531+
54532+ memcpy(path, proc_sys, strlen(proc_sys));
54533+
54534+ pos += strlen(proc_sys);
54535+
54536+ for (; depth > 0; depth--) {
54537+ path[pos] = '/';
54538+ pos++;
54539+ for (i = 1, tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54540+ if (depth == i) {
54541+ memcpy(path + pos, tmp->procname,
54542+ strlen(tmp->procname));
54543+ pos += strlen(tmp->procname);
54544+ }
54545+ i++;
54546+ }
54547+ }
54548+
54549+ obj = gr_lookup_by_name(path, pos);
54550+ err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
54551+
54552+ if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
54553+ ((err & mode) != mode))) {
54554+ __u32 new_mode = mode;
54555+
54556+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
54557+
54558+ err = 0;
54559+ gr_log_learn_sysctl(path, new_mode);
54560+ } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
54561+ gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
54562+ err = -ENOENT;
54563+ } else if (!(err & GR_FIND)) {
54564+ err = -ENOENT;
54565+ } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
54566+ gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
54567+ path, (mode & GR_READ) ? " reading" : "",
54568+ (mode & GR_WRITE) ? " writing" : "");
54569+ err = -EACCES;
54570+ } else if ((err & mode) != mode) {
54571+ err = -EACCES;
54572+ } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
54573+ gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
54574+ path, (mode & GR_READ) ? " reading" : "",
54575+ (mode & GR_WRITE) ? " writing" : "");
54576+ err = 0;
54577+ } else
54578+ err = 0;
54579+
54580+ out:
54581+ preempt_enable();
54582+
54583+ return err;
54584+}
54585+#endif
54586+
54587+int
54588+gr_handle_proc_ptrace(struct task_struct *task)
54589+{
54590+ struct file *filp;
54591+ struct task_struct *tmp = task;
54592+ struct task_struct *curtemp = current;
54593+ __u32 retmode;
54594+
54595+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54596+ if (unlikely(!(gr_status & GR_READY)))
54597+ return 0;
54598+#endif
54599+
54600+ read_lock(&tasklist_lock);
54601+ read_lock(&grsec_exec_file_lock);
54602+ filp = task->exec_file;
54603+
54604+ while (tmp->pid > 0) {
54605+ if (tmp == curtemp)
54606+ break;
54607+ tmp = tmp->real_parent;
54608+ }
54609+
54610+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54611+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
54612+ read_unlock(&grsec_exec_file_lock);
54613+ read_unlock(&tasklist_lock);
54614+ return 1;
54615+ }
54616+
54617+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54618+ if (!(gr_status & GR_READY)) {
54619+ read_unlock(&grsec_exec_file_lock);
54620+ read_unlock(&tasklist_lock);
54621+ return 0;
54622+ }
54623+#endif
54624+
54625+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
54626+ read_unlock(&grsec_exec_file_lock);
54627+ read_unlock(&tasklist_lock);
54628+
54629+ if (retmode & GR_NOPTRACE)
54630+ return 1;
54631+
54632+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
54633+ && (current->acl != task->acl || (current->acl != current->role->root_label
54634+ && current->pid != task->pid)))
54635+ return 1;
54636+
54637+ return 0;
54638+}
54639+
54640+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
54641+{
54642+ if (unlikely(!(gr_status & GR_READY)))
54643+ return;
54644+
54645+ if (!(current->role->roletype & GR_ROLE_GOD))
54646+ return;
54647+
54648+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
54649+ p->role->rolename, gr_task_roletype_to_char(p),
54650+ p->acl->filename);
54651+}
54652+
54653+int
54654+gr_handle_ptrace(struct task_struct *task, const long request)
54655+{
54656+ struct task_struct *tmp = task;
54657+ struct task_struct *curtemp = current;
54658+ __u32 retmode;
54659+
54660+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54661+ if (unlikely(!(gr_status & GR_READY)))
54662+ return 0;
54663+#endif
54664+
54665+ read_lock(&tasklist_lock);
54666+ while (tmp->pid > 0) {
54667+ if (tmp == curtemp)
54668+ break;
54669+ tmp = tmp->real_parent;
54670+ }
54671+
54672+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54673+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
54674+ read_unlock(&tasklist_lock);
54675+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54676+ return 1;
54677+ }
54678+ read_unlock(&tasklist_lock);
54679+
54680+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54681+ if (!(gr_status & GR_READY))
54682+ return 0;
54683+#endif
54684+
54685+ read_lock(&grsec_exec_file_lock);
54686+ if (unlikely(!task->exec_file)) {
54687+ read_unlock(&grsec_exec_file_lock);
54688+ return 0;
54689+ }
54690+
54691+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
54692+ read_unlock(&grsec_exec_file_lock);
54693+
54694+ if (retmode & GR_NOPTRACE) {
54695+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54696+ return 1;
54697+ }
54698+
54699+ if (retmode & GR_PTRACERD) {
54700+ switch (request) {
54701+ case PTRACE_SEIZE:
54702+ case PTRACE_POKETEXT:
54703+ case PTRACE_POKEDATA:
54704+ case PTRACE_POKEUSR:
54705+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
54706+ case PTRACE_SETREGS:
54707+ case PTRACE_SETFPREGS:
54708+#endif
54709+#ifdef CONFIG_X86
54710+ case PTRACE_SETFPXREGS:
54711+#endif
54712+#ifdef CONFIG_ALTIVEC
54713+ case PTRACE_SETVRREGS:
54714+#endif
54715+ return 1;
54716+ default:
54717+ return 0;
54718+ }
54719+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
54720+ !(current->role->roletype & GR_ROLE_GOD) &&
54721+ (current->acl != task->acl)) {
54722+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54723+ return 1;
54724+ }
54725+
54726+ return 0;
54727+}
54728+
54729+static int is_writable_mmap(const struct file *filp)
54730+{
54731+ struct task_struct *task = current;
54732+ struct acl_object_label *obj, *obj2;
54733+
54734+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
54735+ !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))) {
54736+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54737+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
54738+ task->role->root_label);
54739+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
54740+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
54741+ return 1;
54742+ }
54743+ }
54744+ return 0;
54745+}
54746+
54747+int
54748+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
54749+{
54750+ __u32 mode;
54751+
54752+ if (unlikely(!file || !(prot & PROT_EXEC)))
54753+ return 1;
54754+
54755+ if (is_writable_mmap(file))
54756+ return 0;
54757+
54758+ mode =
54759+ gr_search_file(file->f_path.dentry,
54760+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54761+ file->f_path.mnt);
54762+
54763+ if (!gr_tpe_allow(file))
54764+ return 0;
54765+
54766+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54767+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54768+ return 0;
54769+ } else if (unlikely(!(mode & GR_EXEC))) {
54770+ return 0;
54771+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54772+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54773+ return 1;
54774+ }
54775+
54776+ return 1;
54777+}
54778+
54779+int
54780+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
54781+{
54782+ __u32 mode;
54783+
54784+ if (unlikely(!file || !(prot & PROT_EXEC)))
54785+ return 1;
54786+
54787+ if (is_writable_mmap(file))
54788+ return 0;
54789+
54790+ mode =
54791+ gr_search_file(file->f_path.dentry,
54792+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54793+ file->f_path.mnt);
54794+
54795+ if (!gr_tpe_allow(file))
54796+ return 0;
54797+
54798+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54799+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54800+ return 0;
54801+ } else if (unlikely(!(mode & GR_EXEC))) {
54802+ return 0;
54803+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54804+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54805+ return 1;
54806+ }
54807+
54808+ return 1;
54809+}
54810+
54811+void
54812+gr_acl_handle_psacct(struct task_struct *task, const long code)
54813+{
54814+ unsigned long runtime;
54815+ unsigned long cputime;
54816+ unsigned int wday, cday;
54817+ __u8 whr, chr;
54818+ __u8 wmin, cmin;
54819+ __u8 wsec, csec;
54820+ struct timespec timeval;
54821+
54822+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
54823+ !(task->acl->mode & GR_PROCACCT)))
54824+ return;
54825+
54826+ do_posix_clock_monotonic_gettime(&timeval);
54827+ runtime = timeval.tv_sec - task->start_time.tv_sec;
54828+ wday = runtime / (3600 * 24);
54829+ runtime -= wday * (3600 * 24);
54830+ whr = runtime / 3600;
54831+ runtime -= whr * 3600;
54832+ wmin = runtime / 60;
54833+ runtime -= wmin * 60;
54834+ wsec = runtime;
54835+
54836+ cputime = (task->utime + task->stime) / HZ;
54837+ cday = cputime / (3600 * 24);
54838+ cputime -= cday * (3600 * 24);
54839+ chr = cputime / 3600;
54840+ cputime -= chr * 3600;
54841+ cmin = cputime / 60;
54842+ cputime -= cmin * 60;
54843+ csec = cputime;
54844+
54845+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
54846+
54847+ return;
54848+}
54849+
54850+void gr_set_kernel_label(struct task_struct *task)
54851+{
54852+ if (gr_status & GR_READY) {
54853+ task->role = kernel_role;
54854+ task->acl = kernel_role->root_label;
54855+ }
54856+ return;
54857+}
54858+
54859+#ifdef CONFIG_TASKSTATS
54860+int gr_is_taskstats_denied(int pid)
54861+{
54862+ struct task_struct *task;
54863+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54864+ const struct cred *cred;
54865+#endif
54866+ int ret = 0;
54867+
54868+ /* restrict taskstats viewing to un-chrooted root users
54869+ who have the 'view' subject flag if the RBAC system is enabled
54870+ */
54871+
54872+ rcu_read_lock();
54873+ read_lock(&tasklist_lock);
54874+ task = find_task_by_vpid(pid);
54875+ if (task) {
54876+#ifdef CONFIG_GRKERNSEC_CHROOT
54877+ if (proc_is_chrooted(task))
54878+ ret = -EACCES;
54879+#endif
54880+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54881+ cred = __task_cred(task);
54882+#ifdef CONFIG_GRKERNSEC_PROC_USER
54883+ if (cred->uid != 0)
54884+ ret = -EACCES;
54885+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54886+ if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
54887+ ret = -EACCES;
54888+#endif
54889+#endif
54890+ if (gr_status & GR_READY) {
54891+ if (!(task->acl->mode & GR_VIEW))
54892+ ret = -EACCES;
54893+ }
54894+ } else
54895+ ret = -ENOENT;
54896+
54897+ read_unlock(&tasklist_lock);
54898+ rcu_read_unlock();
54899+
54900+ return ret;
54901+}
54902+#endif
54903+
54904+/* AUXV entries are filled via a descendant of search_binary_handler
54905+ after we've already applied the subject for the target
54906+*/
54907+int gr_acl_enable_at_secure(void)
54908+{
54909+ if (unlikely(!(gr_status & GR_READY)))
54910+ return 0;
54911+
54912+ if (current->acl->mode & GR_ATSECURE)
54913+ return 1;
54914+
54915+ return 0;
54916+}
54917+
54918+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
54919+{
54920+ struct task_struct *task = current;
54921+ struct dentry *dentry = file->f_path.dentry;
54922+ struct vfsmount *mnt = file->f_path.mnt;
54923+ struct acl_object_label *obj, *tmp;
54924+ struct acl_subject_label *subj;
54925+ unsigned int bufsize;
54926+ int is_not_root;
54927+ char *path;
54928+ dev_t dev = __get_dev(dentry);
54929+
54930+ if (unlikely(!(gr_status & GR_READY)))
54931+ return 1;
54932+
54933+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
54934+ return 1;
54935+
54936+ /* ignore Eric Biederman */
54937+ if (IS_PRIVATE(dentry->d_inode))
54938+ return 1;
54939+
54940+ subj = task->acl;
54941+ do {
54942+ obj = lookup_acl_obj_label(ino, dev, subj);
54943+ if (obj != NULL)
54944+ return (obj->mode & GR_FIND) ? 1 : 0;
54945+ } while ((subj = subj->parent_subject));
54946+
54947+ /* this is purely an optimization since we're looking for an object
54948+ for the directory we're doing a readdir on
54949+ if it's possible for any globbed object to match the entry we're
54950+ filling into the directory, then the object we find here will be
54951+ an anchor point with attached globbed objects
54952+ */
54953+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
54954+ if (obj->globbed == NULL)
54955+ return (obj->mode & GR_FIND) ? 1 : 0;
54956+
54957+ is_not_root = ((obj->filename[0] == '/') &&
54958+ (obj->filename[1] == '\0')) ? 0 : 1;
54959+ bufsize = PAGE_SIZE - namelen - is_not_root;
54960+
54961+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
54962+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
54963+ return 1;
54964+
54965+ preempt_disable();
54966+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
54967+ bufsize);
54968+
54969+ bufsize = strlen(path);
54970+
54971+ /* if base is "/", don't append an additional slash */
54972+ if (is_not_root)
54973+ *(path + bufsize) = '/';
54974+ memcpy(path + bufsize + is_not_root, name, namelen);
54975+ *(path + bufsize + namelen + is_not_root) = '\0';
54976+
54977+ tmp = obj->globbed;
54978+ while (tmp) {
54979+ if (!glob_match(tmp->filename, path)) {
54980+ preempt_enable();
54981+ return (tmp->mode & GR_FIND) ? 1 : 0;
54982+ }
54983+ tmp = tmp->next;
54984+ }
54985+ preempt_enable();
54986+ return (obj->mode & GR_FIND) ? 1 : 0;
54987+}
54988+
54989+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
54990+EXPORT_SYMBOL(gr_acl_is_enabled);
54991+#endif
54992+EXPORT_SYMBOL(gr_learn_resource);
54993+EXPORT_SYMBOL(gr_set_kernel_label);
54994+#ifdef CONFIG_SECURITY
54995+EXPORT_SYMBOL(gr_check_user_change);
54996+EXPORT_SYMBOL(gr_check_group_change);
54997+#endif
54998+
54999diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
55000new file mode 100644
55001index 0000000..34fefda
55002--- /dev/null
55003+++ b/grsecurity/gracl_alloc.c
55004@@ -0,0 +1,105 @@
55005+#include <linux/kernel.h>
55006+#include <linux/mm.h>
55007+#include <linux/slab.h>
55008+#include <linux/vmalloc.h>
55009+#include <linux/gracl.h>
55010+#include <linux/grsecurity.h>
55011+
55012+static unsigned long alloc_stack_next = 1;
55013+static unsigned long alloc_stack_size = 1;
55014+static void **alloc_stack;
55015+
55016+static __inline__ int
55017+alloc_pop(void)
55018+{
55019+ if (alloc_stack_next == 1)
55020+ return 0;
55021+
55022+ kfree(alloc_stack[alloc_stack_next - 2]);
55023+
55024+ alloc_stack_next--;
55025+
55026+ return 1;
55027+}
55028+
55029+static __inline__ int
55030+alloc_push(void *buf)
55031+{
55032+ if (alloc_stack_next >= alloc_stack_size)
55033+ return 1;
55034+
55035+ alloc_stack[alloc_stack_next - 1] = buf;
55036+
55037+ alloc_stack_next++;
55038+
55039+ return 0;
55040+}
55041+
55042+void *
55043+acl_alloc(unsigned long len)
55044+{
55045+ void *ret = NULL;
55046+
55047+ if (!len || len > PAGE_SIZE)
55048+ goto out;
55049+
55050+ ret = kmalloc(len, GFP_KERNEL);
55051+
55052+ if (ret) {
55053+ if (alloc_push(ret)) {
55054+ kfree(ret);
55055+ ret = NULL;
55056+ }
55057+ }
55058+
55059+out:
55060+ return ret;
55061+}
55062+
55063+void *
55064+acl_alloc_num(unsigned long num, unsigned long len)
55065+{
55066+ if (!len || (num > (PAGE_SIZE / len)))
55067+ return NULL;
55068+
55069+ return acl_alloc(num * len);
55070+}
55071+
55072+void
55073+acl_free_all(void)
55074+{
55075+ if (gr_acl_is_enabled() || !alloc_stack)
55076+ return;
55077+
55078+ while (alloc_pop()) ;
55079+
55080+ if (alloc_stack) {
55081+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
55082+ kfree(alloc_stack);
55083+ else
55084+ vfree(alloc_stack);
55085+ }
55086+
55087+ alloc_stack = NULL;
55088+ alloc_stack_size = 1;
55089+ alloc_stack_next = 1;
55090+
55091+ return;
55092+}
55093+
55094+int
55095+acl_alloc_stack_init(unsigned long size)
55096+{
55097+ if ((size * sizeof (void *)) <= PAGE_SIZE)
55098+ alloc_stack =
55099+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
55100+ else
55101+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
55102+
55103+ alloc_stack_size = size;
55104+
55105+ if (!alloc_stack)
55106+ return 0;
55107+ else
55108+ return 1;
55109+}
55110diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
55111new file mode 100644
55112index 0000000..955ddfb
55113--- /dev/null
55114+++ b/grsecurity/gracl_cap.c
55115@@ -0,0 +1,101 @@
55116+#include <linux/kernel.h>
55117+#include <linux/module.h>
55118+#include <linux/sched.h>
55119+#include <linux/gracl.h>
55120+#include <linux/grsecurity.h>
55121+#include <linux/grinternal.h>
55122+
55123+extern const char *captab_log[];
55124+extern int captab_log_entries;
55125+
55126+int
55127+gr_acl_is_capable(const int cap)
55128+{
55129+ struct task_struct *task = current;
55130+ const struct cred *cred = current_cred();
55131+ struct acl_subject_label *curracl;
55132+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55133+ kernel_cap_t cap_audit = __cap_empty_set;
55134+
55135+ if (!gr_acl_is_enabled())
55136+ return 1;
55137+
55138+ curracl = task->acl;
55139+
55140+ cap_drop = curracl->cap_lower;
55141+ cap_mask = curracl->cap_mask;
55142+ cap_audit = curracl->cap_invert_audit;
55143+
55144+ while ((curracl = curracl->parent_subject)) {
55145+ /* if the cap isn't specified in the current computed mask but is specified in the
55146+ current level subject, and is lowered in the current level subject, then add
55147+ it to the set of dropped capabilities
55148+ otherwise, add the current level subject's mask to the current computed mask
55149+ */
55150+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55151+ cap_raise(cap_mask, cap);
55152+ if (cap_raised(curracl->cap_lower, cap))
55153+ cap_raise(cap_drop, cap);
55154+ if (cap_raised(curracl->cap_invert_audit, cap))
55155+ cap_raise(cap_audit, cap);
55156+ }
55157+ }
55158+
55159+ if (!cap_raised(cap_drop, cap)) {
55160+ if (cap_raised(cap_audit, cap))
55161+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
55162+ return 1;
55163+ }
55164+
55165+ curracl = task->acl;
55166+
55167+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
55168+ && cap_raised(cred->cap_effective, cap)) {
55169+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
55170+ task->role->roletype, cred->uid,
55171+ cred->gid, task->exec_file ?
55172+ gr_to_filename(task->exec_file->f_path.dentry,
55173+ task->exec_file->f_path.mnt) : curracl->filename,
55174+ curracl->filename, 0UL,
55175+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
55176+ return 1;
55177+ }
55178+
55179+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
55180+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
55181+ return 0;
55182+}
55183+
55184+int
55185+gr_acl_is_capable_nolog(const int cap)
55186+{
55187+ struct acl_subject_label *curracl;
55188+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55189+
55190+ if (!gr_acl_is_enabled())
55191+ return 1;
55192+
55193+ curracl = current->acl;
55194+
55195+ cap_drop = curracl->cap_lower;
55196+ cap_mask = curracl->cap_mask;
55197+
55198+ while ((curracl = curracl->parent_subject)) {
55199+ /* if the cap isn't specified in the current computed mask but is specified in the
55200+ current level subject, and is lowered in the current level subject, then add
55201+ it to the set of dropped capabilities
55202+ otherwise, add the current level subject's mask to the current computed mask
55203+ */
55204+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55205+ cap_raise(cap_mask, cap);
55206+ if (cap_raised(curracl->cap_lower, cap))
55207+ cap_raise(cap_drop, cap);
55208+ }
55209+ }
55210+
55211+ if (!cap_raised(cap_drop, cap))
55212+ return 1;
55213+
55214+ return 0;
55215+}
55216+
55217diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
55218new file mode 100644
55219index 0000000..88d0e87
55220--- /dev/null
55221+++ b/grsecurity/gracl_fs.c
55222@@ -0,0 +1,435 @@
55223+#include <linux/kernel.h>
55224+#include <linux/sched.h>
55225+#include <linux/types.h>
55226+#include <linux/fs.h>
55227+#include <linux/file.h>
55228+#include <linux/stat.h>
55229+#include <linux/grsecurity.h>
55230+#include <linux/grinternal.h>
55231+#include <linux/gracl.h>
55232+
55233+umode_t
55234+gr_acl_umask(void)
55235+{
55236+ if (unlikely(!gr_acl_is_enabled()))
55237+ return 0;
55238+
55239+ return current->role->umask;
55240+}
55241+
55242+__u32
55243+gr_acl_handle_hidden_file(const struct dentry * dentry,
55244+ const struct vfsmount * mnt)
55245+{
55246+ __u32 mode;
55247+
55248+ if (unlikely(!dentry->d_inode))
55249+ return GR_FIND;
55250+
55251+ mode =
55252+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
55253+
55254+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
55255+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55256+ return mode;
55257+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
55258+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55259+ return 0;
55260+ } else if (unlikely(!(mode & GR_FIND)))
55261+ return 0;
55262+
55263+ return GR_FIND;
55264+}
55265+
55266+__u32
55267+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
55268+ int acc_mode)
55269+{
55270+ __u32 reqmode = GR_FIND;
55271+ __u32 mode;
55272+
55273+ if (unlikely(!dentry->d_inode))
55274+ return reqmode;
55275+
55276+ if (acc_mode & MAY_APPEND)
55277+ reqmode |= GR_APPEND;
55278+ else if (acc_mode & MAY_WRITE)
55279+ reqmode |= GR_WRITE;
55280+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
55281+ reqmode |= GR_READ;
55282+
55283+ mode =
55284+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55285+ mnt);
55286+
55287+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55288+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55289+ reqmode & GR_READ ? " reading" : "",
55290+ reqmode & GR_WRITE ? " writing" : reqmode &
55291+ GR_APPEND ? " appending" : "");
55292+ return reqmode;
55293+ } else
55294+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55295+ {
55296+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55297+ reqmode & GR_READ ? " reading" : "",
55298+ reqmode & GR_WRITE ? " writing" : reqmode &
55299+ GR_APPEND ? " appending" : "");
55300+ return 0;
55301+ } else if (unlikely((mode & reqmode) != reqmode))
55302+ return 0;
55303+
55304+ return reqmode;
55305+}
55306+
55307+__u32
55308+gr_acl_handle_creat(const struct dentry * dentry,
55309+ const struct dentry * p_dentry,
55310+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
55311+ const int imode)
55312+{
55313+ __u32 reqmode = GR_WRITE | GR_CREATE;
55314+ __u32 mode;
55315+
55316+ if (acc_mode & MAY_APPEND)
55317+ reqmode |= GR_APPEND;
55318+ // if a directory was required or the directory already exists, then
55319+ // don't count this open as a read
55320+ if ((acc_mode & MAY_READ) &&
55321+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
55322+ reqmode |= GR_READ;
55323+ if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
55324+ reqmode |= GR_SETID;
55325+
55326+ mode =
55327+ gr_check_create(dentry, p_dentry, p_mnt,
55328+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55329+
55330+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55331+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55332+ reqmode & GR_READ ? " reading" : "",
55333+ reqmode & GR_WRITE ? " writing" : reqmode &
55334+ GR_APPEND ? " appending" : "");
55335+ return reqmode;
55336+ } else
55337+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55338+ {
55339+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55340+ reqmode & GR_READ ? " reading" : "",
55341+ reqmode & GR_WRITE ? " writing" : reqmode &
55342+ GR_APPEND ? " appending" : "");
55343+ return 0;
55344+ } else if (unlikely((mode & reqmode) != reqmode))
55345+ return 0;
55346+
55347+ return reqmode;
55348+}
55349+
55350+__u32
55351+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
55352+ const int fmode)
55353+{
55354+ __u32 mode, reqmode = GR_FIND;
55355+
55356+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
55357+ reqmode |= GR_EXEC;
55358+ if (fmode & S_IWOTH)
55359+ reqmode |= GR_WRITE;
55360+ if (fmode & S_IROTH)
55361+ reqmode |= GR_READ;
55362+
55363+ mode =
55364+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55365+ mnt);
55366+
55367+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55368+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55369+ reqmode & GR_READ ? " reading" : "",
55370+ reqmode & GR_WRITE ? " writing" : "",
55371+ reqmode & GR_EXEC ? " executing" : "");
55372+ return reqmode;
55373+ } else
55374+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55375+ {
55376+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55377+ reqmode & GR_READ ? " reading" : "",
55378+ reqmode & GR_WRITE ? " writing" : "",
55379+ reqmode & GR_EXEC ? " executing" : "");
55380+ return 0;
55381+ } else if (unlikely((mode & reqmode) != reqmode))
55382+ return 0;
55383+
55384+ return reqmode;
55385+}
55386+
55387+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
55388+{
55389+ __u32 mode;
55390+
55391+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
55392+
55393+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55394+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
55395+ return mode;
55396+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55397+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
55398+ return 0;
55399+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55400+ return 0;
55401+
55402+ return (reqmode);
55403+}
55404+
55405+__u32
55406+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
55407+{
55408+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
55409+}
55410+
55411+__u32
55412+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
55413+{
55414+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
55415+}
55416+
55417+__u32
55418+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
55419+{
55420+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
55421+}
55422+
55423+__u32
55424+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
55425+{
55426+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
55427+}
55428+
55429+__u32
55430+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
55431+ umode_t *modeptr)
55432+{
55433+ umode_t mode;
55434+
55435+ *modeptr &= ~gr_acl_umask();
55436+ mode = *modeptr;
55437+
55438+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
55439+ return 1;
55440+
55441+ if (unlikely(mode & (S_ISUID | S_ISGID))) {
55442+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
55443+ GR_CHMOD_ACL_MSG);
55444+ } else {
55445+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
55446+ }
55447+}
55448+
55449+__u32
55450+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
55451+{
55452+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
55453+}
55454+
55455+__u32
55456+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
55457+{
55458+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
55459+}
55460+
55461+__u32
55462+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
55463+{
55464+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
55465+}
55466+
55467+__u32
55468+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
55469+{
55470+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
55471+ GR_UNIXCONNECT_ACL_MSG);
55472+}
55473+
55474+/* hardlinks require at minimum create and link permission,
55475+ any additional privilege required is based on the
55476+ privilege of the file being linked to
55477+*/
55478+__u32
55479+gr_acl_handle_link(const struct dentry * new_dentry,
55480+ const struct dentry * parent_dentry,
55481+ const struct vfsmount * parent_mnt,
55482+ const struct dentry * old_dentry,
55483+ const struct vfsmount * old_mnt, const char *to)
55484+{
55485+ __u32 mode;
55486+ __u32 needmode = GR_CREATE | GR_LINK;
55487+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
55488+
55489+ mode =
55490+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
55491+ old_mnt);
55492+
55493+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
55494+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55495+ return mode;
55496+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55497+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55498+ return 0;
55499+ } else if (unlikely((mode & needmode) != needmode))
55500+ return 0;
55501+
55502+ return 1;
55503+}
55504+
55505+__u32
55506+gr_acl_handle_symlink(const struct dentry * new_dentry,
55507+ const struct dentry * parent_dentry,
55508+ const struct vfsmount * parent_mnt, const char *from)
55509+{
55510+ __u32 needmode = GR_WRITE | GR_CREATE;
55511+ __u32 mode;
55512+
55513+ mode =
55514+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
55515+ GR_CREATE | GR_AUDIT_CREATE |
55516+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
55517+
55518+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
55519+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55520+ return mode;
55521+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55522+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55523+ return 0;
55524+ } else if (unlikely((mode & needmode) != needmode))
55525+ return 0;
55526+
55527+ return (GR_WRITE | GR_CREATE);
55528+}
55529+
55530+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)
55531+{
55532+ __u32 mode;
55533+
55534+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55535+
55536+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55537+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
55538+ return mode;
55539+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55540+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
55541+ return 0;
55542+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55543+ return 0;
55544+
55545+ return (reqmode);
55546+}
55547+
55548+__u32
55549+gr_acl_handle_mknod(const struct dentry * new_dentry,
55550+ const struct dentry * parent_dentry,
55551+ const struct vfsmount * parent_mnt,
55552+ const int mode)
55553+{
55554+ __u32 reqmode = GR_WRITE | GR_CREATE;
55555+ if (unlikely(mode & (S_ISUID | S_ISGID)))
55556+ reqmode |= GR_SETID;
55557+
55558+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55559+ reqmode, GR_MKNOD_ACL_MSG);
55560+}
55561+
55562+__u32
55563+gr_acl_handle_mkdir(const struct dentry *new_dentry,
55564+ const struct dentry *parent_dentry,
55565+ const struct vfsmount *parent_mnt)
55566+{
55567+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55568+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
55569+}
55570+
55571+#define RENAME_CHECK_SUCCESS(old, new) \
55572+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
55573+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
55574+
55575+int
55576+gr_acl_handle_rename(struct dentry *new_dentry,
55577+ struct dentry *parent_dentry,
55578+ const struct vfsmount *parent_mnt,
55579+ struct dentry *old_dentry,
55580+ struct inode *old_parent_inode,
55581+ struct vfsmount *old_mnt, const char *newname)
55582+{
55583+ __u32 comp1, comp2;
55584+ int error = 0;
55585+
55586+ if (unlikely(!gr_acl_is_enabled()))
55587+ return 0;
55588+
55589+ if (!new_dentry->d_inode) {
55590+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
55591+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
55592+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
55593+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
55594+ GR_DELETE | GR_AUDIT_DELETE |
55595+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55596+ GR_SUPPRESS, old_mnt);
55597+ } else {
55598+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
55599+ GR_CREATE | GR_DELETE |
55600+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
55601+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55602+ GR_SUPPRESS, parent_mnt);
55603+ comp2 =
55604+ gr_search_file(old_dentry,
55605+ GR_READ | GR_WRITE | GR_AUDIT_READ |
55606+ GR_DELETE | GR_AUDIT_DELETE |
55607+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
55608+ }
55609+
55610+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
55611+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
55612+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55613+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
55614+ && !(comp2 & GR_SUPPRESS)) {
55615+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55616+ error = -EACCES;
55617+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
55618+ error = -EACCES;
55619+
55620+ return error;
55621+}
55622+
55623+void
55624+gr_acl_handle_exit(void)
55625+{
55626+ u16 id;
55627+ char *rolename;
55628+ struct file *exec_file;
55629+
55630+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
55631+ !(current->role->roletype & GR_ROLE_PERSIST))) {
55632+ id = current->acl_role_id;
55633+ rolename = current->role->rolename;
55634+ gr_set_acls(1);
55635+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
55636+ }
55637+
55638+ write_lock(&grsec_exec_file_lock);
55639+ exec_file = current->exec_file;
55640+ current->exec_file = NULL;
55641+ write_unlock(&grsec_exec_file_lock);
55642+
55643+ if (exec_file)
55644+ fput(exec_file);
55645+}
55646+
55647+int
55648+gr_acl_handle_procpidmem(const struct task_struct *task)
55649+{
55650+ if (unlikely(!gr_acl_is_enabled()))
55651+ return 0;
55652+
55653+ if (task != current && task->acl->mode & GR_PROTPROCFD)
55654+ return -EACCES;
55655+
55656+ return 0;
55657+}
55658diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
55659new file mode 100644
55660index 0000000..17050ca
55661--- /dev/null
55662+++ b/grsecurity/gracl_ip.c
55663@@ -0,0 +1,381 @@
55664+#include <linux/kernel.h>
55665+#include <asm/uaccess.h>
55666+#include <asm/errno.h>
55667+#include <net/sock.h>
55668+#include <linux/file.h>
55669+#include <linux/fs.h>
55670+#include <linux/net.h>
55671+#include <linux/in.h>
55672+#include <linux/skbuff.h>
55673+#include <linux/ip.h>
55674+#include <linux/udp.h>
55675+#include <linux/types.h>
55676+#include <linux/sched.h>
55677+#include <linux/netdevice.h>
55678+#include <linux/inetdevice.h>
55679+#include <linux/gracl.h>
55680+#include <linux/grsecurity.h>
55681+#include <linux/grinternal.h>
55682+
55683+#define GR_BIND 0x01
55684+#define GR_CONNECT 0x02
55685+#define GR_INVERT 0x04
55686+#define GR_BINDOVERRIDE 0x08
55687+#define GR_CONNECTOVERRIDE 0x10
55688+#define GR_SOCK_FAMILY 0x20
55689+
55690+static const char * gr_protocols[IPPROTO_MAX] = {
55691+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
55692+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
55693+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
55694+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
55695+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
55696+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
55697+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
55698+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
55699+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
55700+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
55701+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
55702+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
55703+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
55704+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
55705+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
55706+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
55707+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
55708+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
55709+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
55710+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
55711+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
55712+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
55713+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
55714+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
55715+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
55716+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
55717+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
55718+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
55719+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
55720+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
55721+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
55722+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
55723+ };
55724+
55725+static const char * gr_socktypes[SOCK_MAX] = {
55726+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
55727+ "unknown:7", "unknown:8", "unknown:9", "packet"
55728+ };
55729+
55730+static const char * gr_sockfamilies[AF_MAX+1] = {
55731+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
55732+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
55733+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
55734+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
55735+ };
55736+
55737+const char *
55738+gr_proto_to_name(unsigned char proto)
55739+{
55740+ return gr_protocols[proto];
55741+}
55742+
55743+const char *
55744+gr_socktype_to_name(unsigned char type)
55745+{
55746+ return gr_socktypes[type];
55747+}
55748+
55749+const char *
55750+gr_sockfamily_to_name(unsigned char family)
55751+{
55752+ return gr_sockfamilies[family];
55753+}
55754+
55755+int
55756+gr_search_socket(const int domain, const int type, const int protocol)
55757+{
55758+ struct acl_subject_label *curr;
55759+ const struct cred *cred = current_cred();
55760+
55761+ if (unlikely(!gr_acl_is_enabled()))
55762+ goto exit;
55763+
55764+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
55765+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
55766+ goto exit; // let the kernel handle it
55767+
55768+ curr = current->acl;
55769+
55770+ if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
55771+ /* the family is allowed, if this is PF_INET allow it only if
55772+ the extra sock type/protocol checks pass */
55773+ if (domain == PF_INET)
55774+ goto inet_check;
55775+ goto exit;
55776+ } else {
55777+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55778+ __u32 fakeip = 0;
55779+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55780+ current->role->roletype, cred->uid,
55781+ cred->gid, current->exec_file ?
55782+ gr_to_filename(current->exec_file->f_path.dentry,
55783+ current->exec_file->f_path.mnt) :
55784+ curr->filename, curr->filename,
55785+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
55786+ &current->signal->saved_ip);
55787+ goto exit;
55788+ }
55789+ goto exit_fail;
55790+ }
55791+
55792+inet_check:
55793+ /* the rest of this checking is for IPv4 only */
55794+ if (!curr->ips)
55795+ goto exit;
55796+
55797+ if ((curr->ip_type & (1 << type)) &&
55798+ (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
55799+ goto exit;
55800+
55801+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55802+ /* we don't place acls on raw sockets , and sometimes
55803+ dgram/ip sockets are opened for ioctl and not
55804+ bind/connect, so we'll fake a bind learn log */
55805+ if (type == SOCK_RAW || type == SOCK_PACKET) {
55806+ __u32 fakeip = 0;
55807+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55808+ current->role->roletype, cred->uid,
55809+ cred->gid, current->exec_file ?
55810+ gr_to_filename(current->exec_file->f_path.dentry,
55811+ current->exec_file->f_path.mnt) :
55812+ curr->filename, curr->filename,
55813+ &fakeip, 0, type,
55814+ protocol, GR_CONNECT, &current->signal->saved_ip);
55815+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
55816+ __u32 fakeip = 0;
55817+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55818+ current->role->roletype, cred->uid,
55819+ cred->gid, current->exec_file ?
55820+ gr_to_filename(current->exec_file->f_path.dentry,
55821+ current->exec_file->f_path.mnt) :
55822+ curr->filename, curr->filename,
55823+ &fakeip, 0, type,
55824+ protocol, GR_BIND, &current->signal->saved_ip);
55825+ }
55826+ /* we'll log when they use connect or bind */
55827+ goto exit;
55828+ }
55829+
55830+exit_fail:
55831+ if (domain == PF_INET)
55832+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
55833+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
55834+ else
55835+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
55836+ gr_socktype_to_name(type), protocol);
55837+
55838+ return 0;
55839+exit:
55840+ return 1;
55841+}
55842+
55843+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)
55844+{
55845+ if ((ip->mode & mode) &&
55846+ (ip_port >= ip->low) &&
55847+ (ip_port <= ip->high) &&
55848+ ((ntohl(ip_addr) & our_netmask) ==
55849+ (ntohl(our_addr) & our_netmask))
55850+ && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
55851+ && (ip->type & (1 << type))) {
55852+ if (ip->mode & GR_INVERT)
55853+ return 2; // specifically denied
55854+ else
55855+ return 1; // allowed
55856+ }
55857+
55858+ return 0; // not specifically allowed, may continue parsing
55859+}
55860+
55861+static int
55862+gr_search_connectbind(const int full_mode, struct sock *sk,
55863+ struct sockaddr_in *addr, const int type)
55864+{
55865+ char iface[IFNAMSIZ] = {0};
55866+ struct acl_subject_label *curr;
55867+ struct acl_ip_label *ip;
55868+ struct inet_sock *isk;
55869+ struct net_device *dev;
55870+ struct in_device *idev;
55871+ unsigned long i;
55872+ int ret;
55873+ int mode = full_mode & (GR_BIND | GR_CONNECT);
55874+ __u32 ip_addr = 0;
55875+ __u32 our_addr;
55876+ __u32 our_netmask;
55877+ char *p;
55878+ __u16 ip_port = 0;
55879+ const struct cred *cred = current_cred();
55880+
55881+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
55882+ return 0;
55883+
55884+ curr = current->acl;
55885+ isk = inet_sk(sk);
55886+
55887+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
55888+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
55889+ addr->sin_addr.s_addr = curr->inaddr_any_override;
55890+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
55891+ struct sockaddr_in saddr;
55892+ int err;
55893+
55894+ saddr.sin_family = AF_INET;
55895+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
55896+ saddr.sin_port = isk->inet_sport;
55897+
55898+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
55899+ if (err)
55900+ return err;
55901+
55902+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
55903+ if (err)
55904+ return err;
55905+ }
55906+
55907+ if (!curr->ips)
55908+ return 0;
55909+
55910+ ip_addr = addr->sin_addr.s_addr;
55911+ ip_port = ntohs(addr->sin_port);
55912+
55913+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55914+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55915+ current->role->roletype, cred->uid,
55916+ cred->gid, current->exec_file ?
55917+ gr_to_filename(current->exec_file->f_path.dentry,
55918+ current->exec_file->f_path.mnt) :
55919+ curr->filename, curr->filename,
55920+ &ip_addr, ip_port, type,
55921+ sk->sk_protocol, mode, &current->signal->saved_ip);
55922+ return 0;
55923+ }
55924+
55925+ for (i = 0; i < curr->ip_num; i++) {
55926+ ip = *(curr->ips + i);
55927+ if (ip->iface != NULL) {
55928+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
55929+ p = strchr(iface, ':');
55930+ if (p != NULL)
55931+ *p = '\0';
55932+ dev = dev_get_by_name(sock_net(sk), iface);
55933+ if (dev == NULL)
55934+ continue;
55935+ idev = in_dev_get(dev);
55936+ if (idev == NULL) {
55937+ dev_put(dev);
55938+ continue;
55939+ }
55940+ rcu_read_lock();
55941+ for_ifa(idev) {
55942+ if (!strcmp(ip->iface, ifa->ifa_label)) {
55943+ our_addr = ifa->ifa_address;
55944+ our_netmask = 0xffffffff;
55945+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
55946+ if (ret == 1) {
55947+ rcu_read_unlock();
55948+ in_dev_put(idev);
55949+ dev_put(dev);
55950+ return 0;
55951+ } else if (ret == 2) {
55952+ rcu_read_unlock();
55953+ in_dev_put(idev);
55954+ dev_put(dev);
55955+ goto denied;
55956+ }
55957+ }
55958+ } endfor_ifa(idev);
55959+ rcu_read_unlock();
55960+ in_dev_put(idev);
55961+ dev_put(dev);
55962+ } else {
55963+ our_addr = ip->addr;
55964+ our_netmask = ip->netmask;
55965+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
55966+ if (ret == 1)
55967+ return 0;
55968+ else if (ret == 2)
55969+ goto denied;
55970+ }
55971+ }
55972+
55973+denied:
55974+ if (mode == GR_BIND)
55975+ 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));
55976+ else if (mode == GR_CONNECT)
55977+ 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));
55978+
55979+ return -EACCES;
55980+}
55981+
55982+int
55983+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
55984+{
55985+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
55986+}
55987+
55988+int
55989+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
55990+{
55991+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
55992+}
55993+
55994+int gr_search_listen(struct socket *sock)
55995+{
55996+ struct sock *sk = sock->sk;
55997+ struct sockaddr_in addr;
55998+
55999+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
56000+ addr.sin_port = inet_sk(sk)->inet_sport;
56001+
56002+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
56003+}
56004+
56005+int gr_search_accept(struct socket *sock)
56006+{
56007+ struct sock *sk = sock->sk;
56008+ struct sockaddr_in addr;
56009+
56010+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
56011+ addr.sin_port = inet_sk(sk)->inet_sport;
56012+
56013+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
56014+}
56015+
56016+int
56017+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
56018+{
56019+ if (addr)
56020+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
56021+ else {
56022+ struct sockaddr_in sin;
56023+ const struct inet_sock *inet = inet_sk(sk);
56024+
56025+ sin.sin_addr.s_addr = inet->inet_daddr;
56026+ sin.sin_port = inet->inet_dport;
56027+
56028+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
56029+ }
56030+}
56031+
56032+int
56033+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
56034+{
56035+ struct sockaddr_in sin;
56036+
56037+ if (unlikely(skb->len < sizeof (struct udphdr)))
56038+ return 0; // skip this packet
56039+
56040+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
56041+ sin.sin_port = udp_hdr(skb)->source;
56042+
56043+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
56044+}
56045diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
56046new file mode 100644
56047index 0000000..25f54ef
56048--- /dev/null
56049+++ b/grsecurity/gracl_learn.c
56050@@ -0,0 +1,207 @@
56051+#include <linux/kernel.h>
56052+#include <linux/mm.h>
56053+#include <linux/sched.h>
56054+#include <linux/poll.h>
56055+#include <linux/string.h>
56056+#include <linux/file.h>
56057+#include <linux/types.h>
56058+#include <linux/vmalloc.h>
56059+#include <linux/grinternal.h>
56060+
56061+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
56062+ size_t count, loff_t *ppos);
56063+extern int gr_acl_is_enabled(void);
56064+
56065+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
56066+static int gr_learn_attached;
56067+
56068+/* use a 512k buffer */
56069+#define LEARN_BUFFER_SIZE (512 * 1024)
56070+
56071+static DEFINE_SPINLOCK(gr_learn_lock);
56072+static DEFINE_MUTEX(gr_learn_user_mutex);
56073+
56074+/* we need to maintain two buffers, so that the kernel context of grlearn
56075+ uses a semaphore around the userspace copying, and the other kernel contexts
56076+ use a spinlock when copying into the buffer, since they cannot sleep
56077+*/
56078+static char *learn_buffer;
56079+static char *learn_buffer_user;
56080+static int learn_buffer_len;
56081+static int learn_buffer_user_len;
56082+
56083+static ssize_t
56084+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
56085+{
56086+ DECLARE_WAITQUEUE(wait, current);
56087+ ssize_t retval = 0;
56088+
56089+ add_wait_queue(&learn_wait, &wait);
56090+ set_current_state(TASK_INTERRUPTIBLE);
56091+ do {
56092+ mutex_lock(&gr_learn_user_mutex);
56093+ spin_lock(&gr_learn_lock);
56094+ if (learn_buffer_len)
56095+ break;
56096+ spin_unlock(&gr_learn_lock);
56097+ mutex_unlock(&gr_learn_user_mutex);
56098+ if (file->f_flags & O_NONBLOCK) {
56099+ retval = -EAGAIN;
56100+ goto out;
56101+ }
56102+ if (signal_pending(current)) {
56103+ retval = -ERESTARTSYS;
56104+ goto out;
56105+ }
56106+
56107+ schedule();
56108+ } while (1);
56109+
56110+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
56111+ learn_buffer_user_len = learn_buffer_len;
56112+ retval = learn_buffer_len;
56113+ learn_buffer_len = 0;
56114+
56115+ spin_unlock(&gr_learn_lock);
56116+
56117+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
56118+ retval = -EFAULT;
56119+
56120+ mutex_unlock(&gr_learn_user_mutex);
56121+out:
56122+ set_current_state(TASK_RUNNING);
56123+ remove_wait_queue(&learn_wait, &wait);
56124+ return retval;
56125+}
56126+
56127+static unsigned int
56128+poll_learn(struct file * file, poll_table * wait)
56129+{
56130+ poll_wait(file, &learn_wait, wait);
56131+
56132+ if (learn_buffer_len)
56133+ return (POLLIN | POLLRDNORM);
56134+
56135+ return 0;
56136+}
56137+
56138+void
56139+gr_clear_learn_entries(void)
56140+{
56141+ char *tmp;
56142+
56143+ mutex_lock(&gr_learn_user_mutex);
56144+ spin_lock(&gr_learn_lock);
56145+ tmp = learn_buffer;
56146+ learn_buffer = NULL;
56147+ spin_unlock(&gr_learn_lock);
56148+ if (tmp)
56149+ vfree(tmp);
56150+ if (learn_buffer_user != NULL) {
56151+ vfree(learn_buffer_user);
56152+ learn_buffer_user = NULL;
56153+ }
56154+ learn_buffer_len = 0;
56155+ mutex_unlock(&gr_learn_user_mutex);
56156+
56157+ return;
56158+}
56159+
56160+void
56161+gr_add_learn_entry(const char *fmt, ...)
56162+{
56163+ va_list args;
56164+ unsigned int len;
56165+
56166+ if (!gr_learn_attached)
56167+ return;
56168+
56169+ spin_lock(&gr_learn_lock);
56170+
56171+ /* leave a gap at the end so we know when it's "full" but don't have to
56172+ compute the exact length of the string we're trying to append
56173+ */
56174+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
56175+ spin_unlock(&gr_learn_lock);
56176+ wake_up_interruptible(&learn_wait);
56177+ return;
56178+ }
56179+ if (learn_buffer == NULL) {
56180+ spin_unlock(&gr_learn_lock);
56181+ return;
56182+ }
56183+
56184+ va_start(args, fmt);
56185+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
56186+ va_end(args);
56187+
56188+ learn_buffer_len += len + 1;
56189+
56190+ spin_unlock(&gr_learn_lock);
56191+ wake_up_interruptible(&learn_wait);
56192+
56193+ return;
56194+}
56195+
56196+static int
56197+open_learn(struct inode *inode, struct file *file)
56198+{
56199+ if (file->f_mode & FMODE_READ && gr_learn_attached)
56200+ return -EBUSY;
56201+ if (file->f_mode & FMODE_READ) {
56202+ int retval = 0;
56203+ mutex_lock(&gr_learn_user_mutex);
56204+ if (learn_buffer == NULL)
56205+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
56206+ if (learn_buffer_user == NULL)
56207+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
56208+ if (learn_buffer == NULL) {
56209+ retval = -ENOMEM;
56210+ goto out_error;
56211+ }
56212+ if (learn_buffer_user == NULL) {
56213+ retval = -ENOMEM;
56214+ goto out_error;
56215+ }
56216+ learn_buffer_len = 0;
56217+ learn_buffer_user_len = 0;
56218+ gr_learn_attached = 1;
56219+out_error:
56220+ mutex_unlock(&gr_learn_user_mutex);
56221+ return retval;
56222+ }
56223+ return 0;
56224+}
56225+
56226+static int
56227+close_learn(struct inode *inode, struct file *file)
56228+{
56229+ if (file->f_mode & FMODE_READ) {
56230+ char *tmp = NULL;
56231+ mutex_lock(&gr_learn_user_mutex);
56232+ spin_lock(&gr_learn_lock);
56233+ tmp = learn_buffer;
56234+ learn_buffer = NULL;
56235+ spin_unlock(&gr_learn_lock);
56236+ if (tmp)
56237+ vfree(tmp);
56238+ if (learn_buffer_user != NULL) {
56239+ vfree(learn_buffer_user);
56240+ learn_buffer_user = NULL;
56241+ }
56242+ learn_buffer_len = 0;
56243+ learn_buffer_user_len = 0;
56244+ gr_learn_attached = 0;
56245+ mutex_unlock(&gr_learn_user_mutex);
56246+ }
56247+
56248+ return 0;
56249+}
56250+
56251+const struct file_operations grsec_fops = {
56252+ .read = read_learn,
56253+ .write = write_grsec_handler,
56254+ .open = open_learn,
56255+ .release = close_learn,
56256+ .poll = poll_learn,
56257+};
56258diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
56259new file mode 100644
56260index 0000000..39645c9
56261--- /dev/null
56262+++ b/grsecurity/gracl_res.c
56263@@ -0,0 +1,68 @@
56264+#include <linux/kernel.h>
56265+#include <linux/sched.h>
56266+#include <linux/gracl.h>
56267+#include <linux/grinternal.h>
56268+
56269+static const char *restab_log[] = {
56270+ [RLIMIT_CPU] = "RLIMIT_CPU",
56271+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
56272+ [RLIMIT_DATA] = "RLIMIT_DATA",
56273+ [RLIMIT_STACK] = "RLIMIT_STACK",
56274+ [RLIMIT_CORE] = "RLIMIT_CORE",
56275+ [RLIMIT_RSS] = "RLIMIT_RSS",
56276+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
56277+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
56278+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
56279+ [RLIMIT_AS] = "RLIMIT_AS",
56280+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
56281+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
56282+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
56283+ [RLIMIT_NICE] = "RLIMIT_NICE",
56284+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
56285+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
56286+ [GR_CRASH_RES] = "RLIMIT_CRASH"
56287+};
56288+
56289+void
56290+gr_log_resource(const struct task_struct *task,
56291+ const int res, const unsigned long wanted, const int gt)
56292+{
56293+ const struct cred *cred;
56294+ unsigned long rlim;
56295+
56296+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
56297+ return;
56298+
56299+ // not yet supported resource
56300+ if (unlikely(!restab_log[res]))
56301+ return;
56302+
56303+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
56304+ rlim = task_rlimit_max(task, res);
56305+ else
56306+ rlim = task_rlimit(task, res);
56307+
56308+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
56309+ return;
56310+
56311+ rcu_read_lock();
56312+ cred = __task_cred(task);
56313+
56314+ if (res == RLIMIT_NPROC &&
56315+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
56316+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
56317+ goto out_rcu_unlock;
56318+ else if (res == RLIMIT_MEMLOCK &&
56319+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
56320+ goto out_rcu_unlock;
56321+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
56322+ goto out_rcu_unlock;
56323+ rcu_read_unlock();
56324+
56325+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
56326+
56327+ return;
56328+out_rcu_unlock:
56329+ rcu_read_unlock();
56330+ return;
56331+}
56332diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
56333new file mode 100644
56334index 0000000..5556be3
56335--- /dev/null
56336+++ b/grsecurity/gracl_segv.c
56337@@ -0,0 +1,299 @@
56338+#include <linux/kernel.h>
56339+#include <linux/mm.h>
56340+#include <asm/uaccess.h>
56341+#include <asm/errno.h>
56342+#include <asm/mman.h>
56343+#include <net/sock.h>
56344+#include <linux/file.h>
56345+#include <linux/fs.h>
56346+#include <linux/net.h>
56347+#include <linux/in.h>
56348+#include <linux/slab.h>
56349+#include <linux/types.h>
56350+#include <linux/sched.h>
56351+#include <linux/timer.h>
56352+#include <linux/gracl.h>
56353+#include <linux/grsecurity.h>
56354+#include <linux/grinternal.h>
56355+
56356+static struct crash_uid *uid_set;
56357+static unsigned short uid_used;
56358+static DEFINE_SPINLOCK(gr_uid_lock);
56359+extern rwlock_t gr_inode_lock;
56360+extern struct acl_subject_label *
56361+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
56362+ struct acl_role_label *role);
56363+
56364+#ifdef CONFIG_BTRFS_FS
56365+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
56366+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
56367+#endif
56368+
56369+static inline dev_t __get_dev(const struct dentry *dentry)
56370+{
56371+#ifdef CONFIG_BTRFS_FS
56372+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
56373+ return get_btrfs_dev_from_inode(dentry->d_inode);
56374+ else
56375+#endif
56376+ return dentry->d_inode->i_sb->s_dev;
56377+}
56378+
56379+int
56380+gr_init_uidset(void)
56381+{
56382+ uid_set =
56383+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
56384+ uid_used = 0;
56385+
56386+ return uid_set ? 1 : 0;
56387+}
56388+
56389+void
56390+gr_free_uidset(void)
56391+{
56392+ if (uid_set)
56393+ kfree(uid_set);
56394+
56395+ return;
56396+}
56397+
56398+int
56399+gr_find_uid(const uid_t uid)
56400+{
56401+ struct crash_uid *tmp = uid_set;
56402+ uid_t buid;
56403+ int low = 0, high = uid_used - 1, mid;
56404+
56405+ while (high >= low) {
56406+ mid = (low + high) >> 1;
56407+ buid = tmp[mid].uid;
56408+ if (buid == uid)
56409+ return mid;
56410+ if (buid > uid)
56411+ high = mid - 1;
56412+ if (buid < uid)
56413+ low = mid + 1;
56414+ }
56415+
56416+ return -1;
56417+}
56418+
56419+static __inline__ void
56420+gr_insertsort(void)
56421+{
56422+ unsigned short i, j;
56423+ struct crash_uid index;
56424+
56425+ for (i = 1; i < uid_used; i++) {
56426+ index = uid_set[i];
56427+ j = i;
56428+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
56429+ uid_set[j] = uid_set[j - 1];
56430+ j--;
56431+ }
56432+ uid_set[j] = index;
56433+ }
56434+
56435+ return;
56436+}
56437+
56438+static __inline__ void
56439+gr_insert_uid(const uid_t uid, const unsigned long expires)
56440+{
56441+ int loc;
56442+
56443+ if (uid_used == GR_UIDTABLE_MAX)
56444+ return;
56445+
56446+ loc = gr_find_uid(uid);
56447+
56448+ if (loc >= 0) {
56449+ uid_set[loc].expires = expires;
56450+ return;
56451+ }
56452+
56453+ uid_set[uid_used].uid = uid;
56454+ uid_set[uid_used].expires = expires;
56455+ uid_used++;
56456+
56457+ gr_insertsort();
56458+
56459+ return;
56460+}
56461+
56462+void
56463+gr_remove_uid(const unsigned short loc)
56464+{
56465+ unsigned short i;
56466+
56467+ for (i = loc + 1; i < uid_used; i++)
56468+ uid_set[i - 1] = uid_set[i];
56469+
56470+ uid_used--;
56471+
56472+ return;
56473+}
56474+
56475+int
56476+gr_check_crash_uid(const uid_t uid)
56477+{
56478+ int loc;
56479+ int ret = 0;
56480+
56481+ if (unlikely(!gr_acl_is_enabled()))
56482+ return 0;
56483+
56484+ spin_lock(&gr_uid_lock);
56485+ loc = gr_find_uid(uid);
56486+
56487+ if (loc < 0)
56488+ goto out_unlock;
56489+
56490+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
56491+ gr_remove_uid(loc);
56492+ else
56493+ ret = 1;
56494+
56495+out_unlock:
56496+ spin_unlock(&gr_uid_lock);
56497+ return ret;
56498+}
56499+
56500+static __inline__ int
56501+proc_is_setxid(const struct cred *cred)
56502+{
56503+ if (cred->uid != cred->euid || cred->uid != cred->suid ||
56504+ cred->uid != cred->fsuid)
56505+ return 1;
56506+ if (cred->gid != cred->egid || cred->gid != cred->sgid ||
56507+ cred->gid != cred->fsgid)
56508+ return 1;
56509+
56510+ return 0;
56511+}
56512+
56513+extern int gr_fake_force_sig(int sig, struct task_struct *t);
56514+
56515+void
56516+gr_handle_crash(struct task_struct *task, const int sig)
56517+{
56518+ struct acl_subject_label *curr;
56519+ struct task_struct *tsk, *tsk2;
56520+ const struct cred *cred;
56521+ const struct cred *cred2;
56522+
56523+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
56524+ return;
56525+
56526+ if (unlikely(!gr_acl_is_enabled()))
56527+ return;
56528+
56529+ curr = task->acl;
56530+
56531+ if (!(curr->resmask & (1 << GR_CRASH_RES)))
56532+ return;
56533+
56534+ if (time_before_eq(curr->expires, get_seconds())) {
56535+ curr->expires = 0;
56536+ curr->crashes = 0;
56537+ }
56538+
56539+ curr->crashes++;
56540+
56541+ if (!curr->expires)
56542+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
56543+
56544+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56545+ time_after(curr->expires, get_seconds())) {
56546+ rcu_read_lock();
56547+ cred = __task_cred(task);
56548+ if (cred->uid && proc_is_setxid(cred)) {
56549+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56550+ spin_lock(&gr_uid_lock);
56551+ gr_insert_uid(cred->uid, curr->expires);
56552+ spin_unlock(&gr_uid_lock);
56553+ curr->expires = 0;
56554+ curr->crashes = 0;
56555+ read_lock(&tasklist_lock);
56556+ do_each_thread(tsk2, tsk) {
56557+ cred2 = __task_cred(tsk);
56558+ if (tsk != task && cred2->uid == cred->uid)
56559+ gr_fake_force_sig(SIGKILL, tsk);
56560+ } while_each_thread(tsk2, tsk);
56561+ read_unlock(&tasklist_lock);
56562+ } else {
56563+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56564+ read_lock(&tasklist_lock);
56565+ read_lock(&grsec_exec_file_lock);
56566+ do_each_thread(tsk2, tsk) {
56567+ if (likely(tsk != task)) {
56568+ // if this thread has the same subject as the one that triggered
56569+ // RES_CRASH and it's the same binary, kill it
56570+ if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
56571+ gr_fake_force_sig(SIGKILL, tsk);
56572+ }
56573+ } while_each_thread(tsk2, tsk);
56574+ read_unlock(&grsec_exec_file_lock);
56575+ read_unlock(&tasklist_lock);
56576+ }
56577+ rcu_read_unlock();
56578+ }
56579+
56580+ return;
56581+}
56582+
56583+int
56584+gr_check_crash_exec(const struct file *filp)
56585+{
56586+ struct acl_subject_label *curr;
56587+
56588+ if (unlikely(!gr_acl_is_enabled()))
56589+ return 0;
56590+
56591+ read_lock(&gr_inode_lock);
56592+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
56593+ __get_dev(filp->f_path.dentry),
56594+ current->role);
56595+ read_unlock(&gr_inode_lock);
56596+
56597+ if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
56598+ (!curr->crashes && !curr->expires))
56599+ return 0;
56600+
56601+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56602+ time_after(curr->expires, get_seconds()))
56603+ return 1;
56604+ else if (time_before_eq(curr->expires, get_seconds())) {
56605+ curr->crashes = 0;
56606+ curr->expires = 0;
56607+ }
56608+
56609+ return 0;
56610+}
56611+
56612+void
56613+gr_handle_alertkill(struct task_struct *task)
56614+{
56615+ struct acl_subject_label *curracl;
56616+ __u32 curr_ip;
56617+ struct task_struct *p, *p2;
56618+
56619+ if (unlikely(!gr_acl_is_enabled()))
56620+ return;
56621+
56622+ curracl = task->acl;
56623+ curr_ip = task->signal->curr_ip;
56624+
56625+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
56626+ read_lock(&tasklist_lock);
56627+ do_each_thread(p2, p) {
56628+ if (p->signal->curr_ip == curr_ip)
56629+ gr_fake_force_sig(SIGKILL, p);
56630+ } while_each_thread(p2, p);
56631+ read_unlock(&tasklist_lock);
56632+ } else if (curracl->mode & GR_KILLPROC)
56633+ gr_fake_force_sig(SIGKILL, task);
56634+
56635+ return;
56636+}
56637diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
56638new file mode 100644
56639index 0000000..9d83a69
56640--- /dev/null
56641+++ b/grsecurity/gracl_shm.c
56642@@ -0,0 +1,40 @@
56643+#include <linux/kernel.h>
56644+#include <linux/mm.h>
56645+#include <linux/sched.h>
56646+#include <linux/file.h>
56647+#include <linux/ipc.h>
56648+#include <linux/gracl.h>
56649+#include <linux/grsecurity.h>
56650+#include <linux/grinternal.h>
56651+
56652+int
56653+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56654+ const time_t shm_createtime, const uid_t cuid, const int shmid)
56655+{
56656+ struct task_struct *task;
56657+
56658+ if (!gr_acl_is_enabled())
56659+ return 1;
56660+
56661+ rcu_read_lock();
56662+ read_lock(&tasklist_lock);
56663+
56664+ task = find_task_by_vpid(shm_cprid);
56665+
56666+ if (unlikely(!task))
56667+ task = find_task_by_vpid(shm_lapid);
56668+
56669+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
56670+ (task->pid == shm_lapid)) &&
56671+ (task->acl->mode & GR_PROTSHM) &&
56672+ (task->acl != current->acl))) {
56673+ read_unlock(&tasklist_lock);
56674+ rcu_read_unlock();
56675+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
56676+ return 0;
56677+ }
56678+ read_unlock(&tasklist_lock);
56679+ rcu_read_unlock();
56680+
56681+ return 1;
56682+}
56683diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
56684new file mode 100644
56685index 0000000..bc0be01
56686--- /dev/null
56687+++ b/grsecurity/grsec_chdir.c
56688@@ -0,0 +1,19 @@
56689+#include <linux/kernel.h>
56690+#include <linux/sched.h>
56691+#include <linux/fs.h>
56692+#include <linux/file.h>
56693+#include <linux/grsecurity.h>
56694+#include <linux/grinternal.h>
56695+
56696+void
56697+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
56698+{
56699+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
56700+ if ((grsec_enable_chdir && grsec_enable_group &&
56701+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
56702+ !grsec_enable_group)) {
56703+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
56704+ }
56705+#endif
56706+ return;
56707+}
56708diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
56709new file mode 100644
56710index 0000000..a2dc675
56711--- /dev/null
56712+++ b/grsecurity/grsec_chroot.c
56713@@ -0,0 +1,351 @@
56714+#include <linux/kernel.h>
56715+#include <linux/module.h>
56716+#include <linux/sched.h>
56717+#include <linux/file.h>
56718+#include <linux/fs.h>
56719+#include <linux/mount.h>
56720+#include <linux/types.h>
56721+#include <linux/pid_namespace.h>
56722+#include <linux/grsecurity.h>
56723+#include <linux/grinternal.h>
56724+
56725+void gr_set_chroot_entries(struct task_struct *task, struct path *path)
56726+{
56727+#ifdef CONFIG_GRKERNSEC
56728+ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
56729+ path->dentry != task->nsproxy->mnt_ns->root->mnt_root)
56730+ task->gr_is_chrooted = 1;
56731+ else
56732+ task->gr_is_chrooted = 0;
56733+
56734+ task->gr_chroot_dentry = path->dentry;
56735+#endif
56736+ return;
56737+}
56738+
56739+void gr_clear_chroot_entries(struct task_struct *task)
56740+{
56741+#ifdef CONFIG_GRKERNSEC
56742+ task->gr_is_chrooted = 0;
56743+ task->gr_chroot_dentry = NULL;
56744+#endif
56745+ return;
56746+}
56747+
56748+int
56749+gr_handle_chroot_unix(const pid_t pid)
56750+{
56751+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
56752+ struct task_struct *p;
56753+
56754+ if (unlikely(!grsec_enable_chroot_unix))
56755+ return 1;
56756+
56757+ if (likely(!proc_is_chrooted(current)))
56758+ return 1;
56759+
56760+ rcu_read_lock();
56761+ read_lock(&tasklist_lock);
56762+ p = find_task_by_vpid_unrestricted(pid);
56763+ if (unlikely(p && !have_same_root(current, p))) {
56764+ read_unlock(&tasklist_lock);
56765+ rcu_read_unlock();
56766+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
56767+ return 0;
56768+ }
56769+ read_unlock(&tasklist_lock);
56770+ rcu_read_unlock();
56771+#endif
56772+ return 1;
56773+}
56774+
56775+int
56776+gr_handle_chroot_nice(void)
56777+{
56778+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56779+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
56780+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
56781+ return -EPERM;
56782+ }
56783+#endif
56784+ return 0;
56785+}
56786+
56787+int
56788+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
56789+{
56790+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56791+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
56792+ && proc_is_chrooted(current)) {
56793+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
56794+ return -EACCES;
56795+ }
56796+#endif
56797+ return 0;
56798+}
56799+
56800+int
56801+gr_handle_chroot_rawio(const struct inode *inode)
56802+{
56803+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56804+ if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
56805+ inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
56806+ return 1;
56807+#endif
56808+ return 0;
56809+}
56810+
56811+int
56812+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
56813+{
56814+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56815+ struct task_struct *p;
56816+ int ret = 0;
56817+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
56818+ return ret;
56819+
56820+ read_lock(&tasklist_lock);
56821+ do_each_pid_task(pid, type, p) {
56822+ if (!have_same_root(current, p)) {
56823+ ret = 1;
56824+ goto out;
56825+ }
56826+ } while_each_pid_task(pid, type, p);
56827+out:
56828+ read_unlock(&tasklist_lock);
56829+ return ret;
56830+#endif
56831+ return 0;
56832+}
56833+
56834+int
56835+gr_pid_is_chrooted(struct task_struct *p)
56836+{
56837+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56838+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
56839+ return 0;
56840+
56841+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
56842+ !have_same_root(current, p)) {
56843+ return 1;
56844+ }
56845+#endif
56846+ return 0;
56847+}
56848+
56849+EXPORT_SYMBOL(gr_pid_is_chrooted);
56850+
56851+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
56852+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
56853+{
56854+ struct path path, currentroot;
56855+ int ret = 0;
56856+
56857+ path.dentry = (struct dentry *)u_dentry;
56858+ path.mnt = (struct vfsmount *)u_mnt;
56859+ get_fs_root(current->fs, &currentroot);
56860+ if (path_is_under(&path, &currentroot))
56861+ ret = 1;
56862+ path_put(&currentroot);
56863+
56864+ return ret;
56865+}
56866+#endif
56867+
56868+int
56869+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
56870+{
56871+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
56872+ if (!grsec_enable_chroot_fchdir)
56873+ return 1;
56874+
56875+ if (!proc_is_chrooted(current))
56876+ return 1;
56877+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
56878+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
56879+ return 0;
56880+ }
56881+#endif
56882+ return 1;
56883+}
56884+
56885+int
56886+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56887+ const time_t shm_createtime)
56888+{
56889+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
56890+ struct task_struct *p;
56891+ time_t starttime;
56892+
56893+ if (unlikely(!grsec_enable_chroot_shmat))
56894+ return 1;
56895+
56896+ if (likely(!proc_is_chrooted(current)))
56897+ return 1;
56898+
56899+ rcu_read_lock();
56900+ read_lock(&tasklist_lock);
56901+
56902+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
56903+ starttime = p->start_time.tv_sec;
56904+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
56905+ if (have_same_root(current, p)) {
56906+ goto allow;
56907+ } else {
56908+ read_unlock(&tasklist_lock);
56909+ rcu_read_unlock();
56910+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
56911+ return 0;
56912+ }
56913+ }
56914+ /* creator exited, pid reuse, fall through to next check */
56915+ }
56916+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
56917+ if (unlikely(!have_same_root(current, p))) {
56918+ read_unlock(&tasklist_lock);
56919+ rcu_read_unlock();
56920+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
56921+ return 0;
56922+ }
56923+ }
56924+
56925+allow:
56926+ read_unlock(&tasklist_lock);
56927+ rcu_read_unlock();
56928+#endif
56929+ return 1;
56930+}
56931+
56932+void
56933+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
56934+{
56935+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
56936+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
56937+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
56938+#endif
56939+ return;
56940+}
56941+
56942+int
56943+gr_handle_chroot_mknod(const struct dentry *dentry,
56944+ const struct vfsmount *mnt, const int mode)
56945+{
56946+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
56947+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
56948+ proc_is_chrooted(current)) {
56949+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
56950+ return -EPERM;
56951+ }
56952+#endif
56953+ return 0;
56954+}
56955+
56956+int
56957+gr_handle_chroot_mount(const struct dentry *dentry,
56958+ const struct vfsmount *mnt, const char *dev_name)
56959+{
56960+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
56961+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
56962+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
56963+ return -EPERM;
56964+ }
56965+#endif
56966+ return 0;
56967+}
56968+
56969+int
56970+gr_handle_chroot_pivot(void)
56971+{
56972+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
56973+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
56974+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
56975+ return -EPERM;
56976+ }
56977+#endif
56978+ return 0;
56979+}
56980+
56981+int
56982+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
56983+{
56984+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
56985+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
56986+ !gr_is_outside_chroot(dentry, mnt)) {
56987+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
56988+ return -EPERM;
56989+ }
56990+#endif
56991+ return 0;
56992+}
56993+
56994+extern const char *captab_log[];
56995+extern int captab_log_entries;
56996+
56997+int
56998+gr_chroot_is_capable(const int cap)
56999+{
57000+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57001+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
57002+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
57003+ if (cap_raised(chroot_caps, cap)) {
57004+ const struct cred *creds = current_cred();
57005+ if (cap_raised(creds->cap_effective, cap) && cap < captab_log_entries) {
57006+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, current, captab_log[cap]);
57007+ }
57008+ return 0;
57009+ }
57010+ }
57011+#endif
57012+ return 1;
57013+}
57014+
57015+int
57016+gr_chroot_is_capable_nolog(const int cap)
57017+{
57018+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57019+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
57020+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
57021+ if (cap_raised(chroot_caps, cap)) {
57022+ return 0;
57023+ }
57024+ }
57025+#endif
57026+ return 1;
57027+}
57028+
57029+int
57030+gr_handle_chroot_sysctl(const int op)
57031+{
57032+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
57033+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
57034+ proc_is_chrooted(current))
57035+ return -EACCES;
57036+#endif
57037+ return 0;
57038+}
57039+
57040+void
57041+gr_handle_chroot_chdir(struct path *path)
57042+{
57043+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
57044+ if (grsec_enable_chroot_chdir)
57045+ set_fs_pwd(current->fs, path);
57046+#endif
57047+ return;
57048+}
57049+
57050+int
57051+gr_handle_chroot_chmod(const struct dentry *dentry,
57052+ const struct vfsmount *mnt, const int mode)
57053+{
57054+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
57055+ /* allow chmod +s on directories, but not files */
57056+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
57057+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
57058+ proc_is_chrooted(current)) {
57059+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
57060+ return -EPERM;
57061+ }
57062+#endif
57063+ return 0;
57064+}
57065diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
57066new file mode 100644
57067index 0000000..213ad8b
57068--- /dev/null
57069+++ b/grsecurity/grsec_disabled.c
57070@@ -0,0 +1,437 @@
57071+#include <linux/kernel.h>
57072+#include <linux/module.h>
57073+#include <linux/sched.h>
57074+#include <linux/file.h>
57075+#include <linux/fs.h>
57076+#include <linux/kdev_t.h>
57077+#include <linux/net.h>
57078+#include <linux/in.h>
57079+#include <linux/ip.h>
57080+#include <linux/skbuff.h>
57081+#include <linux/sysctl.h>
57082+
57083+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
57084+void
57085+pax_set_initial_flags(struct linux_binprm *bprm)
57086+{
57087+ return;
57088+}
57089+#endif
57090+
57091+#ifdef CONFIG_SYSCTL
57092+__u32
57093+gr_handle_sysctl(const struct ctl_table * table, const int op)
57094+{
57095+ return 0;
57096+}
57097+#endif
57098+
57099+#ifdef CONFIG_TASKSTATS
57100+int gr_is_taskstats_denied(int pid)
57101+{
57102+ return 0;
57103+}
57104+#endif
57105+
57106+int
57107+gr_acl_is_enabled(void)
57108+{
57109+ return 0;
57110+}
57111+
57112+void
57113+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
57114+{
57115+ return;
57116+}
57117+
57118+int
57119+gr_handle_rawio(const struct inode *inode)
57120+{
57121+ return 0;
57122+}
57123+
57124+void
57125+gr_acl_handle_psacct(struct task_struct *task, const long code)
57126+{
57127+ return;
57128+}
57129+
57130+int
57131+gr_handle_ptrace(struct task_struct *task, const long request)
57132+{
57133+ return 0;
57134+}
57135+
57136+int
57137+gr_handle_proc_ptrace(struct task_struct *task)
57138+{
57139+ return 0;
57140+}
57141+
57142+void
57143+gr_learn_resource(const struct task_struct *task,
57144+ const int res, const unsigned long wanted, const int gt)
57145+{
57146+ return;
57147+}
57148+
57149+int
57150+gr_set_acls(const int type)
57151+{
57152+ return 0;
57153+}
57154+
57155+int
57156+gr_check_hidden_task(const struct task_struct *tsk)
57157+{
57158+ return 0;
57159+}
57160+
57161+int
57162+gr_check_protected_task(const struct task_struct *task)
57163+{
57164+ return 0;
57165+}
57166+
57167+int
57168+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
57169+{
57170+ return 0;
57171+}
57172+
57173+void
57174+gr_copy_label(struct task_struct *tsk)
57175+{
57176+ return;
57177+}
57178+
57179+void
57180+gr_set_pax_flags(struct task_struct *task)
57181+{
57182+ return;
57183+}
57184+
57185+int
57186+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
57187+ const int unsafe_share)
57188+{
57189+ return 0;
57190+}
57191+
57192+void
57193+gr_handle_delete(const ino_t ino, const dev_t dev)
57194+{
57195+ return;
57196+}
57197+
57198+void
57199+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
57200+{
57201+ return;
57202+}
57203+
57204+void
57205+gr_handle_crash(struct task_struct *task, const int sig)
57206+{
57207+ return;
57208+}
57209+
57210+int
57211+gr_check_crash_exec(const struct file *filp)
57212+{
57213+ return 0;
57214+}
57215+
57216+int
57217+gr_check_crash_uid(const uid_t uid)
57218+{
57219+ return 0;
57220+}
57221+
57222+void
57223+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
57224+ struct dentry *old_dentry,
57225+ struct dentry *new_dentry,
57226+ struct vfsmount *mnt, const __u8 replace)
57227+{
57228+ return;
57229+}
57230+
57231+int
57232+gr_search_socket(const int family, const int type, const int protocol)
57233+{
57234+ return 1;
57235+}
57236+
57237+int
57238+gr_search_connectbind(const int mode, const struct socket *sock,
57239+ const struct sockaddr_in *addr)
57240+{
57241+ return 0;
57242+}
57243+
57244+void
57245+gr_handle_alertkill(struct task_struct *task)
57246+{
57247+ return;
57248+}
57249+
57250+__u32
57251+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
57252+{
57253+ return 1;
57254+}
57255+
57256+__u32
57257+gr_acl_handle_hidden_file(const struct dentry * dentry,
57258+ const struct vfsmount * mnt)
57259+{
57260+ return 1;
57261+}
57262+
57263+__u32
57264+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
57265+ int acc_mode)
57266+{
57267+ return 1;
57268+}
57269+
57270+__u32
57271+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
57272+{
57273+ return 1;
57274+}
57275+
57276+__u32
57277+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
57278+{
57279+ return 1;
57280+}
57281+
57282+int
57283+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
57284+ unsigned int *vm_flags)
57285+{
57286+ return 1;
57287+}
57288+
57289+__u32
57290+gr_acl_handle_truncate(const struct dentry * dentry,
57291+ const struct vfsmount * mnt)
57292+{
57293+ return 1;
57294+}
57295+
57296+__u32
57297+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
57298+{
57299+ return 1;
57300+}
57301+
57302+__u32
57303+gr_acl_handle_access(const struct dentry * dentry,
57304+ const struct vfsmount * mnt, const int fmode)
57305+{
57306+ return 1;
57307+}
57308+
57309+__u32
57310+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
57311+ umode_t *mode)
57312+{
57313+ return 1;
57314+}
57315+
57316+__u32
57317+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
57318+{
57319+ return 1;
57320+}
57321+
57322+__u32
57323+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
57324+{
57325+ return 1;
57326+}
57327+
57328+void
57329+grsecurity_init(void)
57330+{
57331+ return;
57332+}
57333+
57334+umode_t gr_acl_umask(void)
57335+{
57336+ return 0;
57337+}
57338+
57339+__u32
57340+gr_acl_handle_mknod(const struct dentry * new_dentry,
57341+ const struct dentry * parent_dentry,
57342+ const struct vfsmount * parent_mnt,
57343+ const int mode)
57344+{
57345+ return 1;
57346+}
57347+
57348+__u32
57349+gr_acl_handle_mkdir(const struct dentry * new_dentry,
57350+ const struct dentry * parent_dentry,
57351+ const struct vfsmount * parent_mnt)
57352+{
57353+ return 1;
57354+}
57355+
57356+__u32
57357+gr_acl_handle_symlink(const struct dentry * new_dentry,
57358+ const struct dentry * parent_dentry,
57359+ const struct vfsmount * parent_mnt, const char *from)
57360+{
57361+ return 1;
57362+}
57363+
57364+__u32
57365+gr_acl_handle_link(const struct dentry * new_dentry,
57366+ const struct dentry * parent_dentry,
57367+ const struct vfsmount * parent_mnt,
57368+ const struct dentry * old_dentry,
57369+ const struct vfsmount * old_mnt, const char *to)
57370+{
57371+ return 1;
57372+}
57373+
57374+int
57375+gr_acl_handle_rename(const struct dentry *new_dentry,
57376+ const struct dentry *parent_dentry,
57377+ const struct vfsmount *parent_mnt,
57378+ const struct dentry *old_dentry,
57379+ const struct inode *old_parent_inode,
57380+ const struct vfsmount *old_mnt, const char *newname)
57381+{
57382+ return 0;
57383+}
57384+
57385+int
57386+gr_acl_handle_filldir(const struct file *file, const char *name,
57387+ const int namelen, const ino_t ino)
57388+{
57389+ return 1;
57390+}
57391+
57392+int
57393+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
57394+ const time_t shm_createtime, const uid_t cuid, const int shmid)
57395+{
57396+ return 1;
57397+}
57398+
57399+int
57400+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
57401+{
57402+ return 0;
57403+}
57404+
57405+int
57406+gr_search_accept(const struct socket *sock)
57407+{
57408+ return 0;
57409+}
57410+
57411+int
57412+gr_search_listen(const struct socket *sock)
57413+{
57414+ return 0;
57415+}
57416+
57417+int
57418+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
57419+{
57420+ return 0;
57421+}
57422+
57423+__u32
57424+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
57425+{
57426+ return 1;
57427+}
57428+
57429+__u32
57430+gr_acl_handle_creat(const struct dentry * dentry,
57431+ const struct dentry * p_dentry,
57432+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
57433+ const int imode)
57434+{
57435+ return 1;
57436+}
57437+
57438+void
57439+gr_acl_handle_exit(void)
57440+{
57441+ return;
57442+}
57443+
57444+int
57445+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
57446+{
57447+ return 1;
57448+}
57449+
57450+void
57451+gr_set_role_label(const uid_t uid, const gid_t gid)
57452+{
57453+ return;
57454+}
57455+
57456+int
57457+gr_acl_handle_procpidmem(const struct task_struct *task)
57458+{
57459+ return 0;
57460+}
57461+
57462+int
57463+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
57464+{
57465+ return 0;
57466+}
57467+
57468+int
57469+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
57470+{
57471+ return 0;
57472+}
57473+
57474+void
57475+gr_set_kernel_label(struct task_struct *task)
57476+{
57477+ return;
57478+}
57479+
57480+int
57481+gr_check_user_change(int real, int effective, int fs)
57482+{
57483+ return 0;
57484+}
57485+
57486+int
57487+gr_check_group_change(int real, int effective, int fs)
57488+{
57489+ return 0;
57490+}
57491+
57492+int gr_acl_enable_at_secure(void)
57493+{
57494+ return 0;
57495+}
57496+
57497+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
57498+{
57499+ return dentry->d_inode->i_sb->s_dev;
57500+}
57501+
57502+EXPORT_SYMBOL(gr_learn_resource);
57503+EXPORT_SYMBOL(gr_set_kernel_label);
57504+#ifdef CONFIG_SECURITY
57505+EXPORT_SYMBOL(gr_check_user_change);
57506+EXPORT_SYMBOL(gr_check_group_change);
57507+#endif
57508diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
57509new file mode 100644
57510index 0000000..2b05ada
57511--- /dev/null
57512+++ b/grsecurity/grsec_exec.c
57513@@ -0,0 +1,146 @@
57514+#include <linux/kernel.h>
57515+#include <linux/sched.h>
57516+#include <linux/file.h>
57517+#include <linux/binfmts.h>
57518+#include <linux/fs.h>
57519+#include <linux/types.h>
57520+#include <linux/grdefs.h>
57521+#include <linux/grsecurity.h>
57522+#include <linux/grinternal.h>
57523+#include <linux/capability.h>
57524+#include <linux/module.h>
57525+
57526+#include <asm/uaccess.h>
57527+
57528+#ifdef CONFIG_GRKERNSEC_EXECLOG
57529+static char gr_exec_arg_buf[132];
57530+static DEFINE_MUTEX(gr_exec_arg_mutex);
57531+#endif
57532+
57533+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
57534+
57535+void
57536+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
57537+{
57538+#ifdef CONFIG_GRKERNSEC_EXECLOG
57539+ char *grarg = gr_exec_arg_buf;
57540+ unsigned int i, x, execlen = 0;
57541+ char c;
57542+
57543+ if (!((grsec_enable_execlog && grsec_enable_group &&
57544+ in_group_p(grsec_audit_gid))
57545+ || (grsec_enable_execlog && !grsec_enable_group)))
57546+ return;
57547+
57548+ mutex_lock(&gr_exec_arg_mutex);
57549+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
57550+
57551+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
57552+ const char __user *p;
57553+ unsigned int len;
57554+
57555+ p = get_user_arg_ptr(argv, i);
57556+ if (IS_ERR(p))
57557+ goto log;
57558+
57559+ len = strnlen_user(p, 128 - execlen);
57560+ if (len > 128 - execlen)
57561+ len = 128 - execlen;
57562+ else if (len > 0)
57563+ len--;
57564+ if (copy_from_user(grarg + execlen, p, len))
57565+ goto log;
57566+
57567+ /* rewrite unprintable characters */
57568+ for (x = 0; x < len; x++) {
57569+ c = *(grarg + execlen + x);
57570+ if (c < 32 || c > 126)
57571+ *(grarg + execlen + x) = ' ';
57572+ }
57573+
57574+ execlen += len;
57575+ *(grarg + execlen) = ' ';
57576+ *(grarg + execlen + 1) = '\0';
57577+ execlen++;
57578+ }
57579+
57580+ log:
57581+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
57582+ bprm->file->f_path.mnt, grarg);
57583+ mutex_unlock(&gr_exec_arg_mutex);
57584+#endif
57585+ return;
57586+}
57587+
57588+#ifdef CONFIG_GRKERNSEC
57589+extern int gr_acl_is_capable(const int cap);
57590+extern int gr_acl_is_capable_nolog(const int cap);
57591+extern int gr_chroot_is_capable(const int cap);
57592+extern int gr_chroot_is_capable_nolog(const int cap);
57593+#endif
57594+
57595+const char *captab_log[] = {
57596+ "CAP_CHOWN",
57597+ "CAP_DAC_OVERRIDE",
57598+ "CAP_DAC_READ_SEARCH",
57599+ "CAP_FOWNER",
57600+ "CAP_FSETID",
57601+ "CAP_KILL",
57602+ "CAP_SETGID",
57603+ "CAP_SETUID",
57604+ "CAP_SETPCAP",
57605+ "CAP_LINUX_IMMUTABLE",
57606+ "CAP_NET_BIND_SERVICE",
57607+ "CAP_NET_BROADCAST",
57608+ "CAP_NET_ADMIN",
57609+ "CAP_NET_RAW",
57610+ "CAP_IPC_LOCK",
57611+ "CAP_IPC_OWNER",
57612+ "CAP_SYS_MODULE",
57613+ "CAP_SYS_RAWIO",
57614+ "CAP_SYS_CHROOT",
57615+ "CAP_SYS_PTRACE",
57616+ "CAP_SYS_PACCT",
57617+ "CAP_SYS_ADMIN",
57618+ "CAP_SYS_BOOT",
57619+ "CAP_SYS_NICE",
57620+ "CAP_SYS_RESOURCE",
57621+ "CAP_SYS_TIME",
57622+ "CAP_SYS_TTY_CONFIG",
57623+ "CAP_MKNOD",
57624+ "CAP_LEASE",
57625+ "CAP_AUDIT_WRITE",
57626+ "CAP_AUDIT_CONTROL",
57627+ "CAP_SETFCAP",
57628+ "CAP_MAC_OVERRIDE",
57629+ "CAP_MAC_ADMIN",
57630+ "CAP_SYSLOG",
57631+ "CAP_WAKE_ALARM"
57632+};
57633+
57634+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
57635+
57636+int gr_is_capable(const int cap)
57637+{
57638+#ifdef CONFIG_GRKERNSEC
57639+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
57640+ return 1;
57641+ return 0;
57642+#else
57643+ return 1;
57644+#endif
57645+}
57646+
57647+int gr_is_capable_nolog(const int cap)
57648+{
57649+#ifdef CONFIG_GRKERNSEC
57650+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
57651+ return 1;
57652+ return 0;
57653+#else
57654+ return 1;
57655+#endif
57656+}
57657+
57658+EXPORT_SYMBOL(gr_is_capable);
57659+EXPORT_SYMBOL(gr_is_capable_nolog);
57660diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
57661new file mode 100644
57662index 0000000..d3ee748
57663--- /dev/null
57664+++ b/grsecurity/grsec_fifo.c
57665@@ -0,0 +1,24 @@
57666+#include <linux/kernel.h>
57667+#include <linux/sched.h>
57668+#include <linux/fs.h>
57669+#include <linux/file.h>
57670+#include <linux/grinternal.h>
57671+
57672+int
57673+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
57674+ const struct dentry *dir, const int flag, const int acc_mode)
57675+{
57676+#ifdef CONFIG_GRKERNSEC_FIFO
57677+ const struct cred *cred = current_cred();
57678+
57679+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
57680+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
57681+ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
57682+ (cred->fsuid != dentry->d_inode->i_uid)) {
57683+ if (!inode_permission(dentry->d_inode, acc_mode))
57684+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
57685+ return -EACCES;
57686+ }
57687+#endif
57688+ return 0;
57689+}
57690diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
57691new file mode 100644
57692index 0000000..8ca18bf
57693--- /dev/null
57694+++ b/grsecurity/grsec_fork.c
57695@@ -0,0 +1,23 @@
57696+#include <linux/kernel.h>
57697+#include <linux/sched.h>
57698+#include <linux/grsecurity.h>
57699+#include <linux/grinternal.h>
57700+#include <linux/errno.h>
57701+
57702+void
57703+gr_log_forkfail(const int retval)
57704+{
57705+#ifdef CONFIG_GRKERNSEC_FORKFAIL
57706+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
57707+ switch (retval) {
57708+ case -EAGAIN:
57709+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
57710+ break;
57711+ case -ENOMEM:
57712+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
57713+ break;
57714+ }
57715+ }
57716+#endif
57717+ return;
57718+}
57719diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
57720new file mode 100644
57721index 0000000..01ddde4
57722--- /dev/null
57723+++ b/grsecurity/grsec_init.c
57724@@ -0,0 +1,277 @@
57725+#include <linux/kernel.h>
57726+#include <linux/sched.h>
57727+#include <linux/mm.h>
57728+#include <linux/gracl.h>
57729+#include <linux/slab.h>
57730+#include <linux/vmalloc.h>
57731+#include <linux/percpu.h>
57732+#include <linux/module.h>
57733+
57734+int grsec_enable_ptrace_readexec;
57735+int grsec_enable_setxid;
57736+int grsec_enable_brute;
57737+int grsec_enable_link;
57738+int grsec_enable_dmesg;
57739+int grsec_enable_harden_ptrace;
57740+int grsec_enable_fifo;
57741+int grsec_enable_execlog;
57742+int grsec_enable_signal;
57743+int grsec_enable_forkfail;
57744+int grsec_enable_audit_ptrace;
57745+int grsec_enable_time;
57746+int grsec_enable_audit_textrel;
57747+int grsec_enable_group;
57748+int grsec_audit_gid;
57749+int grsec_enable_chdir;
57750+int grsec_enable_mount;
57751+int grsec_enable_rofs;
57752+int grsec_enable_chroot_findtask;
57753+int grsec_enable_chroot_mount;
57754+int grsec_enable_chroot_shmat;
57755+int grsec_enable_chroot_fchdir;
57756+int grsec_enable_chroot_double;
57757+int grsec_enable_chroot_pivot;
57758+int grsec_enable_chroot_chdir;
57759+int grsec_enable_chroot_chmod;
57760+int grsec_enable_chroot_mknod;
57761+int grsec_enable_chroot_nice;
57762+int grsec_enable_chroot_execlog;
57763+int grsec_enable_chroot_caps;
57764+int grsec_enable_chroot_sysctl;
57765+int grsec_enable_chroot_unix;
57766+int grsec_enable_tpe;
57767+int grsec_tpe_gid;
57768+int grsec_enable_blackhole;
57769+#ifdef CONFIG_IPV6_MODULE
57770+EXPORT_SYMBOL(grsec_enable_blackhole);
57771+#endif
57772+int grsec_lastack_retries;
57773+int grsec_enable_tpe_all;
57774+int grsec_enable_tpe_invert;
57775+int grsec_enable_socket_all;
57776+int grsec_socket_all_gid;
57777+int grsec_enable_socket_client;
57778+int grsec_socket_client_gid;
57779+int grsec_enable_socket_server;
57780+int grsec_socket_server_gid;
57781+int grsec_resource_logging;
57782+int grsec_disable_privio;
57783+int grsec_enable_log_rwxmaps;
57784+int grsec_lock;
57785+
57786+DEFINE_SPINLOCK(grsec_alert_lock);
57787+unsigned long grsec_alert_wtime = 0;
57788+unsigned long grsec_alert_fyet = 0;
57789+
57790+DEFINE_SPINLOCK(grsec_audit_lock);
57791+
57792+DEFINE_RWLOCK(grsec_exec_file_lock);
57793+
57794+char *gr_shared_page[4];
57795+
57796+char *gr_alert_log_fmt;
57797+char *gr_audit_log_fmt;
57798+char *gr_alert_log_buf;
57799+char *gr_audit_log_buf;
57800+
57801+extern struct gr_arg *gr_usermode;
57802+extern unsigned char *gr_system_salt;
57803+extern unsigned char *gr_system_sum;
57804+
57805+void __init
57806+grsecurity_init(void)
57807+{
57808+ int j;
57809+ /* create the per-cpu shared pages */
57810+
57811+#ifdef CONFIG_X86
57812+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
57813+#endif
57814+
57815+ for (j = 0; j < 4; j++) {
57816+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
57817+ if (gr_shared_page[j] == NULL) {
57818+ panic("Unable to allocate grsecurity shared page");
57819+ return;
57820+ }
57821+ }
57822+
57823+ /* allocate log buffers */
57824+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
57825+ if (!gr_alert_log_fmt) {
57826+ panic("Unable to allocate grsecurity alert log format buffer");
57827+ return;
57828+ }
57829+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
57830+ if (!gr_audit_log_fmt) {
57831+ panic("Unable to allocate grsecurity audit log format buffer");
57832+ return;
57833+ }
57834+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
57835+ if (!gr_alert_log_buf) {
57836+ panic("Unable to allocate grsecurity alert log buffer");
57837+ return;
57838+ }
57839+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
57840+ if (!gr_audit_log_buf) {
57841+ panic("Unable to allocate grsecurity audit log buffer");
57842+ return;
57843+ }
57844+
57845+ /* allocate memory for authentication structure */
57846+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
57847+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
57848+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
57849+
57850+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
57851+ panic("Unable to allocate grsecurity authentication structure");
57852+ return;
57853+ }
57854+
57855+
57856+#ifdef CONFIG_GRKERNSEC_IO
57857+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
57858+ grsec_disable_privio = 1;
57859+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
57860+ grsec_disable_privio = 1;
57861+#else
57862+ grsec_disable_privio = 0;
57863+#endif
57864+#endif
57865+
57866+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
57867+ /* for backward compatibility, tpe_invert always defaults to on if
57868+ enabled in the kernel
57869+ */
57870+ grsec_enable_tpe_invert = 1;
57871+#endif
57872+
57873+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
57874+#ifndef CONFIG_GRKERNSEC_SYSCTL
57875+ grsec_lock = 1;
57876+#endif
57877+
57878+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
57879+ grsec_enable_audit_textrel = 1;
57880+#endif
57881+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
57882+ grsec_enable_log_rwxmaps = 1;
57883+#endif
57884+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
57885+ grsec_enable_group = 1;
57886+ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
57887+#endif
57888+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
57889+ grsec_enable_ptrace_readexec = 1;
57890+#endif
57891+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
57892+ grsec_enable_chdir = 1;
57893+#endif
57894+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
57895+ grsec_enable_harden_ptrace = 1;
57896+#endif
57897+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
57898+ grsec_enable_mount = 1;
57899+#endif
57900+#ifdef CONFIG_GRKERNSEC_LINK
57901+ grsec_enable_link = 1;
57902+#endif
57903+#ifdef CONFIG_GRKERNSEC_BRUTE
57904+ grsec_enable_brute = 1;
57905+#endif
57906+#ifdef CONFIG_GRKERNSEC_DMESG
57907+ grsec_enable_dmesg = 1;
57908+#endif
57909+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
57910+ grsec_enable_blackhole = 1;
57911+ grsec_lastack_retries = 4;
57912+#endif
57913+#ifdef CONFIG_GRKERNSEC_FIFO
57914+ grsec_enable_fifo = 1;
57915+#endif
57916+#ifdef CONFIG_GRKERNSEC_EXECLOG
57917+ grsec_enable_execlog = 1;
57918+#endif
57919+#ifdef CONFIG_GRKERNSEC_SETXID
57920+ grsec_enable_setxid = 1;
57921+#endif
57922+#ifdef CONFIG_GRKERNSEC_SIGNAL
57923+ grsec_enable_signal = 1;
57924+#endif
57925+#ifdef CONFIG_GRKERNSEC_FORKFAIL
57926+ grsec_enable_forkfail = 1;
57927+#endif
57928+#ifdef CONFIG_GRKERNSEC_TIME
57929+ grsec_enable_time = 1;
57930+#endif
57931+#ifdef CONFIG_GRKERNSEC_RESLOG
57932+ grsec_resource_logging = 1;
57933+#endif
57934+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
57935+ grsec_enable_chroot_findtask = 1;
57936+#endif
57937+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
57938+ grsec_enable_chroot_unix = 1;
57939+#endif
57940+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
57941+ grsec_enable_chroot_mount = 1;
57942+#endif
57943+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
57944+ grsec_enable_chroot_fchdir = 1;
57945+#endif
57946+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
57947+ grsec_enable_chroot_shmat = 1;
57948+#endif
57949+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
57950+ grsec_enable_audit_ptrace = 1;
57951+#endif
57952+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
57953+ grsec_enable_chroot_double = 1;
57954+#endif
57955+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
57956+ grsec_enable_chroot_pivot = 1;
57957+#endif
57958+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
57959+ grsec_enable_chroot_chdir = 1;
57960+#endif
57961+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
57962+ grsec_enable_chroot_chmod = 1;
57963+#endif
57964+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
57965+ grsec_enable_chroot_mknod = 1;
57966+#endif
57967+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
57968+ grsec_enable_chroot_nice = 1;
57969+#endif
57970+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
57971+ grsec_enable_chroot_execlog = 1;
57972+#endif
57973+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57974+ grsec_enable_chroot_caps = 1;
57975+#endif
57976+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
57977+ grsec_enable_chroot_sysctl = 1;
57978+#endif
57979+#ifdef CONFIG_GRKERNSEC_TPE
57980+ grsec_enable_tpe = 1;
57981+ grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
57982+#ifdef CONFIG_GRKERNSEC_TPE_ALL
57983+ grsec_enable_tpe_all = 1;
57984+#endif
57985+#endif
57986+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
57987+ grsec_enable_socket_all = 1;
57988+ grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
57989+#endif
57990+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
57991+ grsec_enable_socket_client = 1;
57992+ grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
57993+#endif
57994+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
57995+ grsec_enable_socket_server = 1;
57996+ grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
57997+#endif
57998+#endif
57999+
58000+ return;
58001+}
58002diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
58003new file mode 100644
58004index 0000000..3efe141
58005--- /dev/null
58006+++ b/grsecurity/grsec_link.c
58007@@ -0,0 +1,43 @@
58008+#include <linux/kernel.h>
58009+#include <linux/sched.h>
58010+#include <linux/fs.h>
58011+#include <linux/file.h>
58012+#include <linux/grinternal.h>
58013+
58014+int
58015+gr_handle_follow_link(const struct inode *parent,
58016+ const struct inode *inode,
58017+ const struct dentry *dentry, const struct vfsmount *mnt)
58018+{
58019+#ifdef CONFIG_GRKERNSEC_LINK
58020+ const struct cred *cred = current_cred();
58021+
58022+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
58023+ (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
58024+ (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
58025+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
58026+ return -EACCES;
58027+ }
58028+#endif
58029+ return 0;
58030+}
58031+
58032+int
58033+gr_handle_hardlink(const struct dentry *dentry,
58034+ const struct vfsmount *mnt,
58035+ struct inode *inode, const int mode, const char *to)
58036+{
58037+#ifdef CONFIG_GRKERNSEC_LINK
58038+ const struct cred *cred = current_cred();
58039+
58040+ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
58041+ (!S_ISREG(mode) || (mode & S_ISUID) ||
58042+ ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
58043+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
58044+ !capable(CAP_FOWNER) && cred->uid) {
58045+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
58046+ return -EPERM;
58047+ }
58048+#endif
58049+ return 0;
58050+}
58051diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
58052new file mode 100644
58053index 0000000..a45d2e9
58054--- /dev/null
58055+++ b/grsecurity/grsec_log.c
58056@@ -0,0 +1,322 @@
58057+#include <linux/kernel.h>
58058+#include <linux/sched.h>
58059+#include <linux/file.h>
58060+#include <linux/tty.h>
58061+#include <linux/fs.h>
58062+#include <linux/grinternal.h>
58063+
58064+#ifdef CONFIG_TREE_PREEMPT_RCU
58065+#define DISABLE_PREEMPT() preempt_disable()
58066+#define ENABLE_PREEMPT() preempt_enable()
58067+#else
58068+#define DISABLE_PREEMPT()
58069+#define ENABLE_PREEMPT()
58070+#endif
58071+
58072+#define BEGIN_LOCKS(x) \
58073+ DISABLE_PREEMPT(); \
58074+ rcu_read_lock(); \
58075+ read_lock(&tasklist_lock); \
58076+ read_lock(&grsec_exec_file_lock); \
58077+ if (x != GR_DO_AUDIT) \
58078+ spin_lock(&grsec_alert_lock); \
58079+ else \
58080+ spin_lock(&grsec_audit_lock)
58081+
58082+#define END_LOCKS(x) \
58083+ if (x != GR_DO_AUDIT) \
58084+ spin_unlock(&grsec_alert_lock); \
58085+ else \
58086+ spin_unlock(&grsec_audit_lock); \
58087+ read_unlock(&grsec_exec_file_lock); \
58088+ read_unlock(&tasklist_lock); \
58089+ rcu_read_unlock(); \
58090+ ENABLE_PREEMPT(); \
58091+ if (x == GR_DONT_AUDIT) \
58092+ gr_handle_alertkill(current)
58093+
58094+enum {
58095+ FLOODING,
58096+ NO_FLOODING
58097+};
58098+
58099+extern char *gr_alert_log_fmt;
58100+extern char *gr_audit_log_fmt;
58101+extern char *gr_alert_log_buf;
58102+extern char *gr_audit_log_buf;
58103+
58104+static int gr_log_start(int audit)
58105+{
58106+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
58107+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
58108+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58109+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
58110+ unsigned long curr_secs = get_seconds();
58111+
58112+ if (audit == GR_DO_AUDIT)
58113+ goto set_fmt;
58114+
58115+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
58116+ grsec_alert_wtime = curr_secs;
58117+ grsec_alert_fyet = 0;
58118+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
58119+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
58120+ grsec_alert_fyet++;
58121+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
58122+ grsec_alert_wtime = curr_secs;
58123+ grsec_alert_fyet++;
58124+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
58125+ return FLOODING;
58126+ }
58127+ else return FLOODING;
58128+
58129+set_fmt:
58130+#endif
58131+ memset(buf, 0, PAGE_SIZE);
58132+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
58133+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
58134+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58135+ } else if (current->signal->curr_ip) {
58136+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
58137+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
58138+ } else if (gr_acl_is_enabled()) {
58139+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
58140+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58141+ } else {
58142+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
58143+ strcpy(buf, fmt);
58144+ }
58145+
58146+ return NO_FLOODING;
58147+}
58148+
58149+static void gr_log_middle(int audit, const char *msg, va_list ap)
58150+ __attribute__ ((format (printf, 2, 0)));
58151+
58152+static void gr_log_middle(int audit, const char *msg, va_list ap)
58153+{
58154+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58155+ unsigned int len = strlen(buf);
58156+
58157+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58158+
58159+ return;
58160+}
58161+
58162+static void gr_log_middle_varargs(int audit, const char *msg, ...)
58163+ __attribute__ ((format (printf, 2, 3)));
58164+
58165+static void gr_log_middle_varargs(int audit, const char *msg, ...)
58166+{
58167+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58168+ unsigned int len = strlen(buf);
58169+ va_list ap;
58170+
58171+ va_start(ap, msg);
58172+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58173+ va_end(ap);
58174+
58175+ return;
58176+}
58177+
58178+static void gr_log_end(int audit, int append_default)
58179+{
58180+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58181+
58182+ if (append_default) {
58183+ unsigned int len = strlen(buf);
58184+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
58185+ }
58186+
58187+ printk("%s\n", buf);
58188+
58189+ return;
58190+}
58191+
58192+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
58193+{
58194+ int logtype;
58195+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
58196+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
58197+ void *voidptr = NULL;
58198+ int num1 = 0, num2 = 0;
58199+ unsigned long ulong1 = 0, ulong2 = 0;
58200+ struct dentry *dentry = NULL;
58201+ struct vfsmount *mnt = NULL;
58202+ struct file *file = NULL;
58203+ struct task_struct *task = NULL;
58204+ const struct cred *cred, *pcred;
58205+ va_list ap;
58206+
58207+ BEGIN_LOCKS(audit);
58208+ logtype = gr_log_start(audit);
58209+ if (logtype == FLOODING) {
58210+ END_LOCKS(audit);
58211+ return;
58212+ }
58213+ va_start(ap, argtypes);
58214+ switch (argtypes) {
58215+ case GR_TTYSNIFF:
58216+ task = va_arg(ap, struct task_struct *);
58217+ 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);
58218+ break;
58219+ case GR_SYSCTL_HIDDEN:
58220+ str1 = va_arg(ap, char *);
58221+ gr_log_middle_varargs(audit, msg, result, str1);
58222+ break;
58223+ case GR_RBAC:
58224+ dentry = va_arg(ap, struct dentry *);
58225+ mnt = va_arg(ap, struct vfsmount *);
58226+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
58227+ break;
58228+ case GR_RBAC_STR:
58229+ dentry = va_arg(ap, struct dentry *);
58230+ mnt = va_arg(ap, struct vfsmount *);
58231+ str1 = va_arg(ap, char *);
58232+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
58233+ break;
58234+ case GR_STR_RBAC:
58235+ str1 = va_arg(ap, char *);
58236+ dentry = va_arg(ap, struct dentry *);
58237+ mnt = va_arg(ap, struct vfsmount *);
58238+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
58239+ break;
58240+ case GR_RBAC_MODE2:
58241+ dentry = va_arg(ap, struct dentry *);
58242+ mnt = va_arg(ap, struct vfsmount *);
58243+ str1 = va_arg(ap, char *);
58244+ str2 = va_arg(ap, char *);
58245+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
58246+ break;
58247+ case GR_RBAC_MODE3:
58248+ dentry = va_arg(ap, struct dentry *);
58249+ mnt = va_arg(ap, struct vfsmount *);
58250+ str1 = va_arg(ap, char *);
58251+ str2 = va_arg(ap, char *);
58252+ str3 = va_arg(ap, char *);
58253+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
58254+ break;
58255+ case GR_FILENAME:
58256+ dentry = va_arg(ap, struct dentry *);
58257+ mnt = va_arg(ap, struct vfsmount *);
58258+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
58259+ break;
58260+ case GR_STR_FILENAME:
58261+ str1 = va_arg(ap, char *);
58262+ dentry = va_arg(ap, struct dentry *);
58263+ mnt = va_arg(ap, struct vfsmount *);
58264+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
58265+ break;
58266+ case GR_FILENAME_STR:
58267+ dentry = va_arg(ap, struct dentry *);
58268+ mnt = va_arg(ap, struct vfsmount *);
58269+ str1 = va_arg(ap, char *);
58270+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
58271+ break;
58272+ case GR_FILENAME_TWO_INT:
58273+ dentry = va_arg(ap, struct dentry *);
58274+ mnt = va_arg(ap, struct vfsmount *);
58275+ num1 = va_arg(ap, int);
58276+ num2 = va_arg(ap, int);
58277+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
58278+ break;
58279+ case GR_FILENAME_TWO_INT_STR:
58280+ dentry = va_arg(ap, struct dentry *);
58281+ mnt = va_arg(ap, struct vfsmount *);
58282+ num1 = va_arg(ap, int);
58283+ num2 = va_arg(ap, int);
58284+ str1 = va_arg(ap, char *);
58285+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
58286+ break;
58287+ case GR_TEXTREL:
58288+ file = va_arg(ap, struct file *);
58289+ ulong1 = va_arg(ap, unsigned long);
58290+ ulong2 = va_arg(ap, unsigned long);
58291+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
58292+ break;
58293+ case GR_PTRACE:
58294+ task = va_arg(ap, struct task_struct *);
58295+ 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);
58296+ break;
58297+ case GR_RESOURCE:
58298+ task = va_arg(ap, struct task_struct *);
58299+ cred = __task_cred(task);
58300+ pcred = __task_cred(task->real_parent);
58301+ ulong1 = va_arg(ap, unsigned long);
58302+ str1 = va_arg(ap, char *);
58303+ ulong2 = va_arg(ap, unsigned long);
58304+ 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);
58305+ break;
58306+ case GR_CAP:
58307+ task = va_arg(ap, struct task_struct *);
58308+ cred = __task_cred(task);
58309+ pcred = __task_cred(task->real_parent);
58310+ str1 = va_arg(ap, char *);
58311+ 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);
58312+ break;
58313+ case GR_SIG:
58314+ str1 = va_arg(ap, char *);
58315+ voidptr = va_arg(ap, void *);
58316+ gr_log_middle_varargs(audit, msg, str1, voidptr);
58317+ break;
58318+ case GR_SIG2:
58319+ task = va_arg(ap, struct task_struct *);
58320+ cred = __task_cred(task);
58321+ pcred = __task_cred(task->real_parent);
58322+ num1 = va_arg(ap, int);
58323+ 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);
58324+ break;
58325+ case GR_CRASH1:
58326+ task = va_arg(ap, struct task_struct *);
58327+ cred = __task_cred(task);
58328+ pcred = __task_cred(task->real_parent);
58329+ ulong1 = va_arg(ap, unsigned long);
58330+ 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);
58331+ break;
58332+ case GR_CRASH2:
58333+ task = va_arg(ap, struct task_struct *);
58334+ cred = __task_cred(task);
58335+ pcred = __task_cred(task->real_parent);
58336+ ulong1 = va_arg(ap, unsigned long);
58337+ 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);
58338+ break;
58339+ case GR_RWXMAP:
58340+ file = va_arg(ap, struct file *);
58341+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
58342+ break;
58343+ case GR_PSACCT:
58344+ {
58345+ unsigned int wday, cday;
58346+ __u8 whr, chr;
58347+ __u8 wmin, cmin;
58348+ __u8 wsec, csec;
58349+ char cur_tty[64] = { 0 };
58350+ char parent_tty[64] = { 0 };
58351+
58352+ task = va_arg(ap, struct task_struct *);
58353+ wday = va_arg(ap, unsigned int);
58354+ cday = va_arg(ap, unsigned int);
58355+ whr = va_arg(ap, int);
58356+ chr = va_arg(ap, int);
58357+ wmin = va_arg(ap, int);
58358+ cmin = va_arg(ap, int);
58359+ wsec = va_arg(ap, int);
58360+ csec = va_arg(ap, int);
58361+ ulong1 = va_arg(ap, unsigned long);
58362+ cred = __task_cred(task);
58363+ pcred = __task_cred(task->real_parent);
58364+
58365+ 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);
58366+ }
58367+ break;
58368+ default:
58369+ gr_log_middle(audit, msg, ap);
58370+ }
58371+ va_end(ap);
58372+ // these don't need DEFAULTSECARGS printed on the end
58373+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
58374+ gr_log_end(audit, 0);
58375+ else
58376+ gr_log_end(audit, 1);
58377+ END_LOCKS(audit);
58378+}
58379diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
58380new file mode 100644
58381index 0000000..f536303
58382--- /dev/null
58383+++ b/grsecurity/grsec_mem.c
58384@@ -0,0 +1,40 @@
58385+#include <linux/kernel.h>
58386+#include <linux/sched.h>
58387+#include <linux/mm.h>
58388+#include <linux/mman.h>
58389+#include <linux/grinternal.h>
58390+
58391+void
58392+gr_handle_ioperm(void)
58393+{
58394+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
58395+ return;
58396+}
58397+
58398+void
58399+gr_handle_iopl(void)
58400+{
58401+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
58402+ return;
58403+}
58404+
58405+void
58406+gr_handle_mem_readwrite(u64 from, u64 to)
58407+{
58408+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
58409+ return;
58410+}
58411+
58412+void
58413+gr_handle_vm86(void)
58414+{
58415+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
58416+ return;
58417+}
58418+
58419+void
58420+gr_log_badprocpid(const char *entry)
58421+{
58422+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
58423+ return;
58424+}
58425diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
58426new file mode 100644
58427index 0000000..2131422
58428--- /dev/null
58429+++ b/grsecurity/grsec_mount.c
58430@@ -0,0 +1,62 @@
58431+#include <linux/kernel.h>
58432+#include <linux/sched.h>
58433+#include <linux/mount.h>
58434+#include <linux/grsecurity.h>
58435+#include <linux/grinternal.h>
58436+
58437+void
58438+gr_log_remount(const char *devname, const int retval)
58439+{
58440+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58441+ if (grsec_enable_mount && (retval >= 0))
58442+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
58443+#endif
58444+ return;
58445+}
58446+
58447+void
58448+gr_log_unmount(const char *devname, const int retval)
58449+{
58450+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58451+ if (grsec_enable_mount && (retval >= 0))
58452+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
58453+#endif
58454+ return;
58455+}
58456+
58457+void
58458+gr_log_mount(const char *from, const char *to, const int retval)
58459+{
58460+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58461+ if (grsec_enable_mount && (retval >= 0))
58462+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
58463+#endif
58464+ return;
58465+}
58466+
58467+int
58468+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
58469+{
58470+#ifdef CONFIG_GRKERNSEC_ROFS
58471+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
58472+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
58473+ return -EPERM;
58474+ } else
58475+ return 0;
58476+#endif
58477+ return 0;
58478+}
58479+
58480+int
58481+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
58482+{
58483+#ifdef CONFIG_GRKERNSEC_ROFS
58484+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
58485+ dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
58486+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
58487+ return -EPERM;
58488+ } else
58489+ return 0;
58490+#endif
58491+ return 0;
58492+}
58493diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
58494new file mode 100644
58495index 0000000..a3b12a0
58496--- /dev/null
58497+++ b/grsecurity/grsec_pax.c
58498@@ -0,0 +1,36 @@
58499+#include <linux/kernel.h>
58500+#include <linux/sched.h>
58501+#include <linux/mm.h>
58502+#include <linux/file.h>
58503+#include <linux/grinternal.h>
58504+#include <linux/grsecurity.h>
58505+
58506+void
58507+gr_log_textrel(struct vm_area_struct * vma)
58508+{
58509+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58510+ if (grsec_enable_audit_textrel)
58511+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
58512+#endif
58513+ return;
58514+}
58515+
58516+void
58517+gr_log_rwxmmap(struct file *file)
58518+{
58519+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58520+ if (grsec_enable_log_rwxmaps)
58521+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
58522+#endif
58523+ return;
58524+}
58525+
58526+void
58527+gr_log_rwxmprotect(struct file *file)
58528+{
58529+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58530+ if (grsec_enable_log_rwxmaps)
58531+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
58532+#endif
58533+ return;
58534+}
58535diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
58536new file mode 100644
58537index 0000000..f7f29aa
58538--- /dev/null
58539+++ b/grsecurity/grsec_ptrace.c
58540@@ -0,0 +1,30 @@
58541+#include <linux/kernel.h>
58542+#include <linux/sched.h>
58543+#include <linux/grinternal.h>
58544+#include <linux/security.h>
58545+
58546+void
58547+gr_audit_ptrace(struct task_struct *task)
58548+{
58549+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58550+ if (grsec_enable_audit_ptrace)
58551+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
58552+#endif
58553+ return;
58554+}
58555+
58556+int
58557+gr_ptrace_readexec(struct file *file, int unsafe_flags)
58558+{
58559+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
58560+ const struct dentry *dentry = file->f_path.dentry;
58561+ const struct vfsmount *mnt = file->f_path.mnt;
58562+
58563+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
58564+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
58565+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
58566+ return -EACCES;
58567+ }
58568+#endif
58569+ return 0;
58570+}
58571diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
58572new file mode 100644
58573index 0000000..7a5b2de
58574--- /dev/null
58575+++ b/grsecurity/grsec_sig.c
58576@@ -0,0 +1,207 @@
58577+#include <linux/kernel.h>
58578+#include <linux/sched.h>
58579+#include <linux/delay.h>
58580+#include <linux/grsecurity.h>
58581+#include <linux/grinternal.h>
58582+#include <linux/hardirq.h>
58583+
58584+char *signames[] = {
58585+ [SIGSEGV] = "Segmentation fault",
58586+ [SIGILL] = "Illegal instruction",
58587+ [SIGABRT] = "Abort",
58588+ [SIGBUS] = "Invalid alignment/Bus error"
58589+};
58590+
58591+void
58592+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
58593+{
58594+#ifdef CONFIG_GRKERNSEC_SIGNAL
58595+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
58596+ (sig == SIGABRT) || (sig == SIGBUS))) {
58597+ if (t->pid == current->pid) {
58598+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
58599+ } else {
58600+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
58601+ }
58602+ }
58603+#endif
58604+ return;
58605+}
58606+
58607+int
58608+gr_handle_signal(const struct task_struct *p, const int sig)
58609+{
58610+#ifdef CONFIG_GRKERNSEC
58611+ /* ignore the 0 signal for protected task checks */
58612+ if (current->pid > 1 && sig && gr_check_protected_task(p)) {
58613+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
58614+ return -EPERM;
58615+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
58616+ return -EPERM;
58617+ }
58618+#endif
58619+ return 0;
58620+}
58621+
58622+#ifdef CONFIG_GRKERNSEC
58623+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
58624+
58625+int gr_fake_force_sig(int sig, struct task_struct *t)
58626+{
58627+ unsigned long int flags;
58628+ int ret, blocked, ignored;
58629+ struct k_sigaction *action;
58630+
58631+ spin_lock_irqsave(&t->sighand->siglock, flags);
58632+ action = &t->sighand->action[sig-1];
58633+ ignored = action->sa.sa_handler == SIG_IGN;
58634+ blocked = sigismember(&t->blocked, sig);
58635+ if (blocked || ignored) {
58636+ action->sa.sa_handler = SIG_DFL;
58637+ if (blocked) {
58638+ sigdelset(&t->blocked, sig);
58639+ recalc_sigpending_and_wake(t);
58640+ }
58641+ }
58642+ if (action->sa.sa_handler == SIG_DFL)
58643+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
58644+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
58645+
58646+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
58647+
58648+ return ret;
58649+}
58650+#endif
58651+
58652+#ifdef CONFIG_GRKERNSEC_BRUTE
58653+#define GR_USER_BAN_TIME (15 * 60)
58654+
58655+static int __get_dumpable(unsigned long mm_flags)
58656+{
58657+ int ret;
58658+
58659+ ret = mm_flags & MMF_DUMPABLE_MASK;
58660+ return (ret >= 2) ? 2 : ret;
58661+}
58662+#endif
58663+
58664+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
58665+{
58666+#ifdef CONFIG_GRKERNSEC_BRUTE
58667+ uid_t uid = 0;
58668+
58669+ if (!grsec_enable_brute)
58670+ return;
58671+
58672+ rcu_read_lock();
58673+ read_lock(&tasklist_lock);
58674+ read_lock(&grsec_exec_file_lock);
58675+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
58676+ p->real_parent->brute = 1;
58677+ else {
58678+ const struct cred *cred = __task_cred(p), *cred2;
58679+ struct task_struct *tsk, *tsk2;
58680+
58681+ if (!__get_dumpable(mm_flags) && cred->uid) {
58682+ struct user_struct *user;
58683+
58684+ uid = cred->uid;
58685+
58686+ /* this is put upon execution past expiration */
58687+ user = find_user(uid);
58688+ if (user == NULL)
58689+ goto unlock;
58690+ user->banned = 1;
58691+ user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
58692+ if (user->ban_expires == ~0UL)
58693+ user->ban_expires--;
58694+
58695+ do_each_thread(tsk2, tsk) {
58696+ cred2 = __task_cred(tsk);
58697+ if (tsk != p && cred2->uid == uid)
58698+ gr_fake_force_sig(SIGKILL, tsk);
58699+ } while_each_thread(tsk2, tsk);
58700+ }
58701+ }
58702+unlock:
58703+ read_unlock(&grsec_exec_file_lock);
58704+ read_unlock(&tasklist_lock);
58705+ rcu_read_unlock();
58706+
58707+ if (uid)
58708+ printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n", uid, GR_USER_BAN_TIME / 60);
58709+
58710+#endif
58711+ return;
58712+}
58713+
58714+void gr_handle_brute_check(void)
58715+{
58716+#ifdef CONFIG_GRKERNSEC_BRUTE
58717+ if (current->brute)
58718+ msleep(30 * 1000);
58719+#endif
58720+ return;
58721+}
58722+
58723+void gr_handle_kernel_exploit(void)
58724+{
58725+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
58726+ const struct cred *cred;
58727+ struct task_struct *tsk, *tsk2;
58728+ struct user_struct *user;
58729+ uid_t uid;
58730+
58731+ if (in_irq() || in_serving_softirq() || in_nmi())
58732+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
58733+
58734+ uid = current_uid();
58735+
58736+ if (uid == 0)
58737+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
58738+ else {
58739+ /* kill all the processes of this user, hold a reference
58740+ to their creds struct, and prevent them from creating
58741+ another process until system reset
58742+ */
58743+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
58744+ /* we intentionally leak this ref */
58745+ user = get_uid(current->cred->user);
58746+ if (user) {
58747+ user->banned = 1;
58748+ user->ban_expires = ~0UL;
58749+ }
58750+
58751+ read_lock(&tasklist_lock);
58752+ do_each_thread(tsk2, tsk) {
58753+ cred = __task_cred(tsk);
58754+ if (cred->uid == uid)
58755+ gr_fake_force_sig(SIGKILL, tsk);
58756+ } while_each_thread(tsk2, tsk);
58757+ read_unlock(&tasklist_lock);
58758+ }
58759+#endif
58760+}
58761+
58762+int __gr_process_user_ban(struct user_struct *user)
58763+{
58764+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58765+ if (unlikely(user->banned)) {
58766+ if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
58767+ user->banned = 0;
58768+ user->ban_expires = 0;
58769+ free_uid(user);
58770+ } else
58771+ return -EPERM;
58772+ }
58773+#endif
58774+ return 0;
58775+}
58776+
58777+int gr_process_user_ban(void)
58778+{
58779+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58780+ return __gr_process_user_ban(current->cred->user);
58781+#endif
58782+ return 0;
58783+}
58784diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
58785new file mode 100644
58786index 0000000..4030d57
58787--- /dev/null
58788+++ b/grsecurity/grsec_sock.c
58789@@ -0,0 +1,244 @@
58790+#include <linux/kernel.h>
58791+#include <linux/module.h>
58792+#include <linux/sched.h>
58793+#include <linux/file.h>
58794+#include <linux/net.h>
58795+#include <linux/in.h>
58796+#include <linux/ip.h>
58797+#include <net/sock.h>
58798+#include <net/inet_sock.h>
58799+#include <linux/grsecurity.h>
58800+#include <linux/grinternal.h>
58801+#include <linux/gracl.h>
58802+
58803+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
58804+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
58805+
58806+EXPORT_SYMBOL(gr_search_udp_recvmsg);
58807+EXPORT_SYMBOL(gr_search_udp_sendmsg);
58808+
58809+#ifdef CONFIG_UNIX_MODULE
58810+EXPORT_SYMBOL(gr_acl_handle_unix);
58811+EXPORT_SYMBOL(gr_acl_handle_mknod);
58812+EXPORT_SYMBOL(gr_handle_chroot_unix);
58813+EXPORT_SYMBOL(gr_handle_create);
58814+#endif
58815+
58816+#ifdef CONFIG_GRKERNSEC
58817+#define gr_conn_table_size 32749
58818+struct conn_table_entry {
58819+ struct conn_table_entry *next;
58820+ struct signal_struct *sig;
58821+};
58822+
58823+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
58824+DEFINE_SPINLOCK(gr_conn_table_lock);
58825+
58826+extern const char * gr_socktype_to_name(unsigned char type);
58827+extern const char * gr_proto_to_name(unsigned char proto);
58828+extern const char * gr_sockfamily_to_name(unsigned char family);
58829+
58830+static __inline__ int
58831+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
58832+{
58833+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
58834+}
58835+
58836+static __inline__ int
58837+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
58838+ __u16 sport, __u16 dport)
58839+{
58840+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
58841+ sig->gr_sport == sport && sig->gr_dport == dport))
58842+ return 1;
58843+ else
58844+ return 0;
58845+}
58846+
58847+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
58848+{
58849+ struct conn_table_entry **match;
58850+ unsigned int index;
58851+
58852+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
58853+ sig->gr_sport, sig->gr_dport,
58854+ gr_conn_table_size);
58855+
58856+ newent->sig = sig;
58857+
58858+ match = &gr_conn_table[index];
58859+ newent->next = *match;
58860+ *match = newent;
58861+
58862+ return;
58863+}
58864+
58865+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
58866+{
58867+ struct conn_table_entry *match, *last = NULL;
58868+ unsigned int index;
58869+
58870+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
58871+ sig->gr_sport, sig->gr_dport,
58872+ gr_conn_table_size);
58873+
58874+ match = gr_conn_table[index];
58875+ while (match && !conn_match(match->sig,
58876+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
58877+ sig->gr_dport)) {
58878+ last = match;
58879+ match = match->next;
58880+ }
58881+
58882+ if (match) {
58883+ if (last)
58884+ last->next = match->next;
58885+ else
58886+ gr_conn_table[index] = NULL;
58887+ kfree(match);
58888+ }
58889+
58890+ return;
58891+}
58892+
58893+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
58894+ __u16 sport, __u16 dport)
58895+{
58896+ struct conn_table_entry *match;
58897+ unsigned int index;
58898+
58899+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
58900+
58901+ match = gr_conn_table[index];
58902+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
58903+ match = match->next;
58904+
58905+ if (match)
58906+ return match->sig;
58907+ else
58908+ return NULL;
58909+}
58910+
58911+#endif
58912+
58913+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
58914+{
58915+#ifdef CONFIG_GRKERNSEC
58916+ struct signal_struct *sig = task->signal;
58917+ struct conn_table_entry *newent;
58918+
58919+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
58920+ if (newent == NULL)
58921+ return;
58922+ /* no bh lock needed since we are called with bh disabled */
58923+ spin_lock(&gr_conn_table_lock);
58924+ gr_del_task_from_ip_table_nolock(sig);
58925+ sig->gr_saddr = inet->inet_rcv_saddr;
58926+ sig->gr_daddr = inet->inet_daddr;
58927+ sig->gr_sport = inet->inet_sport;
58928+ sig->gr_dport = inet->inet_dport;
58929+ gr_add_to_task_ip_table_nolock(sig, newent);
58930+ spin_unlock(&gr_conn_table_lock);
58931+#endif
58932+ return;
58933+}
58934+
58935+void gr_del_task_from_ip_table(struct task_struct *task)
58936+{
58937+#ifdef CONFIG_GRKERNSEC
58938+ spin_lock_bh(&gr_conn_table_lock);
58939+ gr_del_task_from_ip_table_nolock(task->signal);
58940+ spin_unlock_bh(&gr_conn_table_lock);
58941+#endif
58942+ return;
58943+}
58944+
58945+void
58946+gr_attach_curr_ip(const struct sock *sk)
58947+{
58948+#ifdef CONFIG_GRKERNSEC
58949+ struct signal_struct *p, *set;
58950+ const struct inet_sock *inet = inet_sk(sk);
58951+
58952+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
58953+ return;
58954+
58955+ set = current->signal;
58956+
58957+ spin_lock_bh(&gr_conn_table_lock);
58958+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
58959+ inet->inet_dport, inet->inet_sport);
58960+ if (unlikely(p != NULL)) {
58961+ set->curr_ip = p->curr_ip;
58962+ set->used_accept = 1;
58963+ gr_del_task_from_ip_table_nolock(p);
58964+ spin_unlock_bh(&gr_conn_table_lock);
58965+ return;
58966+ }
58967+ spin_unlock_bh(&gr_conn_table_lock);
58968+
58969+ set->curr_ip = inet->inet_daddr;
58970+ set->used_accept = 1;
58971+#endif
58972+ return;
58973+}
58974+
58975+int
58976+gr_handle_sock_all(const int family, const int type, const int protocol)
58977+{
58978+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
58979+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
58980+ (family != AF_UNIX)) {
58981+ if (family == AF_INET)
58982+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
58983+ else
58984+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
58985+ return -EACCES;
58986+ }
58987+#endif
58988+ return 0;
58989+}
58990+
58991+int
58992+gr_handle_sock_server(const struct sockaddr *sck)
58993+{
58994+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
58995+ if (grsec_enable_socket_server &&
58996+ in_group_p(grsec_socket_server_gid) &&
58997+ sck && (sck->sa_family != AF_UNIX) &&
58998+ (sck->sa_family != AF_LOCAL)) {
58999+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
59000+ return -EACCES;
59001+ }
59002+#endif
59003+ return 0;
59004+}
59005+
59006+int
59007+gr_handle_sock_server_other(const struct sock *sck)
59008+{
59009+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59010+ if (grsec_enable_socket_server &&
59011+ in_group_p(grsec_socket_server_gid) &&
59012+ sck && (sck->sk_family != AF_UNIX) &&
59013+ (sck->sk_family != AF_LOCAL)) {
59014+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
59015+ return -EACCES;
59016+ }
59017+#endif
59018+ return 0;
59019+}
59020+
59021+int
59022+gr_handle_sock_client(const struct sockaddr *sck)
59023+{
59024+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59025+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
59026+ sck && (sck->sa_family != AF_UNIX) &&
59027+ (sck->sa_family != AF_LOCAL)) {
59028+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
59029+ return -EACCES;
59030+ }
59031+#endif
59032+ return 0;
59033+}
59034diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
59035new file mode 100644
59036index 0000000..a1aedd7
59037--- /dev/null
59038+++ b/grsecurity/grsec_sysctl.c
59039@@ -0,0 +1,451 @@
59040+#include <linux/kernel.h>
59041+#include <linux/sched.h>
59042+#include <linux/sysctl.h>
59043+#include <linux/grsecurity.h>
59044+#include <linux/grinternal.h>
59045+
59046+int
59047+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
59048+{
59049+#ifdef CONFIG_GRKERNSEC_SYSCTL
59050+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
59051+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
59052+ return -EACCES;
59053+ }
59054+#endif
59055+ return 0;
59056+}
59057+
59058+#ifdef CONFIG_GRKERNSEC_ROFS
59059+static int __maybe_unused one = 1;
59060+#endif
59061+
59062+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
59063+struct ctl_table grsecurity_table[] = {
59064+#ifdef CONFIG_GRKERNSEC_SYSCTL
59065+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
59066+#ifdef CONFIG_GRKERNSEC_IO
59067+ {
59068+ .procname = "disable_priv_io",
59069+ .data = &grsec_disable_privio,
59070+ .maxlen = sizeof(int),
59071+ .mode = 0600,
59072+ .proc_handler = &proc_dointvec,
59073+ },
59074+#endif
59075+#endif
59076+#ifdef CONFIG_GRKERNSEC_LINK
59077+ {
59078+ .procname = "linking_restrictions",
59079+ .data = &grsec_enable_link,
59080+ .maxlen = sizeof(int),
59081+ .mode = 0600,
59082+ .proc_handler = &proc_dointvec,
59083+ },
59084+#endif
59085+#ifdef CONFIG_GRKERNSEC_BRUTE
59086+ {
59087+ .procname = "deter_bruteforce",
59088+ .data = &grsec_enable_brute,
59089+ .maxlen = sizeof(int),
59090+ .mode = 0600,
59091+ .proc_handler = &proc_dointvec,
59092+ },
59093+#endif
59094+#ifdef CONFIG_GRKERNSEC_FIFO
59095+ {
59096+ .procname = "fifo_restrictions",
59097+ .data = &grsec_enable_fifo,
59098+ .maxlen = sizeof(int),
59099+ .mode = 0600,
59100+ .proc_handler = &proc_dointvec,
59101+ },
59102+#endif
59103+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
59104+ {
59105+ .procname = "ptrace_readexec",
59106+ .data = &grsec_enable_ptrace_readexec,
59107+ .maxlen = sizeof(int),
59108+ .mode = 0600,
59109+ .proc_handler = &proc_dointvec,
59110+ },
59111+#endif
59112+#ifdef CONFIG_GRKERNSEC_SETXID
59113+ {
59114+ .procname = "consistent_setxid",
59115+ .data = &grsec_enable_setxid,
59116+ .maxlen = sizeof(int),
59117+ .mode = 0600,
59118+ .proc_handler = &proc_dointvec,
59119+ },
59120+#endif
59121+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
59122+ {
59123+ .procname = "ip_blackhole",
59124+ .data = &grsec_enable_blackhole,
59125+ .maxlen = sizeof(int),
59126+ .mode = 0600,
59127+ .proc_handler = &proc_dointvec,
59128+ },
59129+ {
59130+ .procname = "lastack_retries",
59131+ .data = &grsec_lastack_retries,
59132+ .maxlen = sizeof(int),
59133+ .mode = 0600,
59134+ .proc_handler = &proc_dointvec,
59135+ },
59136+#endif
59137+#ifdef CONFIG_GRKERNSEC_EXECLOG
59138+ {
59139+ .procname = "exec_logging",
59140+ .data = &grsec_enable_execlog,
59141+ .maxlen = sizeof(int),
59142+ .mode = 0600,
59143+ .proc_handler = &proc_dointvec,
59144+ },
59145+#endif
59146+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59147+ {
59148+ .procname = "rwxmap_logging",
59149+ .data = &grsec_enable_log_rwxmaps,
59150+ .maxlen = sizeof(int),
59151+ .mode = 0600,
59152+ .proc_handler = &proc_dointvec,
59153+ },
59154+#endif
59155+#ifdef CONFIG_GRKERNSEC_SIGNAL
59156+ {
59157+ .procname = "signal_logging",
59158+ .data = &grsec_enable_signal,
59159+ .maxlen = sizeof(int),
59160+ .mode = 0600,
59161+ .proc_handler = &proc_dointvec,
59162+ },
59163+#endif
59164+#ifdef CONFIG_GRKERNSEC_FORKFAIL
59165+ {
59166+ .procname = "forkfail_logging",
59167+ .data = &grsec_enable_forkfail,
59168+ .maxlen = sizeof(int),
59169+ .mode = 0600,
59170+ .proc_handler = &proc_dointvec,
59171+ },
59172+#endif
59173+#ifdef CONFIG_GRKERNSEC_TIME
59174+ {
59175+ .procname = "timechange_logging",
59176+ .data = &grsec_enable_time,
59177+ .maxlen = sizeof(int),
59178+ .mode = 0600,
59179+ .proc_handler = &proc_dointvec,
59180+ },
59181+#endif
59182+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
59183+ {
59184+ .procname = "chroot_deny_shmat",
59185+ .data = &grsec_enable_chroot_shmat,
59186+ .maxlen = sizeof(int),
59187+ .mode = 0600,
59188+ .proc_handler = &proc_dointvec,
59189+ },
59190+#endif
59191+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
59192+ {
59193+ .procname = "chroot_deny_unix",
59194+ .data = &grsec_enable_chroot_unix,
59195+ .maxlen = sizeof(int),
59196+ .mode = 0600,
59197+ .proc_handler = &proc_dointvec,
59198+ },
59199+#endif
59200+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
59201+ {
59202+ .procname = "chroot_deny_mount",
59203+ .data = &grsec_enable_chroot_mount,
59204+ .maxlen = sizeof(int),
59205+ .mode = 0600,
59206+ .proc_handler = &proc_dointvec,
59207+ },
59208+#endif
59209+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
59210+ {
59211+ .procname = "chroot_deny_fchdir",
59212+ .data = &grsec_enable_chroot_fchdir,
59213+ .maxlen = sizeof(int),
59214+ .mode = 0600,
59215+ .proc_handler = &proc_dointvec,
59216+ },
59217+#endif
59218+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
59219+ {
59220+ .procname = "chroot_deny_chroot",
59221+ .data = &grsec_enable_chroot_double,
59222+ .maxlen = sizeof(int),
59223+ .mode = 0600,
59224+ .proc_handler = &proc_dointvec,
59225+ },
59226+#endif
59227+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
59228+ {
59229+ .procname = "chroot_deny_pivot",
59230+ .data = &grsec_enable_chroot_pivot,
59231+ .maxlen = sizeof(int),
59232+ .mode = 0600,
59233+ .proc_handler = &proc_dointvec,
59234+ },
59235+#endif
59236+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
59237+ {
59238+ .procname = "chroot_enforce_chdir",
59239+ .data = &grsec_enable_chroot_chdir,
59240+ .maxlen = sizeof(int),
59241+ .mode = 0600,
59242+ .proc_handler = &proc_dointvec,
59243+ },
59244+#endif
59245+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
59246+ {
59247+ .procname = "chroot_deny_chmod",
59248+ .data = &grsec_enable_chroot_chmod,
59249+ .maxlen = sizeof(int),
59250+ .mode = 0600,
59251+ .proc_handler = &proc_dointvec,
59252+ },
59253+#endif
59254+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
59255+ {
59256+ .procname = "chroot_deny_mknod",
59257+ .data = &grsec_enable_chroot_mknod,
59258+ .maxlen = sizeof(int),
59259+ .mode = 0600,
59260+ .proc_handler = &proc_dointvec,
59261+ },
59262+#endif
59263+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
59264+ {
59265+ .procname = "chroot_restrict_nice",
59266+ .data = &grsec_enable_chroot_nice,
59267+ .maxlen = sizeof(int),
59268+ .mode = 0600,
59269+ .proc_handler = &proc_dointvec,
59270+ },
59271+#endif
59272+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
59273+ {
59274+ .procname = "chroot_execlog",
59275+ .data = &grsec_enable_chroot_execlog,
59276+ .maxlen = sizeof(int),
59277+ .mode = 0600,
59278+ .proc_handler = &proc_dointvec,
59279+ },
59280+#endif
59281+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
59282+ {
59283+ .procname = "chroot_caps",
59284+ .data = &grsec_enable_chroot_caps,
59285+ .maxlen = sizeof(int),
59286+ .mode = 0600,
59287+ .proc_handler = &proc_dointvec,
59288+ },
59289+#endif
59290+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
59291+ {
59292+ .procname = "chroot_deny_sysctl",
59293+ .data = &grsec_enable_chroot_sysctl,
59294+ .maxlen = sizeof(int),
59295+ .mode = 0600,
59296+ .proc_handler = &proc_dointvec,
59297+ },
59298+#endif
59299+#ifdef CONFIG_GRKERNSEC_TPE
59300+ {
59301+ .procname = "tpe",
59302+ .data = &grsec_enable_tpe,
59303+ .maxlen = sizeof(int),
59304+ .mode = 0600,
59305+ .proc_handler = &proc_dointvec,
59306+ },
59307+ {
59308+ .procname = "tpe_gid",
59309+ .data = &grsec_tpe_gid,
59310+ .maxlen = sizeof(int),
59311+ .mode = 0600,
59312+ .proc_handler = &proc_dointvec,
59313+ },
59314+#endif
59315+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59316+ {
59317+ .procname = "tpe_invert",
59318+ .data = &grsec_enable_tpe_invert,
59319+ .maxlen = sizeof(int),
59320+ .mode = 0600,
59321+ .proc_handler = &proc_dointvec,
59322+ },
59323+#endif
59324+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59325+ {
59326+ .procname = "tpe_restrict_all",
59327+ .data = &grsec_enable_tpe_all,
59328+ .maxlen = sizeof(int),
59329+ .mode = 0600,
59330+ .proc_handler = &proc_dointvec,
59331+ },
59332+#endif
59333+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59334+ {
59335+ .procname = "socket_all",
59336+ .data = &grsec_enable_socket_all,
59337+ .maxlen = sizeof(int),
59338+ .mode = 0600,
59339+ .proc_handler = &proc_dointvec,
59340+ },
59341+ {
59342+ .procname = "socket_all_gid",
59343+ .data = &grsec_socket_all_gid,
59344+ .maxlen = sizeof(int),
59345+ .mode = 0600,
59346+ .proc_handler = &proc_dointvec,
59347+ },
59348+#endif
59349+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59350+ {
59351+ .procname = "socket_client",
59352+ .data = &grsec_enable_socket_client,
59353+ .maxlen = sizeof(int),
59354+ .mode = 0600,
59355+ .proc_handler = &proc_dointvec,
59356+ },
59357+ {
59358+ .procname = "socket_client_gid",
59359+ .data = &grsec_socket_client_gid,
59360+ .maxlen = sizeof(int),
59361+ .mode = 0600,
59362+ .proc_handler = &proc_dointvec,
59363+ },
59364+#endif
59365+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59366+ {
59367+ .procname = "socket_server",
59368+ .data = &grsec_enable_socket_server,
59369+ .maxlen = sizeof(int),
59370+ .mode = 0600,
59371+ .proc_handler = &proc_dointvec,
59372+ },
59373+ {
59374+ .procname = "socket_server_gid",
59375+ .data = &grsec_socket_server_gid,
59376+ .maxlen = sizeof(int),
59377+ .mode = 0600,
59378+ .proc_handler = &proc_dointvec,
59379+ },
59380+#endif
59381+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
59382+ {
59383+ .procname = "audit_group",
59384+ .data = &grsec_enable_group,
59385+ .maxlen = sizeof(int),
59386+ .mode = 0600,
59387+ .proc_handler = &proc_dointvec,
59388+ },
59389+ {
59390+ .procname = "audit_gid",
59391+ .data = &grsec_audit_gid,
59392+ .maxlen = sizeof(int),
59393+ .mode = 0600,
59394+ .proc_handler = &proc_dointvec,
59395+ },
59396+#endif
59397+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
59398+ {
59399+ .procname = "audit_chdir",
59400+ .data = &grsec_enable_chdir,
59401+ .maxlen = sizeof(int),
59402+ .mode = 0600,
59403+ .proc_handler = &proc_dointvec,
59404+ },
59405+#endif
59406+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
59407+ {
59408+ .procname = "audit_mount",
59409+ .data = &grsec_enable_mount,
59410+ .maxlen = sizeof(int),
59411+ .mode = 0600,
59412+ .proc_handler = &proc_dointvec,
59413+ },
59414+#endif
59415+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
59416+ {
59417+ .procname = "audit_textrel",
59418+ .data = &grsec_enable_audit_textrel,
59419+ .maxlen = sizeof(int),
59420+ .mode = 0600,
59421+ .proc_handler = &proc_dointvec,
59422+ },
59423+#endif
59424+#ifdef CONFIG_GRKERNSEC_DMESG
59425+ {
59426+ .procname = "dmesg",
59427+ .data = &grsec_enable_dmesg,
59428+ .maxlen = sizeof(int),
59429+ .mode = 0600,
59430+ .proc_handler = &proc_dointvec,
59431+ },
59432+#endif
59433+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
59434+ {
59435+ .procname = "chroot_findtask",
59436+ .data = &grsec_enable_chroot_findtask,
59437+ .maxlen = sizeof(int),
59438+ .mode = 0600,
59439+ .proc_handler = &proc_dointvec,
59440+ },
59441+#endif
59442+#ifdef CONFIG_GRKERNSEC_RESLOG
59443+ {
59444+ .procname = "resource_logging",
59445+ .data = &grsec_resource_logging,
59446+ .maxlen = sizeof(int),
59447+ .mode = 0600,
59448+ .proc_handler = &proc_dointvec,
59449+ },
59450+#endif
59451+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
59452+ {
59453+ .procname = "audit_ptrace",
59454+ .data = &grsec_enable_audit_ptrace,
59455+ .maxlen = sizeof(int),
59456+ .mode = 0600,
59457+ .proc_handler = &proc_dointvec,
59458+ },
59459+#endif
59460+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59461+ {
59462+ .procname = "harden_ptrace",
59463+ .data = &grsec_enable_harden_ptrace,
59464+ .maxlen = sizeof(int),
59465+ .mode = 0600,
59466+ .proc_handler = &proc_dointvec,
59467+ },
59468+#endif
59469+ {
59470+ .procname = "grsec_lock",
59471+ .data = &grsec_lock,
59472+ .maxlen = sizeof(int),
59473+ .mode = 0600,
59474+ .proc_handler = &proc_dointvec,
59475+ },
59476+#endif
59477+#ifdef CONFIG_GRKERNSEC_ROFS
59478+ {
59479+ .procname = "romount_protect",
59480+ .data = &grsec_enable_rofs,
59481+ .maxlen = sizeof(int),
59482+ .mode = 0600,
59483+ .proc_handler = &proc_dointvec_minmax,
59484+ .extra1 = &one,
59485+ .extra2 = &one,
59486+ },
59487+#endif
59488+ { }
59489+};
59490+#endif
59491diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
59492new file mode 100644
59493index 0000000..0dc13c3
59494--- /dev/null
59495+++ b/grsecurity/grsec_time.c
59496@@ -0,0 +1,16 @@
59497+#include <linux/kernel.h>
59498+#include <linux/sched.h>
59499+#include <linux/grinternal.h>
59500+#include <linux/module.h>
59501+
59502+void
59503+gr_log_timechange(void)
59504+{
59505+#ifdef CONFIG_GRKERNSEC_TIME
59506+ if (grsec_enable_time)
59507+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
59508+#endif
59509+ return;
59510+}
59511+
59512+EXPORT_SYMBOL(gr_log_timechange);
59513diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
59514new file mode 100644
59515index 0000000..07e0dc0
59516--- /dev/null
59517+++ b/grsecurity/grsec_tpe.c
59518@@ -0,0 +1,73 @@
59519+#include <linux/kernel.h>
59520+#include <linux/sched.h>
59521+#include <linux/file.h>
59522+#include <linux/fs.h>
59523+#include <linux/grinternal.h>
59524+
59525+extern int gr_acl_tpe_check(void);
59526+
59527+int
59528+gr_tpe_allow(const struct file *file)
59529+{
59530+#ifdef CONFIG_GRKERNSEC
59531+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
59532+ const struct cred *cred = current_cred();
59533+ char *msg = NULL;
59534+ char *msg2 = NULL;
59535+
59536+ // never restrict root
59537+ if (!cred->uid)
59538+ return 1;
59539+
59540+ if (grsec_enable_tpe) {
59541+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59542+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
59543+ msg = "not being in trusted group";
59544+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
59545+ msg = "being in untrusted group";
59546+#else
59547+ if (in_group_p(grsec_tpe_gid))
59548+ msg = "being in untrusted group";
59549+#endif
59550+ }
59551+ if (!msg && gr_acl_tpe_check())
59552+ msg = "being in untrusted role";
59553+
59554+ // not in any affected group/role
59555+ if (!msg)
59556+ goto next_check;
59557+
59558+ if (inode->i_uid)
59559+ msg2 = "file in non-root-owned directory";
59560+ else if (inode->i_mode & S_IWOTH)
59561+ msg2 = "file in world-writable directory";
59562+ else if (inode->i_mode & S_IWGRP)
59563+ msg2 = "file in group-writable directory";
59564+
59565+ if (msg && msg2) {
59566+ char fullmsg[70] = {0};
59567+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
59568+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
59569+ return 0;
59570+ }
59571+ msg = NULL;
59572+next_check:
59573+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59574+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
59575+ return 1;
59576+
59577+ if (inode->i_uid && (inode->i_uid != cred->uid))
59578+ msg = "directory not owned by user";
59579+ else if (inode->i_mode & S_IWOTH)
59580+ msg = "file in world-writable directory";
59581+ else if (inode->i_mode & S_IWGRP)
59582+ msg = "file in group-writable directory";
59583+
59584+ if (msg) {
59585+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
59586+ return 0;
59587+ }
59588+#endif
59589+#endif
59590+ return 1;
59591+}
59592diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
59593new file mode 100644
59594index 0000000..9f7b1ac
59595--- /dev/null
59596+++ b/grsecurity/grsum.c
59597@@ -0,0 +1,61 @@
59598+#include <linux/err.h>
59599+#include <linux/kernel.h>
59600+#include <linux/sched.h>
59601+#include <linux/mm.h>
59602+#include <linux/scatterlist.h>
59603+#include <linux/crypto.h>
59604+#include <linux/gracl.h>
59605+
59606+
59607+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
59608+#error "crypto and sha256 must be built into the kernel"
59609+#endif
59610+
59611+int
59612+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
59613+{
59614+ char *p;
59615+ struct crypto_hash *tfm;
59616+ struct hash_desc desc;
59617+ struct scatterlist sg;
59618+ unsigned char temp_sum[GR_SHA_LEN];
59619+ volatile int retval = 0;
59620+ volatile int dummy = 0;
59621+ unsigned int i;
59622+
59623+ sg_init_table(&sg, 1);
59624+
59625+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
59626+ if (IS_ERR(tfm)) {
59627+ /* should never happen, since sha256 should be built in */
59628+ return 1;
59629+ }
59630+
59631+ desc.tfm = tfm;
59632+ desc.flags = 0;
59633+
59634+ crypto_hash_init(&desc);
59635+
59636+ p = salt;
59637+ sg_set_buf(&sg, p, GR_SALT_LEN);
59638+ crypto_hash_update(&desc, &sg, sg.length);
59639+
59640+ p = entry->pw;
59641+ sg_set_buf(&sg, p, strlen(p));
59642+
59643+ crypto_hash_update(&desc, &sg, sg.length);
59644+
59645+ crypto_hash_final(&desc, temp_sum);
59646+
59647+ memset(entry->pw, 0, GR_PW_LEN);
59648+
59649+ for (i = 0; i < GR_SHA_LEN; i++)
59650+ if (sum[i] != temp_sum[i])
59651+ retval = 1;
59652+ else
59653+ dummy = 1; // waste a cycle
59654+
59655+ crypto_free_hash(tfm);
59656+
59657+ return retval;
59658+}
59659diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
59660index 6cd5b64..f620d2d 100644
59661--- a/include/acpi/acpi_bus.h
59662+++ b/include/acpi/acpi_bus.h
59663@@ -107,7 +107,7 @@ struct acpi_device_ops {
59664 acpi_op_bind bind;
59665 acpi_op_unbind unbind;
59666 acpi_op_notify notify;
59667-};
59668+} __no_const;
59669
59670 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
59671
59672diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
59673index b7babf0..71e4e74 100644
59674--- a/include/asm-generic/atomic-long.h
59675+++ b/include/asm-generic/atomic-long.h
59676@@ -22,6 +22,12 @@
59677
59678 typedef atomic64_t atomic_long_t;
59679
59680+#ifdef CONFIG_PAX_REFCOUNT
59681+typedef atomic64_unchecked_t atomic_long_unchecked_t;
59682+#else
59683+typedef atomic64_t atomic_long_unchecked_t;
59684+#endif
59685+
59686 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
59687
59688 static inline long atomic_long_read(atomic_long_t *l)
59689@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
59690 return (long)atomic64_read(v);
59691 }
59692
59693+#ifdef CONFIG_PAX_REFCOUNT
59694+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
59695+{
59696+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59697+
59698+ return (long)atomic64_read_unchecked(v);
59699+}
59700+#endif
59701+
59702 static inline void atomic_long_set(atomic_long_t *l, long i)
59703 {
59704 atomic64_t *v = (atomic64_t *)l;
59705@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
59706 atomic64_set(v, i);
59707 }
59708
59709+#ifdef CONFIG_PAX_REFCOUNT
59710+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
59711+{
59712+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59713+
59714+ atomic64_set_unchecked(v, i);
59715+}
59716+#endif
59717+
59718 static inline void atomic_long_inc(atomic_long_t *l)
59719 {
59720 atomic64_t *v = (atomic64_t *)l;
59721@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
59722 atomic64_inc(v);
59723 }
59724
59725+#ifdef CONFIG_PAX_REFCOUNT
59726+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
59727+{
59728+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59729+
59730+ atomic64_inc_unchecked(v);
59731+}
59732+#endif
59733+
59734 static inline void atomic_long_dec(atomic_long_t *l)
59735 {
59736 atomic64_t *v = (atomic64_t *)l;
59737@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
59738 atomic64_dec(v);
59739 }
59740
59741+#ifdef CONFIG_PAX_REFCOUNT
59742+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
59743+{
59744+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59745+
59746+ atomic64_dec_unchecked(v);
59747+}
59748+#endif
59749+
59750 static inline void atomic_long_add(long i, atomic_long_t *l)
59751 {
59752 atomic64_t *v = (atomic64_t *)l;
59753@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
59754 atomic64_add(i, v);
59755 }
59756
59757+#ifdef CONFIG_PAX_REFCOUNT
59758+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
59759+{
59760+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59761+
59762+ atomic64_add_unchecked(i, v);
59763+}
59764+#endif
59765+
59766 static inline void atomic_long_sub(long i, atomic_long_t *l)
59767 {
59768 atomic64_t *v = (atomic64_t *)l;
59769@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
59770 atomic64_sub(i, v);
59771 }
59772
59773+#ifdef CONFIG_PAX_REFCOUNT
59774+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
59775+{
59776+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59777+
59778+ atomic64_sub_unchecked(i, v);
59779+}
59780+#endif
59781+
59782 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
59783 {
59784 atomic64_t *v = (atomic64_t *)l;
59785@@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
59786 return (long)atomic64_inc_return(v);
59787 }
59788
59789+#ifdef CONFIG_PAX_REFCOUNT
59790+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
59791+{
59792+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59793+
59794+ return (long)atomic64_inc_return_unchecked(v);
59795+}
59796+#endif
59797+
59798 static inline long atomic_long_dec_return(atomic_long_t *l)
59799 {
59800 atomic64_t *v = (atomic64_t *)l;
59801@@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
59802
59803 typedef atomic_t atomic_long_t;
59804
59805+#ifdef CONFIG_PAX_REFCOUNT
59806+typedef atomic_unchecked_t atomic_long_unchecked_t;
59807+#else
59808+typedef atomic_t atomic_long_unchecked_t;
59809+#endif
59810+
59811 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
59812 static inline long atomic_long_read(atomic_long_t *l)
59813 {
59814@@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
59815 return (long)atomic_read(v);
59816 }
59817
59818+#ifdef CONFIG_PAX_REFCOUNT
59819+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
59820+{
59821+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59822+
59823+ return (long)atomic_read_unchecked(v);
59824+}
59825+#endif
59826+
59827 static inline void atomic_long_set(atomic_long_t *l, long i)
59828 {
59829 atomic_t *v = (atomic_t *)l;
59830@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
59831 atomic_set(v, i);
59832 }
59833
59834+#ifdef CONFIG_PAX_REFCOUNT
59835+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
59836+{
59837+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59838+
59839+ atomic_set_unchecked(v, i);
59840+}
59841+#endif
59842+
59843 static inline void atomic_long_inc(atomic_long_t *l)
59844 {
59845 atomic_t *v = (atomic_t *)l;
59846@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
59847 atomic_inc(v);
59848 }
59849
59850+#ifdef CONFIG_PAX_REFCOUNT
59851+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
59852+{
59853+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59854+
59855+ atomic_inc_unchecked(v);
59856+}
59857+#endif
59858+
59859 static inline void atomic_long_dec(atomic_long_t *l)
59860 {
59861 atomic_t *v = (atomic_t *)l;
59862@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
59863 atomic_dec(v);
59864 }
59865
59866+#ifdef CONFIG_PAX_REFCOUNT
59867+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
59868+{
59869+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59870+
59871+ atomic_dec_unchecked(v);
59872+}
59873+#endif
59874+
59875 static inline void atomic_long_add(long i, atomic_long_t *l)
59876 {
59877 atomic_t *v = (atomic_t *)l;
59878@@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
59879 atomic_add(i, v);
59880 }
59881
59882+#ifdef CONFIG_PAX_REFCOUNT
59883+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
59884+{
59885+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59886+
59887+ atomic_add_unchecked(i, v);
59888+}
59889+#endif
59890+
59891 static inline void atomic_long_sub(long i, atomic_long_t *l)
59892 {
59893 atomic_t *v = (atomic_t *)l;
59894@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
59895 atomic_sub(i, v);
59896 }
59897
59898+#ifdef CONFIG_PAX_REFCOUNT
59899+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
59900+{
59901+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59902+
59903+ atomic_sub_unchecked(i, v);
59904+}
59905+#endif
59906+
59907 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
59908 {
59909 atomic_t *v = (atomic_t *)l;
59910@@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
59911 return (long)atomic_inc_return(v);
59912 }
59913
59914+#ifdef CONFIG_PAX_REFCOUNT
59915+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
59916+{
59917+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59918+
59919+ return (long)atomic_inc_return_unchecked(v);
59920+}
59921+#endif
59922+
59923 static inline long atomic_long_dec_return(atomic_long_t *l)
59924 {
59925 atomic_t *v = (atomic_t *)l;
59926@@ -255,4 +393,49 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
59927
59928 #endif /* BITS_PER_LONG == 64 */
59929
59930+#ifdef CONFIG_PAX_REFCOUNT
59931+static inline void pax_refcount_needs_these_functions(void)
59932+{
59933+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
59934+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
59935+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
59936+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
59937+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
59938+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
59939+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
59940+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
59941+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
59942+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
59943+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
59944+
59945+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
59946+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
59947+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
59948+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
59949+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
59950+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
59951+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
59952+}
59953+#else
59954+#define atomic_read_unchecked(v) atomic_read(v)
59955+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
59956+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
59957+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
59958+#define atomic_inc_unchecked(v) atomic_inc(v)
59959+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
59960+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
59961+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
59962+#define atomic_dec_unchecked(v) atomic_dec(v)
59963+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
59964+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
59965+
59966+#define atomic_long_read_unchecked(v) atomic_long_read(v)
59967+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
59968+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
59969+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
59970+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
59971+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
59972+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
59973+#endif
59974+
59975 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
59976diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
59977index b18ce4f..2ee2843 100644
59978--- a/include/asm-generic/atomic64.h
59979+++ b/include/asm-generic/atomic64.h
59980@@ -16,6 +16,8 @@ typedef struct {
59981 long long counter;
59982 } atomic64_t;
59983
59984+typedef atomic64_t atomic64_unchecked_t;
59985+
59986 #define ATOMIC64_INIT(i) { (i) }
59987
59988 extern long long atomic64_read(const atomic64_t *v);
59989@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
59990 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
59991 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
59992
59993+#define atomic64_read_unchecked(v) atomic64_read(v)
59994+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
59995+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
59996+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
59997+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
59998+#define atomic64_inc_unchecked(v) atomic64_inc(v)
59999+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
60000+#define atomic64_dec_unchecked(v) atomic64_dec(v)
60001+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
60002+
60003 #endif /* _ASM_GENERIC_ATOMIC64_H */
60004diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
60005index 1bfcfe5..e04c5c9 100644
60006--- a/include/asm-generic/cache.h
60007+++ b/include/asm-generic/cache.h
60008@@ -6,7 +6,7 @@
60009 * cache lines need to provide their own cache.h.
60010 */
60011
60012-#define L1_CACHE_SHIFT 5
60013-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
60014+#define L1_CACHE_SHIFT 5UL
60015+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
60016
60017 #endif /* __ASM_GENERIC_CACHE_H */
60018diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
60019index 0d68a1e..b74a761 100644
60020--- a/include/asm-generic/emergency-restart.h
60021+++ b/include/asm-generic/emergency-restart.h
60022@@ -1,7 +1,7 @@
60023 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
60024 #define _ASM_GENERIC_EMERGENCY_RESTART_H
60025
60026-static inline void machine_emergency_restart(void)
60027+static inline __noreturn void machine_emergency_restart(void)
60028 {
60029 machine_restart(NULL);
60030 }
60031diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
60032index 0232ccb..13d9165 100644
60033--- a/include/asm-generic/kmap_types.h
60034+++ b/include/asm-generic/kmap_types.h
60035@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
60036 KMAP_D(17) KM_NMI,
60037 KMAP_D(18) KM_NMI_PTE,
60038 KMAP_D(19) KM_KDB,
60039+KMAP_D(20) KM_CLEARPAGE,
60040 /*
60041 * Remember to update debug_kmap_atomic() when adding new kmap types!
60042 */
60043-KMAP_D(20) KM_TYPE_NR
60044+KMAP_D(21) KM_TYPE_NR
60045 };
60046
60047 #undef KMAP_D
60048diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
60049index 9ceb03b..2efbcbd 100644
60050--- a/include/asm-generic/local.h
60051+++ b/include/asm-generic/local.h
60052@@ -39,6 +39,7 @@ typedef struct
60053 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
60054 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
60055 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
60056+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
60057
60058 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
60059 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
60060diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
60061index 725612b..9cc513a 100644
60062--- a/include/asm-generic/pgtable-nopmd.h
60063+++ b/include/asm-generic/pgtable-nopmd.h
60064@@ -1,14 +1,19 @@
60065 #ifndef _PGTABLE_NOPMD_H
60066 #define _PGTABLE_NOPMD_H
60067
60068-#ifndef __ASSEMBLY__
60069-
60070 #include <asm-generic/pgtable-nopud.h>
60071
60072-struct mm_struct;
60073-
60074 #define __PAGETABLE_PMD_FOLDED
60075
60076+#define PMD_SHIFT PUD_SHIFT
60077+#define PTRS_PER_PMD 1
60078+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
60079+#define PMD_MASK (~(PMD_SIZE-1))
60080+
60081+#ifndef __ASSEMBLY__
60082+
60083+struct mm_struct;
60084+
60085 /*
60086 * Having the pmd type consist of a pud gets the size right, and allows
60087 * us to conceptually access the pud entry that this pmd is folded into
60088@@ -16,11 +21,6 @@ struct mm_struct;
60089 */
60090 typedef struct { pud_t pud; } pmd_t;
60091
60092-#define PMD_SHIFT PUD_SHIFT
60093-#define PTRS_PER_PMD 1
60094-#define PMD_SIZE (1UL << PMD_SHIFT)
60095-#define PMD_MASK (~(PMD_SIZE-1))
60096-
60097 /*
60098 * The "pud_xxx()" functions here are trivial for a folded two-level
60099 * setup: the pmd is never bad, and a pmd always exists (as it's folded
60100diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
60101index 810431d..ccc3638 100644
60102--- a/include/asm-generic/pgtable-nopud.h
60103+++ b/include/asm-generic/pgtable-nopud.h
60104@@ -1,10 +1,15 @@
60105 #ifndef _PGTABLE_NOPUD_H
60106 #define _PGTABLE_NOPUD_H
60107
60108-#ifndef __ASSEMBLY__
60109-
60110 #define __PAGETABLE_PUD_FOLDED
60111
60112+#define PUD_SHIFT PGDIR_SHIFT
60113+#define PTRS_PER_PUD 1
60114+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
60115+#define PUD_MASK (~(PUD_SIZE-1))
60116+
60117+#ifndef __ASSEMBLY__
60118+
60119 /*
60120 * Having the pud type consist of a pgd gets the size right, and allows
60121 * us to conceptually access the pgd entry that this pud is folded into
60122@@ -12,11 +17,6 @@
60123 */
60124 typedef struct { pgd_t pgd; } pud_t;
60125
60126-#define PUD_SHIFT PGDIR_SHIFT
60127-#define PTRS_PER_PUD 1
60128-#define PUD_SIZE (1UL << PUD_SHIFT)
60129-#define PUD_MASK (~(PUD_SIZE-1))
60130-
60131 /*
60132 * The "pgd_xxx()" functions here are trivial for a folded two-level
60133 * setup: the pud is never bad, and a pud always exists (as it's folded
60134diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
60135index 76bff2b..c7a14e2 100644
60136--- a/include/asm-generic/pgtable.h
60137+++ b/include/asm-generic/pgtable.h
60138@@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
60139 #endif /* __HAVE_ARCH_PMD_WRITE */
60140 #endif
60141
60142+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
60143+static inline unsigned long pax_open_kernel(void) { return 0; }
60144+#endif
60145+
60146+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
60147+static inline unsigned long pax_close_kernel(void) { return 0; }
60148+#endif
60149+
60150 #endif /* !__ASSEMBLY__ */
60151
60152 #endif /* _ASM_GENERIC_PGTABLE_H */
60153diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
60154index ac68c99..b495b0a 100644
60155--- a/include/asm-generic/uaccess.h
60156+++ b/include/asm-generic/uaccess.h
60157@@ -76,6 +76,8 @@ extern unsigned long search_exception_table(unsigned long);
60158 */
60159 #ifndef __copy_from_user
60160 static inline __must_check long __copy_from_user(void *to,
60161+ const void __user * from, unsigned long n) __size_overflow(3);
60162+static inline __must_check long __copy_from_user(void *to,
60163 const void __user * from, unsigned long n)
60164 {
60165 if (__builtin_constant_p(n)) {
60166@@ -106,6 +108,8 @@ static inline __must_check long __copy_from_user(void *to,
60167
60168 #ifndef __copy_to_user
60169 static inline __must_check long __copy_to_user(void __user *to,
60170+ const void *from, unsigned long n) __size_overflow(3);
60171+static inline __must_check long __copy_to_user(void __user *to,
60172 const void *from, unsigned long n)
60173 {
60174 if (__builtin_constant_p(n)) {
60175@@ -224,6 +228,7 @@ extern int __put_user_bad(void) __attribute__((noreturn));
60176 -EFAULT; \
60177 })
60178
60179+static inline int __get_user_fn(size_t size, const void __user *ptr, void *x) __size_overflow(1);
60180 static inline int __get_user_fn(size_t size, const void __user *ptr, void *x)
60181 {
60182 size = __copy_from_user(x, ptr, size);
60183@@ -240,6 +245,7 @@ extern int __get_user_bad(void) __attribute__((noreturn));
60184 #define __copy_to_user_inatomic __copy_to_user
60185 #endif
60186
60187+static inline long copy_from_user(void *to, const void __user * from, unsigned long n) __size_overflow(3);
60188 static inline long copy_from_user(void *to,
60189 const void __user * from, unsigned long n)
60190 {
60191@@ -250,6 +256,7 @@ static inline long copy_from_user(void *to,
60192 return n;
60193 }
60194
60195+static inline long copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
60196 static inline long copy_to_user(void __user *to,
60197 const void *from, unsigned long n)
60198 {
60199@@ -265,6 +272,8 @@ static inline long copy_to_user(void __user *to,
60200 */
60201 #ifndef __strncpy_from_user
60202 static inline long
60203+__strncpy_from_user(char *dst, const char __user *src, unsigned long count) __size_overflow(3);
60204+static inline long
60205 __strncpy_from_user(char *dst, const char __user *src, long count)
60206 {
60207 char *tmp;
60208@@ -276,6 +285,8 @@ __strncpy_from_user(char *dst, const char __user *src, long count)
60209 #endif
60210
60211 static inline long
60212+strncpy_from_user(char *dst, const char __user *src, unsigned long count) __size_overflow(3);
60213+static inline long
60214 strncpy_from_user(char *dst, const char __user *src, long count)
60215 {
60216 if (!access_ok(VERIFY_READ, src, 1))
60217@@ -309,6 +320,8 @@ static inline long strlen_user(const char __user *src)
60218 */
60219 #ifndef __clear_user
60220 static inline __must_check unsigned long
60221+__clear_user(void __user *to, unsigned long n) __size_overflow(2);
60222+static inline __must_check unsigned long
60223 __clear_user(void __user *to, unsigned long n)
60224 {
60225 memset((void __force *)to, 0, n);
60226@@ -317,6 +330,8 @@ __clear_user(void __user *to, unsigned long n)
60227 #endif
60228
60229 static inline __must_check unsigned long
60230+clear_user(void __user *to, unsigned long n) __size_overflow(2);
60231+static inline __must_check unsigned long
60232 clear_user(void __user *to, unsigned long n)
60233 {
60234 might_sleep();
60235diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
60236index b5e2e4c..6a5373e 100644
60237--- a/include/asm-generic/vmlinux.lds.h
60238+++ b/include/asm-generic/vmlinux.lds.h
60239@@ -217,6 +217,7 @@
60240 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
60241 VMLINUX_SYMBOL(__start_rodata) = .; \
60242 *(.rodata) *(.rodata.*) \
60243+ *(.data..read_only) \
60244 *(__vermagic) /* Kernel version magic */ \
60245 . = ALIGN(8); \
60246 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
60247@@ -722,17 +723,18 @@
60248 * section in the linker script will go there too. @phdr should have
60249 * a leading colon.
60250 *
60251- * Note that this macros defines __per_cpu_load as an absolute symbol.
60252+ * Note that this macros defines per_cpu_load as an absolute symbol.
60253 * If there is no need to put the percpu section at a predetermined
60254 * address, use PERCPU_SECTION.
60255 */
60256 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
60257- VMLINUX_SYMBOL(__per_cpu_load) = .; \
60258- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
60259+ per_cpu_load = .; \
60260+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
60261 - LOAD_OFFSET) { \
60262+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
60263 PERCPU_INPUT(cacheline) \
60264 } phdr \
60265- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
60266+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
60267
60268 /**
60269 * PERCPU_SECTION - define output section for percpu area, simple version
60270diff --git a/include/drm/drmP.h b/include/drm/drmP.h
60271index bf4b2dc..2d0762f 100644
60272--- a/include/drm/drmP.h
60273+++ b/include/drm/drmP.h
60274@@ -72,6 +72,7 @@
60275 #include <linux/workqueue.h>
60276 #include <linux/poll.h>
60277 #include <asm/pgalloc.h>
60278+#include <asm/local.h>
60279 #include "drm.h"
60280
60281 #include <linux/idr.h>
60282@@ -1038,7 +1039,7 @@ struct drm_device {
60283
60284 /** \name Usage Counters */
60285 /*@{ */
60286- int open_count; /**< Outstanding files open */
60287+ local_t open_count; /**< Outstanding files open */
60288 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
60289 atomic_t vma_count; /**< Outstanding vma areas open */
60290 int buf_use; /**< Buffers in use -- cannot alloc */
60291@@ -1049,7 +1050,7 @@ struct drm_device {
60292 /*@{ */
60293 unsigned long counters;
60294 enum drm_stat_type types[15];
60295- atomic_t counts[15];
60296+ atomic_unchecked_t counts[15];
60297 /*@} */
60298
60299 struct list_head filelist;
60300diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
60301index 73b0712..0b7ef2f 100644
60302--- a/include/drm/drm_crtc_helper.h
60303+++ b/include/drm/drm_crtc_helper.h
60304@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
60305
60306 /* disable crtc when not in use - more explicit than dpms off */
60307 void (*disable)(struct drm_crtc *crtc);
60308-};
60309+} __no_const;
60310
60311 struct drm_encoder_helper_funcs {
60312 void (*dpms)(struct drm_encoder *encoder, int mode);
60313@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs {
60314 struct drm_connector *connector);
60315 /* disable encoder when not in use - more explicit than dpms off */
60316 void (*disable)(struct drm_encoder *encoder);
60317-};
60318+} __no_const;
60319
60320 struct drm_connector_helper_funcs {
60321 int (*get_modes)(struct drm_connector *connector);
60322diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
60323index 26c1f78..6722682 100644
60324--- a/include/drm/ttm/ttm_memory.h
60325+++ b/include/drm/ttm/ttm_memory.h
60326@@ -47,7 +47,7 @@
60327
60328 struct ttm_mem_shrink {
60329 int (*do_shrink) (struct ttm_mem_shrink *);
60330-};
60331+} __no_const;
60332
60333 /**
60334 * struct ttm_mem_global - Global memory accounting structure.
60335diff --git a/include/linux/a.out.h b/include/linux/a.out.h
60336index e86dfca..40cc55f 100644
60337--- a/include/linux/a.out.h
60338+++ b/include/linux/a.out.h
60339@@ -39,6 +39,14 @@ enum machine_type {
60340 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
60341 };
60342
60343+/* Constants for the N_FLAGS field */
60344+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
60345+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
60346+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
60347+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
60348+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
60349+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
60350+
60351 #if !defined (N_MAGIC)
60352 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
60353 #endif
60354diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
60355index 49a83ca..df96b54 100644
60356--- a/include/linux/atmdev.h
60357+++ b/include/linux/atmdev.h
60358@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
60359 #endif
60360
60361 struct k_atm_aal_stats {
60362-#define __HANDLE_ITEM(i) atomic_t i
60363+#define __HANDLE_ITEM(i) atomic_unchecked_t i
60364 __AAL_STAT_ITEMS
60365 #undef __HANDLE_ITEM
60366 };
60367diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
60368index fd88a39..8a801b4 100644
60369--- a/include/linux/binfmts.h
60370+++ b/include/linux/binfmts.h
60371@@ -18,7 +18,7 @@ struct pt_regs;
60372 #define BINPRM_BUF_SIZE 128
60373
60374 #ifdef __KERNEL__
60375-#include <linux/list.h>
60376+#include <linux/sched.h>
60377
60378 #define CORENAME_MAX_SIZE 128
60379
60380@@ -58,6 +58,7 @@ struct linux_binprm {
60381 unsigned interp_flags;
60382 unsigned interp_data;
60383 unsigned long loader, exec;
60384+ char tcomm[TASK_COMM_LEN];
60385 };
60386
60387 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
60388@@ -88,6 +89,7 @@ struct linux_binfmt {
60389 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
60390 int (*load_shlib)(struct file *);
60391 int (*core_dump)(struct coredump_params *cprm);
60392+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
60393 unsigned long min_coredump; /* minimal dump size */
60394 };
60395
60396diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
60397index 0ed1eb0..3ab569b 100644
60398--- a/include/linux/blkdev.h
60399+++ b/include/linux/blkdev.h
60400@@ -1315,7 +1315,7 @@ struct block_device_operations {
60401 /* this callback is with swap_lock and sometimes page table lock held */
60402 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
60403 struct module *owner;
60404-};
60405+} __do_const;
60406
60407 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
60408 unsigned long);
60409diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
60410index 4d1a074..88f929a 100644
60411--- a/include/linux/blktrace_api.h
60412+++ b/include/linux/blktrace_api.h
60413@@ -162,7 +162,7 @@ struct blk_trace {
60414 struct dentry *dir;
60415 struct dentry *dropped_file;
60416 struct dentry *msg_file;
60417- atomic_t dropped;
60418+ atomic_unchecked_t dropped;
60419 };
60420
60421 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
60422diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
60423index 83195fb..0b0f77d 100644
60424--- a/include/linux/byteorder/little_endian.h
60425+++ b/include/linux/byteorder/little_endian.h
60426@@ -42,51 +42,51 @@
60427
60428 static inline __le64 __cpu_to_le64p(const __u64 *p)
60429 {
60430- return (__force __le64)*p;
60431+ return (__force const __le64)*p;
60432 }
60433 static inline __u64 __le64_to_cpup(const __le64 *p)
60434 {
60435- return (__force __u64)*p;
60436+ return (__force const __u64)*p;
60437 }
60438 static inline __le32 __cpu_to_le32p(const __u32 *p)
60439 {
60440- return (__force __le32)*p;
60441+ return (__force const __le32)*p;
60442 }
60443 static inline __u32 __le32_to_cpup(const __le32 *p)
60444 {
60445- return (__force __u32)*p;
60446+ return (__force const __u32)*p;
60447 }
60448 static inline __le16 __cpu_to_le16p(const __u16 *p)
60449 {
60450- return (__force __le16)*p;
60451+ return (__force const __le16)*p;
60452 }
60453 static inline __u16 __le16_to_cpup(const __le16 *p)
60454 {
60455- return (__force __u16)*p;
60456+ return (__force const __u16)*p;
60457 }
60458 static inline __be64 __cpu_to_be64p(const __u64 *p)
60459 {
60460- return (__force __be64)__swab64p(p);
60461+ return (__force const __be64)__swab64p(p);
60462 }
60463 static inline __u64 __be64_to_cpup(const __be64 *p)
60464 {
60465- return __swab64p((__u64 *)p);
60466+ return __swab64p((const __u64 *)p);
60467 }
60468 static inline __be32 __cpu_to_be32p(const __u32 *p)
60469 {
60470- return (__force __be32)__swab32p(p);
60471+ return (__force const __be32)__swab32p(p);
60472 }
60473 static inline __u32 __be32_to_cpup(const __be32 *p)
60474 {
60475- return __swab32p((__u32 *)p);
60476+ return __swab32p((const __u32 *)p);
60477 }
60478 static inline __be16 __cpu_to_be16p(const __u16 *p)
60479 {
60480- return (__force __be16)__swab16p(p);
60481+ return (__force const __be16)__swab16p(p);
60482 }
60483 static inline __u16 __be16_to_cpup(const __be16 *p)
60484 {
60485- return __swab16p((__u16 *)p);
60486+ return __swab16p((const __u16 *)p);
60487 }
60488 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
60489 #define __le64_to_cpus(x) do { (void)(x); } while (0)
60490diff --git a/include/linux/cache.h b/include/linux/cache.h
60491index 4c57065..4307975 100644
60492--- a/include/linux/cache.h
60493+++ b/include/linux/cache.h
60494@@ -16,6 +16,10 @@
60495 #define __read_mostly
60496 #endif
60497
60498+#ifndef __read_only
60499+#define __read_only __read_mostly
60500+#endif
60501+
60502 #ifndef ____cacheline_aligned
60503 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
60504 #endif
60505diff --git a/include/linux/capability.h b/include/linux/capability.h
60506index a63d13d..069bfd5 100644
60507--- a/include/linux/capability.h
60508+++ b/include/linux/capability.h
60509@@ -548,6 +548,9 @@ extern bool capable(int cap);
60510 extern bool ns_capable(struct user_namespace *ns, int cap);
60511 extern bool task_ns_capable(struct task_struct *t, int cap);
60512 extern bool nsown_capable(int cap);
60513+extern bool task_ns_capable_nolog(struct task_struct *t, int cap);
60514+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
60515+extern bool capable_nolog(int cap);
60516
60517 /* audit system wants to get cap info from files as well */
60518 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
60519diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
60520index 04ffb2e..6799180 100644
60521--- a/include/linux/cleancache.h
60522+++ b/include/linux/cleancache.h
60523@@ -31,7 +31,7 @@ struct cleancache_ops {
60524 void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
60525 void (*flush_inode)(int, struct cleancache_filekey);
60526 void (*flush_fs)(int);
60527-};
60528+} __no_const;
60529
60530 extern struct cleancache_ops
60531 cleancache_register_ops(struct cleancache_ops *ops);
60532diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
60533index dfadc96..d90deca 100644
60534--- a/include/linux/compiler-gcc4.h
60535+++ b/include/linux/compiler-gcc4.h
60536@@ -31,6 +31,15 @@
60537
60538
60539 #if __GNUC_MINOR__ >= 5
60540+
60541+#ifdef CONSTIFY_PLUGIN
60542+#define __no_const __attribute__((no_const))
60543+#define __do_const __attribute__((do_const))
60544+#endif
60545+
60546+#ifdef SIZE_OVERFLOW_PLUGIN
60547+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
60548+#endif
60549 /*
60550 * Mark a position in code as unreachable. This can be used to
60551 * suppress control flow warnings after asm blocks that transfer
60552@@ -46,6 +55,11 @@
60553 #define __noclone __attribute__((__noclone__))
60554
60555 #endif
60556+
60557+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
60558+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
60559+#define __bos0(ptr) __bos((ptr), 0)
60560+#define __bos1(ptr) __bos((ptr), 1)
60561 #endif
60562
60563 #if __GNUC_MINOR__ > 0
60564diff --git a/include/linux/compiler.h b/include/linux/compiler.h
60565index 320d6c9..1221a6b 100644
60566--- a/include/linux/compiler.h
60567+++ b/include/linux/compiler.h
60568@@ -5,31 +5,62 @@
60569
60570 #ifdef __CHECKER__
60571 # define __user __attribute__((noderef, address_space(1)))
60572+# define __force_user __force __user
60573 # define __kernel __attribute__((address_space(0)))
60574+# define __force_kernel __force __kernel
60575 # define __safe __attribute__((safe))
60576 # define __force __attribute__((force))
60577 # define __nocast __attribute__((nocast))
60578 # define __iomem __attribute__((noderef, address_space(2)))
60579+# define __force_iomem __force __iomem
60580 # define __acquires(x) __attribute__((context(x,0,1)))
60581 # define __releases(x) __attribute__((context(x,1,0)))
60582 # define __acquire(x) __context__(x,1)
60583 # define __release(x) __context__(x,-1)
60584 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
60585 # define __percpu __attribute__((noderef, address_space(3)))
60586+# define __force_percpu __force __percpu
60587 #ifdef CONFIG_SPARSE_RCU_POINTER
60588 # define __rcu __attribute__((noderef, address_space(4)))
60589+# define __force_rcu __force __rcu
60590 #else
60591 # define __rcu
60592+# define __force_rcu
60593 #endif
60594 extern void __chk_user_ptr(const volatile void __user *);
60595 extern void __chk_io_ptr(const volatile void __iomem *);
60596+#elif defined(CHECKER_PLUGIN)
60597+//# define __user
60598+//# define __force_user
60599+//# define __kernel
60600+//# define __force_kernel
60601+# define __safe
60602+# define __force
60603+# define __nocast
60604+# define __iomem
60605+# define __force_iomem
60606+# define __chk_user_ptr(x) (void)0
60607+# define __chk_io_ptr(x) (void)0
60608+# define __builtin_warning(x, y...) (1)
60609+# define __acquires(x)
60610+# define __releases(x)
60611+# define __acquire(x) (void)0
60612+# define __release(x) (void)0
60613+# define __cond_lock(x,c) (c)
60614+# define __percpu
60615+# define __force_percpu
60616+# define __rcu
60617+# define __force_rcu
60618 #else
60619 # define __user
60620+# define __force_user
60621 # define __kernel
60622+# define __force_kernel
60623 # define __safe
60624 # define __force
60625 # define __nocast
60626 # define __iomem
60627+# define __force_iomem
60628 # define __chk_user_ptr(x) (void)0
60629 # define __chk_io_ptr(x) (void)0
60630 # define __builtin_warning(x, y...) (1)
60631@@ -39,7 +70,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
60632 # define __release(x) (void)0
60633 # define __cond_lock(x,c) (c)
60634 # define __percpu
60635+# define __force_percpu
60636 # define __rcu
60637+# define __force_rcu
60638 #endif
60639
60640 #ifdef __KERNEL__
60641@@ -264,6 +297,17 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60642 # define __attribute_const__ /* unimplemented */
60643 #endif
60644
60645+#ifndef __no_const
60646+# define __no_const
60647+#endif
60648+
60649+#ifndef __do_const
60650+# define __do_const
60651+#endif
60652+
60653+#ifndef __size_overflow
60654+# define __size_overflow(...)
60655+#endif
60656 /*
60657 * Tell gcc if a function is cold. The compiler will assume any path
60658 * directly leading to the call is unlikely.
60659@@ -273,6 +317,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60660 #define __cold
60661 #endif
60662
60663+#ifndef __alloc_size
60664+#define __alloc_size(...)
60665+#endif
60666+
60667+#ifndef __bos
60668+#define __bos(ptr, arg)
60669+#endif
60670+
60671+#ifndef __bos0
60672+#define __bos0(ptr)
60673+#endif
60674+
60675+#ifndef __bos1
60676+#define __bos1(ptr)
60677+#endif
60678+
60679 /* Simple shorthand for a section definition */
60680 #ifndef __section
60681 # define __section(S) __attribute__ ((__section__(#S)))
60682@@ -306,6 +366,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60683 * use is to mediate communication between process-level code and irq/NMI
60684 * handlers, all running on the same CPU.
60685 */
60686-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
60687+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
60688+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
60689
60690 #endif /* __LINUX_COMPILER_H */
60691diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
60692index e9eaec5..bfeb9bb 100644
60693--- a/include/linux/cpuset.h
60694+++ b/include/linux/cpuset.h
60695@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void)
60696 * nodemask.
60697 */
60698 smp_mb();
60699- --ACCESS_ONCE(current->mems_allowed_change_disable);
60700+ --ACCESS_ONCE_RW(current->mems_allowed_change_disable);
60701 }
60702
60703 static inline void set_mems_allowed(nodemask_t nodemask)
60704diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
60705index b936763..48685ee 100644
60706--- a/include/linux/crash_dump.h
60707+++ b/include/linux/crash_dump.h
60708@@ -14,7 +14,7 @@ extern unsigned long long elfcorehdr_addr;
60709 extern unsigned long long elfcorehdr_size;
60710
60711 extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
60712- unsigned long, int);
60713+ unsigned long, int) __size_overflow(3);
60714
60715 /* Architecture code defines this if there are other possible ELF
60716 * machine types, e.g. on bi-arch capable hardware. */
60717diff --git a/include/linux/cred.h b/include/linux/cred.h
60718index 4030896..8d6f342 100644
60719--- a/include/linux/cred.h
60720+++ b/include/linux/cred.h
60721@@ -207,6 +207,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
60722 static inline void validate_process_creds(void)
60723 {
60724 }
60725+static inline void validate_task_creds(struct task_struct *task)
60726+{
60727+}
60728 #endif
60729
60730 /**
60731diff --git a/include/linux/crypto.h b/include/linux/crypto.h
60732index 8a94217..15d49e3 100644
60733--- a/include/linux/crypto.h
60734+++ b/include/linux/crypto.h
60735@@ -365,7 +365,7 @@ struct cipher_tfm {
60736 const u8 *key, unsigned int keylen);
60737 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60738 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60739-};
60740+} __no_const;
60741
60742 struct hash_tfm {
60743 int (*init)(struct hash_desc *desc);
60744@@ -386,13 +386,13 @@ struct compress_tfm {
60745 int (*cot_decompress)(struct crypto_tfm *tfm,
60746 const u8 *src, unsigned int slen,
60747 u8 *dst, unsigned int *dlen);
60748-};
60749+} __no_const;
60750
60751 struct rng_tfm {
60752 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
60753 unsigned int dlen);
60754 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
60755-};
60756+} __no_const;
60757
60758 #define crt_ablkcipher crt_u.ablkcipher
60759 #define crt_aead crt_u.aead
60760diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
60761index 7925bf0..d5143d2 100644
60762--- a/include/linux/decompress/mm.h
60763+++ b/include/linux/decompress/mm.h
60764@@ -77,7 +77,7 @@ static void free(void *where)
60765 * warnings when not needed (indeed large_malloc / large_free are not
60766 * needed by inflate */
60767
60768-#define malloc(a) kmalloc(a, GFP_KERNEL)
60769+#define malloc(a) kmalloc((a), GFP_KERNEL)
60770 #define free(a) kfree(a)
60771
60772 #define large_malloc(a) vmalloc(a)
60773diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
60774index e13117c..e9fc938 100644
60775--- a/include/linux/dma-mapping.h
60776+++ b/include/linux/dma-mapping.h
60777@@ -46,7 +46,7 @@ struct dma_map_ops {
60778 u64 (*get_required_mask)(struct device *dev);
60779 #endif
60780 int is_phys;
60781-};
60782+} __do_const;
60783
60784 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
60785
60786diff --git a/include/linux/efi.h b/include/linux/efi.h
60787index 2362a0b..cfaf8fcc 100644
60788--- a/include/linux/efi.h
60789+++ b/include/linux/efi.h
60790@@ -446,7 +446,7 @@ struct efivar_operations {
60791 efi_get_variable_t *get_variable;
60792 efi_get_next_variable_t *get_next_variable;
60793 efi_set_variable_t *set_variable;
60794-};
60795+} __no_const;
60796
60797 struct efivars {
60798 /*
60799diff --git a/include/linux/elf.h b/include/linux/elf.h
60800index 31f0508..5421c01 100644
60801--- a/include/linux/elf.h
60802+++ b/include/linux/elf.h
60803@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
60804 #define PT_GNU_EH_FRAME 0x6474e550
60805
60806 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
60807+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
60808+
60809+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
60810+
60811+/* Constants for the e_flags field */
60812+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
60813+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
60814+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
60815+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
60816+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
60817+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
60818
60819 /*
60820 * Extended Numbering
60821@@ -106,6 +117,8 @@ typedef __s64 Elf64_Sxword;
60822 #define DT_DEBUG 21
60823 #define DT_TEXTREL 22
60824 #define DT_JMPREL 23
60825+#define DT_FLAGS 30
60826+ #define DF_TEXTREL 0x00000004
60827 #define DT_ENCODING 32
60828 #define OLD_DT_LOOS 0x60000000
60829 #define DT_LOOS 0x6000000d
60830@@ -252,6 +265,19 @@ typedef struct elf64_hdr {
60831 #define PF_W 0x2
60832 #define PF_X 0x1
60833
60834+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
60835+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
60836+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
60837+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
60838+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
60839+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
60840+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
60841+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
60842+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
60843+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
60844+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
60845+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
60846+
60847 typedef struct elf32_phdr{
60848 Elf32_Word p_type;
60849 Elf32_Off p_offset;
60850@@ -344,6 +370,8 @@ typedef struct elf64_shdr {
60851 #define EI_OSABI 7
60852 #define EI_PAD 8
60853
60854+#define EI_PAX 14
60855+
60856 #define ELFMAG0 0x7f /* EI_MAG */
60857 #define ELFMAG1 'E'
60858 #define ELFMAG2 'L'
60859@@ -423,6 +451,7 @@ extern Elf32_Dyn _DYNAMIC [];
60860 #define elf_note elf32_note
60861 #define elf_addr_t Elf32_Off
60862 #define Elf_Half Elf32_Half
60863+#define elf_dyn Elf32_Dyn
60864
60865 #else
60866
60867@@ -433,6 +462,7 @@ extern Elf64_Dyn _DYNAMIC [];
60868 #define elf_note elf64_note
60869 #define elf_addr_t Elf64_Off
60870 #define Elf_Half Elf64_Half
60871+#define elf_dyn Elf64_Dyn
60872
60873 #endif
60874
60875diff --git a/include/linux/filter.h b/include/linux/filter.h
60876index 8eeb205..d59bfa2 100644
60877--- a/include/linux/filter.h
60878+++ b/include/linux/filter.h
60879@@ -134,6 +134,7 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */
60880
60881 struct sk_buff;
60882 struct sock;
60883+struct bpf_jit_work;
60884
60885 struct sk_filter
60886 {
60887@@ -141,6 +142,9 @@ struct sk_filter
60888 unsigned int len; /* Number of filter blocks */
60889 unsigned int (*bpf_func)(const struct sk_buff *skb,
60890 const struct sock_filter *filter);
60891+#ifdef CONFIG_BPF_JIT
60892+ struct bpf_jit_work *work;
60893+#endif
60894 struct rcu_head rcu;
60895 struct sock_filter insns[0];
60896 };
60897diff --git a/include/linux/firewire.h b/include/linux/firewire.h
60898index 84ccf8e..2e9b14c 100644
60899--- a/include/linux/firewire.h
60900+++ b/include/linux/firewire.h
60901@@ -428,7 +428,7 @@ struct fw_iso_context {
60902 union {
60903 fw_iso_callback_t sc;
60904 fw_iso_mc_callback_t mc;
60905- } callback;
60906+ } __no_const callback;
60907 void *callback_data;
60908 };
60909
60910diff --git a/include/linux/fs.h b/include/linux/fs.h
60911index 10b2288..09180e4 100644
60912--- a/include/linux/fs.h
60913+++ b/include/linux/fs.h
60914@@ -1609,7 +1609,8 @@ struct file_operations {
60915 int (*setlease)(struct file *, long, struct file_lock **);
60916 long (*fallocate)(struct file *file, int mode, loff_t offset,
60917 loff_t len);
60918-};
60919+} __do_const;
60920+typedef struct file_operations __no_const file_operations_no_const;
60921
60922 struct inode_operations {
60923 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
60924diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
60925index 003dc0f..3c4ea97 100644
60926--- a/include/linux/fs_struct.h
60927+++ b/include/linux/fs_struct.h
60928@@ -6,7 +6,7 @@
60929 #include <linux/seqlock.h>
60930
60931 struct fs_struct {
60932- int users;
60933+ atomic_t users;
60934 spinlock_t lock;
60935 seqcount_t seq;
60936 int umask;
60937diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
60938index ce31408..b1ad003 100644
60939--- a/include/linux/fscache-cache.h
60940+++ b/include/linux/fscache-cache.h
60941@@ -102,7 +102,7 @@ struct fscache_operation {
60942 fscache_operation_release_t release;
60943 };
60944
60945-extern atomic_t fscache_op_debug_id;
60946+extern atomic_unchecked_t fscache_op_debug_id;
60947 extern void fscache_op_work_func(struct work_struct *work);
60948
60949 extern void fscache_enqueue_operation(struct fscache_operation *);
60950@@ -122,7 +122,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
60951 {
60952 INIT_WORK(&op->work, fscache_op_work_func);
60953 atomic_set(&op->usage, 1);
60954- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
60955+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
60956 op->processor = processor;
60957 op->release = release;
60958 INIT_LIST_HEAD(&op->pend_link);
60959diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
60960index 2a53f10..0187fdf 100644
60961--- a/include/linux/fsnotify.h
60962+++ b/include/linux/fsnotify.h
60963@@ -314,7 +314,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
60964 */
60965 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
60966 {
60967- return kstrdup(name, GFP_KERNEL);
60968+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
60969 }
60970
60971 /*
60972diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
60973index 91d0e0a3..035666b 100644
60974--- a/include/linux/fsnotify_backend.h
60975+++ b/include/linux/fsnotify_backend.h
60976@@ -105,6 +105,7 @@ struct fsnotify_ops {
60977 void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
60978 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
60979 };
60980+typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
60981
60982 /*
60983 * A group is a "thing" that wants to receive notification about filesystem
60984diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
60985index c3da42d..c70e0df 100644
60986--- a/include/linux/ftrace_event.h
60987+++ b/include/linux/ftrace_event.h
60988@@ -97,7 +97,7 @@ struct trace_event_functions {
60989 trace_print_func raw;
60990 trace_print_func hex;
60991 trace_print_func binary;
60992-};
60993+} __no_const;
60994
60995 struct trace_event {
60996 struct hlist_node node;
60997@@ -254,7 +254,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
60998 extern int trace_add_event_call(struct ftrace_event_call *call);
60999 extern void trace_remove_event_call(struct ftrace_event_call *call);
61000
61001-#define is_signed_type(type) (((type)(-1)) < 0)
61002+#define is_signed_type(type) (((type)(-1)) < (type)1)
61003
61004 int trace_set_clr_event(const char *system, const char *event, int set);
61005
61006diff --git a/include/linux/genhd.h b/include/linux/genhd.h
61007index 6d18f35..ab71e2c 100644
61008--- a/include/linux/genhd.h
61009+++ b/include/linux/genhd.h
61010@@ -185,7 +185,7 @@ struct gendisk {
61011 struct kobject *slave_dir;
61012
61013 struct timer_rand_state *random;
61014- atomic_t sync_io; /* RAID */
61015+ atomic_unchecked_t sync_io; /* RAID */
61016 struct disk_events *ev;
61017 #ifdef CONFIG_BLK_DEV_INTEGRITY
61018 struct blk_integrity *integrity;
61019diff --git a/include/linux/gracl.h b/include/linux/gracl.h
61020new file mode 100644
61021index 0000000..8a130b6
61022--- /dev/null
61023+++ b/include/linux/gracl.h
61024@@ -0,0 +1,319 @@
61025+#ifndef GR_ACL_H
61026+#define GR_ACL_H
61027+
61028+#include <linux/grdefs.h>
61029+#include <linux/resource.h>
61030+#include <linux/capability.h>
61031+#include <linux/dcache.h>
61032+#include <asm/resource.h>
61033+
61034+/* Major status information */
61035+
61036+#define GR_VERSION "grsecurity 2.9"
61037+#define GRSECURITY_VERSION 0x2900
61038+
61039+enum {
61040+ GR_SHUTDOWN = 0,
61041+ GR_ENABLE = 1,
61042+ GR_SPROLE = 2,
61043+ GR_RELOAD = 3,
61044+ GR_SEGVMOD = 4,
61045+ GR_STATUS = 5,
61046+ GR_UNSPROLE = 6,
61047+ GR_PASSSET = 7,
61048+ GR_SPROLEPAM = 8,
61049+};
61050+
61051+/* Password setup definitions
61052+ * kernel/grhash.c */
61053+enum {
61054+ GR_PW_LEN = 128,
61055+ GR_SALT_LEN = 16,
61056+ GR_SHA_LEN = 32,
61057+};
61058+
61059+enum {
61060+ GR_SPROLE_LEN = 64,
61061+};
61062+
61063+enum {
61064+ GR_NO_GLOB = 0,
61065+ GR_REG_GLOB,
61066+ GR_CREATE_GLOB
61067+};
61068+
61069+#define GR_NLIMITS 32
61070+
61071+/* Begin Data Structures */
61072+
61073+struct sprole_pw {
61074+ unsigned char *rolename;
61075+ unsigned char salt[GR_SALT_LEN];
61076+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
61077+};
61078+
61079+struct name_entry {
61080+ __u32 key;
61081+ ino_t inode;
61082+ dev_t device;
61083+ char *name;
61084+ __u16 len;
61085+ __u8 deleted;
61086+ struct name_entry *prev;
61087+ struct name_entry *next;
61088+};
61089+
61090+struct inodev_entry {
61091+ struct name_entry *nentry;
61092+ struct inodev_entry *prev;
61093+ struct inodev_entry *next;
61094+};
61095+
61096+struct acl_role_db {
61097+ struct acl_role_label **r_hash;
61098+ __u32 r_size;
61099+};
61100+
61101+struct inodev_db {
61102+ struct inodev_entry **i_hash;
61103+ __u32 i_size;
61104+};
61105+
61106+struct name_db {
61107+ struct name_entry **n_hash;
61108+ __u32 n_size;
61109+};
61110+
61111+struct crash_uid {
61112+ uid_t uid;
61113+ unsigned long expires;
61114+};
61115+
61116+struct gr_hash_struct {
61117+ void **table;
61118+ void **nametable;
61119+ void *first;
61120+ __u32 table_size;
61121+ __u32 used_size;
61122+ int type;
61123+};
61124+
61125+/* Userspace Grsecurity ACL data structures */
61126+
61127+struct acl_subject_label {
61128+ char *filename;
61129+ ino_t inode;
61130+ dev_t device;
61131+ __u32 mode;
61132+ kernel_cap_t cap_mask;
61133+ kernel_cap_t cap_lower;
61134+ kernel_cap_t cap_invert_audit;
61135+
61136+ struct rlimit res[GR_NLIMITS];
61137+ __u32 resmask;
61138+
61139+ __u8 user_trans_type;
61140+ __u8 group_trans_type;
61141+ uid_t *user_transitions;
61142+ gid_t *group_transitions;
61143+ __u16 user_trans_num;
61144+ __u16 group_trans_num;
61145+
61146+ __u32 sock_families[2];
61147+ __u32 ip_proto[8];
61148+ __u32 ip_type;
61149+ struct acl_ip_label **ips;
61150+ __u32 ip_num;
61151+ __u32 inaddr_any_override;
61152+
61153+ __u32 crashes;
61154+ unsigned long expires;
61155+
61156+ struct acl_subject_label *parent_subject;
61157+ struct gr_hash_struct *hash;
61158+ struct acl_subject_label *prev;
61159+ struct acl_subject_label *next;
61160+
61161+ struct acl_object_label **obj_hash;
61162+ __u32 obj_hash_size;
61163+ __u16 pax_flags;
61164+};
61165+
61166+struct role_allowed_ip {
61167+ __u32 addr;
61168+ __u32 netmask;
61169+
61170+ struct role_allowed_ip *prev;
61171+ struct role_allowed_ip *next;
61172+};
61173+
61174+struct role_transition {
61175+ char *rolename;
61176+
61177+ struct role_transition *prev;
61178+ struct role_transition *next;
61179+};
61180+
61181+struct acl_role_label {
61182+ char *rolename;
61183+ uid_t uidgid;
61184+ __u16 roletype;
61185+
61186+ __u16 auth_attempts;
61187+ unsigned long expires;
61188+
61189+ struct acl_subject_label *root_label;
61190+ struct gr_hash_struct *hash;
61191+
61192+ struct acl_role_label *prev;
61193+ struct acl_role_label *next;
61194+
61195+ struct role_transition *transitions;
61196+ struct role_allowed_ip *allowed_ips;
61197+ uid_t *domain_children;
61198+ __u16 domain_child_num;
61199+
61200+ umode_t umask;
61201+
61202+ struct acl_subject_label **subj_hash;
61203+ __u32 subj_hash_size;
61204+};
61205+
61206+struct user_acl_role_db {
61207+ struct acl_role_label **r_table;
61208+ __u32 num_pointers; /* Number of allocations to track */
61209+ __u32 num_roles; /* Number of roles */
61210+ __u32 num_domain_children; /* Number of domain children */
61211+ __u32 num_subjects; /* Number of subjects */
61212+ __u32 num_objects; /* Number of objects */
61213+};
61214+
61215+struct acl_object_label {
61216+ char *filename;
61217+ ino_t inode;
61218+ dev_t device;
61219+ __u32 mode;
61220+
61221+ struct acl_subject_label *nested;
61222+ struct acl_object_label *globbed;
61223+
61224+ /* next two structures not used */
61225+
61226+ struct acl_object_label *prev;
61227+ struct acl_object_label *next;
61228+};
61229+
61230+struct acl_ip_label {
61231+ char *iface;
61232+ __u32 addr;
61233+ __u32 netmask;
61234+ __u16 low, high;
61235+ __u8 mode;
61236+ __u32 type;
61237+ __u32 proto[8];
61238+
61239+ /* next two structures not used */
61240+
61241+ struct acl_ip_label *prev;
61242+ struct acl_ip_label *next;
61243+};
61244+
61245+struct gr_arg {
61246+ struct user_acl_role_db role_db;
61247+ unsigned char pw[GR_PW_LEN];
61248+ unsigned char salt[GR_SALT_LEN];
61249+ unsigned char sum[GR_SHA_LEN];
61250+ unsigned char sp_role[GR_SPROLE_LEN];
61251+ struct sprole_pw *sprole_pws;
61252+ dev_t segv_device;
61253+ ino_t segv_inode;
61254+ uid_t segv_uid;
61255+ __u16 num_sprole_pws;
61256+ __u16 mode;
61257+};
61258+
61259+struct gr_arg_wrapper {
61260+ struct gr_arg *arg;
61261+ __u32 version;
61262+ __u32 size;
61263+};
61264+
61265+struct subject_map {
61266+ struct acl_subject_label *user;
61267+ struct acl_subject_label *kernel;
61268+ struct subject_map *prev;
61269+ struct subject_map *next;
61270+};
61271+
61272+struct acl_subj_map_db {
61273+ struct subject_map **s_hash;
61274+ __u32 s_size;
61275+};
61276+
61277+/* End Data Structures Section */
61278+
61279+/* Hash functions generated by empirical testing by Brad Spengler
61280+ Makes good use of the low bits of the inode. Generally 0-1 times
61281+ in loop for successful match. 0-3 for unsuccessful match.
61282+ Shift/add algorithm with modulus of table size and an XOR*/
61283+
61284+static __inline__ unsigned int
61285+rhash(const uid_t uid, const __u16 type, const unsigned int sz)
61286+{
61287+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
61288+}
61289+
61290+ static __inline__ unsigned int
61291+shash(const struct acl_subject_label *userp, const unsigned int sz)
61292+{
61293+ return ((const unsigned long)userp % sz);
61294+}
61295+
61296+static __inline__ unsigned int
61297+fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
61298+{
61299+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
61300+}
61301+
61302+static __inline__ unsigned int
61303+nhash(const char *name, const __u16 len, const unsigned int sz)
61304+{
61305+ return full_name_hash((const unsigned char *)name, len) % sz;
61306+}
61307+
61308+#define FOR_EACH_ROLE_START(role) \
61309+ role = role_list; \
61310+ while (role) {
61311+
61312+#define FOR_EACH_ROLE_END(role) \
61313+ role = role->prev; \
61314+ }
61315+
61316+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
61317+ subj = NULL; \
61318+ iter = 0; \
61319+ while (iter < role->subj_hash_size) { \
61320+ if (subj == NULL) \
61321+ subj = role->subj_hash[iter]; \
61322+ if (subj == NULL) { \
61323+ iter++; \
61324+ continue; \
61325+ }
61326+
61327+#define FOR_EACH_SUBJECT_END(subj,iter) \
61328+ subj = subj->next; \
61329+ if (subj == NULL) \
61330+ iter++; \
61331+ }
61332+
61333+
61334+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
61335+ subj = role->hash->first; \
61336+ while (subj != NULL) {
61337+
61338+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
61339+ subj = subj->next; \
61340+ }
61341+
61342+#endif
61343+
61344diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
61345new file mode 100644
61346index 0000000..323ecf2
61347--- /dev/null
61348+++ b/include/linux/gralloc.h
61349@@ -0,0 +1,9 @@
61350+#ifndef __GRALLOC_H
61351+#define __GRALLOC_H
61352+
61353+void acl_free_all(void);
61354+int acl_alloc_stack_init(unsigned long size);
61355+void *acl_alloc(unsigned long len);
61356+void *acl_alloc_num(unsigned long num, unsigned long len);
61357+
61358+#endif
61359diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
61360new file mode 100644
61361index 0000000..b30e9bc
61362--- /dev/null
61363+++ b/include/linux/grdefs.h
61364@@ -0,0 +1,140 @@
61365+#ifndef GRDEFS_H
61366+#define GRDEFS_H
61367+
61368+/* Begin grsecurity status declarations */
61369+
61370+enum {
61371+ GR_READY = 0x01,
61372+ GR_STATUS_INIT = 0x00 // disabled state
61373+};
61374+
61375+/* Begin ACL declarations */
61376+
61377+/* Role flags */
61378+
61379+enum {
61380+ GR_ROLE_USER = 0x0001,
61381+ GR_ROLE_GROUP = 0x0002,
61382+ GR_ROLE_DEFAULT = 0x0004,
61383+ GR_ROLE_SPECIAL = 0x0008,
61384+ GR_ROLE_AUTH = 0x0010,
61385+ GR_ROLE_NOPW = 0x0020,
61386+ GR_ROLE_GOD = 0x0040,
61387+ GR_ROLE_LEARN = 0x0080,
61388+ GR_ROLE_TPE = 0x0100,
61389+ GR_ROLE_DOMAIN = 0x0200,
61390+ GR_ROLE_PAM = 0x0400,
61391+ GR_ROLE_PERSIST = 0x0800
61392+};
61393+
61394+/* ACL Subject and Object mode flags */
61395+enum {
61396+ GR_DELETED = 0x80000000
61397+};
61398+
61399+/* ACL Object-only mode flags */
61400+enum {
61401+ GR_READ = 0x00000001,
61402+ GR_APPEND = 0x00000002,
61403+ GR_WRITE = 0x00000004,
61404+ GR_EXEC = 0x00000008,
61405+ GR_FIND = 0x00000010,
61406+ GR_INHERIT = 0x00000020,
61407+ GR_SETID = 0x00000040,
61408+ GR_CREATE = 0x00000080,
61409+ GR_DELETE = 0x00000100,
61410+ GR_LINK = 0x00000200,
61411+ GR_AUDIT_READ = 0x00000400,
61412+ GR_AUDIT_APPEND = 0x00000800,
61413+ GR_AUDIT_WRITE = 0x00001000,
61414+ GR_AUDIT_EXEC = 0x00002000,
61415+ GR_AUDIT_FIND = 0x00004000,
61416+ GR_AUDIT_INHERIT= 0x00008000,
61417+ GR_AUDIT_SETID = 0x00010000,
61418+ GR_AUDIT_CREATE = 0x00020000,
61419+ GR_AUDIT_DELETE = 0x00040000,
61420+ GR_AUDIT_LINK = 0x00080000,
61421+ GR_PTRACERD = 0x00100000,
61422+ GR_NOPTRACE = 0x00200000,
61423+ GR_SUPPRESS = 0x00400000,
61424+ GR_NOLEARN = 0x00800000,
61425+ GR_INIT_TRANSFER= 0x01000000
61426+};
61427+
61428+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
61429+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
61430+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
61431+
61432+/* ACL subject-only mode flags */
61433+enum {
61434+ GR_KILL = 0x00000001,
61435+ GR_VIEW = 0x00000002,
61436+ GR_PROTECTED = 0x00000004,
61437+ GR_LEARN = 0x00000008,
61438+ GR_OVERRIDE = 0x00000010,
61439+ /* just a placeholder, this mode is only used in userspace */
61440+ GR_DUMMY = 0x00000020,
61441+ GR_PROTSHM = 0x00000040,
61442+ GR_KILLPROC = 0x00000080,
61443+ GR_KILLIPPROC = 0x00000100,
61444+ /* just a placeholder, this mode is only used in userspace */
61445+ GR_NOTROJAN = 0x00000200,
61446+ GR_PROTPROCFD = 0x00000400,
61447+ GR_PROCACCT = 0x00000800,
61448+ GR_RELAXPTRACE = 0x00001000,
61449+ GR_NESTED = 0x00002000,
61450+ GR_INHERITLEARN = 0x00004000,
61451+ GR_PROCFIND = 0x00008000,
61452+ GR_POVERRIDE = 0x00010000,
61453+ GR_KERNELAUTH = 0x00020000,
61454+ GR_ATSECURE = 0x00040000,
61455+ GR_SHMEXEC = 0x00080000
61456+};
61457+
61458+enum {
61459+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
61460+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
61461+ GR_PAX_ENABLE_MPROTECT = 0x0004,
61462+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
61463+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
61464+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
61465+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
61466+ GR_PAX_DISABLE_MPROTECT = 0x0400,
61467+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
61468+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
61469+};
61470+
61471+enum {
61472+ GR_ID_USER = 0x01,
61473+ GR_ID_GROUP = 0x02,
61474+};
61475+
61476+enum {
61477+ GR_ID_ALLOW = 0x01,
61478+ GR_ID_DENY = 0x02,
61479+};
61480+
61481+#define GR_CRASH_RES 31
61482+#define GR_UIDTABLE_MAX 500
61483+
61484+/* begin resource learning section */
61485+enum {
61486+ GR_RLIM_CPU_BUMP = 60,
61487+ GR_RLIM_FSIZE_BUMP = 50000,
61488+ GR_RLIM_DATA_BUMP = 10000,
61489+ GR_RLIM_STACK_BUMP = 1000,
61490+ GR_RLIM_CORE_BUMP = 10000,
61491+ GR_RLIM_RSS_BUMP = 500000,
61492+ GR_RLIM_NPROC_BUMP = 1,
61493+ GR_RLIM_NOFILE_BUMP = 5,
61494+ GR_RLIM_MEMLOCK_BUMP = 50000,
61495+ GR_RLIM_AS_BUMP = 500000,
61496+ GR_RLIM_LOCKS_BUMP = 2,
61497+ GR_RLIM_SIGPENDING_BUMP = 5,
61498+ GR_RLIM_MSGQUEUE_BUMP = 10000,
61499+ GR_RLIM_NICE_BUMP = 1,
61500+ GR_RLIM_RTPRIO_BUMP = 1,
61501+ GR_RLIM_RTTIME_BUMP = 1000000
61502+};
61503+
61504+#endif
61505diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
61506new file mode 100644
61507index 0000000..da390f1
61508--- /dev/null
61509+++ b/include/linux/grinternal.h
61510@@ -0,0 +1,221 @@
61511+#ifndef __GRINTERNAL_H
61512+#define __GRINTERNAL_H
61513+
61514+#ifdef CONFIG_GRKERNSEC
61515+
61516+#include <linux/fs.h>
61517+#include <linux/mnt_namespace.h>
61518+#include <linux/nsproxy.h>
61519+#include <linux/gracl.h>
61520+#include <linux/grdefs.h>
61521+#include <linux/grmsg.h>
61522+
61523+void gr_add_learn_entry(const char *fmt, ...)
61524+ __attribute__ ((format (printf, 1, 2)));
61525+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
61526+ const struct vfsmount *mnt);
61527+__u32 gr_check_create(const struct dentry *new_dentry,
61528+ const struct dentry *parent,
61529+ const struct vfsmount *mnt, const __u32 mode);
61530+int gr_check_protected_task(const struct task_struct *task);
61531+__u32 to_gr_audit(const __u32 reqmode);
61532+int gr_set_acls(const int type);
61533+int gr_apply_subject_to_task(struct task_struct *task);
61534+int gr_acl_is_enabled(void);
61535+char gr_roletype_to_char(void);
61536+
61537+void gr_handle_alertkill(struct task_struct *task);
61538+char *gr_to_filename(const struct dentry *dentry,
61539+ const struct vfsmount *mnt);
61540+char *gr_to_filename1(const struct dentry *dentry,
61541+ const struct vfsmount *mnt);
61542+char *gr_to_filename2(const struct dentry *dentry,
61543+ const struct vfsmount *mnt);
61544+char *gr_to_filename3(const struct dentry *dentry,
61545+ const struct vfsmount *mnt);
61546+
61547+extern int grsec_enable_ptrace_readexec;
61548+extern int grsec_enable_harden_ptrace;
61549+extern int grsec_enable_link;
61550+extern int grsec_enable_fifo;
61551+extern int grsec_enable_execve;
61552+extern int grsec_enable_shm;
61553+extern int grsec_enable_execlog;
61554+extern int grsec_enable_signal;
61555+extern int grsec_enable_audit_ptrace;
61556+extern int grsec_enable_forkfail;
61557+extern int grsec_enable_time;
61558+extern int grsec_enable_rofs;
61559+extern int grsec_enable_chroot_shmat;
61560+extern int grsec_enable_chroot_mount;
61561+extern int grsec_enable_chroot_double;
61562+extern int grsec_enable_chroot_pivot;
61563+extern int grsec_enable_chroot_chdir;
61564+extern int grsec_enable_chroot_chmod;
61565+extern int grsec_enable_chroot_mknod;
61566+extern int grsec_enable_chroot_fchdir;
61567+extern int grsec_enable_chroot_nice;
61568+extern int grsec_enable_chroot_execlog;
61569+extern int grsec_enable_chroot_caps;
61570+extern int grsec_enable_chroot_sysctl;
61571+extern int grsec_enable_chroot_unix;
61572+extern int grsec_enable_tpe;
61573+extern int grsec_tpe_gid;
61574+extern int grsec_enable_tpe_all;
61575+extern int grsec_enable_tpe_invert;
61576+extern int grsec_enable_socket_all;
61577+extern int grsec_socket_all_gid;
61578+extern int grsec_enable_socket_client;
61579+extern int grsec_socket_client_gid;
61580+extern int grsec_enable_socket_server;
61581+extern int grsec_socket_server_gid;
61582+extern int grsec_audit_gid;
61583+extern int grsec_enable_group;
61584+extern int grsec_enable_audit_textrel;
61585+extern int grsec_enable_log_rwxmaps;
61586+extern int grsec_enable_mount;
61587+extern int grsec_enable_chdir;
61588+extern int grsec_resource_logging;
61589+extern int grsec_enable_blackhole;
61590+extern int grsec_lastack_retries;
61591+extern int grsec_enable_brute;
61592+extern int grsec_lock;
61593+
61594+extern spinlock_t grsec_alert_lock;
61595+extern unsigned long grsec_alert_wtime;
61596+extern unsigned long grsec_alert_fyet;
61597+
61598+extern spinlock_t grsec_audit_lock;
61599+
61600+extern rwlock_t grsec_exec_file_lock;
61601+
61602+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
61603+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
61604+ (tsk)->exec_file->f_vfsmnt) : "/")
61605+
61606+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
61607+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
61608+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61609+
61610+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
61611+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
61612+ (tsk)->exec_file->f_vfsmnt) : "/")
61613+
61614+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
61615+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
61616+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61617+
61618+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
61619+
61620+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
61621+
61622+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
61623+ (task)->pid, (cred)->uid, \
61624+ (cred)->euid, (cred)->gid, (cred)->egid, \
61625+ gr_parent_task_fullpath(task), \
61626+ (task)->real_parent->comm, (task)->real_parent->pid, \
61627+ (pcred)->uid, (pcred)->euid, \
61628+ (pcred)->gid, (pcred)->egid
61629+
61630+#define GR_CHROOT_CAPS {{ \
61631+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
61632+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
61633+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
61634+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
61635+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
61636+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
61637+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
61638+
61639+#define security_learn(normal_msg,args...) \
61640+({ \
61641+ read_lock(&grsec_exec_file_lock); \
61642+ gr_add_learn_entry(normal_msg "\n", ## args); \
61643+ read_unlock(&grsec_exec_file_lock); \
61644+})
61645+
61646+enum {
61647+ GR_DO_AUDIT,
61648+ GR_DONT_AUDIT,
61649+ /* used for non-audit messages that we shouldn't kill the task on */
61650+ GR_DONT_AUDIT_GOOD
61651+};
61652+
61653+enum {
61654+ GR_TTYSNIFF,
61655+ GR_RBAC,
61656+ GR_RBAC_STR,
61657+ GR_STR_RBAC,
61658+ GR_RBAC_MODE2,
61659+ GR_RBAC_MODE3,
61660+ GR_FILENAME,
61661+ GR_SYSCTL_HIDDEN,
61662+ GR_NOARGS,
61663+ GR_ONE_INT,
61664+ GR_ONE_INT_TWO_STR,
61665+ GR_ONE_STR,
61666+ GR_STR_INT,
61667+ GR_TWO_STR_INT,
61668+ GR_TWO_INT,
61669+ GR_TWO_U64,
61670+ GR_THREE_INT,
61671+ GR_FIVE_INT_TWO_STR,
61672+ GR_TWO_STR,
61673+ GR_THREE_STR,
61674+ GR_FOUR_STR,
61675+ GR_STR_FILENAME,
61676+ GR_FILENAME_STR,
61677+ GR_FILENAME_TWO_INT,
61678+ GR_FILENAME_TWO_INT_STR,
61679+ GR_TEXTREL,
61680+ GR_PTRACE,
61681+ GR_RESOURCE,
61682+ GR_CAP,
61683+ GR_SIG,
61684+ GR_SIG2,
61685+ GR_CRASH1,
61686+ GR_CRASH2,
61687+ GR_PSACCT,
61688+ GR_RWXMAP
61689+};
61690+
61691+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
61692+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
61693+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
61694+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
61695+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
61696+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
61697+#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)
61698+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
61699+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
61700+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
61701+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
61702+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
61703+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
61704+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
61705+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
61706+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
61707+#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)
61708+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
61709+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
61710+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
61711+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
61712+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
61713+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
61714+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
61715+#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)
61716+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
61717+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
61718+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
61719+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
61720+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
61721+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
61722+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
61723+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
61724+#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)
61725+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
61726+
61727+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
61728+
61729+#endif
61730+
61731+#endif
61732diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
61733new file mode 100644
61734index 0000000..ae576a1
61735--- /dev/null
61736+++ b/include/linux/grmsg.h
61737@@ -0,0 +1,109 @@
61738+#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"
61739+#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"
61740+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
61741+#define GR_STOPMOD_MSG "denied modification of module state by "
61742+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
61743+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
61744+#define GR_IOPERM_MSG "denied use of ioperm() by "
61745+#define GR_IOPL_MSG "denied use of iopl() by "
61746+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
61747+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
61748+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
61749+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
61750+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
61751+#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"
61752+#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"
61753+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
61754+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
61755+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
61756+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
61757+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
61758+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
61759+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
61760+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
61761+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
61762+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
61763+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
61764+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
61765+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
61766+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
61767+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
61768+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
61769+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
61770+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
61771+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
61772+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
61773+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
61774+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
61775+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
61776+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
61777+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
61778+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
61779+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
61780+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
61781+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
61782+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
61783+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
61784+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
61785+#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
61786+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
61787+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
61788+#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"
61789+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
61790+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
61791+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
61792+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
61793+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
61794+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
61795+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
61796+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
61797+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
61798+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
61799+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
61800+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
61801+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
61802+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
61803+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
61804+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
61805+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
61806+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
61807+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
61808+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
61809+#define GR_FAILFORK_MSG "failed fork with errno %s by "
61810+#define GR_NICE_CHROOT_MSG "denied priority change by "
61811+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
61812+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
61813+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
61814+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
61815+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
61816+#define GR_TIME_MSG "time set by "
61817+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
61818+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
61819+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
61820+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
61821+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
61822+#define GR_BIND_MSG "denied bind() by "
61823+#define GR_CONNECT_MSG "denied connect() by "
61824+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
61825+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
61826+#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"
61827+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
61828+#define GR_CAP_ACL_MSG "use of %s denied for "
61829+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
61830+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
61831+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
61832+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
61833+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
61834+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
61835+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
61836+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
61837+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
61838+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
61839+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
61840+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
61841+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
61842+#define GR_VM86_MSG "denied use of vm86 by "
61843+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
61844+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
61845+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
61846+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
61847diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
61848new file mode 100644
61849index 0000000..2ccf677
61850--- /dev/null
61851+++ b/include/linux/grsecurity.h
61852@@ -0,0 +1,229 @@
61853+#ifndef GR_SECURITY_H
61854+#define GR_SECURITY_H
61855+#include <linux/fs.h>
61856+#include <linux/fs_struct.h>
61857+#include <linux/binfmts.h>
61858+#include <linux/gracl.h>
61859+
61860+/* notify of brain-dead configs */
61861+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61862+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
61863+#endif
61864+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
61865+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
61866+#endif
61867+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
61868+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
61869+#endif
61870+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
61871+#error "CONFIG_PAX enabled, but no PaX options are enabled."
61872+#endif
61873+
61874+#include <linux/compat.h>
61875+
61876+struct user_arg_ptr {
61877+#ifdef CONFIG_COMPAT
61878+ bool is_compat;
61879+#endif
61880+ union {
61881+ const char __user *const __user *native;
61882+#ifdef CONFIG_COMPAT
61883+ compat_uptr_t __user *compat;
61884+#endif
61885+ } ptr;
61886+};
61887+
61888+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
61889+void gr_handle_brute_check(void);
61890+void gr_handle_kernel_exploit(void);
61891+int gr_process_user_ban(void);
61892+
61893+char gr_roletype_to_char(void);
61894+
61895+int gr_acl_enable_at_secure(void);
61896+
61897+int gr_check_user_change(int real, int effective, int fs);
61898+int gr_check_group_change(int real, int effective, int fs);
61899+
61900+void gr_del_task_from_ip_table(struct task_struct *p);
61901+
61902+int gr_pid_is_chrooted(struct task_struct *p);
61903+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
61904+int gr_handle_chroot_nice(void);
61905+int gr_handle_chroot_sysctl(const int op);
61906+int gr_handle_chroot_setpriority(struct task_struct *p,
61907+ const int niceval);
61908+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
61909+int gr_handle_chroot_chroot(const struct dentry *dentry,
61910+ const struct vfsmount *mnt);
61911+void gr_handle_chroot_chdir(struct path *path);
61912+int gr_handle_chroot_chmod(const struct dentry *dentry,
61913+ const struct vfsmount *mnt, const int mode);
61914+int gr_handle_chroot_mknod(const struct dentry *dentry,
61915+ const struct vfsmount *mnt, const int mode);
61916+int gr_handle_chroot_mount(const struct dentry *dentry,
61917+ const struct vfsmount *mnt,
61918+ const char *dev_name);
61919+int gr_handle_chroot_pivot(void);
61920+int gr_handle_chroot_unix(const pid_t pid);
61921+
61922+int gr_handle_rawio(const struct inode *inode);
61923+
61924+void gr_handle_ioperm(void);
61925+void gr_handle_iopl(void);
61926+
61927+umode_t gr_acl_umask(void);
61928+
61929+int gr_tpe_allow(const struct file *file);
61930+
61931+void gr_set_chroot_entries(struct task_struct *task, struct path *path);
61932+void gr_clear_chroot_entries(struct task_struct *task);
61933+
61934+void gr_log_forkfail(const int retval);
61935+void gr_log_timechange(void);
61936+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
61937+void gr_log_chdir(const struct dentry *dentry,
61938+ const struct vfsmount *mnt);
61939+void gr_log_chroot_exec(const struct dentry *dentry,
61940+ const struct vfsmount *mnt);
61941+void gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv);
61942+void gr_log_remount(const char *devname, const int retval);
61943+void gr_log_unmount(const char *devname, const int retval);
61944+void gr_log_mount(const char *from, const char *to, const int retval);
61945+void gr_log_textrel(struct vm_area_struct *vma);
61946+void gr_log_rwxmmap(struct file *file);
61947+void gr_log_rwxmprotect(struct file *file);
61948+
61949+int gr_handle_follow_link(const struct inode *parent,
61950+ const struct inode *inode,
61951+ const struct dentry *dentry,
61952+ const struct vfsmount *mnt);
61953+int gr_handle_fifo(const struct dentry *dentry,
61954+ const struct vfsmount *mnt,
61955+ const struct dentry *dir, const int flag,
61956+ const int acc_mode);
61957+int gr_handle_hardlink(const struct dentry *dentry,
61958+ const struct vfsmount *mnt,
61959+ struct inode *inode,
61960+ const int mode, const char *to);
61961+
61962+int gr_is_capable(const int cap);
61963+int gr_is_capable_nolog(const int cap);
61964+void gr_learn_resource(const struct task_struct *task, const int limit,
61965+ const unsigned long wanted, const int gt);
61966+void gr_copy_label(struct task_struct *tsk);
61967+void gr_handle_crash(struct task_struct *task, const int sig);
61968+int gr_handle_signal(const struct task_struct *p, const int sig);
61969+int gr_check_crash_uid(const uid_t uid);
61970+int gr_check_protected_task(const struct task_struct *task);
61971+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
61972+int gr_acl_handle_mmap(const struct file *file,
61973+ const unsigned long prot);
61974+int gr_acl_handle_mprotect(const struct file *file,
61975+ const unsigned long prot);
61976+int gr_check_hidden_task(const struct task_struct *tsk);
61977+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
61978+ const struct vfsmount *mnt);
61979+__u32 gr_acl_handle_utime(const struct dentry *dentry,
61980+ const struct vfsmount *mnt);
61981+__u32 gr_acl_handle_access(const struct dentry *dentry,
61982+ const struct vfsmount *mnt, const int fmode);
61983+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
61984+ const struct vfsmount *mnt, umode_t *mode);
61985+__u32 gr_acl_handle_chown(const struct dentry *dentry,
61986+ const struct vfsmount *mnt);
61987+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
61988+ const struct vfsmount *mnt);
61989+int gr_handle_ptrace(struct task_struct *task, const long request);
61990+int gr_handle_proc_ptrace(struct task_struct *task);
61991+__u32 gr_acl_handle_execve(const struct dentry *dentry,
61992+ const struct vfsmount *mnt);
61993+int gr_check_crash_exec(const struct file *filp);
61994+int gr_acl_is_enabled(void);
61995+void gr_set_kernel_label(struct task_struct *task);
61996+void gr_set_role_label(struct task_struct *task, const uid_t uid,
61997+ const gid_t gid);
61998+int gr_set_proc_label(const struct dentry *dentry,
61999+ const struct vfsmount *mnt,
62000+ const int unsafe_flags);
62001+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
62002+ const struct vfsmount *mnt);
62003+__u32 gr_acl_handle_open(const struct dentry *dentry,
62004+ const struct vfsmount *mnt, int acc_mode);
62005+__u32 gr_acl_handle_creat(const struct dentry *dentry,
62006+ const struct dentry *p_dentry,
62007+ const struct vfsmount *p_mnt,
62008+ int open_flags, int acc_mode, const int imode);
62009+void gr_handle_create(const struct dentry *dentry,
62010+ const struct vfsmount *mnt);
62011+void gr_handle_proc_create(const struct dentry *dentry,
62012+ const struct inode *inode);
62013+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
62014+ const struct dentry *parent_dentry,
62015+ const struct vfsmount *parent_mnt,
62016+ const int mode);
62017+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
62018+ const struct dentry *parent_dentry,
62019+ const struct vfsmount *parent_mnt);
62020+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
62021+ const struct vfsmount *mnt);
62022+void gr_handle_delete(const ino_t ino, const dev_t dev);
62023+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
62024+ const struct vfsmount *mnt);
62025+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
62026+ const struct dentry *parent_dentry,
62027+ const struct vfsmount *parent_mnt,
62028+ const char *from);
62029+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
62030+ const struct dentry *parent_dentry,
62031+ const struct vfsmount *parent_mnt,
62032+ const struct dentry *old_dentry,
62033+ const struct vfsmount *old_mnt, const char *to);
62034+int gr_acl_handle_rename(struct dentry *new_dentry,
62035+ struct dentry *parent_dentry,
62036+ const struct vfsmount *parent_mnt,
62037+ struct dentry *old_dentry,
62038+ struct inode *old_parent_inode,
62039+ struct vfsmount *old_mnt, const char *newname);
62040+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
62041+ struct dentry *old_dentry,
62042+ struct dentry *new_dentry,
62043+ struct vfsmount *mnt, const __u8 replace);
62044+__u32 gr_check_link(const struct dentry *new_dentry,
62045+ const struct dentry *parent_dentry,
62046+ const struct vfsmount *parent_mnt,
62047+ const struct dentry *old_dentry,
62048+ const struct vfsmount *old_mnt);
62049+int gr_acl_handle_filldir(const struct file *file, const char *name,
62050+ const unsigned int namelen, const ino_t ino);
62051+
62052+__u32 gr_acl_handle_unix(const struct dentry *dentry,
62053+ const struct vfsmount *mnt);
62054+void gr_acl_handle_exit(void);
62055+void gr_acl_handle_psacct(struct task_struct *task, const long code);
62056+int gr_acl_handle_procpidmem(const struct task_struct *task);
62057+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
62058+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
62059+void gr_audit_ptrace(struct task_struct *task);
62060+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
62061+
62062+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
62063+
62064+#ifdef CONFIG_GRKERNSEC
62065+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
62066+void gr_handle_vm86(void);
62067+void gr_handle_mem_readwrite(u64 from, u64 to);
62068+
62069+void gr_log_badprocpid(const char *entry);
62070+
62071+extern int grsec_enable_dmesg;
62072+extern int grsec_disable_privio;
62073+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
62074+extern int grsec_enable_chroot_findtask;
62075+#endif
62076+#ifdef CONFIG_GRKERNSEC_SETXID
62077+extern int grsec_enable_setxid;
62078+#endif
62079+#endif
62080+
62081+#endif
62082diff --git a/include/linux/grsock.h b/include/linux/grsock.h
62083new file mode 100644
62084index 0000000..e7ffaaf
62085--- /dev/null
62086+++ b/include/linux/grsock.h
62087@@ -0,0 +1,19 @@
62088+#ifndef __GRSOCK_H
62089+#define __GRSOCK_H
62090+
62091+extern void gr_attach_curr_ip(const struct sock *sk);
62092+extern int gr_handle_sock_all(const int family, const int type,
62093+ const int protocol);
62094+extern int gr_handle_sock_server(const struct sockaddr *sck);
62095+extern int gr_handle_sock_server_other(const struct sock *sck);
62096+extern int gr_handle_sock_client(const struct sockaddr *sck);
62097+extern int gr_search_connect(struct socket * sock,
62098+ struct sockaddr_in * addr);
62099+extern int gr_search_bind(struct socket * sock,
62100+ struct sockaddr_in * addr);
62101+extern int gr_search_listen(struct socket * sock);
62102+extern int gr_search_accept(struct socket * sock);
62103+extern int gr_search_socket(const int domain, const int type,
62104+ const int protocol);
62105+
62106+#endif
62107diff --git a/include/linux/hid.h b/include/linux/hid.h
62108index c235e4e..f0cf7a0 100644
62109--- a/include/linux/hid.h
62110+++ b/include/linux/hid.h
62111@@ -679,7 +679,7 @@ struct hid_ll_driver {
62112 unsigned int code, int value);
62113
62114 int (*parse)(struct hid_device *hdev);
62115-};
62116+} __no_const;
62117
62118 #define PM_HINT_FULLON 1<<5
62119 #define PM_HINT_NORMAL 1<<1
62120diff --git a/include/linux/highmem.h b/include/linux/highmem.h
62121index 3a93f73..b19d0b3 100644
62122--- a/include/linux/highmem.h
62123+++ b/include/linux/highmem.h
62124@@ -185,6 +185,18 @@ static inline void clear_highpage(struct page *page)
62125 kunmap_atomic(kaddr, KM_USER0);
62126 }
62127
62128+static inline void sanitize_highpage(struct page *page)
62129+{
62130+ void *kaddr;
62131+ unsigned long flags;
62132+
62133+ local_irq_save(flags);
62134+ kaddr = kmap_atomic(page, KM_CLEARPAGE);
62135+ clear_page(kaddr);
62136+ kunmap_atomic(kaddr, KM_CLEARPAGE);
62137+ local_irq_restore(flags);
62138+}
62139+
62140 static inline void zero_user_segments(struct page *page,
62141 unsigned start1, unsigned end1,
62142 unsigned start2, unsigned end2)
62143diff --git a/include/linux/i2c.h b/include/linux/i2c.h
62144index 07d103a..04ec65b 100644
62145--- a/include/linux/i2c.h
62146+++ b/include/linux/i2c.h
62147@@ -364,6 +364,7 @@ struct i2c_algorithm {
62148 /* To determine what the adapter supports */
62149 u32 (*functionality) (struct i2c_adapter *);
62150 };
62151+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
62152
62153 /*
62154 * i2c_adapter is the structure used to identify a physical i2c bus along
62155diff --git a/include/linux/i2o.h b/include/linux/i2o.h
62156index a6deef4..c56a7f2 100644
62157--- a/include/linux/i2o.h
62158+++ b/include/linux/i2o.h
62159@@ -564,7 +564,7 @@ struct i2o_controller {
62160 struct i2o_device *exec; /* Executive */
62161 #if BITS_PER_LONG == 64
62162 spinlock_t context_list_lock; /* lock for context_list */
62163- atomic_t context_list_counter; /* needed for unique contexts */
62164+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
62165 struct list_head context_list; /* list of context id's
62166 and pointers */
62167 #endif
62168diff --git a/include/linux/init.h b/include/linux/init.h
62169index 9146f39..885354d 100644
62170--- a/include/linux/init.h
62171+++ b/include/linux/init.h
62172@@ -293,13 +293,13 @@ void __init parse_early_options(char *cmdline);
62173
62174 /* Each module must use one module_init(). */
62175 #define module_init(initfn) \
62176- static inline initcall_t __inittest(void) \
62177+ static inline __used initcall_t __inittest(void) \
62178 { return initfn; } \
62179 int init_module(void) __attribute__((alias(#initfn)));
62180
62181 /* This is only required if you want to be unloadable. */
62182 #define module_exit(exitfn) \
62183- static inline exitcall_t __exittest(void) \
62184+ static inline __used exitcall_t __exittest(void) \
62185 { return exitfn; } \
62186 void cleanup_module(void) __attribute__((alias(#exitfn)));
62187
62188diff --git a/include/linux/init_task.h b/include/linux/init_task.h
62189index 32574ee..00d4ef1 100644
62190--- a/include/linux/init_task.h
62191+++ b/include/linux/init_task.h
62192@@ -128,6 +128,12 @@ extern struct cred init_cred;
62193
62194 #define INIT_TASK_COMM "swapper"
62195
62196+#ifdef CONFIG_X86
62197+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
62198+#else
62199+#define INIT_TASK_THREAD_INFO
62200+#endif
62201+
62202 /*
62203 * INIT_TASK is used to set up the first task table, touch at
62204 * your own risk!. Base=0, limit=0x1fffff (=2MB)
62205@@ -166,6 +172,7 @@ extern struct cred init_cred;
62206 RCU_INIT_POINTER(.cred, &init_cred), \
62207 .comm = INIT_TASK_COMM, \
62208 .thread = INIT_THREAD, \
62209+ INIT_TASK_THREAD_INFO \
62210 .fs = &init_fs, \
62211 .files = &init_files, \
62212 .signal = &init_signals, \
62213diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
62214index e6ca56d..8583707 100644
62215--- a/include/linux/intel-iommu.h
62216+++ b/include/linux/intel-iommu.h
62217@@ -296,7 +296,7 @@ struct iommu_flush {
62218 u8 fm, u64 type);
62219 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
62220 unsigned int size_order, u64 type);
62221-};
62222+} __no_const;
62223
62224 enum {
62225 SR_DMAR_FECTL_REG,
62226diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
62227index a64b00e..464d8bc 100644
62228--- a/include/linux/interrupt.h
62229+++ b/include/linux/interrupt.h
62230@@ -441,7 +441,7 @@ enum
62231 /* map softirq index to softirq name. update 'softirq_to_name' in
62232 * kernel/softirq.c when adding a new softirq.
62233 */
62234-extern char *softirq_to_name[NR_SOFTIRQS];
62235+extern const char * const softirq_to_name[NR_SOFTIRQS];
62236
62237 /* softirq mask and active fields moved to irq_cpustat_t in
62238 * asm/hardirq.h to get better cache usage. KAO
62239@@ -449,12 +449,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
62240
62241 struct softirq_action
62242 {
62243- void (*action)(struct softirq_action *);
62244+ void (*action)(void);
62245 };
62246
62247 asmlinkage void do_softirq(void);
62248 asmlinkage void __do_softirq(void);
62249-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
62250+extern void open_softirq(int nr, void (*action)(void));
62251 extern void softirq_init(void);
62252 static inline void __raise_softirq_irqoff(unsigned int nr)
62253 {
62254diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
62255index 3875719..4cd454c 100644
62256--- a/include/linux/kallsyms.h
62257+++ b/include/linux/kallsyms.h
62258@@ -15,7 +15,8 @@
62259
62260 struct module;
62261
62262-#ifdef CONFIG_KALLSYMS
62263+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
62264+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
62265 /* Lookup the address for a symbol. Returns 0 if not found. */
62266 unsigned long kallsyms_lookup_name(const char *name);
62267
62268@@ -99,6 +100,16 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
62269 /* Stupid that this does nothing, but I didn't create this mess. */
62270 #define __print_symbol(fmt, addr)
62271 #endif /*CONFIG_KALLSYMS*/
62272+#else /* when included by kallsyms.c, vsnprintf.c, or
62273+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
62274+extern void __print_symbol(const char *fmt, unsigned long address);
62275+extern int sprint_backtrace(char *buffer, unsigned long address);
62276+extern int sprint_symbol(char *buffer, unsigned long address);
62277+const char *kallsyms_lookup(unsigned long addr,
62278+ unsigned long *symbolsize,
62279+ unsigned long *offset,
62280+ char **modname, char *namebuf);
62281+#endif
62282
62283 /* This macro allows us to keep printk typechecking */
62284 static __printf(1, 2)
62285diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
62286index fa39183..40160be 100644
62287--- a/include/linux/kgdb.h
62288+++ b/include/linux/kgdb.h
62289@@ -53,7 +53,7 @@ extern int kgdb_connected;
62290 extern int kgdb_io_module_registered;
62291
62292 extern atomic_t kgdb_setting_breakpoint;
62293-extern atomic_t kgdb_cpu_doing_single_step;
62294+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
62295
62296 extern struct task_struct *kgdb_usethread;
62297 extern struct task_struct *kgdb_contthread;
62298@@ -251,7 +251,7 @@ struct kgdb_arch {
62299 void (*disable_hw_break)(struct pt_regs *regs);
62300 void (*remove_all_hw_break)(void);
62301 void (*correct_hw_break)(void);
62302-};
62303+} __do_const;
62304
62305 /**
62306 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
62307@@ -276,7 +276,7 @@ struct kgdb_io {
62308 void (*pre_exception) (void);
62309 void (*post_exception) (void);
62310 int is_console;
62311-};
62312+} __do_const;
62313
62314 extern struct kgdb_arch arch_kgdb_ops;
62315
62316diff --git a/include/linux/kmod.h b/include/linux/kmod.h
62317index b16f653..eb908f4 100644
62318--- a/include/linux/kmod.h
62319+++ b/include/linux/kmod.h
62320@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
62321 * usually useless though. */
62322 extern __printf(2, 3)
62323 int __request_module(bool wait, const char *name, ...);
62324+extern __printf(3, 4)
62325+int ___request_module(bool wait, char *param_name, const char *name, ...);
62326 #define request_module(mod...) __request_module(true, mod)
62327 #define request_module_nowait(mod...) __request_module(false, mod)
62328 #define try_then_request_module(x, mod...) \
62329diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
62330index d526231..c9599fc 100644
62331--- a/include/linux/kvm_host.h
62332+++ b/include/linux/kvm_host.h
62333@@ -308,7 +308,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
62334 void vcpu_load(struct kvm_vcpu *vcpu);
62335 void vcpu_put(struct kvm_vcpu *vcpu);
62336
62337-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62338+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62339 struct module *module);
62340 void kvm_exit(void);
62341
62342@@ -385,20 +385,20 @@ void kvm_get_pfn(pfn_t pfn);
62343 int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,
62344 int len);
62345 int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data,
62346- unsigned long len);
62347-int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len);
62348+ unsigned long len) __size_overflow(4);
62349+int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len) __size_overflow(2,4);
62350 int kvm_read_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62351- void *data, unsigned long len);
62352+ void *data, unsigned long len) __size_overflow(4);
62353 int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn, const void *data,
62354 int offset, int len);
62355 int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,
62356- unsigned long len);
62357+ unsigned long len) __size_overflow(2,4);
62358 int kvm_write_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62359- void *data, unsigned long len);
62360+ void *data, unsigned long len) __size_overflow(4);
62361 int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62362 gpa_t gpa);
62363 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len);
62364-int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);
62365+int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len) __size_overflow(2,3);
62366 struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);
62367 int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);
62368 unsigned long kvm_host_page_size(struct kvm *kvm, gfn_t gfn);
62369@@ -454,7 +454,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
62370 struct kvm_guest_debug *dbg);
62371 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
62372
62373-int kvm_arch_init(void *opaque);
62374+int kvm_arch_init(const void *opaque);
62375 void kvm_arch_exit(void);
62376
62377 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
62378@@ -690,7 +690,7 @@ int kvm_setup_default_irq_routing(struct kvm *kvm);
62379 int kvm_set_irq_routing(struct kvm *kvm,
62380 const struct kvm_irq_routing_entry *entries,
62381 unsigned nr,
62382- unsigned flags);
62383+ unsigned flags) __size_overflow(3);
62384 void kvm_free_irq_routing(struct kvm *kvm);
62385
62386 #else
62387diff --git a/include/linux/libata.h b/include/linux/libata.h
62388index cafc09a..d7e7829 100644
62389--- a/include/linux/libata.h
62390+++ b/include/linux/libata.h
62391@@ -909,7 +909,7 @@ struct ata_port_operations {
62392 * fields must be pointers.
62393 */
62394 const struct ata_port_operations *inherits;
62395-};
62396+} __do_const;
62397
62398 struct ata_port_info {
62399 unsigned long flags;
62400diff --git a/include/linux/mca.h b/include/linux/mca.h
62401index 3797270..7765ede 100644
62402--- a/include/linux/mca.h
62403+++ b/include/linux/mca.h
62404@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
62405 int region);
62406 void * (*mca_transform_memory)(struct mca_device *,
62407 void *memory);
62408-};
62409+} __no_const;
62410
62411 struct mca_bus {
62412 u64 default_dma_mask;
62413diff --git a/include/linux/memory.h b/include/linux/memory.h
62414index 935699b..11042cc 100644
62415--- a/include/linux/memory.h
62416+++ b/include/linux/memory.h
62417@@ -144,7 +144,7 @@ struct memory_accessor {
62418 size_t count);
62419 ssize_t (*write)(struct memory_accessor *, const char *buf,
62420 off_t offset, size_t count);
62421-};
62422+} __no_const;
62423
62424 /*
62425 * Kernel text modification mutex, used for code patching. Users of this lock
62426diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
62427index 9970337..9444122 100644
62428--- a/include/linux/mfd/abx500.h
62429+++ b/include/linux/mfd/abx500.h
62430@@ -188,6 +188,7 @@ struct abx500_ops {
62431 int (*event_registers_startup_state_get) (struct device *, u8 *);
62432 int (*startup_irq_enabled) (struct device *, unsigned int);
62433 };
62434+typedef struct abx500_ops __no_const abx500_ops_no_const;
62435
62436 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
62437 void abx500_remove_ops(struct device *dev);
62438diff --git a/include/linux/mm.h b/include/linux/mm.h
62439index 4baadd1..2e0b45e 100644
62440--- a/include/linux/mm.h
62441+++ b/include/linux/mm.h
62442@@ -115,7 +115,14 @@ extern unsigned int kobjsize(const void *objp);
62443
62444 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
62445 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
62446+
62447+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
62448+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
62449+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
62450+#else
62451 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
62452+#endif
62453+
62454 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
62455 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
62456
62457@@ -1012,34 +1019,6 @@ int set_page_dirty(struct page *page);
62458 int set_page_dirty_lock(struct page *page);
62459 int clear_page_dirty_for_io(struct page *page);
62460
62461-/* Is the vma a continuation of the stack vma above it? */
62462-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
62463-{
62464- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
62465-}
62466-
62467-static inline int stack_guard_page_start(struct vm_area_struct *vma,
62468- unsigned long addr)
62469-{
62470- return (vma->vm_flags & VM_GROWSDOWN) &&
62471- (vma->vm_start == addr) &&
62472- !vma_growsdown(vma->vm_prev, addr);
62473-}
62474-
62475-/* Is the vma a continuation of the stack vma below it? */
62476-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
62477-{
62478- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
62479-}
62480-
62481-static inline int stack_guard_page_end(struct vm_area_struct *vma,
62482- unsigned long addr)
62483-{
62484- return (vma->vm_flags & VM_GROWSUP) &&
62485- (vma->vm_end == addr) &&
62486- !vma_growsup(vma->vm_next, addr);
62487-}
62488-
62489 extern unsigned long move_page_tables(struct vm_area_struct *vma,
62490 unsigned long old_addr, struct vm_area_struct *new_vma,
62491 unsigned long new_addr, unsigned long len);
62492@@ -1134,6 +1113,15 @@ static inline void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
62493 }
62494 #endif
62495
62496+#ifdef CONFIG_MMU
62497+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
62498+#else
62499+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
62500+{
62501+ return __pgprot(0);
62502+}
62503+#endif
62504+
62505 int vma_wants_writenotify(struct vm_area_struct *vma);
62506
62507 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
62508@@ -1419,6 +1407,7 @@ out:
62509 }
62510
62511 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
62512+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
62513
62514 extern unsigned long do_brk(unsigned long, unsigned long);
62515
62516@@ -1476,6 +1465,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
62517 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
62518 struct vm_area_struct **pprev);
62519
62520+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
62521+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
62522+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
62523+
62524 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
62525 NULL if none. Assume start_addr < end_addr. */
62526 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
62527@@ -1492,15 +1485,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
62528 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
62529 }
62530
62531-#ifdef CONFIG_MMU
62532-pgprot_t vm_get_page_prot(unsigned long vm_flags);
62533-#else
62534-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
62535-{
62536- return __pgprot(0);
62537-}
62538-#endif
62539-
62540 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
62541 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
62542 unsigned long pfn, unsigned long size, pgprot_t);
62543@@ -1614,7 +1598,7 @@ extern int unpoison_memory(unsigned long pfn);
62544 extern int sysctl_memory_failure_early_kill;
62545 extern int sysctl_memory_failure_recovery;
62546 extern void shake_page(struct page *p, int access);
62547-extern atomic_long_t mce_bad_pages;
62548+extern atomic_long_unchecked_t mce_bad_pages;
62549 extern int soft_offline_page(struct page *page, int flags);
62550
62551 extern void dump_page(struct page *page);
62552@@ -1628,5 +1612,11 @@ extern void copy_user_huge_page(struct page *dst, struct page *src,
62553 unsigned int pages_per_huge_page);
62554 #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
62555
62556+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
62557+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
62558+#else
62559+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
62560+#endif
62561+
62562 #endif /* __KERNEL__ */
62563 #endif /* _LINUX_MM_H */
62564diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
62565index 5b42f1b..759e4b4 100644
62566--- a/include/linux/mm_types.h
62567+++ b/include/linux/mm_types.h
62568@@ -253,6 +253,8 @@ struct vm_area_struct {
62569 #ifdef CONFIG_NUMA
62570 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
62571 #endif
62572+
62573+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
62574 };
62575
62576 struct core_thread {
62577@@ -389,6 +391,24 @@ struct mm_struct {
62578 #ifdef CONFIG_CPUMASK_OFFSTACK
62579 struct cpumask cpumask_allocation;
62580 #endif
62581+
62582+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
62583+ unsigned long pax_flags;
62584+#endif
62585+
62586+#ifdef CONFIG_PAX_DLRESOLVE
62587+ unsigned long call_dl_resolve;
62588+#endif
62589+
62590+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
62591+ unsigned long call_syscall;
62592+#endif
62593+
62594+#ifdef CONFIG_PAX_ASLR
62595+ unsigned long delta_mmap; /* randomized offset */
62596+ unsigned long delta_stack; /* randomized offset */
62597+#endif
62598+
62599 };
62600
62601 static inline void mm_init_cpumask(struct mm_struct *mm)
62602diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
62603index 1d1b1e1..2a13c78 100644
62604--- a/include/linux/mmu_notifier.h
62605+++ b/include/linux/mmu_notifier.h
62606@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
62607 */
62608 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
62609 ({ \
62610- pte_t __pte; \
62611+ pte_t ___pte; \
62612 struct vm_area_struct *___vma = __vma; \
62613 unsigned long ___address = __address; \
62614- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
62615+ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
62616 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
62617- __pte; \
62618+ ___pte; \
62619 })
62620
62621 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
62622diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
62623index 188cb2f..d78409b 100644
62624--- a/include/linux/mmzone.h
62625+++ b/include/linux/mmzone.h
62626@@ -369,7 +369,7 @@ struct zone {
62627 unsigned long flags; /* zone flags, see below */
62628
62629 /* Zone statistics */
62630- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
62631+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
62632
62633 /*
62634 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
62635diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
62636index 468819c..17b9db3 100644
62637--- a/include/linux/mod_devicetable.h
62638+++ b/include/linux/mod_devicetable.h
62639@@ -12,7 +12,7 @@
62640 typedef unsigned long kernel_ulong_t;
62641 #endif
62642
62643-#define PCI_ANY_ID (~0)
62644+#define PCI_ANY_ID ((__u16)~0)
62645
62646 struct pci_device_id {
62647 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
62648@@ -131,7 +131,7 @@ struct usb_device_id {
62649 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
62650 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
62651
62652-#define HID_ANY_ID (~0)
62653+#define HID_ANY_ID (~0U)
62654
62655 struct hid_device_id {
62656 __u16 bus;
62657diff --git a/include/linux/module.h b/include/linux/module.h
62658index 3cb7839..511cb87 100644
62659--- a/include/linux/module.h
62660+++ b/include/linux/module.h
62661@@ -17,6 +17,7 @@
62662 #include <linux/moduleparam.h>
62663 #include <linux/tracepoint.h>
62664 #include <linux/export.h>
62665+#include <linux/fs.h>
62666
62667 #include <linux/percpu.h>
62668 #include <asm/module.h>
62669@@ -261,19 +262,16 @@ struct module
62670 int (*init)(void);
62671
62672 /* If this is non-NULL, vfree after init() returns */
62673- void *module_init;
62674+ void *module_init_rx, *module_init_rw;
62675
62676 /* Here is the actual code + data, vfree'd on unload. */
62677- void *module_core;
62678+ void *module_core_rx, *module_core_rw;
62679
62680 /* Here are the sizes of the init and core sections */
62681- unsigned int init_size, core_size;
62682+ unsigned int init_size_rw, core_size_rw;
62683
62684 /* The size of the executable code in each section. */
62685- unsigned int init_text_size, core_text_size;
62686-
62687- /* Size of RO sections of the module (text+rodata) */
62688- unsigned int init_ro_size, core_ro_size;
62689+ unsigned int init_size_rx, core_size_rx;
62690
62691 /* Arch-specific module values */
62692 struct mod_arch_specific arch;
62693@@ -329,6 +327,10 @@ struct module
62694 #ifdef CONFIG_EVENT_TRACING
62695 struct ftrace_event_call **trace_events;
62696 unsigned int num_trace_events;
62697+ struct file_operations trace_id;
62698+ struct file_operations trace_enable;
62699+ struct file_operations trace_format;
62700+ struct file_operations trace_filter;
62701 #endif
62702 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
62703 unsigned int num_ftrace_callsites;
62704@@ -379,16 +381,46 @@ bool is_module_address(unsigned long addr);
62705 bool is_module_percpu_address(unsigned long addr);
62706 bool is_module_text_address(unsigned long addr);
62707
62708+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
62709+{
62710+
62711+#ifdef CONFIG_PAX_KERNEXEC
62712+ if (ktla_ktva(addr) >= (unsigned long)start &&
62713+ ktla_ktva(addr) < (unsigned long)start + size)
62714+ return 1;
62715+#endif
62716+
62717+ return ((void *)addr >= start && (void *)addr < start + size);
62718+}
62719+
62720+static inline int within_module_core_rx(unsigned long addr, struct module *mod)
62721+{
62722+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
62723+}
62724+
62725+static inline int within_module_core_rw(unsigned long addr, struct module *mod)
62726+{
62727+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
62728+}
62729+
62730+static inline int within_module_init_rx(unsigned long addr, struct module *mod)
62731+{
62732+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
62733+}
62734+
62735+static inline int within_module_init_rw(unsigned long addr, struct module *mod)
62736+{
62737+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
62738+}
62739+
62740 static inline int within_module_core(unsigned long addr, struct module *mod)
62741 {
62742- return (unsigned long)mod->module_core <= addr &&
62743- addr < (unsigned long)mod->module_core + mod->core_size;
62744+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
62745 }
62746
62747 static inline int within_module_init(unsigned long addr, struct module *mod)
62748 {
62749- return (unsigned long)mod->module_init <= addr &&
62750- addr < (unsigned long)mod->module_init + mod->init_size;
62751+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
62752 }
62753
62754 /* Search for module by name: must hold module_mutex. */
62755diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
62756index b2be02e..edb10c9 100644
62757--- a/include/linux/moduleloader.h
62758+++ b/include/linux/moduleloader.h
62759@@ -23,11 +23,23 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
62760
62761 /* Allocator used for allocating struct module, core sections and init
62762 sections. Returns NULL on failure. */
62763-void *module_alloc(unsigned long size);
62764+void *module_alloc(unsigned long size) __size_overflow(1);
62765+
62766+#ifdef CONFIG_PAX_KERNEXEC
62767+void *module_alloc_exec(unsigned long size);
62768+#else
62769+#define module_alloc_exec(x) module_alloc(x)
62770+#endif
62771
62772 /* Free memory returned from module_alloc. */
62773 void module_free(struct module *mod, void *module_region);
62774
62775+#ifdef CONFIG_PAX_KERNEXEC
62776+void module_free_exec(struct module *mod, void *module_region);
62777+#else
62778+#define module_free_exec(x, y) module_free((x), (y))
62779+#endif
62780+
62781 /* Apply the given relocation to the (simplified) ELF. Return -error
62782 or 0. */
62783 int apply_relocate(Elf_Shdr *sechdrs,
62784diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
62785index 7939f63..ec6df57 100644
62786--- a/include/linux/moduleparam.h
62787+++ b/include/linux/moduleparam.h
62788@@ -260,7 +260,7 @@ static inline void __kernel_param_unlock(void)
62789 * @len is usually just sizeof(string).
62790 */
62791 #define module_param_string(name, string, len, perm) \
62792- static const struct kparam_string __param_string_##name \
62793+ static const struct kparam_string __param_string_##name __used \
62794 = { len, string }; \
62795 __module_param_call(MODULE_PARAM_PREFIX, name, \
62796 &param_ops_string, \
62797@@ -395,7 +395,7 @@ extern int param_get_invbool(char *buffer, const struct kernel_param *kp);
62798 * module_param_named() for why this might be necessary.
62799 */
62800 #define module_param_array_named(name, array, type, nump, perm) \
62801- static const struct kparam_array __param_arr_##name \
62802+ static const struct kparam_array __param_arr_##name __used \
62803 = { .max = ARRAY_SIZE(array), .num = nump, \
62804 .ops = &param_ops_##type, \
62805 .elemsize = sizeof(array[0]), .elem = array }; \
62806diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
62807index a9e6ba4..0f9e29b 100644
62808--- a/include/linux/mtd/map.h
62809+++ b/include/linux/mtd/map.h
62810@@ -25,6 +25,7 @@
62811 #include <linux/types.h>
62812 #include <linux/list.h>
62813 #include <linux/string.h>
62814+#include <linux/kernel.h>
62815 #include <linux/bug.h>
62816
62817
62818diff --git a/include/linux/namei.h b/include/linux/namei.h
62819index ffc0213..2c1f2cb 100644
62820--- a/include/linux/namei.h
62821+++ b/include/linux/namei.h
62822@@ -24,7 +24,7 @@ struct nameidata {
62823 unsigned seq;
62824 int last_type;
62825 unsigned depth;
62826- char *saved_names[MAX_NESTED_LINKS + 1];
62827+ const char *saved_names[MAX_NESTED_LINKS + 1];
62828
62829 /* Intent data */
62830 union {
62831@@ -94,12 +94,12 @@ extern int follow_up(struct path *);
62832 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
62833 extern void unlock_rename(struct dentry *, struct dentry *);
62834
62835-static inline void nd_set_link(struct nameidata *nd, char *path)
62836+static inline void nd_set_link(struct nameidata *nd, const char *path)
62837 {
62838 nd->saved_names[nd->depth] = path;
62839 }
62840
62841-static inline char *nd_get_link(struct nameidata *nd)
62842+static inline const char *nd_get_link(const struct nameidata *nd)
62843 {
62844 return nd->saved_names[nd->depth];
62845 }
62846diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
62847index a82ad4d..90d15b7 100644
62848--- a/include/linux/netdevice.h
62849+++ b/include/linux/netdevice.h
62850@@ -949,6 +949,7 @@ struct net_device_ops {
62851 int (*ndo_set_features)(struct net_device *dev,
62852 u32 features);
62853 };
62854+typedef struct net_device_ops __no_const net_device_ops_no_const;
62855
62856 /*
62857 * The DEVICE structure.
62858@@ -1088,7 +1089,7 @@ struct net_device {
62859 int iflink;
62860
62861 struct net_device_stats stats;
62862- atomic_long_t rx_dropped; /* dropped packets by core network
62863+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
62864 * Do not use this in drivers.
62865 */
62866
62867diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
62868new file mode 100644
62869index 0000000..33f4af8
62870--- /dev/null
62871+++ b/include/linux/netfilter/xt_gradm.h
62872@@ -0,0 +1,9 @@
62873+#ifndef _LINUX_NETFILTER_XT_GRADM_H
62874+#define _LINUX_NETFILTER_XT_GRADM_H 1
62875+
62876+struct xt_gradm_mtinfo {
62877+ __u16 flags;
62878+ __u16 invflags;
62879+};
62880+
62881+#endif
62882diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h
62883index c65a18a..0c05f3a 100644
62884--- a/include/linux/of_pdt.h
62885+++ b/include/linux/of_pdt.h
62886@@ -32,7 +32,7 @@ struct of_pdt_ops {
62887
62888 /* return 0 on success; fill in 'len' with number of bytes in path */
62889 int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
62890-};
62891+} __no_const;
62892
62893 extern void *prom_early_alloc(unsigned long size);
62894
62895diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
62896index a4c5624..2dabfb7 100644
62897--- a/include/linux/oprofile.h
62898+++ b/include/linux/oprofile.h
62899@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
62900 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
62901 char const * name, ulong * val);
62902
62903-/** Create a file for read-only access to an atomic_t. */
62904+/** Create a file for read-only access to an atomic_unchecked_t. */
62905 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
62906- char const * name, atomic_t * val);
62907+ char const * name, atomic_unchecked_t * val);
62908
62909 /** create a directory */
62910 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
62911@@ -163,7 +163,7 @@ ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user * buf, size_t co
62912 * Read an ASCII string for a number from a userspace buffer and fill *val on success.
62913 * Returns 0 on success, < 0 on error.
62914 */
62915-int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count);
62916+int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count) __size_overflow(3);
62917
62918 /** lock for read/write safety */
62919 extern raw_spinlock_t oprofilefs_lock;
62920diff --git a/include/linux/padata.h b/include/linux/padata.h
62921index 4633b2f..988bc08 100644
62922--- a/include/linux/padata.h
62923+++ b/include/linux/padata.h
62924@@ -129,7 +129,7 @@ struct parallel_data {
62925 struct padata_instance *pinst;
62926 struct padata_parallel_queue __percpu *pqueue;
62927 struct padata_serial_queue __percpu *squeue;
62928- atomic_t seq_nr;
62929+ atomic_unchecked_t seq_nr;
62930 atomic_t reorder_objects;
62931 atomic_t refcnt;
62932 unsigned int max_seq_nr;
62933diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
62934index b1f8912..c955bff 100644
62935--- a/include/linux/perf_event.h
62936+++ b/include/linux/perf_event.h
62937@@ -748,8 +748,8 @@ struct perf_event {
62938
62939 enum perf_event_active_state state;
62940 unsigned int attach_state;
62941- local64_t count;
62942- atomic64_t child_count;
62943+ local64_t count; /* PaX: fix it one day */
62944+ atomic64_unchecked_t child_count;
62945
62946 /*
62947 * These are the total time in nanoseconds that the event
62948@@ -800,8 +800,8 @@ struct perf_event {
62949 * These accumulate total time (in nanoseconds) that children
62950 * events have been enabled and running, respectively.
62951 */
62952- atomic64_t child_total_time_enabled;
62953- atomic64_t child_total_time_running;
62954+ atomic64_unchecked_t child_total_time_enabled;
62955+ atomic64_unchecked_t child_total_time_running;
62956
62957 /*
62958 * Protect attach/detach and child_list:
62959diff --git a/include/linux/personality.h b/include/linux/personality.h
62960index 8fc7dd1a..c19d89e 100644
62961--- a/include/linux/personality.h
62962+++ b/include/linux/personality.h
62963@@ -44,6 +44,7 @@ enum {
62964 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
62965 ADDR_NO_RANDOMIZE | \
62966 ADDR_COMPAT_LAYOUT | \
62967+ ADDR_LIMIT_3GB | \
62968 MMAP_PAGE_ZERO)
62969
62970 /*
62971diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
62972index 77257c9..51d473a 100644
62973--- a/include/linux/pipe_fs_i.h
62974+++ b/include/linux/pipe_fs_i.h
62975@@ -46,9 +46,9 @@ struct pipe_buffer {
62976 struct pipe_inode_info {
62977 wait_queue_head_t wait;
62978 unsigned int nrbufs, curbuf, buffers;
62979- unsigned int readers;
62980- unsigned int writers;
62981- unsigned int waiting_writers;
62982+ atomic_t readers;
62983+ atomic_t writers;
62984+ atomic_t waiting_writers;
62985 unsigned int r_counter;
62986 unsigned int w_counter;
62987 struct page *tmp_page;
62988diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
62989index d3085e7..fd01052 100644
62990--- a/include/linux/pm_runtime.h
62991+++ b/include/linux/pm_runtime.h
62992@@ -95,7 +95,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
62993
62994 static inline void pm_runtime_mark_last_busy(struct device *dev)
62995 {
62996- ACCESS_ONCE(dev->power.last_busy) = jiffies;
62997+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
62998 }
62999
63000 #else /* !CONFIG_PM_RUNTIME */
63001diff --git a/include/linux/poison.h b/include/linux/poison.h
63002index 79159de..f1233a9 100644
63003--- a/include/linux/poison.h
63004+++ b/include/linux/poison.h
63005@@ -19,8 +19,8 @@
63006 * under normal circumstances, used to verify that nobody uses
63007 * non-initialized list entries.
63008 */
63009-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
63010-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
63011+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
63012+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
63013
63014 /********** include/linux/timer.h **********/
63015 /*
63016diff --git a/include/linux/preempt.h b/include/linux/preempt.h
63017index 58969b2..ead129b 100644
63018--- a/include/linux/preempt.h
63019+++ b/include/linux/preempt.h
63020@@ -123,7 +123,7 @@ struct preempt_ops {
63021 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
63022 void (*sched_out)(struct preempt_notifier *notifier,
63023 struct task_struct *next);
63024-};
63025+} __no_const;
63026
63027 /**
63028 * preempt_notifier - key for installing preemption notifiers
63029diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
63030index 643b96c..ef55a9c 100644
63031--- a/include/linux/proc_fs.h
63032+++ b/include/linux/proc_fs.h
63033@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
63034 return proc_create_data(name, mode, parent, proc_fops, NULL);
63035 }
63036
63037+static inline struct proc_dir_entry *proc_create_grsec(const char *name, mode_t mode,
63038+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
63039+{
63040+#ifdef CONFIG_GRKERNSEC_PROC_USER
63041+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
63042+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63043+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
63044+#else
63045+ return proc_create_data(name, mode, parent, proc_fops, NULL);
63046+#endif
63047+}
63048+
63049+
63050 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
63051 mode_t mode, struct proc_dir_entry *base,
63052 read_proc_t *read_proc, void * data)
63053@@ -258,7 +271,7 @@ union proc_op {
63054 int (*proc_show)(struct seq_file *m,
63055 struct pid_namespace *ns, struct pid *pid,
63056 struct task_struct *task);
63057-};
63058+} __no_const;
63059
63060 struct ctl_table_header;
63061 struct ctl_table;
63062diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
63063index 800f113..e9ee2e3 100644
63064--- a/include/linux/ptrace.h
63065+++ b/include/linux/ptrace.h
63066@@ -129,10 +129,12 @@ extern void __ptrace_unlink(struct task_struct *child);
63067 extern void exit_ptrace(struct task_struct *tracer);
63068 #define PTRACE_MODE_READ 1
63069 #define PTRACE_MODE_ATTACH 2
63070-/* Returns 0 on success, -errno on denial. */
63071-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
63072 /* Returns true on success, false on denial. */
63073 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
63074+/* Returns true on success, false on denial. */
63075+extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
63076+/* Returns true on success, false on denial. */
63077+extern bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode);
63078
63079 static inline int ptrace_reparented(struct task_struct *child)
63080 {
63081diff --git a/include/linux/random.h b/include/linux/random.h
63082index 8f74538..02a1012 100644
63083--- a/include/linux/random.h
63084+++ b/include/linux/random.h
63085@@ -69,12 +69,17 @@ void srandom32(u32 seed);
63086
63087 u32 prandom32(struct rnd_state *);
63088
63089+static inline unsigned long pax_get_random_long(void)
63090+{
63091+ return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
63092+}
63093+
63094 /*
63095 * Handle minimum values for seeds
63096 */
63097 static inline u32 __seed(u32 x, u32 m)
63098 {
63099- return (x < m) ? x + m : x;
63100+ return (x <= m) ? x + m + 1 : x;
63101 }
63102
63103 /**
63104diff --git a/include/linux/reboot.h b/include/linux/reboot.h
63105index e0879a7..a12f962 100644
63106--- a/include/linux/reboot.h
63107+++ b/include/linux/reboot.h
63108@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
63109 * Architecture-specific implementations of sys_reboot commands.
63110 */
63111
63112-extern void machine_restart(char *cmd);
63113-extern void machine_halt(void);
63114-extern void machine_power_off(void);
63115+extern void machine_restart(char *cmd) __noreturn;
63116+extern void machine_halt(void) __noreturn;
63117+extern void machine_power_off(void) __noreturn;
63118
63119 extern void machine_shutdown(void);
63120 struct pt_regs;
63121@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
63122 */
63123
63124 extern void kernel_restart_prepare(char *cmd);
63125-extern void kernel_restart(char *cmd);
63126-extern void kernel_halt(void);
63127-extern void kernel_power_off(void);
63128+extern void kernel_restart(char *cmd) __noreturn;
63129+extern void kernel_halt(void) __noreturn;
63130+extern void kernel_power_off(void) __noreturn;
63131
63132 extern int C_A_D; /* for sysctl */
63133 void ctrl_alt_del(void);
63134@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
63135 * Emergency restart, callable from an interrupt handler.
63136 */
63137
63138-extern void emergency_restart(void);
63139+extern void emergency_restart(void) __noreturn;
63140 #include <asm/emergency-restart.h>
63141
63142 #endif
63143diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
63144index 96d465f..b084e05 100644
63145--- a/include/linux/reiserfs_fs.h
63146+++ b/include/linux/reiserfs_fs.h
63147@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
63148 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
63149
63150 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
63151-#define get_generation(s) atomic_read (&fs_generation(s))
63152+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
63153 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
63154 #define __fs_changed(gen,s) (gen != get_generation (s))
63155 #define fs_changed(gen,s) \
63156diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
63157index 52c83b6..18ed7eb 100644
63158--- a/include/linux/reiserfs_fs_sb.h
63159+++ b/include/linux/reiserfs_fs_sb.h
63160@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
63161 /* Comment? -Hans */
63162 wait_queue_head_t s_wait;
63163 /* To be obsoleted soon by per buffer seals.. -Hans */
63164- atomic_t s_generation_counter; // increased by one every time the
63165+ atomic_unchecked_t s_generation_counter; // increased by one every time the
63166 // tree gets re-balanced
63167 unsigned long s_properties; /* File system properties. Currently holds
63168 on-disk FS format */
63169diff --git a/include/linux/relay.h b/include/linux/relay.h
63170index 14a86bc..17d0700 100644
63171--- a/include/linux/relay.h
63172+++ b/include/linux/relay.h
63173@@ -159,7 +159,7 @@ struct rchan_callbacks
63174 * The callback should return 0 if successful, negative if not.
63175 */
63176 int (*remove_buf_file)(struct dentry *dentry);
63177-};
63178+} __no_const;
63179
63180 /*
63181 * CONFIG_RELAY kernel API, kernel/relay.c
63182diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
63183index c6c6084..5bf1212 100644
63184--- a/include/linux/rfkill.h
63185+++ b/include/linux/rfkill.h
63186@@ -147,6 +147,7 @@ struct rfkill_ops {
63187 void (*query)(struct rfkill *rfkill, void *data);
63188 int (*set_block)(void *data, bool blocked);
63189 };
63190+typedef struct rfkill_ops __no_const rfkill_ops_no_const;
63191
63192 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
63193 /**
63194diff --git a/include/linux/rio.h b/include/linux/rio.h
63195index 4d50611..c6858a2 100644
63196--- a/include/linux/rio.h
63197+++ b/include/linux/rio.h
63198@@ -315,7 +315,7 @@ struct rio_ops {
63199 int mbox, void *buffer, size_t len);
63200 int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
63201 void *(*get_inb_message)(struct rio_mport *mport, int mbox);
63202-};
63203+} __no_const;
63204
63205 #define RIO_RESOURCE_MEM 0x00000100
63206 #define RIO_RESOURCE_DOORBELL 0x00000200
63207diff --git a/include/linux/rmap.h b/include/linux/rmap.h
63208index 2148b12..519b820 100644
63209--- a/include/linux/rmap.h
63210+++ b/include/linux/rmap.h
63211@@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
63212 void anon_vma_init(void); /* create anon_vma_cachep */
63213 int anon_vma_prepare(struct vm_area_struct *);
63214 void unlink_anon_vmas(struct vm_area_struct *);
63215-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
63216-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
63217+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
63218+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
63219 void __anon_vma_link(struct vm_area_struct *);
63220
63221 static inline void anon_vma_merge(struct vm_area_struct *vma,
63222diff --git a/include/linux/sched.h b/include/linux/sched.h
63223index 1c4f3e9..342eb1f 100644
63224--- a/include/linux/sched.h
63225+++ b/include/linux/sched.h
63226@@ -101,6 +101,7 @@ struct bio_list;
63227 struct fs_struct;
63228 struct perf_event_context;
63229 struct blk_plug;
63230+struct linux_binprm;
63231
63232 /*
63233 * List of flags we want to share for kernel threads,
63234@@ -380,10 +381,13 @@ struct user_namespace;
63235 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
63236
63237 extern int sysctl_max_map_count;
63238+extern unsigned long sysctl_heap_stack_gap;
63239
63240 #include <linux/aio.h>
63241
63242 #ifdef CONFIG_MMU
63243+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
63244+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
63245 extern void arch_pick_mmap_layout(struct mm_struct *mm);
63246 extern unsigned long
63247 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
63248@@ -629,6 +633,17 @@ struct signal_struct {
63249 #ifdef CONFIG_TASKSTATS
63250 struct taskstats *stats;
63251 #endif
63252+
63253+#ifdef CONFIG_GRKERNSEC
63254+ u32 curr_ip;
63255+ u32 saved_ip;
63256+ u32 gr_saddr;
63257+ u32 gr_daddr;
63258+ u16 gr_sport;
63259+ u16 gr_dport;
63260+ u8 used_accept:1;
63261+#endif
63262+
63263 #ifdef CONFIG_AUDIT
63264 unsigned audit_tty;
63265 struct tty_audit_buf *tty_audit_buf;
63266@@ -710,6 +725,11 @@ struct user_struct {
63267 struct key *session_keyring; /* UID's default session keyring */
63268 #endif
63269
63270+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
63271+ unsigned int banned;
63272+ unsigned long ban_expires;
63273+#endif
63274+
63275 /* Hash table maintenance information */
63276 struct hlist_node uidhash_node;
63277 uid_t uid;
63278@@ -1337,8 +1357,8 @@ struct task_struct {
63279 struct list_head thread_group;
63280
63281 struct completion *vfork_done; /* for vfork() */
63282- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
63283- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63284+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
63285+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63286
63287 cputime_t utime, stime, utimescaled, stimescaled;
63288 cputime_t gtime;
63289@@ -1354,13 +1374,6 @@ struct task_struct {
63290 struct task_cputime cputime_expires;
63291 struct list_head cpu_timers[3];
63292
63293-/* process credentials */
63294- const struct cred __rcu *real_cred; /* objective and real subjective task
63295- * credentials (COW) */
63296- const struct cred __rcu *cred; /* effective (overridable) subjective task
63297- * credentials (COW) */
63298- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63299-
63300 char comm[TASK_COMM_LEN]; /* executable name excluding path
63301 - access with [gs]et_task_comm (which lock
63302 it with task_lock())
63303@@ -1377,8 +1390,16 @@ struct task_struct {
63304 #endif
63305 /* CPU-specific state of this task */
63306 struct thread_struct thread;
63307+/* thread_info moved to task_struct */
63308+#ifdef CONFIG_X86
63309+ struct thread_info tinfo;
63310+#endif
63311 /* filesystem information */
63312 struct fs_struct *fs;
63313+
63314+ const struct cred __rcu *cred; /* effective (overridable) subjective task
63315+ * credentials (COW) */
63316+
63317 /* open file information */
63318 struct files_struct *files;
63319 /* namespaces */
63320@@ -1425,6 +1446,11 @@ struct task_struct {
63321 struct rt_mutex_waiter *pi_blocked_on;
63322 #endif
63323
63324+/* process credentials */
63325+ const struct cred __rcu *real_cred; /* objective and real subjective task
63326+ * credentials (COW) */
63327+ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63328+
63329 #ifdef CONFIG_DEBUG_MUTEXES
63330 /* mutex deadlock detection */
63331 struct mutex_waiter *blocked_on;
63332@@ -1540,6 +1566,27 @@ struct task_struct {
63333 unsigned long default_timer_slack_ns;
63334
63335 struct list_head *scm_work_list;
63336+
63337+#ifdef CONFIG_GRKERNSEC
63338+ /* grsecurity */
63339+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63340+ u64 exec_id;
63341+#endif
63342+#ifdef CONFIG_GRKERNSEC_SETXID
63343+ const struct cred *delayed_cred;
63344+#endif
63345+ struct dentry *gr_chroot_dentry;
63346+ struct acl_subject_label *acl;
63347+ struct acl_role_label *role;
63348+ struct file *exec_file;
63349+ u16 acl_role_id;
63350+ /* is this the task that authenticated to the special role */
63351+ u8 acl_sp_role;
63352+ u8 is_writable;
63353+ u8 brute;
63354+ u8 gr_is_chrooted;
63355+#endif
63356+
63357 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
63358 /* Index of current stored address in ret_stack */
63359 int curr_ret_stack;
63360@@ -1574,6 +1621,51 @@ struct task_struct {
63361 #endif
63362 };
63363
63364+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
63365+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
63366+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
63367+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
63368+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
63369+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
63370+
63371+#ifdef CONFIG_PAX_SOFTMODE
63372+extern int pax_softmode;
63373+#endif
63374+
63375+extern int pax_check_flags(unsigned long *);
63376+
63377+/* if tsk != current then task_lock must be held on it */
63378+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63379+static inline unsigned long pax_get_flags(struct task_struct *tsk)
63380+{
63381+ if (likely(tsk->mm))
63382+ return tsk->mm->pax_flags;
63383+ else
63384+ return 0UL;
63385+}
63386+
63387+/* if tsk != current then task_lock must be held on it */
63388+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
63389+{
63390+ if (likely(tsk->mm)) {
63391+ tsk->mm->pax_flags = flags;
63392+ return 0;
63393+ }
63394+ return -EINVAL;
63395+}
63396+#endif
63397+
63398+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
63399+extern void pax_set_initial_flags(struct linux_binprm *bprm);
63400+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
63401+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
63402+#endif
63403+
63404+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
63405+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
63406+extern void pax_report_refcount_overflow(struct pt_regs *regs);
63407+extern __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type);
63408+
63409 /* Future-safe accessor for struct task_struct's cpus_allowed. */
63410 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
63411
63412@@ -2081,7 +2173,9 @@ void yield(void);
63413 extern struct exec_domain default_exec_domain;
63414
63415 union thread_union {
63416+#ifndef CONFIG_X86
63417 struct thread_info thread_info;
63418+#endif
63419 unsigned long stack[THREAD_SIZE/sizeof(long)];
63420 };
63421
63422@@ -2114,6 +2208,7 @@ extern struct pid_namespace init_pid_ns;
63423 */
63424
63425 extern struct task_struct *find_task_by_vpid(pid_t nr);
63426+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
63427 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
63428 struct pid_namespace *ns);
63429
63430@@ -2235,6 +2330,12 @@ static inline void mmdrop(struct mm_struct * mm)
63431 extern void mmput(struct mm_struct *);
63432 /* Grab a reference to a task's mm, if it is not already going away */
63433 extern struct mm_struct *get_task_mm(struct task_struct *task);
63434+/*
63435+ * Grab a reference to a task's mm, if it is not already going away
63436+ * and ptrace_may_access with the mode parameter passed to it
63437+ * succeeds.
63438+ */
63439+extern struct mm_struct *mm_access(struct task_struct *task, unsigned int mode);
63440 /* Remove the current tasks stale references to the old mm_struct */
63441 extern void mm_release(struct task_struct *, struct mm_struct *);
63442 /* Allocate a new mm structure and copy contents from tsk->mm */
63443@@ -2251,7 +2352,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
63444 extern void exit_itimers(struct signal_struct *);
63445 extern void flush_itimer_signals(void);
63446
63447-extern NORET_TYPE void do_group_exit(int);
63448+extern __noreturn void do_group_exit(int);
63449
63450 extern void daemonize(const char *, ...);
63451 extern int allow_signal(int);
63452@@ -2416,13 +2517,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
63453
63454 #endif
63455
63456-static inline int object_is_on_stack(void *obj)
63457+static inline int object_starts_on_stack(void *obj)
63458 {
63459- void *stack = task_stack_page(current);
63460+ const void *stack = task_stack_page(current);
63461
63462 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
63463 }
63464
63465+#ifdef CONFIG_PAX_USERCOPY
63466+extern int object_is_on_stack(const void *obj, unsigned long len);
63467+#endif
63468+
63469 extern void thread_info_cache_init(void);
63470
63471 #ifdef CONFIG_DEBUG_STACK_USAGE
63472diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
63473index 899fbb4..1cb4138 100644
63474--- a/include/linux/screen_info.h
63475+++ b/include/linux/screen_info.h
63476@@ -43,7 +43,8 @@ struct screen_info {
63477 __u16 pages; /* 0x32 */
63478 __u16 vesa_attributes; /* 0x34 */
63479 __u32 capabilities; /* 0x36 */
63480- __u8 _reserved[6]; /* 0x3a */
63481+ __u16 vesapm_size; /* 0x3a */
63482+ __u8 _reserved[4]; /* 0x3c */
63483 } __attribute__((packed));
63484
63485 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
63486diff --git a/include/linux/security.h b/include/linux/security.h
63487index e8c619d..e0cbd1c 100644
63488--- a/include/linux/security.h
63489+++ b/include/linux/security.h
63490@@ -37,6 +37,7 @@
63491 #include <linux/xfrm.h>
63492 #include <linux/slab.h>
63493 #include <linux/xattr.h>
63494+#include <linux/grsecurity.h>
63495 #include <net/flow.h>
63496
63497 /* Maximum number of letters for an LSM name string */
63498diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
63499index 0b69a46..b2ffa4c 100644
63500--- a/include/linux/seq_file.h
63501+++ b/include/linux/seq_file.h
63502@@ -24,6 +24,9 @@ struct seq_file {
63503 struct mutex lock;
63504 const struct seq_operations *op;
63505 int poll_event;
63506+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63507+ u64 exec_id;
63508+#endif
63509 void *private;
63510 };
63511
63512@@ -33,6 +36,7 @@ struct seq_operations {
63513 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
63514 int (*show) (struct seq_file *m, void *v);
63515 };
63516+typedef struct seq_operations __no_const seq_operations_no_const;
63517
63518 #define SEQ_SKIP 1
63519
63520diff --git a/include/linux/shm.h b/include/linux/shm.h
63521index 92808b8..c28cac4 100644
63522--- a/include/linux/shm.h
63523+++ b/include/linux/shm.h
63524@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the kernel */
63525
63526 /* The task created the shm object. NULL if the task is dead. */
63527 struct task_struct *shm_creator;
63528+#ifdef CONFIG_GRKERNSEC
63529+ time_t shm_createtime;
63530+ pid_t shm_lapid;
63531+#endif
63532 };
63533
63534 /* shm_mode upper byte flags */
63535diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
63536index fe86488..1563c1c 100644
63537--- a/include/linux/skbuff.h
63538+++ b/include/linux/skbuff.h
63539@@ -642,7 +642,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
63540 */
63541 static inline int skb_queue_empty(const struct sk_buff_head *list)
63542 {
63543- return list->next == (struct sk_buff *)list;
63544+ return list->next == (const struct sk_buff *)list;
63545 }
63546
63547 /**
63548@@ -655,7 +655,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
63549 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63550 const struct sk_buff *skb)
63551 {
63552- return skb->next == (struct sk_buff *)list;
63553+ return skb->next == (const struct sk_buff *)list;
63554 }
63555
63556 /**
63557@@ -668,7 +668,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63558 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
63559 const struct sk_buff *skb)
63560 {
63561- return skb->prev == (struct sk_buff *)list;
63562+ return skb->prev == (const struct sk_buff *)list;
63563 }
63564
63565 /**
63566@@ -1523,7 +1523,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
63567 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
63568 */
63569 #ifndef NET_SKB_PAD
63570-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
63571+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
63572 #endif
63573
63574 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
63575diff --git a/include/linux/slab.h b/include/linux/slab.h
63576index 573c809..07e1f43 100644
63577--- a/include/linux/slab.h
63578+++ b/include/linux/slab.h
63579@@ -11,12 +11,20 @@
63580
63581 #include <linux/gfp.h>
63582 #include <linux/types.h>
63583+#include <linux/err.h>
63584
63585 /*
63586 * Flags to pass to kmem_cache_create().
63587 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
63588 */
63589 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
63590+
63591+#ifdef CONFIG_PAX_USERCOPY
63592+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
63593+#else
63594+#define SLAB_USERCOPY 0x00000000UL
63595+#endif
63596+
63597 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
63598 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
63599 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
63600@@ -87,10 +95,13 @@
63601 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
63602 * Both make kfree a no-op.
63603 */
63604-#define ZERO_SIZE_PTR ((void *)16)
63605+#define ZERO_SIZE_PTR \
63606+({ \
63607+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
63608+ (void *)(-MAX_ERRNO-1L); \
63609+})
63610
63611-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
63612- (unsigned long)ZERO_SIZE_PTR)
63613+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
63614
63615 /*
63616 * struct kmem_cache related prototypes
63617@@ -156,11 +167,12 @@ unsigned int kmem_cache_size(struct kmem_cache *);
63618 /*
63619 * Common kmalloc functions provided by all allocators
63620 */
63621-void * __must_check __krealloc(const void *, size_t, gfp_t);
63622-void * __must_check krealloc(const void *, size_t, gfp_t);
63623+void * __must_check __krealloc(const void *, size_t, gfp_t) __size_overflow(2);
63624+void * __must_check krealloc(const void *, size_t, gfp_t) __size_overflow(2);
63625 void kfree(const void *);
63626 void kzfree(const void *);
63627 size_t ksize(const void *);
63628+void check_object_size(const void *ptr, unsigned long n, bool to);
63629
63630 /*
63631 * Allocator specific definitions. These are mainly used to establish optimized
63632@@ -287,7 +299,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
63633 */
63634 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63635 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63636-extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63637+extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1);
63638 #define kmalloc_track_caller(size, flags) \
63639 __kmalloc_track_caller(size, flags, _RET_IP_)
63640 #else
63641@@ -306,7 +318,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63642 */
63643 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63644 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63645-extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
63646+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1);
63647 #define kmalloc_node_track_caller(size, flags, node) \
63648 __kmalloc_node_track_caller(size, flags, node, \
63649 _RET_IP_)
63650diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
63651index d00e0ba..d61fb1f 100644
63652--- a/include/linux/slab_def.h
63653+++ b/include/linux/slab_def.h
63654@@ -68,10 +68,10 @@ struct kmem_cache {
63655 unsigned long node_allocs;
63656 unsigned long node_frees;
63657 unsigned long node_overflow;
63658- atomic_t allochit;
63659- atomic_t allocmiss;
63660- atomic_t freehit;
63661- atomic_t freemiss;
63662+ atomic_unchecked_t allochit;
63663+ atomic_unchecked_t allocmiss;
63664+ atomic_unchecked_t freehit;
63665+ atomic_unchecked_t freemiss;
63666
63667 /*
63668 * If debugging is enabled, then the allocator can add additional
63669@@ -109,7 +109,7 @@ struct cache_sizes {
63670 extern struct cache_sizes malloc_sizes[];
63671
63672 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
63673-void *__kmalloc(size_t size, gfp_t flags);
63674+void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63675
63676 #ifdef CONFIG_TRACING
63677 extern void *kmem_cache_alloc_trace(size_t size,
63678@@ -127,6 +127,7 @@ static inline size_t slab_buffer_size(struct kmem_cache *cachep)
63679 }
63680 #endif
63681
63682+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63683 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63684 {
63685 struct kmem_cache *cachep;
63686@@ -162,7 +163,7 @@ found:
63687 }
63688
63689 #ifdef CONFIG_NUMA
63690-extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
63691+extern void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63692 extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
63693
63694 #ifdef CONFIG_TRACING
63695@@ -181,6 +182,7 @@ kmem_cache_alloc_node_trace(size_t size,
63696 }
63697 #endif
63698
63699+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63700 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63701 {
63702 struct kmem_cache *cachep;
63703diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
63704index 0ec00b3..65e7e0e 100644
63705--- a/include/linux/slob_def.h
63706+++ b/include/linux/slob_def.h
63707@@ -9,8 +9,9 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
63708 return kmem_cache_alloc_node(cachep, flags, -1);
63709 }
63710
63711-void *__kmalloc_node(size_t size, gfp_t flags, int node);
63712+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63713
63714+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63715 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63716 {
63717 return __kmalloc_node(size, flags, node);
63718@@ -24,11 +25,13 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63719 * kmalloc is the normal method of allocating memory
63720 * in the kernel.
63721 */
63722+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63723 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63724 {
63725 return __kmalloc_node(size, flags, -1);
63726 }
63727
63728+static __always_inline void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63729 static __always_inline void *__kmalloc(size_t size, gfp_t flags)
63730 {
63731 return kmalloc(size, flags);
63732diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
63733index a32bcfd..d26bd6e 100644
63734--- a/include/linux/slub_def.h
63735+++ b/include/linux/slub_def.h
63736@@ -89,7 +89,7 @@ struct kmem_cache {
63737 struct kmem_cache_order_objects max;
63738 struct kmem_cache_order_objects min;
63739 gfp_t allocflags; /* gfp flags to use on each alloc */
63740- int refcount; /* Refcount for slab cache destroy */
63741+ atomic_t refcount; /* Refcount for slab cache destroy */
63742 void (*ctor)(void *);
63743 int inuse; /* Offset to metadata */
63744 int align; /* Alignment */
63745@@ -204,6 +204,7 @@ static __always_inline int kmalloc_index(size_t size)
63746 * This ought to end up with a global pointer to the right cache
63747 * in kmalloc_caches.
63748 */
63749+static __always_inline struct kmem_cache *kmalloc_slab(size_t size) __size_overflow(1);
63750 static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
63751 {
63752 int index = kmalloc_index(size);
63753@@ -215,9 +216,11 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
63754 }
63755
63756 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
63757-void *__kmalloc(size_t size, gfp_t flags);
63758+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
63759
63760 static __always_inline void *
63761+kmalloc_order(size_t size, gfp_t flags, unsigned int order) __size_overflow(1);
63762+static __always_inline void *
63763 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
63764 {
63765 void *ret = (void *) __get_free_pages(flags | __GFP_COMP, order);
63766@@ -256,12 +259,14 @@ kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
63767 }
63768 #endif
63769
63770+static __always_inline void *kmalloc_large(size_t size, gfp_t flags) __size_overflow(1);
63771 static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
63772 {
63773 unsigned int order = get_order(size);
63774 return kmalloc_order_trace(size, flags, order);
63775 }
63776
63777+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63778 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63779 {
63780 if (__builtin_constant_p(size)) {
63781@@ -281,7 +286,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
63782 }
63783
63784 #ifdef CONFIG_NUMA
63785-void *__kmalloc_node(size_t size, gfp_t flags, int node);
63786+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63787 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
63788
63789 #ifdef CONFIG_TRACING
63790@@ -298,6 +303,7 @@ kmem_cache_alloc_node_trace(struct kmem_cache *s,
63791 }
63792 #endif
63793
63794+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63795 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63796 {
63797 if (__builtin_constant_p(size) &&
63798diff --git a/include/linux/sonet.h b/include/linux/sonet.h
63799index de8832d..0147b46 100644
63800--- a/include/linux/sonet.h
63801+++ b/include/linux/sonet.h
63802@@ -61,7 +61,7 @@ struct sonet_stats {
63803 #include <linux/atomic.h>
63804
63805 struct k_sonet_stats {
63806-#define __HANDLE_ITEM(i) atomic_t i
63807+#define __HANDLE_ITEM(i) atomic_unchecked_t i
63808 __SONET_ITEMS
63809 #undef __HANDLE_ITEM
63810 };
63811diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
63812index 3d8f9c4..69f1c0a 100644
63813--- a/include/linux/sunrpc/clnt.h
63814+++ b/include/linux/sunrpc/clnt.h
63815@@ -172,9 +172,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
63816 {
63817 switch (sap->sa_family) {
63818 case AF_INET:
63819- return ntohs(((struct sockaddr_in *)sap)->sin_port);
63820+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
63821 case AF_INET6:
63822- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
63823+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
63824 }
63825 return 0;
63826 }
63827@@ -207,7 +207,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
63828 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
63829 const struct sockaddr *src)
63830 {
63831- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
63832+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
63833 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
63834
63835 dsin->sin_family = ssin->sin_family;
63836@@ -310,7 +310,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
63837 if (sa->sa_family != AF_INET6)
63838 return 0;
63839
63840- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
63841+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
63842 }
63843
63844 #endif /* __KERNEL__ */
63845diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
63846index e775689..9e206d9 100644
63847--- a/include/linux/sunrpc/sched.h
63848+++ b/include/linux/sunrpc/sched.h
63849@@ -105,6 +105,7 @@ struct rpc_call_ops {
63850 void (*rpc_call_done)(struct rpc_task *, void *);
63851 void (*rpc_release)(void *);
63852 };
63853+typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
63854
63855 struct rpc_task_setup {
63856 struct rpc_task *task;
63857diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
63858index c14fe86..393245e 100644
63859--- a/include/linux/sunrpc/svc_rdma.h
63860+++ b/include/linux/sunrpc/svc_rdma.h
63861@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
63862 extern unsigned int svcrdma_max_requests;
63863 extern unsigned int svcrdma_max_req_size;
63864
63865-extern atomic_t rdma_stat_recv;
63866-extern atomic_t rdma_stat_read;
63867-extern atomic_t rdma_stat_write;
63868-extern atomic_t rdma_stat_sq_starve;
63869-extern atomic_t rdma_stat_rq_starve;
63870-extern atomic_t rdma_stat_rq_poll;
63871-extern atomic_t rdma_stat_rq_prod;
63872-extern atomic_t rdma_stat_sq_poll;
63873-extern atomic_t rdma_stat_sq_prod;
63874+extern atomic_unchecked_t rdma_stat_recv;
63875+extern atomic_unchecked_t rdma_stat_read;
63876+extern atomic_unchecked_t rdma_stat_write;
63877+extern atomic_unchecked_t rdma_stat_sq_starve;
63878+extern atomic_unchecked_t rdma_stat_rq_starve;
63879+extern atomic_unchecked_t rdma_stat_rq_poll;
63880+extern atomic_unchecked_t rdma_stat_rq_prod;
63881+extern atomic_unchecked_t rdma_stat_sq_poll;
63882+extern atomic_unchecked_t rdma_stat_sq_prod;
63883
63884 #define RPCRDMA_VERSION 1
63885
63886diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
63887index 703cfa33..0b8ca72ac 100644
63888--- a/include/linux/sysctl.h
63889+++ b/include/linux/sysctl.h
63890@@ -155,7 +155,11 @@ enum
63891 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
63892 };
63893
63894-
63895+#ifdef CONFIG_PAX_SOFTMODE
63896+enum {
63897+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
63898+};
63899+#endif
63900
63901 /* CTL_VM names: */
63902 enum
63903@@ -968,6 +972,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
63904
63905 extern int proc_dostring(struct ctl_table *, int,
63906 void __user *, size_t *, loff_t *);
63907+extern int proc_dostring_modpriv(struct ctl_table *, int,
63908+ void __user *, size_t *, loff_t *);
63909 extern int proc_dointvec(struct ctl_table *, int,
63910 void __user *, size_t *, loff_t *);
63911 extern int proc_dointvec_minmax(struct ctl_table *, int,
63912diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
63913index a71a292..51bd91d 100644
63914--- a/include/linux/tracehook.h
63915+++ b/include/linux/tracehook.h
63916@@ -54,12 +54,12 @@ struct linux_binprm;
63917 /*
63918 * ptrace report for syscall entry and exit looks identical.
63919 */
63920-static inline void ptrace_report_syscall(struct pt_regs *regs)
63921+static inline int ptrace_report_syscall(struct pt_regs *regs)
63922 {
63923 int ptrace = current->ptrace;
63924
63925 if (!(ptrace & PT_PTRACED))
63926- return;
63927+ return 0;
63928
63929 ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
63930
63931@@ -72,6 +72,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
63932 send_sig(current->exit_code, current, 1);
63933 current->exit_code = 0;
63934 }
63935+
63936+ return fatal_signal_pending(current);
63937 }
63938
63939 /**
63940@@ -96,8 +98,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
63941 static inline __must_check int tracehook_report_syscall_entry(
63942 struct pt_regs *regs)
63943 {
63944- ptrace_report_syscall(regs);
63945- return 0;
63946+ return ptrace_report_syscall(regs);
63947 }
63948
63949 /**
63950diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
63951index ff7dc08..893e1bd 100644
63952--- a/include/linux/tty_ldisc.h
63953+++ b/include/linux/tty_ldisc.h
63954@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
63955
63956 struct module *owner;
63957
63958- int refcount;
63959+ atomic_t refcount;
63960 };
63961
63962 struct tty_ldisc {
63963diff --git a/include/linux/types.h b/include/linux/types.h
63964index 57a9723..dbe234a 100644
63965--- a/include/linux/types.h
63966+++ b/include/linux/types.h
63967@@ -213,10 +213,26 @@ typedef struct {
63968 int counter;
63969 } atomic_t;
63970
63971+#ifdef CONFIG_PAX_REFCOUNT
63972+typedef struct {
63973+ int counter;
63974+} atomic_unchecked_t;
63975+#else
63976+typedef atomic_t atomic_unchecked_t;
63977+#endif
63978+
63979 #ifdef CONFIG_64BIT
63980 typedef struct {
63981 long counter;
63982 } atomic64_t;
63983+
63984+#ifdef CONFIG_PAX_REFCOUNT
63985+typedef struct {
63986+ long counter;
63987+} atomic64_unchecked_t;
63988+#else
63989+typedef atomic64_t atomic64_unchecked_t;
63990+#endif
63991 #endif
63992
63993 struct list_head {
63994diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
63995index 5ca0951..53a2fff 100644
63996--- a/include/linux/uaccess.h
63997+++ b/include/linux/uaccess.h
63998@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
63999 long ret; \
64000 mm_segment_t old_fs = get_fs(); \
64001 \
64002- set_fs(KERNEL_DS); \
64003 pagefault_disable(); \
64004- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
64005- pagefault_enable(); \
64006+ set_fs(KERNEL_DS); \
64007+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
64008 set_fs(old_fs); \
64009+ pagefault_enable(); \
64010 ret; \
64011 })
64012
64013@@ -105,7 +105,7 @@ extern long __probe_kernel_read(void *dst, const void *src, size_t size);
64014 * Safely write to address @dst from the buffer at @src. If a kernel fault
64015 * happens, handle that and return -EFAULT.
64016 */
64017-extern long notrace probe_kernel_write(void *dst, const void *src, size_t size);
64018+extern long notrace probe_kernel_write(void *dst, const void *src, size_t size) __size_overflow(3);
64019 extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
64020
64021 #endif /* __LINUX_UACCESS_H__ */
64022diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
64023index 99c1b4d..bb94261 100644
64024--- a/include/linux/unaligned/access_ok.h
64025+++ b/include/linux/unaligned/access_ok.h
64026@@ -6,32 +6,32 @@
64027
64028 static inline u16 get_unaligned_le16(const void *p)
64029 {
64030- return le16_to_cpup((__le16 *)p);
64031+ return le16_to_cpup((const __le16 *)p);
64032 }
64033
64034 static inline u32 get_unaligned_le32(const void *p)
64035 {
64036- return le32_to_cpup((__le32 *)p);
64037+ return le32_to_cpup((const __le32 *)p);
64038 }
64039
64040 static inline u64 get_unaligned_le64(const void *p)
64041 {
64042- return le64_to_cpup((__le64 *)p);
64043+ return le64_to_cpup((const __le64 *)p);
64044 }
64045
64046 static inline u16 get_unaligned_be16(const void *p)
64047 {
64048- return be16_to_cpup((__be16 *)p);
64049+ return be16_to_cpup((const __be16 *)p);
64050 }
64051
64052 static inline u32 get_unaligned_be32(const void *p)
64053 {
64054- return be32_to_cpup((__be32 *)p);
64055+ return be32_to_cpup((const __be32 *)p);
64056 }
64057
64058 static inline u64 get_unaligned_be64(const void *p)
64059 {
64060- return be64_to_cpup((__be64 *)p);
64061+ return be64_to_cpup((const __be64 *)p);
64062 }
64063
64064 static inline void put_unaligned_le16(u16 val, void *p)
64065diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
64066index e5a40c3..20ab0f6 100644
64067--- a/include/linux/usb/renesas_usbhs.h
64068+++ b/include/linux/usb/renesas_usbhs.h
64069@@ -39,7 +39,7 @@ enum {
64070 */
64071 struct renesas_usbhs_driver_callback {
64072 int (*notify_hotplug)(struct platform_device *pdev);
64073-};
64074+} __no_const;
64075
64076 /*
64077 * callback functions for platform
64078@@ -89,7 +89,7 @@ struct renesas_usbhs_platform_callback {
64079 * VBUS control is needed for Host
64080 */
64081 int (*set_vbus)(struct platform_device *pdev, int enable);
64082-};
64083+} __no_const;
64084
64085 /*
64086 * parameters for renesas usbhs
64087diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
64088index 6f8fbcf..8259001 100644
64089--- a/include/linux/vermagic.h
64090+++ b/include/linux/vermagic.h
64091@@ -25,9 +25,35 @@
64092 #define MODULE_ARCH_VERMAGIC ""
64093 #endif
64094
64095+#ifdef CONFIG_PAX_REFCOUNT
64096+#define MODULE_PAX_REFCOUNT "REFCOUNT "
64097+#else
64098+#define MODULE_PAX_REFCOUNT ""
64099+#endif
64100+
64101+#ifdef CONSTIFY_PLUGIN
64102+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
64103+#else
64104+#define MODULE_CONSTIFY_PLUGIN ""
64105+#endif
64106+
64107+#ifdef STACKLEAK_PLUGIN
64108+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
64109+#else
64110+#define MODULE_STACKLEAK_PLUGIN ""
64111+#endif
64112+
64113+#ifdef CONFIG_GRKERNSEC
64114+#define MODULE_GRSEC "GRSEC "
64115+#else
64116+#define MODULE_GRSEC ""
64117+#endif
64118+
64119 #define VERMAGIC_STRING \
64120 UTS_RELEASE " " \
64121 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
64122 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
64123- MODULE_ARCH_VERMAGIC
64124+ MODULE_ARCH_VERMAGIC \
64125+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
64126+ MODULE_GRSEC
64127
64128diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
64129index 4bde182..c42a656 100644
64130--- a/include/linux/vmalloc.h
64131+++ b/include/linux/vmalloc.h
64132@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
64133 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
64134 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
64135 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
64136+
64137+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
64138+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
64139+#endif
64140+
64141 /* bits [20..32] reserved for arch specific ioremap internals */
64142
64143 /*
64144@@ -51,18 +56,18 @@ static inline void vmalloc_init(void)
64145 }
64146 #endif
64147
64148-extern void *vmalloc(unsigned long size);
64149-extern void *vzalloc(unsigned long size);
64150-extern void *vmalloc_user(unsigned long size);
64151-extern void *vmalloc_node(unsigned long size, int node);
64152-extern void *vzalloc_node(unsigned long size, int node);
64153-extern void *vmalloc_exec(unsigned long size);
64154-extern void *vmalloc_32(unsigned long size);
64155-extern void *vmalloc_32_user(unsigned long size);
64156-extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
64157+extern void *vmalloc(unsigned long size) __size_overflow(1);
64158+extern void *vzalloc(unsigned long size) __size_overflow(1);
64159+extern void *vmalloc_user(unsigned long size) __size_overflow(1);
64160+extern void *vmalloc_node(unsigned long size, int node) __size_overflow(1);
64161+extern void *vzalloc_node(unsigned long size, int node) __size_overflow(1);
64162+extern void *vmalloc_exec(unsigned long size) __size_overflow(1);
64163+extern void *vmalloc_32(unsigned long size) __size_overflow(1);
64164+extern void *vmalloc_32_user(unsigned long size) __size_overflow(1);
64165+extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) __size_overflow(1);
64166 extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
64167 unsigned long start, unsigned long end, gfp_t gfp_mask,
64168- pgprot_t prot, int node, void *caller);
64169+ pgprot_t prot, int node, void *caller) __size_overflow(1);
64170 extern void vfree(const void *addr);
64171
64172 extern void *vmap(struct page **pages, unsigned int count,
64173@@ -123,8 +128,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes);
64174 extern void free_vm_area(struct vm_struct *area);
64175
64176 /* for /dev/kmem */
64177-extern long vread(char *buf, char *addr, unsigned long count);
64178-extern long vwrite(char *buf, char *addr, unsigned long count);
64179+extern long vread(char *buf, char *addr, unsigned long count) __size_overflow(3);
64180+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
64181
64182 /*
64183 * Internals. Dont't use..
64184diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
64185index 65efb92..137adbb 100644
64186--- a/include/linux/vmstat.h
64187+++ b/include/linux/vmstat.h
64188@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
64189 /*
64190 * Zone based page accounting with per cpu differentials.
64191 */
64192-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64193+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64194
64195 static inline void zone_page_state_add(long x, struct zone *zone,
64196 enum zone_stat_item item)
64197 {
64198- atomic_long_add(x, &zone->vm_stat[item]);
64199- atomic_long_add(x, &vm_stat[item]);
64200+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
64201+ atomic_long_add_unchecked(x, &vm_stat[item]);
64202 }
64203
64204 static inline unsigned long global_page_state(enum zone_stat_item item)
64205 {
64206- long x = atomic_long_read(&vm_stat[item]);
64207+ long x = atomic_long_read_unchecked(&vm_stat[item]);
64208 #ifdef CONFIG_SMP
64209 if (x < 0)
64210 x = 0;
64211@@ -109,7 +109,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
64212 static inline unsigned long zone_page_state(struct zone *zone,
64213 enum zone_stat_item item)
64214 {
64215- long x = atomic_long_read(&zone->vm_stat[item]);
64216+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64217 #ifdef CONFIG_SMP
64218 if (x < 0)
64219 x = 0;
64220@@ -126,7 +126,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
64221 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
64222 enum zone_stat_item item)
64223 {
64224- long x = atomic_long_read(&zone->vm_stat[item]);
64225+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64226
64227 #ifdef CONFIG_SMP
64228 int cpu;
64229@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
64230
64231 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
64232 {
64233- atomic_long_inc(&zone->vm_stat[item]);
64234- atomic_long_inc(&vm_stat[item]);
64235+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
64236+ atomic_long_inc_unchecked(&vm_stat[item]);
64237 }
64238
64239 static inline void __inc_zone_page_state(struct page *page,
64240@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page,
64241
64242 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
64243 {
64244- atomic_long_dec(&zone->vm_stat[item]);
64245- atomic_long_dec(&vm_stat[item]);
64246+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
64247+ atomic_long_dec_unchecked(&vm_stat[item]);
64248 }
64249
64250 static inline void __dec_zone_page_state(struct page *page,
64251diff --git a/include/linux/xattr.h b/include/linux/xattr.h
64252index e5d1220..ef6e406 100644
64253--- a/include/linux/xattr.h
64254+++ b/include/linux/xattr.h
64255@@ -57,6 +57,11 @@
64256 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
64257 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
64258
64259+/* User namespace */
64260+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
64261+#define XATTR_PAX_FLAGS_SUFFIX "flags"
64262+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
64263+
64264 #ifdef __KERNEL__
64265
64266 #include <linux/types.h>
64267diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
64268index 4aeff96..b378cdc 100644
64269--- a/include/media/saa7146_vv.h
64270+++ b/include/media/saa7146_vv.h
64271@@ -163,7 +163,7 @@ struct saa7146_ext_vv
64272 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
64273
64274 /* the extension can override this */
64275- struct v4l2_ioctl_ops ops;
64276+ v4l2_ioctl_ops_no_const ops;
64277 /* pointer to the saa7146 core ops */
64278 const struct v4l2_ioctl_ops *core_ops;
64279
64280diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
64281index c7c40f1..4f01585 100644
64282--- a/include/media/v4l2-dev.h
64283+++ b/include/media/v4l2-dev.h
64284@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
64285
64286
64287 struct v4l2_file_operations {
64288- struct module *owner;
64289+ struct module * const owner;
64290 ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
64291 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
64292 unsigned int (*poll) (struct file *, struct poll_table_struct *);
64293@@ -68,6 +68,7 @@ struct v4l2_file_operations {
64294 int (*open) (struct file *);
64295 int (*release) (struct file *);
64296 };
64297+typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
64298
64299 /*
64300 * Newer version of video_device, handled by videodev2.c
64301diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
64302index 4d1c74a..65e1221 100644
64303--- a/include/media/v4l2-ioctl.h
64304+++ b/include/media/v4l2-ioctl.h
64305@@ -274,7 +274,7 @@ struct v4l2_ioctl_ops {
64306 long (*vidioc_default) (struct file *file, void *fh,
64307 bool valid_prio, int cmd, void *arg);
64308 };
64309-
64310+typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
64311
64312 /* v4l debugging and diagnostics */
64313
64314diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
64315index 8d55251..dfe5b0a 100644
64316--- a/include/net/caif/caif_hsi.h
64317+++ b/include/net/caif/caif_hsi.h
64318@@ -98,7 +98,7 @@ struct cfhsi_drv {
64319 void (*rx_done_cb) (struct cfhsi_drv *drv);
64320 void (*wake_up_cb) (struct cfhsi_drv *drv);
64321 void (*wake_down_cb) (struct cfhsi_drv *drv);
64322-};
64323+} __no_const;
64324
64325 /* Structure implemented by HSI device. */
64326 struct cfhsi_dev {
64327diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
64328index 9e5425b..8136ffc 100644
64329--- a/include/net/caif/cfctrl.h
64330+++ b/include/net/caif/cfctrl.h
64331@@ -52,7 +52,7 @@ struct cfctrl_rsp {
64332 void (*radioset_rsp)(void);
64333 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
64334 struct cflayer *client_layer);
64335-};
64336+} __no_const;
64337
64338 /* Link Setup Parameters for CAIF-Links. */
64339 struct cfctrl_link_param {
64340@@ -101,8 +101,8 @@ struct cfctrl_request_info {
64341 struct cfctrl {
64342 struct cfsrvl serv;
64343 struct cfctrl_rsp res;
64344- atomic_t req_seq_no;
64345- atomic_t rsp_seq_no;
64346+ atomic_unchecked_t req_seq_no;
64347+ atomic_unchecked_t rsp_seq_no;
64348 struct list_head list;
64349 /* Protects from simultaneous access to first_req list */
64350 spinlock_t info_list_lock;
64351diff --git a/include/net/flow.h b/include/net/flow.h
64352index 2a7eefd..3250f3b 100644
64353--- a/include/net/flow.h
64354+++ b/include/net/flow.h
64355@@ -218,6 +218,6 @@ extern struct flow_cache_object *flow_cache_lookup(
64356
64357 extern void flow_cache_flush(void);
64358 extern void flow_cache_flush_deferred(void);
64359-extern atomic_t flow_cache_genid;
64360+extern atomic_unchecked_t flow_cache_genid;
64361
64362 #endif
64363diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
64364index e9ff3fc..9d3e5c7 100644
64365--- a/include/net/inetpeer.h
64366+++ b/include/net/inetpeer.h
64367@@ -48,8 +48,8 @@ struct inet_peer {
64368 */
64369 union {
64370 struct {
64371- atomic_t rid; /* Frag reception counter */
64372- atomic_t ip_id_count; /* IP ID for the next packet */
64373+ atomic_unchecked_t rid; /* Frag reception counter */
64374+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
64375 __u32 tcp_ts;
64376 __u32 tcp_ts_stamp;
64377 };
64378@@ -113,11 +113,11 @@ static inline int inet_getid(struct inet_peer *p, int more)
64379 more++;
64380 inet_peer_refcheck(p);
64381 do {
64382- old = atomic_read(&p->ip_id_count);
64383+ old = atomic_read_unchecked(&p->ip_id_count);
64384 new = old + more;
64385 if (!new)
64386 new = 1;
64387- } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
64388+ } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
64389 return new;
64390 }
64391
64392diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
64393index 10422ef..662570f 100644
64394--- a/include/net/ip_fib.h
64395+++ b/include/net/ip_fib.h
64396@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
64397
64398 #define FIB_RES_SADDR(net, res) \
64399 ((FIB_RES_NH(res).nh_saddr_genid == \
64400- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
64401+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
64402 FIB_RES_NH(res).nh_saddr : \
64403 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
64404 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
64405diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
64406index e5a7b9a..f4fc44b 100644
64407--- a/include/net/ip_vs.h
64408+++ b/include/net/ip_vs.h
64409@@ -509,7 +509,7 @@ struct ip_vs_conn {
64410 struct ip_vs_conn *control; /* Master control connection */
64411 atomic_t n_control; /* Number of controlled ones */
64412 struct ip_vs_dest *dest; /* real server */
64413- atomic_t in_pkts; /* incoming packet counter */
64414+ atomic_unchecked_t in_pkts; /* incoming packet counter */
64415
64416 /* packet transmitter for different forwarding methods. If it
64417 mangles the packet, it must return NF_DROP or better NF_STOLEN,
64418@@ -647,7 +647,7 @@ struct ip_vs_dest {
64419 __be16 port; /* port number of the server */
64420 union nf_inet_addr addr; /* IP address of the server */
64421 volatile unsigned flags; /* dest status flags */
64422- atomic_t conn_flags; /* flags to copy to conn */
64423+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
64424 atomic_t weight; /* server weight */
64425
64426 atomic_t refcnt; /* reference counter */
64427diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
64428index 69b610a..fe3962c 100644
64429--- a/include/net/irda/ircomm_core.h
64430+++ b/include/net/irda/ircomm_core.h
64431@@ -51,7 +51,7 @@ typedef struct {
64432 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
64433 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
64434 struct ircomm_info *);
64435-} call_t;
64436+} __no_const call_t;
64437
64438 struct ircomm_cb {
64439 irda_queue_t queue;
64440diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
64441index 59ba38bc..d515662 100644
64442--- a/include/net/irda/ircomm_tty.h
64443+++ b/include/net/irda/ircomm_tty.h
64444@@ -35,6 +35,7 @@
64445 #include <linux/termios.h>
64446 #include <linux/timer.h>
64447 #include <linux/tty.h> /* struct tty_struct */
64448+#include <asm/local.h>
64449
64450 #include <net/irda/irias_object.h>
64451 #include <net/irda/ircomm_core.h>
64452@@ -105,8 +106,8 @@ struct ircomm_tty_cb {
64453 unsigned short close_delay;
64454 unsigned short closing_wait; /* time to wait before closing */
64455
64456- int open_count;
64457- int blocked_open; /* # of blocked opens */
64458+ local_t open_count;
64459+ local_t blocked_open; /* # of blocked opens */
64460
64461 /* Protect concurent access to :
64462 * o self->open_count
64463diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
64464index f2419cf..473679f 100644
64465--- a/include/net/iucv/af_iucv.h
64466+++ b/include/net/iucv/af_iucv.h
64467@@ -139,7 +139,7 @@ struct iucv_sock {
64468 struct iucv_sock_list {
64469 struct hlist_head head;
64470 rwlock_t lock;
64471- atomic_t autobind_name;
64472+ atomic_unchecked_t autobind_name;
64473 };
64474
64475 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
64476diff --git a/include/net/neighbour.h b/include/net/neighbour.h
64477index 2720884..3aa5c25 100644
64478--- a/include/net/neighbour.h
64479+++ b/include/net/neighbour.h
64480@@ -122,7 +122,7 @@ struct neigh_ops {
64481 void (*error_report)(struct neighbour *, struct sk_buff *);
64482 int (*output)(struct neighbour *, struct sk_buff *);
64483 int (*connected_output)(struct neighbour *, struct sk_buff *);
64484-};
64485+} __do_const;
64486
64487 struct pneigh_entry {
64488 struct pneigh_entry *next;
64489diff --git a/include/net/netlink.h b/include/net/netlink.h
64490index cb1f350..3279d2c 100644
64491--- a/include/net/netlink.h
64492+++ b/include/net/netlink.h
64493@@ -569,7 +569,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
64494 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
64495 {
64496 if (mark)
64497- skb_trim(skb, (unsigned char *) mark - skb->data);
64498+ skb_trim(skb, (const unsigned char *) mark - skb->data);
64499 }
64500
64501 /**
64502diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
64503index d786b4f..4c3dd41 100644
64504--- a/include/net/netns/ipv4.h
64505+++ b/include/net/netns/ipv4.h
64506@@ -56,8 +56,8 @@ struct netns_ipv4 {
64507
64508 unsigned int sysctl_ping_group_range[2];
64509
64510- atomic_t rt_genid;
64511- atomic_t dev_addr_genid;
64512+ atomic_unchecked_t rt_genid;
64513+ atomic_unchecked_t dev_addr_genid;
64514
64515 #ifdef CONFIG_IP_MROUTE
64516 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
64517diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
64518index 6a72a58..e6a127d 100644
64519--- a/include/net/sctp/sctp.h
64520+++ b/include/net/sctp/sctp.h
64521@@ -318,9 +318,9 @@ do { \
64522
64523 #else /* SCTP_DEBUG */
64524
64525-#define SCTP_DEBUG_PRINTK(whatever...)
64526-#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
64527-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
64528+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
64529+#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
64530+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
64531 #define SCTP_ENABLE_DEBUG
64532 #define SCTP_DISABLE_DEBUG
64533 #define SCTP_ASSERT(expr, str, func)
64534diff --git a/include/net/sock.h b/include/net/sock.h
64535index 32e3937..87a1dbc 100644
64536--- a/include/net/sock.h
64537+++ b/include/net/sock.h
64538@@ -277,7 +277,7 @@ struct sock {
64539 #ifdef CONFIG_RPS
64540 __u32 sk_rxhash;
64541 #endif
64542- atomic_t sk_drops;
64543+ atomic_unchecked_t sk_drops;
64544 int sk_rcvbuf;
64545
64546 struct sk_filter __rcu *sk_filter;
64547@@ -1402,7 +1402,7 @@ static inline void sk_nocaps_add(struct sock *sk, int flags)
64548 }
64549
64550 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
64551- char __user *from, char *to,
64552+ char __user *from, unsigned char *to,
64553 int copy, int offset)
64554 {
64555 if (skb->ip_summed == CHECKSUM_NONE) {
64556diff --git a/include/net/tcp.h b/include/net/tcp.h
64557index bb18c4d..bb87972 100644
64558--- a/include/net/tcp.h
64559+++ b/include/net/tcp.h
64560@@ -1409,7 +1409,7 @@ struct tcp_seq_afinfo {
64561 char *name;
64562 sa_family_t family;
64563 const struct file_operations *seq_fops;
64564- struct seq_operations seq_ops;
64565+ seq_operations_no_const seq_ops;
64566 };
64567
64568 struct tcp_iter_state {
64569diff --git a/include/net/udp.h b/include/net/udp.h
64570index 3b285f4..0219639 100644
64571--- a/include/net/udp.h
64572+++ b/include/net/udp.h
64573@@ -237,7 +237,7 @@ struct udp_seq_afinfo {
64574 sa_family_t family;
64575 struct udp_table *udp_table;
64576 const struct file_operations *seq_fops;
64577- struct seq_operations seq_ops;
64578+ seq_operations_no_const seq_ops;
64579 };
64580
64581 struct udp_iter_state {
64582diff --git a/include/net/xfrm.h b/include/net/xfrm.h
64583index b203e14..1df3991 100644
64584--- a/include/net/xfrm.h
64585+++ b/include/net/xfrm.h
64586@@ -505,7 +505,7 @@ struct xfrm_policy {
64587 struct timer_list timer;
64588
64589 struct flow_cache_object flo;
64590- atomic_t genid;
64591+ atomic_unchecked_t genid;
64592 u32 priority;
64593 u32 index;
64594 struct xfrm_mark mark;
64595diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
64596index 1a046b1..ee0bef0 100644
64597--- a/include/rdma/iw_cm.h
64598+++ b/include/rdma/iw_cm.h
64599@@ -122,7 +122,7 @@ struct iw_cm_verbs {
64600 int backlog);
64601
64602 int (*destroy_listen)(struct iw_cm_id *cm_id);
64603-};
64604+} __no_const;
64605
64606 /**
64607 * iw_create_cm_id - Create an IW CM identifier.
64608diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
64609index 5d1a758..1dbf795 100644
64610--- a/include/scsi/libfc.h
64611+++ b/include/scsi/libfc.h
64612@@ -748,6 +748,7 @@ struct libfc_function_template {
64613 */
64614 void (*disc_stop_final) (struct fc_lport *);
64615 };
64616+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
64617
64618 /**
64619 * struct fc_disc - Discovery context
64620@@ -851,7 +852,7 @@ struct fc_lport {
64621 struct fc_vport *vport;
64622
64623 /* Operational Information */
64624- struct libfc_function_template tt;
64625+ libfc_function_template_no_const tt;
64626 u8 link_up;
64627 u8 qfull;
64628 enum fc_lport_state state;
64629diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
64630index 5591ed5..13eb457 100644
64631--- a/include/scsi/scsi_device.h
64632+++ b/include/scsi/scsi_device.h
64633@@ -161,9 +161,9 @@ struct scsi_device {
64634 unsigned int max_device_blocked; /* what device_blocked counts down from */
64635 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
64636
64637- atomic_t iorequest_cnt;
64638- atomic_t iodone_cnt;
64639- atomic_t ioerr_cnt;
64640+ atomic_unchecked_t iorequest_cnt;
64641+ atomic_unchecked_t iodone_cnt;
64642+ atomic_unchecked_t ioerr_cnt;
64643
64644 struct device sdev_gendev,
64645 sdev_dev;
64646diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
64647index 2a65167..91e01f8 100644
64648--- a/include/scsi/scsi_transport_fc.h
64649+++ b/include/scsi/scsi_transport_fc.h
64650@@ -711,7 +711,7 @@ struct fc_function_template {
64651 unsigned long show_host_system_hostname:1;
64652
64653 unsigned long disable_target_scan:1;
64654-};
64655+} __do_const;
64656
64657
64658 /**
64659diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
64660index 030b87c..98a6954 100644
64661--- a/include/sound/ak4xxx-adda.h
64662+++ b/include/sound/ak4xxx-adda.h
64663@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
64664 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
64665 unsigned char val);
64666 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
64667-};
64668+} __no_const;
64669
64670 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
64671
64672diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
64673index 8c05e47..2b5df97 100644
64674--- a/include/sound/hwdep.h
64675+++ b/include/sound/hwdep.h
64676@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
64677 struct snd_hwdep_dsp_status *status);
64678 int (*dsp_load)(struct snd_hwdep *hw,
64679 struct snd_hwdep_dsp_image *image);
64680-};
64681+} __no_const;
64682
64683 struct snd_hwdep {
64684 struct snd_card *card;
64685diff --git a/include/sound/info.h b/include/sound/info.h
64686index 5492cc4..1a65278 100644
64687--- a/include/sound/info.h
64688+++ b/include/sound/info.h
64689@@ -44,7 +44,7 @@ struct snd_info_entry_text {
64690 struct snd_info_buffer *buffer);
64691 void (*write)(struct snd_info_entry *entry,
64692 struct snd_info_buffer *buffer);
64693-};
64694+} __no_const;
64695
64696 struct snd_info_entry_ops {
64697 int (*open)(struct snd_info_entry *entry,
64698diff --git a/include/sound/pcm.h b/include/sound/pcm.h
64699index 0cf91b2..b70cae4 100644
64700--- a/include/sound/pcm.h
64701+++ b/include/sound/pcm.h
64702@@ -81,6 +81,7 @@ struct snd_pcm_ops {
64703 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
64704 int (*ack)(struct snd_pcm_substream *substream);
64705 };
64706+typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
64707
64708 /*
64709 *
64710diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
64711index af1b49e..a5d55a5 100644
64712--- a/include/sound/sb16_csp.h
64713+++ b/include/sound/sb16_csp.h
64714@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
64715 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
64716 int (*csp_stop) (struct snd_sb_csp * p);
64717 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
64718-};
64719+} __no_const;
64720
64721 /*
64722 * CSP private data
64723diff --git a/include/sound/soc.h b/include/sound/soc.h
64724index 11cfb59..e3f93f4 100644
64725--- a/include/sound/soc.h
64726+++ b/include/sound/soc.h
64727@@ -683,7 +683,7 @@ struct snd_soc_platform_driver {
64728 /* platform IO - used for platform DAPM */
64729 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
64730 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
64731-};
64732+} __do_const;
64733
64734 struct snd_soc_platform {
64735 const char *name;
64736diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
64737index 444cd6b..3327cc5 100644
64738--- a/include/sound/ymfpci.h
64739+++ b/include/sound/ymfpci.h
64740@@ -358,7 +358,7 @@ struct snd_ymfpci {
64741 spinlock_t reg_lock;
64742 spinlock_t voice_lock;
64743 wait_queue_head_t interrupt_sleep;
64744- atomic_t interrupt_sleep_count;
64745+ atomic_unchecked_t interrupt_sleep_count;
64746 struct snd_info_entry *proc_entry;
64747 const struct firmware *dsp_microcode;
64748 const struct firmware *controller_microcode;
64749diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
64750index 94bbec3..3a8c6b0 100644
64751--- a/include/target/target_core_base.h
64752+++ b/include/target/target_core_base.h
64753@@ -346,7 +346,7 @@ struct t10_reservation_ops {
64754 int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
64755 int (*t10_pr_register)(struct se_cmd *);
64756 int (*t10_pr_clear)(struct se_cmd *);
64757-};
64758+} __no_const;
64759
64760 struct t10_reservation {
64761 /* Reservation effects all target ports */
64762@@ -465,8 +465,8 @@ struct se_cmd {
64763 atomic_t t_se_count;
64764 atomic_t t_task_cdbs_left;
64765 atomic_t t_task_cdbs_ex_left;
64766- atomic_t t_task_cdbs_sent;
64767- atomic_t t_transport_aborted;
64768+ atomic_unchecked_t t_task_cdbs_sent;
64769+ atomic_unchecked_t t_transport_aborted;
64770 atomic_t t_transport_active;
64771 atomic_t t_transport_complete;
64772 atomic_t t_transport_queue_active;
64773@@ -705,7 +705,7 @@ struct se_device {
64774 /* Active commands on this virtual SE device */
64775 atomic_t simple_cmds;
64776 atomic_t depth_left;
64777- atomic_t dev_ordered_id;
64778+ atomic_unchecked_t dev_ordered_id;
64779 atomic_t execute_tasks;
64780 atomic_t dev_ordered_sync;
64781 atomic_t dev_qf_count;
64782diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
64783index 1c09820..7f5ec79 100644
64784--- a/include/trace/events/irq.h
64785+++ b/include/trace/events/irq.h
64786@@ -36,7 +36,7 @@ struct softirq_action;
64787 */
64788 TRACE_EVENT(irq_handler_entry,
64789
64790- TP_PROTO(int irq, struct irqaction *action),
64791+ TP_PROTO(int irq, const struct irqaction *action),
64792
64793 TP_ARGS(irq, action),
64794
64795@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
64796 */
64797 TRACE_EVENT(irq_handler_exit,
64798
64799- TP_PROTO(int irq, struct irqaction *action, int ret),
64800+ TP_PROTO(int irq, const struct irqaction *action, int ret),
64801
64802 TP_ARGS(irq, action, ret),
64803
64804diff --git a/include/video/udlfb.h b/include/video/udlfb.h
64805index c41f308..6918de3 100644
64806--- a/include/video/udlfb.h
64807+++ b/include/video/udlfb.h
64808@@ -52,10 +52,10 @@ struct dlfb_data {
64809 u32 pseudo_palette[256];
64810 int blank_mode; /*one of FB_BLANK_ */
64811 /* blit-only rendering path metrics, exposed through sysfs */
64812- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
64813- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
64814- atomic_t bytes_sent; /* to usb, after compression including overhead */
64815- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
64816+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
64817+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
64818+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
64819+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
64820 };
64821
64822 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
64823diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
64824index 0993a22..32ba2fe 100644
64825--- a/include/video/uvesafb.h
64826+++ b/include/video/uvesafb.h
64827@@ -177,6 +177,7 @@ struct uvesafb_par {
64828 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
64829 u8 pmi_setpal; /* PMI for palette changes */
64830 u16 *pmi_base; /* protected mode interface location */
64831+ u8 *pmi_code; /* protected mode code location */
64832 void *pmi_start;
64833 void *pmi_pal;
64834 u8 *vbe_state_orig; /*
64835diff --git a/init/Kconfig b/init/Kconfig
64836index 43298f9..2f56c12 100644
64837--- a/init/Kconfig
64838+++ b/init/Kconfig
64839@@ -1214,7 +1214,7 @@ config SLUB_DEBUG
64840
64841 config COMPAT_BRK
64842 bool "Disable heap randomization"
64843- default y
64844+ default n
64845 help
64846 Randomizing heap placement makes heap exploits harder, but it
64847 also breaks ancient binaries (including anything libc5 based).
64848diff --git a/init/do_mounts.c b/init/do_mounts.c
64849index db6e5ee..7677ff7 100644
64850--- a/init/do_mounts.c
64851+++ b/init/do_mounts.c
64852@@ -325,11 +325,11 @@ static void __init get_fs_names(char *page)
64853
64854 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
64855 {
64856- int err = sys_mount(name, "/root", fs, flags, data);
64857+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
64858 if (err)
64859 return err;
64860
64861- sys_chdir((const char __user __force *)"/root");
64862+ sys_chdir((const char __force_user*)"/root");
64863 ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
64864 printk(KERN_INFO
64865 "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
64866@@ -448,18 +448,18 @@ void __init change_floppy(char *fmt, ...)
64867 va_start(args, fmt);
64868 vsprintf(buf, fmt, args);
64869 va_end(args);
64870- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
64871+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
64872 if (fd >= 0) {
64873 sys_ioctl(fd, FDEJECT, 0);
64874 sys_close(fd);
64875 }
64876 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
64877- fd = sys_open("/dev/console", O_RDWR, 0);
64878+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
64879 if (fd >= 0) {
64880 sys_ioctl(fd, TCGETS, (long)&termios);
64881 termios.c_lflag &= ~ICANON;
64882 sys_ioctl(fd, TCSETSF, (long)&termios);
64883- sys_read(fd, &c, 1);
64884+ sys_read(fd, (char __user *)&c, 1);
64885 termios.c_lflag |= ICANON;
64886 sys_ioctl(fd, TCSETSF, (long)&termios);
64887 sys_close(fd);
64888@@ -553,6 +553,6 @@ void __init prepare_namespace(void)
64889 mount_root();
64890 out:
64891 devtmpfs_mount("dev");
64892- sys_mount(".", "/", NULL, MS_MOVE, NULL);
64893- sys_chroot((const char __user __force *)".");
64894+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
64895+ sys_chroot((const char __force_user *)".");
64896 }
64897diff --git a/init/do_mounts.h b/init/do_mounts.h
64898index f5b978a..69dbfe8 100644
64899--- a/init/do_mounts.h
64900+++ b/init/do_mounts.h
64901@@ -15,15 +15,15 @@ extern int root_mountflags;
64902
64903 static inline int create_dev(char *name, dev_t dev)
64904 {
64905- sys_unlink(name);
64906- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
64907+ sys_unlink((char __force_user *)name);
64908+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
64909 }
64910
64911 #if BITS_PER_LONG == 32
64912 static inline u32 bstat(char *name)
64913 {
64914 struct stat64 stat;
64915- if (sys_stat64(name, &stat) != 0)
64916+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
64917 return 0;
64918 if (!S_ISBLK(stat.st_mode))
64919 return 0;
64920@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
64921 static inline u32 bstat(char *name)
64922 {
64923 struct stat stat;
64924- if (sys_newstat(name, &stat) != 0)
64925+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
64926 return 0;
64927 if (!S_ISBLK(stat.st_mode))
64928 return 0;
64929diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
64930index 3098a38..253064e 100644
64931--- a/init/do_mounts_initrd.c
64932+++ b/init/do_mounts_initrd.c
64933@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
64934 create_dev("/dev/root.old", Root_RAM0);
64935 /* mount initrd on rootfs' /root */
64936 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
64937- sys_mkdir("/old", 0700);
64938- root_fd = sys_open("/", 0, 0);
64939- old_fd = sys_open("/old", 0, 0);
64940+ sys_mkdir((const char __force_user *)"/old", 0700);
64941+ root_fd = sys_open((const char __force_user *)"/", 0, 0);
64942+ old_fd = sys_open((const char __force_user *)"/old", 0, 0);
64943 /* move initrd over / and chdir/chroot in initrd root */
64944- sys_chdir("/root");
64945- sys_mount(".", "/", NULL, MS_MOVE, NULL);
64946- sys_chroot(".");
64947+ sys_chdir((const char __force_user *)"/root");
64948+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
64949+ sys_chroot((const char __force_user *)".");
64950
64951 /*
64952 * In case that a resume from disk is carried out by linuxrc or one of
64953@@ -67,15 +67,15 @@ static void __init handle_initrd(void)
64954
64955 /* move initrd to rootfs' /old */
64956 sys_fchdir(old_fd);
64957- sys_mount("/", ".", NULL, MS_MOVE, NULL);
64958+ sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
64959 /* switch root and cwd back to / of rootfs */
64960 sys_fchdir(root_fd);
64961- sys_chroot(".");
64962+ sys_chroot((const char __force_user *)".");
64963 sys_close(old_fd);
64964 sys_close(root_fd);
64965
64966 if (new_decode_dev(real_root_dev) == Root_RAM0) {
64967- sys_chdir("/old");
64968+ sys_chdir((const char __force_user *)"/old");
64969 return;
64970 }
64971
64972@@ -83,17 +83,17 @@ static void __init handle_initrd(void)
64973 mount_root();
64974
64975 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
64976- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
64977+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
64978 if (!error)
64979 printk("okay\n");
64980 else {
64981- int fd = sys_open("/dev/root.old", O_RDWR, 0);
64982+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
64983 if (error == -ENOENT)
64984 printk("/initrd does not exist. Ignored.\n");
64985 else
64986 printk("failed\n");
64987 printk(KERN_NOTICE "Unmounting old root\n");
64988- sys_umount("/old", MNT_DETACH);
64989+ sys_umount((char __force_user *)"/old", MNT_DETACH);
64990 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
64991 if (fd < 0) {
64992 error = fd;
64993@@ -116,11 +116,11 @@ int __init initrd_load(void)
64994 * mounted in the normal path.
64995 */
64996 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
64997- sys_unlink("/initrd.image");
64998+ sys_unlink((const char __force_user *)"/initrd.image");
64999 handle_initrd();
65000 return 1;
65001 }
65002 }
65003- sys_unlink("/initrd.image");
65004+ sys_unlink((const char __force_user *)"/initrd.image");
65005 return 0;
65006 }
65007diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
65008index 32c4799..c27ee74 100644
65009--- a/init/do_mounts_md.c
65010+++ b/init/do_mounts_md.c
65011@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
65012 partitioned ? "_d" : "", minor,
65013 md_setup_args[ent].device_names);
65014
65015- fd = sys_open(name, 0, 0);
65016+ fd = sys_open((char __force_user *)name, 0, 0);
65017 if (fd < 0) {
65018 printk(KERN_ERR "md: open failed - cannot start "
65019 "array %s\n", name);
65020@@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
65021 * array without it
65022 */
65023 sys_close(fd);
65024- fd = sys_open(name, 0, 0);
65025+ fd = sys_open((char __force_user *)name, 0, 0);
65026 sys_ioctl(fd, BLKRRPART, 0);
65027 }
65028 sys_close(fd);
65029@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
65030
65031 wait_for_device_probe();
65032
65033- fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
65034+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
65035 if (fd >= 0) {
65036 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
65037 sys_close(fd);
65038diff --git a/init/initramfs.c b/init/initramfs.c
65039index 2531811..040d4d4 100644
65040--- a/init/initramfs.c
65041+++ b/init/initramfs.c
65042@@ -74,7 +74,7 @@ static void __init free_hash(void)
65043 }
65044 }
65045
65046-static long __init do_utime(char __user *filename, time_t mtime)
65047+static long __init do_utime(__force char __user *filename, time_t mtime)
65048 {
65049 struct timespec t[2];
65050
65051@@ -109,7 +109,7 @@ static void __init dir_utime(void)
65052 struct dir_entry *de, *tmp;
65053 list_for_each_entry_safe(de, tmp, &dir_list, list) {
65054 list_del(&de->list);
65055- do_utime(de->name, de->mtime);
65056+ do_utime((char __force_user *)de->name, de->mtime);
65057 kfree(de->name);
65058 kfree(de);
65059 }
65060@@ -271,7 +271,7 @@ static int __init maybe_link(void)
65061 if (nlink >= 2) {
65062 char *old = find_link(major, minor, ino, mode, collected);
65063 if (old)
65064- return (sys_link(old, collected) < 0) ? -1 : 1;
65065+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
65066 }
65067 return 0;
65068 }
65069@@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode)
65070 {
65071 struct stat st;
65072
65073- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
65074+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
65075 if (S_ISDIR(st.st_mode))
65076- sys_rmdir(path);
65077+ sys_rmdir((char __force_user *)path);
65078 else
65079- sys_unlink(path);
65080+ sys_unlink((char __force_user *)path);
65081 }
65082 }
65083
65084@@ -305,7 +305,7 @@ static int __init do_name(void)
65085 int openflags = O_WRONLY|O_CREAT;
65086 if (ml != 1)
65087 openflags |= O_TRUNC;
65088- wfd = sys_open(collected, openflags, mode);
65089+ wfd = sys_open((char __force_user *)collected, openflags, mode);
65090
65091 if (wfd >= 0) {
65092 sys_fchown(wfd, uid, gid);
65093@@ -317,17 +317,17 @@ static int __init do_name(void)
65094 }
65095 }
65096 } else if (S_ISDIR(mode)) {
65097- sys_mkdir(collected, mode);
65098- sys_chown(collected, uid, gid);
65099- sys_chmod(collected, mode);
65100+ sys_mkdir((char __force_user *)collected, mode);
65101+ sys_chown((char __force_user *)collected, uid, gid);
65102+ sys_chmod((char __force_user *)collected, mode);
65103 dir_add(collected, mtime);
65104 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
65105 S_ISFIFO(mode) || S_ISSOCK(mode)) {
65106 if (maybe_link() == 0) {
65107- sys_mknod(collected, mode, rdev);
65108- sys_chown(collected, uid, gid);
65109- sys_chmod(collected, mode);
65110- do_utime(collected, mtime);
65111+ sys_mknod((char __force_user *)collected, mode, rdev);
65112+ sys_chown((char __force_user *)collected, uid, gid);
65113+ sys_chmod((char __force_user *)collected, mode);
65114+ do_utime((char __force_user *)collected, mtime);
65115 }
65116 }
65117 return 0;
65118@@ -336,15 +336,15 @@ static int __init do_name(void)
65119 static int __init do_copy(void)
65120 {
65121 if (count >= body_len) {
65122- sys_write(wfd, victim, body_len);
65123+ sys_write(wfd, (char __force_user *)victim, body_len);
65124 sys_close(wfd);
65125- do_utime(vcollected, mtime);
65126+ do_utime((char __force_user *)vcollected, mtime);
65127 kfree(vcollected);
65128 eat(body_len);
65129 state = SkipIt;
65130 return 0;
65131 } else {
65132- sys_write(wfd, victim, count);
65133+ sys_write(wfd, (char __force_user *)victim, count);
65134 body_len -= count;
65135 eat(count);
65136 return 1;
65137@@ -355,9 +355,9 @@ static int __init do_symlink(void)
65138 {
65139 collected[N_ALIGN(name_len) + body_len] = '\0';
65140 clean_path(collected, 0);
65141- sys_symlink(collected + N_ALIGN(name_len), collected);
65142- sys_lchown(collected, uid, gid);
65143- do_utime(collected, mtime);
65144+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
65145+ sys_lchown((char __force_user *)collected, uid, gid);
65146+ do_utime((char __force_user *)collected, mtime);
65147 state = SkipIt;
65148 next_state = Reset;
65149 return 0;
65150diff --git a/init/main.c b/init/main.c
65151index 217ed23..ec5406f 100644
65152--- a/init/main.c
65153+++ b/init/main.c
65154@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
65155 extern void tc_init(void);
65156 #endif
65157
65158+extern void grsecurity_init(void);
65159+
65160 /*
65161 * Debug helper: via this flag we know that we are in 'early bootup code'
65162 * where only the boot processor is running with IRQ disabled. This means
65163@@ -149,6 +151,49 @@ static int __init set_reset_devices(char *str)
65164
65165 __setup("reset_devices", set_reset_devices);
65166
65167+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
65168+extern char pax_enter_kernel_user[];
65169+extern char pax_exit_kernel_user[];
65170+extern pgdval_t clone_pgd_mask;
65171+#endif
65172+
65173+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
65174+static int __init setup_pax_nouderef(char *str)
65175+{
65176+#ifdef CONFIG_X86_32
65177+ unsigned int cpu;
65178+ struct desc_struct *gdt;
65179+
65180+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
65181+ gdt = get_cpu_gdt_table(cpu);
65182+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
65183+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
65184+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
65185+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
65186+ }
65187+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
65188+#else
65189+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
65190+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
65191+ clone_pgd_mask = ~(pgdval_t)0UL;
65192+#endif
65193+
65194+ return 0;
65195+}
65196+early_param("pax_nouderef", setup_pax_nouderef);
65197+#endif
65198+
65199+#ifdef CONFIG_PAX_SOFTMODE
65200+int pax_softmode;
65201+
65202+static int __init setup_pax_softmode(char *str)
65203+{
65204+ get_option(&str, &pax_softmode);
65205+ return 1;
65206+}
65207+__setup("pax_softmode=", setup_pax_softmode);
65208+#endif
65209+
65210 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
65211 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
65212 static const char *panic_later, *panic_param;
65213@@ -681,6 +726,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
65214 {
65215 int count = preempt_count();
65216 int ret;
65217+ const char *msg1 = "", *msg2 = "";
65218
65219 if (initcall_debug)
65220 ret = do_one_initcall_debug(fn);
65221@@ -693,15 +739,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
65222 sprintf(msgbuf, "error code %d ", ret);
65223
65224 if (preempt_count() != count) {
65225- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
65226+ msg1 = " preemption imbalance";
65227 preempt_count() = count;
65228 }
65229 if (irqs_disabled()) {
65230- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
65231+ msg2 = " disabled interrupts";
65232 local_irq_enable();
65233 }
65234- if (msgbuf[0]) {
65235- printk("initcall %pF returned with %s\n", fn, msgbuf);
65236+ if (msgbuf[0] || *msg1 || *msg2) {
65237+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
65238 }
65239
65240 return ret;
65241@@ -820,7 +866,7 @@ static int __init kernel_init(void * unused)
65242 do_basic_setup();
65243
65244 /* Open the /dev/console on the rootfs, this should never fail */
65245- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
65246+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
65247 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
65248
65249 (void) sys_dup(0);
65250@@ -833,11 +879,13 @@ static int __init kernel_init(void * unused)
65251 if (!ramdisk_execute_command)
65252 ramdisk_execute_command = "/init";
65253
65254- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
65255+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
65256 ramdisk_execute_command = NULL;
65257 prepare_namespace();
65258 }
65259
65260+ grsecurity_init();
65261+
65262 /*
65263 * Ok, we have completed the initial bootup, and
65264 * we're essentially up and running. Get rid of the
65265diff --git a/ipc/mqueue.c b/ipc/mqueue.c
65266index 5b4293d..f179875 100644
65267--- a/ipc/mqueue.c
65268+++ b/ipc/mqueue.c
65269@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
65270 mq_bytes = (mq_msg_tblsz +
65271 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
65272
65273+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
65274 spin_lock(&mq_lock);
65275 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
65276 u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
65277diff --git a/ipc/msg.c b/ipc/msg.c
65278index 7385de2..a8180e08 100644
65279--- a/ipc/msg.c
65280+++ b/ipc/msg.c
65281@@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
65282 return security_msg_queue_associate(msq, msgflg);
65283 }
65284
65285+static struct ipc_ops msg_ops = {
65286+ .getnew = newque,
65287+ .associate = msg_security,
65288+ .more_checks = NULL
65289+};
65290+
65291 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
65292 {
65293 struct ipc_namespace *ns;
65294- struct ipc_ops msg_ops;
65295 struct ipc_params msg_params;
65296
65297 ns = current->nsproxy->ipc_ns;
65298
65299- msg_ops.getnew = newque;
65300- msg_ops.associate = msg_security;
65301- msg_ops.more_checks = NULL;
65302-
65303 msg_params.key = key;
65304 msg_params.flg = msgflg;
65305
65306diff --git a/ipc/sem.c b/ipc/sem.c
65307index 5215a81..cfc0cac 100644
65308--- a/ipc/sem.c
65309+++ b/ipc/sem.c
65310@@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
65311 return 0;
65312 }
65313
65314+static struct ipc_ops sem_ops = {
65315+ .getnew = newary,
65316+ .associate = sem_security,
65317+ .more_checks = sem_more_checks
65318+};
65319+
65320 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65321 {
65322 struct ipc_namespace *ns;
65323- struct ipc_ops sem_ops;
65324 struct ipc_params sem_params;
65325
65326 ns = current->nsproxy->ipc_ns;
65327@@ -375,10 +380,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65328 if (nsems < 0 || nsems > ns->sc_semmsl)
65329 return -EINVAL;
65330
65331- sem_ops.getnew = newary;
65332- sem_ops.associate = sem_security;
65333- sem_ops.more_checks = sem_more_checks;
65334-
65335 sem_params.key = key;
65336 sem_params.flg = semflg;
65337 sem_params.u.nsems = nsems;
65338diff --git a/ipc/shm.c b/ipc/shm.c
65339index b76be5b..859e750 100644
65340--- a/ipc/shm.c
65341+++ b/ipc/shm.c
65342@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
65343 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
65344 #endif
65345
65346+#ifdef CONFIG_GRKERNSEC
65347+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65348+ const time_t shm_createtime, const uid_t cuid,
65349+ const int shmid);
65350+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65351+ const time_t shm_createtime);
65352+#endif
65353+
65354 void shm_init_ns(struct ipc_namespace *ns)
65355 {
65356 ns->shm_ctlmax = SHMMAX;
65357@@ -508,6 +516,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
65358 shp->shm_lprid = 0;
65359 shp->shm_atim = shp->shm_dtim = 0;
65360 shp->shm_ctim = get_seconds();
65361+#ifdef CONFIG_GRKERNSEC
65362+ {
65363+ struct timespec timeval;
65364+ do_posix_clock_monotonic_gettime(&timeval);
65365+
65366+ shp->shm_createtime = timeval.tv_sec;
65367+ }
65368+#endif
65369 shp->shm_segsz = size;
65370 shp->shm_nattch = 0;
65371 shp->shm_file = file;
65372@@ -559,18 +575,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
65373 return 0;
65374 }
65375
65376+static struct ipc_ops shm_ops = {
65377+ .getnew = newseg,
65378+ .associate = shm_security,
65379+ .more_checks = shm_more_checks
65380+};
65381+
65382 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
65383 {
65384 struct ipc_namespace *ns;
65385- struct ipc_ops shm_ops;
65386 struct ipc_params shm_params;
65387
65388 ns = current->nsproxy->ipc_ns;
65389
65390- shm_ops.getnew = newseg;
65391- shm_ops.associate = shm_security;
65392- shm_ops.more_checks = shm_more_checks;
65393-
65394 shm_params.key = key;
65395 shm_params.flg = shmflg;
65396 shm_params.u.size = size;
65397@@ -988,6 +1005,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65398 f_mode = FMODE_READ | FMODE_WRITE;
65399 }
65400 if (shmflg & SHM_EXEC) {
65401+
65402+#ifdef CONFIG_PAX_MPROTECT
65403+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
65404+ goto out;
65405+#endif
65406+
65407 prot |= PROT_EXEC;
65408 acc_mode |= S_IXUGO;
65409 }
65410@@ -1011,9 +1034,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65411 if (err)
65412 goto out_unlock;
65413
65414+#ifdef CONFIG_GRKERNSEC
65415+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
65416+ shp->shm_perm.cuid, shmid) ||
65417+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
65418+ err = -EACCES;
65419+ goto out_unlock;
65420+ }
65421+#endif
65422+
65423 path = shp->shm_file->f_path;
65424 path_get(&path);
65425 shp->shm_nattch++;
65426+#ifdef CONFIG_GRKERNSEC
65427+ shp->shm_lapid = current->pid;
65428+#endif
65429 size = i_size_read(path.dentry->d_inode);
65430 shm_unlock(shp);
65431
65432diff --git a/kernel/acct.c b/kernel/acct.c
65433index fa7eb3d..7faf116 100644
65434--- a/kernel/acct.c
65435+++ b/kernel/acct.c
65436@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
65437 */
65438 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
65439 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
65440- file->f_op->write(file, (char *)&ac,
65441+ file->f_op->write(file, (char __force_user *)&ac,
65442 sizeof(acct_t), &file->f_pos);
65443 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
65444 set_fs(fs);
65445diff --git a/kernel/audit.c b/kernel/audit.c
65446index 09fae26..ed71d5b 100644
65447--- a/kernel/audit.c
65448+++ b/kernel/audit.c
65449@@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
65450 3) suppressed due to audit_rate_limit
65451 4) suppressed due to audit_backlog_limit
65452 */
65453-static atomic_t audit_lost = ATOMIC_INIT(0);
65454+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
65455
65456 /* The netlink socket. */
65457 static struct sock *audit_sock;
65458@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
65459 unsigned long now;
65460 int print;
65461
65462- atomic_inc(&audit_lost);
65463+ atomic_inc_unchecked(&audit_lost);
65464
65465 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
65466
65467@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
65468 printk(KERN_WARNING
65469 "audit: audit_lost=%d audit_rate_limit=%d "
65470 "audit_backlog_limit=%d\n",
65471- atomic_read(&audit_lost),
65472+ atomic_read_unchecked(&audit_lost),
65473 audit_rate_limit,
65474 audit_backlog_limit);
65475 audit_panic(message);
65476@@ -689,7 +689,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
65477 status_set.pid = audit_pid;
65478 status_set.rate_limit = audit_rate_limit;
65479 status_set.backlog_limit = audit_backlog_limit;
65480- status_set.lost = atomic_read(&audit_lost);
65481+ status_set.lost = atomic_read_unchecked(&audit_lost);
65482 status_set.backlog = skb_queue_len(&audit_skb_queue);
65483 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
65484 &status_set, sizeof(status_set));
65485@@ -1260,12 +1260,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
65486 avail = audit_expand(ab,
65487 max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
65488 if (!avail)
65489- goto out;
65490+ goto out_va_end;
65491 len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
65492 }
65493- va_end(args2);
65494 if (len > 0)
65495 skb_put(skb, len);
65496+out_va_end:
65497+ va_end(args2);
65498 out:
65499 return;
65500 }
65501diff --git a/kernel/auditsc.c b/kernel/auditsc.c
65502index 47b7fc1..c003c33 100644
65503--- a/kernel/auditsc.c
65504+++ b/kernel/auditsc.c
65505@@ -1166,8 +1166,8 @@ static void audit_log_execve_info(struct audit_context *context,
65506 struct audit_buffer **ab,
65507 struct audit_aux_data_execve *axi)
65508 {
65509- int i;
65510- size_t len, len_sent = 0;
65511+ int i, len;
65512+ size_t len_sent = 0;
65513 const char __user *p;
65514 char *buf;
65515
65516@@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
65517 }
65518
65519 /* global counter which is incremented every time something logs in */
65520-static atomic_t session_id = ATOMIC_INIT(0);
65521+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
65522
65523 /**
65524 * audit_set_loginuid - set a task's audit_context loginuid
65525@@ -2131,7 +2131,7 @@ static atomic_t session_id = ATOMIC_INIT(0);
65526 */
65527 int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
65528 {
65529- unsigned int sessionid = atomic_inc_return(&session_id);
65530+ unsigned int sessionid = atomic_inc_return_unchecked(&session_id);
65531 struct audit_context *context = task->audit_context;
65532
65533 if (context && context->in_syscall) {
65534diff --git a/kernel/capability.c b/kernel/capability.c
65535index b463871..fa3ea1f 100644
65536--- a/kernel/capability.c
65537+++ b/kernel/capability.c
65538@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
65539 * before modification is attempted and the application
65540 * fails.
65541 */
65542+ if (tocopy > ARRAY_SIZE(kdata))
65543+ return -EFAULT;
65544+
65545 if (copy_to_user(dataptr, kdata, tocopy
65546 * sizeof(struct __user_cap_data_struct))) {
65547 return -EFAULT;
65548@@ -374,7 +377,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
65549 BUG();
65550 }
65551
65552- if (security_capable(ns, current_cred(), cap) == 0) {
65553+ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable(cap)) {
65554 current->flags |= PF_SUPERPRIV;
65555 return true;
65556 }
65557@@ -382,6 +385,27 @@ bool ns_capable(struct user_namespace *ns, int cap)
65558 }
65559 EXPORT_SYMBOL(ns_capable);
65560
65561+bool ns_capable_nolog(struct user_namespace *ns, int cap)
65562+{
65563+ if (unlikely(!cap_valid(cap))) {
65564+ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
65565+ BUG();
65566+ }
65567+
65568+ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable_nolog(cap)) {
65569+ current->flags |= PF_SUPERPRIV;
65570+ return true;
65571+ }
65572+ return false;
65573+}
65574+EXPORT_SYMBOL(ns_capable_nolog);
65575+
65576+bool capable_nolog(int cap)
65577+{
65578+ return ns_capable_nolog(&init_user_ns, cap);
65579+}
65580+EXPORT_SYMBOL(capable_nolog);
65581+
65582 /**
65583 * task_ns_capable - Determine whether current task has a superior
65584 * capability targeted at a specific task's user namespace.
65585@@ -396,6 +420,12 @@ bool task_ns_capable(struct task_struct *t, int cap)
65586 }
65587 EXPORT_SYMBOL(task_ns_capable);
65588
65589+bool task_ns_capable_nolog(struct task_struct *t, int cap)
65590+{
65591+ return ns_capable_nolog(task_cred_xxx(t, user)->user_ns, cap);
65592+}
65593+EXPORT_SYMBOL(task_ns_capable_nolog);
65594+
65595 /**
65596 * nsown_capable - Check superior capability to one's own user_ns
65597 * @cap: The capability in question
65598diff --git a/kernel/compat.c b/kernel/compat.c
65599index f346ced..aa2b1f4 100644
65600--- a/kernel/compat.c
65601+++ b/kernel/compat.c
65602@@ -13,6 +13,7 @@
65603
65604 #include <linux/linkage.h>
65605 #include <linux/compat.h>
65606+#include <linux/module.h>
65607 #include <linux/errno.h>
65608 #include <linux/time.h>
65609 #include <linux/signal.h>
65610@@ -168,7 +169,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
65611 mm_segment_t oldfs;
65612 long ret;
65613
65614- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
65615+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
65616 oldfs = get_fs();
65617 set_fs(KERNEL_DS);
65618 ret = hrtimer_nanosleep_restart(restart);
65619@@ -200,7 +201,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
65620 oldfs = get_fs();
65621 set_fs(KERNEL_DS);
65622 ret = hrtimer_nanosleep(&tu,
65623- rmtp ? (struct timespec __user *)&rmt : NULL,
65624+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
65625 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
65626 set_fs(oldfs);
65627
65628@@ -309,7 +310,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
65629 mm_segment_t old_fs = get_fs();
65630
65631 set_fs(KERNEL_DS);
65632- ret = sys_sigpending((old_sigset_t __user *) &s);
65633+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
65634 set_fs(old_fs);
65635 if (ret == 0)
65636 ret = put_user(s, set);
65637@@ -332,8 +333,8 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
65638 old_fs = get_fs();
65639 set_fs(KERNEL_DS);
65640 ret = sys_sigprocmask(how,
65641- set ? (old_sigset_t __user *) &s : NULL,
65642- oset ? (old_sigset_t __user *) &s : NULL);
65643+ set ? (old_sigset_t __force_user *) &s : NULL,
65644+ oset ? (old_sigset_t __force_user *) &s : NULL);
65645 set_fs(old_fs);
65646 if (ret == 0)
65647 if (oset)
65648@@ -370,7 +371,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
65649 mm_segment_t old_fs = get_fs();
65650
65651 set_fs(KERNEL_DS);
65652- ret = sys_old_getrlimit(resource, &r);
65653+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
65654 set_fs(old_fs);
65655
65656 if (!ret) {
65657@@ -442,7 +443,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
65658 mm_segment_t old_fs = get_fs();
65659
65660 set_fs(KERNEL_DS);
65661- ret = sys_getrusage(who, (struct rusage __user *) &r);
65662+ ret = sys_getrusage(who, (struct rusage __force_user *) &r);
65663 set_fs(old_fs);
65664
65665 if (ret)
65666@@ -469,8 +470,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
65667 set_fs (KERNEL_DS);
65668 ret = sys_wait4(pid,
65669 (stat_addr ?
65670- (unsigned int __user *) &status : NULL),
65671- options, (struct rusage __user *) &r);
65672+ (unsigned int __force_user *) &status : NULL),
65673+ options, (struct rusage __force_user *) &r);
65674 set_fs (old_fs);
65675
65676 if (ret > 0) {
65677@@ -495,8 +496,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
65678 memset(&info, 0, sizeof(info));
65679
65680 set_fs(KERNEL_DS);
65681- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
65682- uru ? (struct rusage __user *)&ru : NULL);
65683+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
65684+ uru ? (struct rusage __force_user *)&ru : NULL);
65685 set_fs(old_fs);
65686
65687 if ((ret < 0) || (info.si_signo == 0))
65688@@ -626,8 +627,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
65689 oldfs = get_fs();
65690 set_fs(KERNEL_DS);
65691 err = sys_timer_settime(timer_id, flags,
65692- (struct itimerspec __user *) &newts,
65693- (struct itimerspec __user *) &oldts);
65694+ (struct itimerspec __force_user *) &newts,
65695+ (struct itimerspec __force_user *) &oldts);
65696 set_fs(oldfs);
65697 if (!err && old && put_compat_itimerspec(old, &oldts))
65698 return -EFAULT;
65699@@ -644,7 +645,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
65700 oldfs = get_fs();
65701 set_fs(KERNEL_DS);
65702 err = sys_timer_gettime(timer_id,
65703- (struct itimerspec __user *) &ts);
65704+ (struct itimerspec __force_user *) &ts);
65705 set_fs(oldfs);
65706 if (!err && put_compat_itimerspec(setting, &ts))
65707 return -EFAULT;
65708@@ -663,7 +664,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
65709 oldfs = get_fs();
65710 set_fs(KERNEL_DS);
65711 err = sys_clock_settime(which_clock,
65712- (struct timespec __user *) &ts);
65713+ (struct timespec __force_user *) &ts);
65714 set_fs(oldfs);
65715 return err;
65716 }
65717@@ -678,7 +679,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
65718 oldfs = get_fs();
65719 set_fs(KERNEL_DS);
65720 err = sys_clock_gettime(which_clock,
65721- (struct timespec __user *) &ts);
65722+ (struct timespec __force_user *) &ts);
65723 set_fs(oldfs);
65724 if (!err && put_compat_timespec(&ts, tp))
65725 return -EFAULT;
65726@@ -698,7 +699,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
65727
65728 oldfs = get_fs();
65729 set_fs(KERNEL_DS);
65730- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
65731+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
65732 set_fs(oldfs);
65733
65734 err = compat_put_timex(utp, &txc);
65735@@ -718,7 +719,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
65736 oldfs = get_fs();
65737 set_fs(KERNEL_DS);
65738 err = sys_clock_getres(which_clock,
65739- (struct timespec __user *) &ts);
65740+ (struct timespec __force_user *) &ts);
65741 set_fs(oldfs);
65742 if (!err && tp && put_compat_timespec(&ts, tp))
65743 return -EFAULT;
65744@@ -730,9 +731,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
65745 long err;
65746 mm_segment_t oldfs;
65747 struct timespec tu;
65748- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
65749+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
65750
65751- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
65752+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
65753 oldfs = get_fs();
65754 set_fs(KERNEL_DS);
65755 err = clock_nanosleep_restart(restart);
65756@@ -764,8 +765,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
65757 oldfs = get_fs();
65758 set_fs(KERNEL_DS);
65759 err = sys_clock_nanosleep(which_clock, flags,
65760- (struct timespec __user *) &in,
65761- (struct timespec __user *) &out);
65762+ (struct timespec __force_user *) &in,
65763+ (struct timespec __force_user *) &out);
65764 set_fs(oldfs);
65765
65766 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
65767diff --git a/kernel/configs.c b/kernel/configs.c
65768index 42e8fa0..9e7406b 100644
65769--- a/kernel/configs.c
65770+++ b/kernel/configs.c
65771@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
65772 struct proc_dir_entry *entry;
65773
65774 /* create the current config file */
65775+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
65776+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
65777+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
65778+ &ikconfig_file_ops);
65779+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65780+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
65781+ &ikconfig_file_ops);
65782+#endif
65783+#else
65784 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
65785 &ikconfig_file_ops);
65786+#endif
65787+
65788 if (!entry)
65789 return -ENOMEM;
65790
65791diff --git a/kernel/cred.c b/kernel/cred.c
65792index 5791612..a3c04dc 100644
65793--- a/kernel/cred.c
65794+++ b/kernel/cred.c
65795@@ -204,6 +204,15 @@ void exit_creds(struct task_struct *tsk)
65796 validate_creds(cred);
65797 put_cred(cred);
65798 }
65799+
65800+#ifdef CONFIG_GRKERNSEC_SETXID
65801+ cred = (struct cred *) tsk->delayed_cred;
65802+ if (cred) {
65803+ tsk->delayed_cred = NULL;
65804+ validate_creds(cred);
65805+ put_cred(cred);
65806+ }
65807+#endif
65808 }
65809
65810 /**
65811@@ -470,7 +479,7 @@ error_put:
65812 * Always returns 0 thus allowing this function to be tail-called at the end
65813 * of, say, sys_setgid().
65814 */
65815-int commit_creds(struct cred *new)
65816+static int __commit_creds(struct cred *new)
65817 {
65818 struct task_struct *task = current;
65819 const struct cred *old = task->real_cred;
65820@@ -489,6 +498,8 @@ int commit_creds(struct cred *new)
65821
65822 get_cred(new); /* we will require a ref for the subj creds too */
65823
65824+ gr_set_role_label(task, new->uid, new->gid);
65825+
65826 /* dumpability changes */
65827 if (old->euid != new->euid ||
65828 old->egid != new->egid ||
65829@@ -538,6 +549,92 @@ int commit_creds(struct cred *new)
65830 put_cred(old);
65831 return 0;
65832 }
65833+#ifdef CONFIG_GRKERNSEC_SETXID
65834+extern int set_user(struct cred *new);
65835+
65836+void gr_delayed_cred_worker(void)
65837+{
65838+ const struct cred *new = current->delayed_cred;
65839+ struct cred *ncred;
65840+
65841+ current->delayed_cred = NULL;
65842+
65843+ if (current_uid() && new != NULL) {
65844+ // from doing get_cred on it when queueing this
65845+ put_cred(new);
65846+ return;
65847+ } else if (new == NULL)
65848+ return;
65849+
65850+ ncred = prepare_creds();
65851+ if (!ncred)
65852+ goto die;
65853+ // uids
65854+ ncred->uid = new->uid;
65855+ ncred->euid = new->euid;
65856+ ncred->suid = new->suid;
65857+ ncred->fsuid = new->fsuid;
65858+ // gids
65859+ ncred->gid = new->gid;
65860+ ncred->egid = new->egid;
65861+ ncred->sgid = new->sgid;
65862+ ncred->fsgid = new->fsgid;
65863+ // groups
65864+ if (set_groups(ncred, new->group_info) < 0) {
65865+ abort_creds(ncred);
65866+ goto die;
65867+ }
65868+ // caps
65869+ ncred->securebits = new->securebits;
65870+ ncred->cap_inheritable = new->cap_inheritable;
65871+ ncred->cap_permitted = new->cap_permitted;
65872+ ncred->cap_effective = new->cap_effective;
65873+ ncred->cap_bset = new->cap_bset;
65874+
65875+ if (set_user(ncred)) {
65876+ abort_creds(ncred);
65877+ goto die;
65878+ }
65879+
65880+ // from doing get_cred on it when queueing this
65881+ put_cred(new);
65882+
65883+ __commit_creds(ncred);
65884+ return;
65885+die:
65886+ // from doing get_cred on it when queueing this
65887+ put_cred(new);
65888+ do_group_exit(SIGKILL);
65889+}
65890+#endif
65891+
65892+int commit_creds(struct cred *new)
65893+{
65894+#ifdef CONFIG_GRKERNSEC_SETXID
65895+ struct task_struct *t;
65896+
65897+ /* we won't get called with tasklist_lock held for writing
65898+ and interrupts disabled as the cred struct in that case is
65899+ init_cred
65900+ */
65901+ if (grsec_enable_setxid && !current_is_single_threaded() &&
65902+ !current_uid() && new->uid) {
65903+ rcu_read_lock();
65904+ read_lock(&tasklist_lock);
65905+ for (t = next_thread(current); t != current;
65906+ t = next_thread(t)) {
65907+ if (t->delayed_cred == NULL) {
65908+ t->delayed_cred = get_cred(new);
65909+ set_tsk_need_resched(t);
65910+ }
65911+ }
65912+ read_unlock(&tasklist_lock);
65913+ rcu_read_unlock();
65914+ }
65915+#endif
65916+ return __commit_creds(new);
65917+}
65918+
65919 EXPORT_SYMBOL(commit_creds);
65920
65921 /**
65922diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
65923index 0d7c087..01b8cef 100644
65924--- a/kernel/debug/debug_core.c
65925+++ b/kernel/debug/debug_core.c
65926@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
65927 */
65928 static atomic_t masters_in_kgdb;
65929 static atomic_t slaves_in_kgdb;
65930-static atomic_t kgdb_break_tasklet_var;
65931+static atomic_unchecked_t kgdb_break_tasklet_var;
65932 atomic_t kgdb_setting_breakpoint;
65933
65934 struct task_struct *kgdb_usethread;
65935@@ -129,7 +129,7 @@ int kgdb_single_step;
65936 static pid_t kgdb_sstep_pid;
65937
65938 /* to keep track of the CPU which is doing the single stepping*/
65939-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
65940+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
65941
65942 /*
65943 * If you are debugging a problem where roundup (the collection of
65944@@ -542,7 +542,7 @@ return_normal:
65945 * kernel will only try for the value of sstep_tries before
65946 * giving up and continuing on.
65947 */
65948- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
65949+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
65950 (kgdb_info[cpu].task &&
65951 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
65952 atomic_set(&kgdb_active, -1);
65953@@ -636,8 +636,8 @@ cpu_master_loop:
65954 }
65955
65956 kgdb_restore:
65957- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
65958- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
65959+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
65960+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
65961 if (kgdb_info[sstep_cpu].task)
65962 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
65963 else
65964@@ -834,18 +834,18 @@ static void kgdb_unregister_callbacks(void)
65965 static void kgdb_tasklet_bpt(unsigned long ing)
65966 {
65967 kgdb_breakpoint();
65968- atomic_set(&kgdb_break_tasklet_var, 0);
65969+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
65970 }
65971
65972 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
65973
65974 void kgdb_schedule_breakpoint(void)
65975 {
65976- if (atomic_read(&kgdb_break_tasklet_var) ||
65977+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
65978 atomic_read(&kgdb_active) != -1 ||
65979 atomic_read(&kgdb_setting_breakpoint))
65980 return;
65981- atomic_inc(&kgdb_break_tasklet_var);
65982+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
65983 tasklet_schedule(&kgdb_tasklet_breakpoint);
65984 }
65985 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
65986diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
65987index 63786e7..0780cac 100644
65988--- a/kernel/debug/kdb/kdb_main.c
65989+++ b/kernel/debug/kdb/kdb_main.c
65990@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const char **argv)
65991 list_for_each_entry(mod, kdb_modules, list) {
65992
65993 kdb_printf("%-20s%8u 0x%p ", mod->name,
65994- mod->core_size, (void *)mod);
65995+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
65996 #ifdef CONFIG_MODULE_UNLOAD
65997 kdb_printf("%4d ", module_refcount(mod));
65998 #endif
65999@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const char **argv)
66000 kdb_printf(" (Loading)");
66001 else
66002 kdb_printf(" (Live)");
66003- kdb_printf(" 0x%p", mod->module_core);
66004+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
66005
66006 #ifdef CONFIG_MODULE_UNLOAD
66007 {
66008diff --git a/kernel/events/core.c b/kernel/events/core.c
66009index 58690af..d903d75 100644
66010--- a/kernel/events/core.c
66011+++ b/kernel/events/core.c
66012@@ -173,7 +173,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
66013 return 0;
66014 }
66015
66016-static atomic64_t perf_event_id;
66017+static atomic64_unchecked_t perf_event_id;
66018
66019 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
66020 enum event_type_t event_type);
66021@@ -2540,7 +2540,7 @@ static void __perf_event_read(void *info)
66022
66023 static inline u64 perf_event_count(struct perf_event *event)
66024 {
66025- return local64_read(&event->count) + atomic64_read(&event->child_count);
66026+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
66027 }
66028
66029 static u64 perf_event_read(struct perf_event *event)
66030@@ -3065,9 +3065,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
66031 mutex_lock(&event->child_mutex);
66032 total += perf_event_read(event);
66033 *enabled += event->total_time_enabled +
66034- atomic64_read(&event->child_total_time_enabled);
66035+ atomic64_read_unchecked(&event->child_total_time_enabled);
66036 *running += event->total_time_running +
66037- atomic64_read(&event->child_total_time_running);
66038+ atomic64_read_unchecked(&event->child_total_time_running);
66039
66040 list_for_each_entry(child, &event->child_list, child_list) {
66041 total += perf_event_read(child);
66042@@ -3474,10 +3474,10 @@ void perf_event_update_userpage(struct perf_event *event)
66043 userpg->offset -= local64_read(&event->hw.prev_count);
66044
66045 userpg->time_enabled = enabled +
66046- atomic64_read(&event->child_total_time_enabled);
66047+ atomic64_read_unchecked(&event->child_total_time_enabled);
66048
66049 userpg->time_running = running +
66050- atomic64_read(&event->child_total_time_running);
66051+ atomic64_read_unchecked(&event->child_total_time_running);
66052
66053 barrier();
66054 ++userpg->lock;
66055@@ -3906,11 +3906,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
66056 values[n++] = perf_event_count(event);
66057 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
66058 values[n++] = enabled +
66059- atomic64_read(&event->child_total_time_enabled);
66060+ atomic64_read_unchecked(&event->child_total_time_enabled);
66061 }
66062 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
66063 values[n++] = running +
66064- atomic64_read(&event->child_total_time_running);
66065+ atomic64_read_unchecked(&event->child_total_time_running);
66066 }
66067 if (read_format & PERF_FORMAT_ID)
66068 values[n++] = primary_event_id(event);
66069@@ -4561,12 +4561,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
66070 * need to add enough zero bytes after the string to handle
66071 * the 64bit alignment we do later.
66072 */
66073- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
66074+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
66075 if (!buf) {
66076 name = strncpy(tmp, "//enomem", sizeof(tmp));
66077 goto got_name;
66078 }
66079- name = d_path(&file->f_path, buf, PATH_MAX);
66080+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
66081 if (IS_ERR(name)) {
66082 name = strncpy(tmp, "//toolong", sizeof(tmp));
66083 goto got_name;
66084@@ -5921,7 +5921,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
66085 event->parent = parent_event;
66086
66087 event->ns = get_pid_ns(current->nsproxy->pid_ns);
66088- event->id = atomic64_inc_return(&perf_event_id);
66089+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
66090
66091 event->state = PERF_EVENT_STATE_INACTIVE;
66092
66093@@ -6443,10 +6443,10 @@ static void sync_child_event(struct perf_event *child_event,
66094 /*
66095 * Add back the child's count to the parent's count:
66096 */
66097- atomic64_add(child_val, &parent_event->child_count);
66098- atomic64_add(child_event->total_time_enabled,
66099+ atomic64_add_unchecked(child_val, &parent_event->child_count);
66100+ atomic64_add_unchecked(child_event->total_time_enabled,
66101 &parent_event->child_total_time_enabled);
66102- atomic64_add(child_event->total_time_running,
66103+ atomic64_add_unchecked(child_event->total_time_running,
66104 &parent_event->child_total_time_running);
66105
66106 /*
66107diff --git a/kernel/exit.c b/kernel/exit.c
66108index e6e01b9..0a21b0a 100644
66109--- a/kernel/exit.c
66110+++ b/kernel/exit.c
66111@@ -57,6 +57,10 @@
66112 #include <asm/pgtable.h>
66113 #include <asm/mmu_context.h>
66114
66115+#ifdef CONFIG_GRKERNSEC
66116+extern rwlock_t grsec_exec_file_lock;
66117+#endif
66118+
66119 static void exit_mm(struct task_struct * tsk);
66120
66121 static void __unhash_process(struct task_struct *p, bool group_dead)
66122@@ -168,6 +172,10 @@ void release_task(struct task_struct * p)
66123 struct task_struct *leader;
66124 int zap_leader;
66125 repeat:
66126+#ifdef CONFIG_NET
66127+ gr_del_task_from_ip_table(p);
66128+#endif
66129+
66130 /* don't need to get the RCU readlock here - the process is dead and
66131 * can't be modifying its own credentials. But shut RCU-lockdep up */
66132 rcu_read_lock();
66133@@ -380,7 +388,7 @@ int allow_signal(int sig)
66134 * know it'll be handled, so that they don't get converted to
66135 * SIGKILL or just silently dropped.
66136 */
66137- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
66138+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
66139 recalc_sigpending();
66140 spin_unlock_irq(&current->sighand->siglock);
66141 return 0;
66142@@ -416,6 +424,17 @@ void daemonize(const char *name, ...)
66143 vsnprintf(current->comm, sizeof(current->comm), name, args);
66144 va_end(args);
66145
66146+#ifdef CONFIG_GRKERNSEC
66147+ write_lock(&grsec_exec_file_lock);
66148+ if (current->exec_file) {
66149+ fput(current->exec_file);
66150+ current->exec_file = NULL;
66151+ }
66152+ write_unlock(&grsec_exec_file_lock);
66153+#endif
66154+
66155+ gr_set_kernel_label(current);
66156+
66157 /*
66158 * If we were started as result of loading a module, close all of the
66159 * user space pages. We don't need them, and if we didn't close them
66160@@ -893,6 +912,8 @@ NORET_TYPE void do_exit(long code)
66161 struct task_struct *tsk = current;
66162 int group_dead;
66163
66164+ set_fs(USER_DS);
66165+
66166 profile_task_exit(tsk);
66167
66168 WARN_ON(blk_needs_flush_plug(tsk));
66169@@ -909,7 +930,6 @@ NORET_TYPE void do_exit(long code)
66170 * mm_release()->clear_child_tid() from writing to a user-controlled
66171 * kernel address.
66172 */
66173- set_fs(USER_DS);
66174
66175 ptrace_event(PTRACE_EVENT_EXIT, code);
66176
66177@@ -971,6 +991,9 @@ NORET_TYPE void do_exit(long code)
66178 tsk->exit_code = code;
66179 taskstats_exit(tsk, group_dead);
66180
66181+ gr_acl_handle_psacct(tsk, code);
66182+ gr_acl_handle_exit();
66183+
66184 exit_mm(tsk);
66185
66186 if (group_dead)
66187@@ -1068,7 +1091,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
66188 * Take down every thread in the group. This is called by fatal signals
66189 * as well as by sys_exit_group (below).
66190 */
66191-NORET_TYPE void
66192+__noreturn void
66193 do_group_exit(int exit_code)
66194 {
66195 struct signal_struct *sig = current->signal;
66196diff --git a/kernel/fork.c b/kernel/fork.c
66197index 0acf42c0..9e40e2e 100644
66198--- a/kernel/fork.c
66199+++ b/kernel/fork.c
66200@@ -281,7 +281,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
66201 *stackend = STACK_END_MAGIC; /* for overflow detection */
66202
66203 #ifdef CONFIG_CC_STACKPROTECTOR
66204- tsk->stack_canary = get_random_int();
66205+ tsk->stack_canary = pax_get_random_long();
66206 #endif
66207
66208 /*
66209@@ -305,13 +305,77 @@ out:
66210 }
66211
66212 #ifdef CONFIG_MMU
66213+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct vm_area_struct *mpnt)
66214+{
66215+ struct vm_area_struct *tmp;
66216+ unsigned long charge;
66217+ struct mempolicy *pol;
66218+ struct file *file;
66219+
66220+ charge = 0;
66221+ if (mpnt->vm_flags & VM_ACCOUNT) {
66222+ unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66223+ if (security_vm_enough_memory(len))
66224+ goto fail_nomem;
66225+ charge = len;
66226+ }
66227+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66228+ if (!tmp)
66229+ goto fail_nomem;
66230+ *tmp = *mpnt;
66231+ tmp->vm_mm = mm;
66232+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
66233+ pol = mpol_dup(vma_policy(mpnt));
66234+ if (IS_ERR(pol))
66235+ goto fail_nomem_policy;
66236+ vma_set_policy(tmp, pol);
66237+ if (anon_vma_fork(tmp, mpnt))
66238+ goto fail_nomem_anon_vma_fork;
66239+ tmp->vm_flags &= ~VM_LOCKED;
66240+ tmp->vm_next = tmp->vm_prev = NULL;
66241+ tmp->vm_mirror = NULL;
66242+ file = tmp->vm_file;
66243+ if (file) {
66244+ struct inode *inode = file->f_path.dentry->d_inode;
66245+ struct address_space *mapping = file->f_mapping;
66246+
66247+ get_file(file);
66248+ if (tmp->vm_flags & VM_DENYWRITE)
66249+ atomic_dec(&inode->i_writecount);
66250+ mutex_lock(&mapping->i_mmap_mutex);
66251+ if (tmp->vm_flags & VM_SHARED)
66252+ mapping->i_mmap_writable++;
66253+ flush_dcache_mmap_lock(mapping);
66254+ /* insert tmp into the share list, just after mpnt */
66255+ vma_prio_tree_add(tmp, mpnt);
66256+ flush_dcache_mmap_unlock(mapping);
66257+ mutex_unlock(&mapping->i_mmap_mutex);
66258+ }
66259+
66260+ /*
66261+ * Clear hugetlb-related page reserves for children. This only
66262+ * affects MAP_PRIVATE mappings. Faults generated by the child
66263+ * are not guaranteed to succeed, even if read-only
66264+ */
66265+ if (is_vm_hugetlb_page(tmp))
66266+ reset_vma_resv_huge_pages(tmp);
66267+
66268+ return tmp;
66269+
66270+fail_nomem_anon_vma_fork:
66271+ mpol_put(pol);
66272+fail_nomem_policy:
66273+ kmem_cache_free(vm_area_cachep, tmp);
66274+fail_nomem:
66275+ vm_unacct_memory(charge);
66276+ return NULL;
66277+}
66278+
66279 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66280 {
66281 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
66282 struct rb_node **rb_link, *rb_parent;
66283 int retval;
66284- unsigned long charge;
66285- struct mempolicy *pol;
66286
66287 down_write(&oldmm->mmap_sem);
66288 flush_cache_dup_mm(oldmm);
66289@@ -323,8 +387,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66290 mm->locked_vm = 0;
66291 mm->mmap = NULL;
66292 mm->mmap_cache = NULL;
66293- mm->free_area_cache = oldmm->mmap_base;
66294- mm->cached_hole_size = ~0UL;
66295+ mm->free_area_cache = oldmm->free_area_cache;
66296+ mm->cached_hole_size = oldmm->cached_hole_size;
66297 mm->map_count = 0;
66298 cpumask_clear(mm_cpumask(mm));
66299 mm->mm_rb = RB_ROOT;
66300@@ -340,8 +404,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66301
66302 prev = NULL;
66303 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
66304- struct file *file;
66305-
66306 if (mpnt->vm_flags & VM_DONTCOPY) {
66307 long pages = vma_pages(mpnt);
66308 mm->total_vm -= pages;
66309@@ -349,53 +411,11 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66310 -pages);
66311 continue;
66312 }
66313- charge = 0;
66314- if (mpnt->vm_flags & VM_ACCOUNT) {
66315- unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66316- if (security_vm_enough_memory(len))
66317- goto fail_nomem;
66318- charge = len;
66319+ tmp = dup_vma(mm, mpnt);
66320+ if (!tmp) {
66321+ retval = -ENOMEM;
66322+ goto out;
66323 }
66324- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66325- if (!tmp)
66326- goto fail_nomem;
66327- *tmp = *mpnt;
66328- INIT_LIST_HEAD(&tmp->anon_vma_chain);
66329- pol = mpol_dup(vma_policy(mpnt));
66330- retval = PTR_ERR(pol);
66331- if (IS_ERR(pol))
66332- goto fail_nomem_policy;
66333- vma_set_policy(tmp, pol);
66334- tmp->vm_mm = mm;
66335- if (anon_vma_fork(tmp, mpnt))
66336- goto fail_nomem_anon_vma_fork;
66337- tmp->vm_flags &= ~VM_LOCKED;
66338- tmp->vm_next = tmp->vm_prev = NULL;
66339- file = tmp->vm_file;
66340- if (file) {
66341- struct inode *inode = file->f_path.dentry->d_inode;
66342- struct address_space *mapping = file->f_mapping;
66343-
66344- get_file(file);
66345- if (tmp->vm_flags & VM_DENYWRITE)
66346- atomic_dec(&inode->i_writecount);
66347- mutex_lock(&mapping->i_mmap_mutex);
66348- if (tmp->vm_flags & VM_SHARED)
66349- mapping->i_mmap_writable++;
66350- flush_dcache_mmap_lock(mapping);
66351- /* insert tmp into the share list, just after mpnt */
66352- vma_prio_tree_add(tmp, mpnt);
66353- flush_dcache_mmap_unlock(mapping);
66354- mutex_unlock(&mapping->i_mmap_mutex);
66355- }
66356-
66357- /*
66358- * Clear hugetlb-related page reserves for children. This only
66359- * affects MAP_PRIVATE mappings. Faults generated by the child
66360- * are not guaranteed to succeed, even if read-only
66361- */
66362- if (is_vm_hugetlb_page(tmp))
66363- reset_vma_resv_huge_pages(tmp);
66364
66365 /*
66366 * Link in the new vma and copy the page table entries.
66367@@ -418,6 +438,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66368 if (retval)
66369 goto out;
66370 }
66371+
66372+#ifdef CONFIG_PAX_SEGMEXEC
66373+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
66374+ struct vm_area_struct *mpnt_m;
66375+
66376+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
66377+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
66378+
66379+ if (!mpnt->vm_mirror)
66380+ continue;
66381+
66382+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
66383+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
66384+ mpnt->vm_mirror = mpnt_m;
66385+ } else {
66386+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
66387+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
66388+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
66389+ mpnt->vm_mirror->vm_mirror = mpnt;
66390+ }
66391+ }
66392+ BUG_ON(mpnt_m);
66393+ }
66394+#endif
66395+
66396 /* a new mm has just been created */
66397 arch_dup_mmap(oldmm, mm);
66398 retval = 0;
66399@@ -426,14 +471,6 @@ out:
66400 flush_tlb_mm(oldmm);
66401 up_write(&oldmm->mmap_sem);
66402 return retval;
66403-fail_nomem_anon_vma_fork:
66404- mpol_put(pol);
66405-fail_nomem_policy:
66406- kmem_cache_free(vm_area_cachep, tmp);
66407-fail_nomem:
66408- retval = -ENOMEM;
66409- vm_unacct_memory(charge);
66410- goto out;
66411 }
66412
66413 static inline int mm_alloc_pgd(struct mm_struct *mm)
66414@@ -645,6 +682,26 @@ struct mm_struct *get_task_mm(struct task_struct *task)
66415 }
66416 EXPORT_SYMBOL_GPL(get_task_mm);
66417
66418+struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
66419+{
66420+ struct mm_struct *mm;
66421+ int err;
66422+
66423+ err = mutex_lock_killable(&task->signal->cred_guard_mutex);
66424+ if (err)
66425+ return ERR_PTR(err);
66426+
66427+ mm = get_task_mm(task);
66428+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
66429+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
66430+ mmput(mm);
66431+ mm = ERR_PTR(-EACCES);
66432+ }
66433+ mutex_unlock(&task->signal->cred_guard_mutex);
66434+
66435+ return mm;
66436+}
66437+
66438 /* Please note the differences between mmput and mm_release.
66439 * mmput is called whenever we stop holding onto a mm_struct,
66440 * error success whatever.
66441@@ -830,13 +887,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
66442 spin_unlock(&fs->lock);
66443 return -EAGAIN;
66444 }
66445- fs->users++;
66446+ atomic_inc(&fs->users);
66447 spin_unlock(&fs->lock);
66448 return 0;
66449 }
66450 tsk->fs = copy_fs_struct(fs);
66451 if (!tsk->fs)
66452 return -ENOMEM;
66453+ gr_set_chroot_entries(tsk, &tsk->fs->root);
66454 return 0;
66455 }
66456
66457@@ -1100,6 +1158,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66458 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
66459 #endif
66460 retval = -EAGAIN;
66461+
66462+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
66463+
66464 if (atomic_read(&p->real_cred->user->processes) >=
66465 task_rlimit(p, RLIMIT_NPROC)) {
66466 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
66467@@ -1259,6 +1320,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66468 if (clone_flags & CLONE_THREAD)
66469 p->tgid = current->tgid;
66470
66471+ gr_copy_label(p);
66472+
66473 p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
66474 /*
66475 * Clear TID on mm_release()?
66476@@ -1421,6 +1484,8 @@ bad_fork_cleanup_count:
66477 bad_fork_free:
66478 free_task(p);
66479 fork_out:
66480+ gr_log_forkfail(retval);
66481+
66482 return ERR_PTR(retval);
66483 }
66484
66485@@ -1521,6 +1586,8 @@ long do_fork(unsigned long clone_flags,
66486 if (clone_flags & CLONE_PARENT_SETTID)
66487 put_user(nr, parent_tidptr);
66488
66489+ gr_handle_brute_check();
66490+
66491 if (clone_flags & CLONE_VFORK) {
66492 p->vfork_done = &vfork;
66493 init_completion(&vfork);
66494@@ -1630,7 +1697,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
66495 return 0;
66496
66497 /* don't need lock here; in the worst case we'll do useless copy */
66498- if (fs->users == 1)
66499+ if (atomic_read(&fs->users) == 1)
66500 return 0;
66501
66502 *new_fsp = copy_fs_struct(fs);
66503@@ -1719,7 +1786,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
66504 fs = current->fs;
66505 spin_lock(&fs->lock);
66506 current->fs = new_fs;
66507- if (--fs->users)
66508+ gr_set_chroot_entries(current, &current->fs->root);
66509+ if (atomic_dec_return(&fs->users))
66510 new_fs = NULL;
66511 else
66512 new_fs = fs;
66513diff --git a/kernel/futex.c b/kernel/futex.c
66514index 1614be2..37abc7e 100644
66515--- a/kernel/futex.c
66516+++ b/kernel/futex.c
66517@@ -54,6 +54,7 @@
66518 #include <linux/mount.h>
66519 #include <linux/pagemap.h>
66520 #include <linux/syscalls.h>
66521+#include <linux/ptrace.h>
66522 #include <linux/signal.h>
66523 #include <linux/export.h>
66524 #include <linux/magic.h>
66525@@ -238,6 +239,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
66526 struct page *page, *page_head;
66527 int err, ro = 0;
66528
66529+#ifdef CONFIG_PAX_SEGMEXEC
66530+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
66531+ return -EFAULT;
66532+#endif
66533+
66534 /*
66535 * The futex address must be "naturally" aligned.
66536 */
66537@@ -2459,6 +2465,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
66538 if (!p)
66539 goto err_unlock;
66540 ret = -EPERM;
66541+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66542+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
66543+ goto err_unlock;
66544+#endif
66545 pcred = __task_cred(p);
66546 /* If victim is in different user_ns, then uids are not
66547 comparable, so we must have CAP_SYS_PTRACE */
66548@@ -2724,6 +2734,7 @@ static int __init futex_init(void)
66549 {
66550 u32 curval;
66551 int i;
66552+ mm_segment_t oldfs;
66553
66554 /*
66555 * This will fail and we want it. Some arch implementations do
66556@@ -2735,8 +2746,11 @@ static int __init futex_init(void)
66557 * implementation, the non-functional ones will return
66558 * -ENOSYS.
66559 */
66560+ oldfs = get_fs();
66561+ set_fs(USER_DS);
66562 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
66563 futex_cmpxchg_enabled = 1;
66564+ set_fs(oldfs);
66565
66566 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
66567 plist_head_init(&futex_queues[i].chain);
66568diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
66569index 5f9e689..582d46d 100644
66570--- a/kernel/futex_compat.c
66571+++ b/kernel/futex_compat.c
66572@@ -10,6 +10,7 @@
66573 #include <linux/compat.h>
66574 #include <linux/nsproxy.h>
66575 #include <linux/futex.h>
66576+#include <linux/ptrace.h>
66577
66578 #include <asm/uaccess.h>
66579
66580@@ -136,7 +137,8 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
66581 {
66582 struct compat_robust_list_head __user *head;
66583 unsigned long ret;
66584- const struct cred *cred = current_cred(), *pcred;
66585+ const struct cred *cred = current_cred();
66586+ const struct cred *pcred;
66587
66588 if (!futex_cmpxchg_enabled)
66589 return -ENOSYS;
66590@@ -152,6 +154,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
66591 if (!p)
66592 goto err_unlock;
66593 ret = -EPERM;
66594+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66595+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
66596+ goto err_unlock;
66597+#endif
66598 pcred = __task_cred(p);
66599 /* If victim is in different user_ns, then uids are not
66600 comparable, so we must have CAP_SYS_PTRACE */
66601diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
66602index 9b22d03..6295b62 100644
66603--- a/kernel/gcov/base.c
66604+++ b/kernel/gcov/base.c
66605@@ -102,11 +102,6 @@ void gcov_enable_events(void)
66606 }
66607
66608 #ifdef CONFIG_MODULES
66609-static inline int within(void *addr, void *start, unsigned long size)
66610-{
66611- return ((addr >= start) && (addr < start + size));
66612-}
66613-
66614 /* Update list and generate events when modules are unloaded. */
66615 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66616 void *data)
66617@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66618 prev = NULL;
66619 /* Remove entries located in module from linked list. */
66620 for (info = gcov_info_head; info; info = info->next) {
66621- if (within(info, mod->module_core, mod->core_size)) {
66622+ if (within_module_core_rw((unsigned long)info, mod)) {
66623 if (prev)
66624 prev->next = info->next;
66625 else
66626diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
66627index ae34bf5..4e2f3d0 100644
66628--- a/kernel/hrtimer.c
66629+++ b/kernel/hrtimer.c
66630@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
66631 local_irq_restore(flags);
66632 }
66633
66634-static void run_hrtimer_softirq(struct softirq_action *h)
66635+static void run_hrtimer_softirq(void)
66636 {
66637 hrtimer_peek_ahead_timers();
66638 }
66639diff --git a/kernel/jump_label.c b/kernel/jump_label.c
66640index 66ff710..05a5128 100644
66641--- a/kernel/jump_label.c
66642+++ b/kernel/jump_label.c
66643@@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
66644
66645 size = (((unsigned long)stop - (unsigned long)start)
66646 / sizeof(struct jump_entry));
66647+ pax_open_kernel();
66648 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
66649+ pax_close_kernel();
66650 }
66651
66652 static void jump_label_update(struct jump_label_key *key, int enable);
66653@@ -303,10 +305,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
66654 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
66655 struct jump_entry *iter;
66656
66657+ pax_open_kernel();
66658 for (iter = iter_start; iter < iter_stop; iter++) {
66659 if (within_module_init(iter->code, mod))
66660 iter->code = 0;
66661 }
66662+ pax_close_kernel();
66663 }
66664
66665 static int
66666diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
66667index 079f1d3..a407562 100644
66668--- a/kernel/kallsyms.c
66669+++ b/kernel/kallsyms.c
66670@@ -11,6 +11,9 @@
66671 * Changed the compression method from stem compression to "table lookup"
66672 * compression (see scripts/kallsyms.c for a more complete description)
66673 */
66674+#ifdef CONFIG_GRKERNSEC_HIDESYM
66675+#define __INCLUDED_BY_HIDESYM 1
66676+#endif
66677 #include <linux/kallsyms.h>
66678 #include <linux/module.h>
66679 #include <linux/init.h>
66680@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
66681
66682 static inline int is_kernel_inittext(unsigned long addr)
66683 {
66684+ if (system_state != SYSTEM_BOOTING)
66685+ return 0;
66686+
66687 if (addr >= (unsigned long)_sinittext
66688 && addr <= (unsigned long)_einittext)
66689 return 1;
66690 return 0;
66691 }
66692
66693+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66694+#ifdef CONFIG_MODULES
66695+static inline int is_module_text(unsigned long addr)
66696+{
66697+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
66698+ return 1;
66699+
66700+ addr = ktla_ktva(addr);
66701+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
66702+}
66703+#else
66704+static inline int is_module_text(unsigned long addr)
66705+{
66706+ return 0;
66707+}
66708+#endif
66709+#endif
66710+
66711 static inline int is_kernel_text(unsigned long addr)
66712 {
66713 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
66714@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
66715
66716 static inline int is_kernel(unsigned long addr)
66717 {
66718+
66719+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66720+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
66721+ return 1;
66722+
66723+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
66724+#else
66725 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
66726+#endif
66727+
66728 return 1;
66729 return in_gate_area_no_mm(addr);
66730 }
66731
66732 static int is_ksym_addr(unsigned long addr)
66733 {
66734+
66735+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66736+ if (is_module_text(addr))
66737+ return 0;
66738+#endif
66739+
66740 if (all_var)
66741 return is_kernel(addr);
66742
66743@@ -454,7 +493,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
66744
66745 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
66746 {
66747- iter->name[0] = '\0';
66748 iter->nameoff = get_symbol_offset(new_pos);
66749 iter->pos = new_pos;
66750 }
66751@@ -502,6 +540,11 @@ static int s_show(struct seq_file *m, void *p)
66752 {
66753 struct kallsym_iter *iter = m->private;
66754
66755+#ifdef CONFIG_GRKERNSEC_HIDESYM
66756+ if (current_uid())
66757+ return 0;
66758+#endif
66759+
66760 /* Some debugging symbols have no name. Ignore them. */
66761 if (!iter->name[0])
66762 return 0;
66763@@ -540,7 +583,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
66764 struct kallsym_iter *iter;
66765 int ret;
66766
66767- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
66768+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
66769 if (!iter)
66770 return -ENOMEM;
66771 reset_iter(iter, 0);
66772diff --git a/kernel/kexec.c b/kernel/kexec.c
66773index dc7bc08..4601964 100644
66774--- a/kernel/kexec.c
66775+++ b/kernel/kexec.c
66776@@ -1048,7 +1048,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
66777 unsigned long flags)
66778 {
66779 struct compat_kexec_segment in;
66780- struct kexec_segment out, __user *ksegments;
66781+ struct kexec_segment out;
66782+ struct kexec_segment __user *ksegments;
66783 unsigned long i, result;
66784
66785 /* Don't allow clients that don't understand the native
66786diff --git a/kernel/kmod.c b/kernel/kmod.c
66787index a4bea97..7a1ae9a 100644
66788--- a/kernel/kmod.c
66789+++ b/kernel/kmod.c
66790@@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
66791 * If module auto-loading support is disabled then this function
66792 * becomes a no-operation.
66793 */
66794-int __request_module(bool wait, const char *fmt, ...)
66795+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
66796 {
66797- va_list args;
66798 char module_name[MODULE_NAME_LEN];
66799 unsigned int max_modprobes;
66800 int ret;
66801- char *argv[] = { modprobe_path, "-q", "--", module_name, NULL };
66802+ char *argv[] = { modprobe_path, "-q", "--", module_name, module_param, NULL };
66803 static char *envp[] = { "HOME=/",
66804 "TERM=linux",
66805 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
66806@@ -88,9 +87,7 @@ int __request_module(bool wait, const char *fmt, ...)
66807 #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
66808 static int kmod_loop_msg;
66809
66810- va_start(args, fmt);
66811- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
66812- va_end(args);
66813+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
66814 if (ret >= MODULE_NAME_LEN)
66815 return -ENAMETOOLONG;
66816
66817@@ -98,6 +95,20 @@ int __request_module(bool wait, const char *fmt, ...)
66818 if (ret)
66819 return ret;
66820
66821+#ifdef CONFIG_GRKERNSEC_MODHARDEN
66822+ if (!current_uid()) {
66823+ /* hack to workaround consolekit/udisks stupidity */
66824+ read_lock(&tasklist_lock);
66825+ if (!strcmp(current->comm, "mount") &&
66826+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
66827+ read_unlock(&tasklist_lock);
66828+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
66829+ return -EPERM;
66830+ }
66831+ read_unlock(&tasklist_lock);
66832+ }
66833+#endif
66834+
66835 /* If modprobe needs a service that is in a module, we get a recursive
66836 * loop. Limit the number of running kmod threads to max_threads/2 or
66837 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
66838@@ -133,6 +144,47 @@ int __request_module(bool wait, const char *fmt, ...)
66839 atomic_dec(&kmod_concurrent);
66840 return ret;
66841 }
66842+
66843+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
66844+{
66845+ va_list args;
66846+ int ret;
66847+
66848+ va_start(args, fmt);
66849+ ret = ____request_module(wait, module_param, fmt, args);
66850+ va_end(args);
66851+
66852+ return ret;
66853+}
66854+
66855+int __request_module(bool wait, const char *fmt, ...)
66856+{
66857+ va_list args;
66858+ int ret;
66859+
66860+#ifdef CONFIG_GRKERNSEC_MODHARDEN
66861+ if (current_uid()) {
66862+ char module_param[MODULE_NAME_LEN];
66863+
66864+ memset(module_param, 0, sizeof(module_param));
66865+
66866+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
66867+
66868+ va_start(args, fmt);
66869+ ret = ____request_module(wait, module_param, fmt, args);
66870+ va_end(args);
66871+
66872+ return ret;
66873+ }
66874+#endif
66875+
66876+ va_start(args, fmt);
66877+ ret = ____request_module(wait, NULL, fmt, args);
66878+ va_end(args);
66879+
66880+ return ret;
66881+}
66882+
66883 EXPORT_SYMBOL(__request_module);
66884 #endif /* CONFIG_MODULES */
66885
66886@@ -222,7 +274,7 @@ static int wait_for_helper(void *data)
66887 *
66888 * Thus the __user pointer cast is valid here.
66889 */
66890- sys_wait4(pid, (int __user *)&ret, 0, NULL);
66891+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
66892
66893 /*
66894 * If ret is 0, either ____call_usermodehelper failed and the
66895diff --git a/kernel/kprobes.c b/kernel/kprobes.c
66896index bc90b87..43c7d8c 100644
66897--- a/kernel/kprobes.c
66898+++ b/kernel/kprobes.c
66899@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
66900 * kernel image and loaded module images reside. This is required
66901 * so x86_64 can correctly handle the %rip-relative fixups.
66902 */
66903- kip->insns = module_alloc(PAGE_SIZE);
66904+ kip->insns = module_alloc_exec(PAGE_SIZE);
66905 if (!kip->insns) {
66906 kfree(kip);
66907 return NULL;
66908@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
66909 */
66910 if (!list_is_singular(&kip->list)) {
66911 list_del(&kip->list);
66912- module_free(NULL, kip->insns);
66913+ module_free_exec(NULL, kip->insns);
66914 kfree(kip);
66915 }
66916 return 1;
66917@@ -1955,7 +1955,7 @@ static int __init init_kprobes(void)
66918 {
66919 int i, err = 0;
66920 unsigned long offset = 0, size = 0;
66921- char *modname, namebuf[128];
66922+ char *modname, namebuf[KSYM_NAME_LEN];
66923 const char *symbol_name;
66924 void *addr;
66925 struct kprobe_blackpoint *kb;
66926@@ -2081,7 +2081,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
66927 const char *sym = NULL;
66928 unsigned int i = *(loff_t *) v;
66929 unsigned long offset = 0;
66930- char *modname, namebuf[128];
66931+ char *modname, namebuf[KSYM_NAME_LEN];
66932
66933 head = &kprobe_table[i];
66934 preempt_disable();
66935diff --git a/kernel/lockdep.c b/kernel/lockdep.c
66936index b2e08c9..01d8049 100644
66937--- a/kernel/lockdep.c
66938+++ b/kernel/lockdep.c
66939@@ -592,6 +592,10 @@ static int static_obj(void *obj)
66940 end = (unsigned long) &_end,
66941 addr = (unsigned long) obj;
66942
66943+#ifdef CONFIG_PAX_KERNEXEC
66944+ start = ktla_ktva(start);
66945+#endif
66946+
66947 /*
66948 * static variable?
66949 */
66950@@ -731,6 +735,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
66951 if (!static_obj(lock->key)) {
66952 debug_locks_off();
66953 printk("INFO: trying to register non-static key.\n");
66954+ printk("lock:%pS key:%pS.\n", lock, lock->key);
66955 printk("the code is fine but needs lockdep annotation.\n");
66956 printk("turning off the locking correctness validator.\n");
66957 dump_stack();
66958@@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
66959 if (!class)
66960 return 0;
66961 }
66962- atomic_inc((atomic_t *)&class->ops);
66963+ atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
66964 if (very_verbose(class)) {
66965 printk("\nacquire class [%p] %s", class->key, class->name);
66966 if (class->name_version > 1)
66967diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
66968index 91c32a0..b2c71c5 100644
66969--- a/kernel/lockdep_proc.c
66970+++ b/kernel/lockdep_proc.c
66971@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
66972
66973 static void print_name(struct seq_file *m, struct lock_class *class)
66974 {
66975- char str[128];
66976+ char str[KSYM_NAME_LEN];
66977 const char *name = class->name;
66978
66979 if (!name) {
66980diff --git a/kernel/module.c b/kernel/module.c
66981index 178333c..04e3408 100644
66982--- a/kernel/module.c
66983+++ b/kernel/module.c
66984@@ -58,6 +58,7 @@
66985 #include <linux/jump_label.h>
66986 #include <linux/pfn.h>
66987 #include <linux/bsearch.h>
66988+#include <linux/grsecurity.h>
66989
66990 #define CREATE_TRACE_POINTS
66991 #include <trace/events/module.h>
66992@@ -119,7 +120,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
66993
66994 /* Bounds of module allocation, for speeding __module_address.
66995 * Protected by module_mutex. */
66996-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
66997+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
66998+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
66999
67000 int register_module_notifier(struct notifier_block * nb)
67001 {
67002@@ -284,7 +286,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
67003 return true;
67004
67005 list_for_each_entry_rcu(mod, &modules, list) {
67006- struct symsearch arr[] = {
67007+ struct symsearch modarr[] = {
67008 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
67009 NOT_GPL_ONLY, false },
67010 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
67011@@ -306,7 +308,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
67012 #endif
67013 };
67014
67015- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
67016+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
67017 return true;
67018 }
67019 return false;
67020@@ -438,7 +440,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
67021 static int percpu_modalloc(struct module *mod,
67022 unsigned long size, unsigned long align)
67023 {
67024- if (align > PAGE_SIZE) {
67025+ if (align-1 >= PAGE_SIZE) {
67026 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
67027 mod->name, align, PAGE_SIZE);
67028 align = PAGE_SIZE;
67029@@ -1183,7 +1185,7 @@ resolve_symbol_wait(struct module *mod,
67030 */
67031 #ifdef CONFIG_SYSFS
67032
67033-#ifdef CONFIG_KALLSYMS
67034+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67035 static inline bool sect_empty(const Elf_Shdr *sect)
67036 {
67037 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
67038@@ -1649,21 +1651,21 @@ static void set_section_ro_nx(void *base,
67039
67040 static void unset_module_core_ro_nx(struct module *mod)
67041 {
67042- set_page_attributes(mod->module_core + mod->core_text_size,
67043- mod->module_core + mod->core_size,
67044+ set_page_attributes(mod->module_core_rw,
67045+ mod->module_core_rw + mod->core_size_rw,
67046 set_memory_x);
67047- set_page_attributes(mod->module_core,
67048- mod->module_core + mod->core_ro_size,
67049+ set_page_attributes(mod->module_core_rx,
67050+ mod->module_core_rx + mod->core_size_rx,
67051 set_memory_rw);
67052 }
67053
67054 static void unset_module_init_ro_nx(struct module *mod)
67055 {
67056- set_page_attributes(mod->module_init + mod->init_text_size,
67057- mod->module_init + mod->init_size,
67058+ set_page_attributes(mod->module_init_rw,
67059+ mod->module_init_rw + mod->init_size_rw,
67060 set_memory_x);
67061- set_page_attributes(mod->module_init,
67062- mod->module_init + mod->init_ro_size,
67063+ set_page_attributes(mod->module_init_rx,
67064+ mod->module_init_rx + mod->init_size_rx,
67065 set_memory_rw);
67066 }
67067
67068@@ -1674,14 +1676,14 @@ void set_all_modules_text_rw(void)
67069
67070 mutex_lock(&module_mutex);
67071 list_for_each_entry_rcu(mod, &modules, list) {
67072- if ((mod->module_core) && (mod->core_text_size)) {
67073- set_page_attributes(mod->module_core,
67074- mod->module_core + mod->core_text_size,
67075+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
67076+ set_page_attributes(mod->module_core_rx,
67077+ mod->module_core_rx + mod->core_size_rx,
67078 set_memory_rw);
67079 }
67080- if ((mod->module_init) && (mod->init_text_size)) {
67081- set_page_attributes(mod->module_init,
67082- mod->module_init + mod->init_text_size,
67083+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
67084+ set_page_attributes(mod->module_init_rx,
67085+ mod->module_init_rx + mod->init_size_rx,
67086 set_memory_rw);
67087 }
67088 }
67089@@ -1695,14 +1697,14 @@ void set_all_modules_text_ro(void)
67090
67091 mutex_lock(&module_mutex);
67092 list_for_each_entry_rcu(mod, &modules, list) {
67093- if ((mod->module_core) && (mod->core_text_size)) {
67094- set_page_attributes(mod->module_core,
67095- mod->module_core + mod->core_text_size,
67096+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
67097+ set_page_attributes(mod->module_core_rx,
67098+ mod->module_core_rx + mod->core_size_rx,
67099 set_memory_ro);
67100 }
67101- if ((mod->module_init) && (mod->init_text_size)) {
67102- set_page_attributes(mod->module_init,
67103- mod->module_init + mod->init_text_size,
67104+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
67105+ set_page_attributes(mod->module_init_rx,
67106+ mod->module_init_rx + mod->init_size_rx,
67107 set_memory_ro);
67108 }
67109 }
67110@@ -1748,16 +1750,19 @@ static void free_module(struct module *mod)
67111
67112 /* This may be NULL, but that's OK */
67113 unset_module_init_ro_nx(mod);
67114- module_free(mod, mod->module_init);
67115+ module_free(mod, mod->module_init_rw);
67116+ module_free_exec(mod, mod->module_init_rx);
67117 kfree(mod->args);
67118 percpu_modfree(mod);
67119
67120 /* Free lock-classes: */
67121- lockdep_free_key_range(mod->module_core, mod->core_size);
67122+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
67123+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
67124
67125 /* Finally, free the core (containing the module structure) */
67126 unset_module_core_ro_nx(mod);
67127- module_free(mod, mod->module_core);
67128+ module_free_exec(mod, mod->module_core_rx);
67129+ module_free(mod, mod->module_core_rw);
67130
67131 #ifdef CONFIG_MPU
67132 update_protections(current->mm);
67133@@ -1826,10 +1831,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67134 unsigned int i;
67135 int ret = 0;
67136 const struct kernel_symbol *ksym;
67137+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67138+ int is_fs_load = 0;
67139+ int register_filesystem_found = 0;
67140+ char *p;
67141+
67142+ p = strstr(mod->args, "grsec_modharden_fs");
67143+ if (p) {
67144+ char *endptr = p + strlen("grsec_modharden_fs");
67145+ /* copy \0 as well */
67146+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
67147+ is_fs_load = 1;
67148+ }
67149+#endif
67150
67151 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
67152 const char *name = info->strtab + sym[i].st_name;
67153
67154+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67155+ /* it's a real shame this will never get ripped and copied
67156+ upstream! ;(
67157+ */
67158+ if (is_fs_load && !strcmp(name, "register_filesystem"))
67159+ register_filesystem_found = 1;
67160+#endif
67161+
67162 switch (sym[i].st_shndx) {
67163 case SHN_COMMON:
67164 /* We compiled with -fno-common. These are not
67165@@ -1850,7 +1876,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67166 ksym = resolve_symbol_wait(mod, info, name);
67167 /* Ok if resolved. */
67168 if (ksym && !IS_ERR(ksym)) {
67169+ pax_open_kernel();
67170 sym[i].st_value = ksym->value;
67171+ pax_close_kernel();
67172 break;
67173 }
67174
67175@@ -1869,11 +1897,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67176 secbase = (unsigned long)mod_percpu(mod);
67177 else
67178 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
67179+ pax_open_kernel();
67180 sym[i].st_value += secbase;
67181+ pax_close_kernel();
67182 break;
67183 }
67184 }
67185
67186+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67187+ if (is_fs_load && !register_filesystem_found) {
67188+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
67189+ ret = -EPERM;
67190+ }
67191+#endif
67192+
67193 return ret;
67194 }
67195
67196@@ -1977,22 +2014,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
67197 || s->sh_entsize != ~0UL
67198 || strstarts(sname, ".init"))
67199 continue;
67200- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
67201+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67202+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
67203+ else
67204+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
67205 DEBUGP("\t%s\n", name);
67206 }
67207- switch (m) {
67208- case 0: /* executable */
67209- mod->core_size = debug_align(mod->core_size);
67210- mod->core_text_size = mod->core_size;
67211- break;
67212- case 1: /* RO: text and ro-data */
67213- mod->core_size = debug_align(mod->core_size);
67214- mod->core_ro_size = mod->core_size;
67215- break;
67216- case 3: /* whole core */
67217- mod->core_size = debug_align(mod->core_size);
67218- break;
67219- }
67220 }
67221
67222 DEBUGP("Init section allocation order:\n");
67223@@ -2006,23 +2033,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
67224 || s->sh_entsize != ~0UL
67225 || !strstarts(sname, ".init"))
67226 continue;
67227- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
67228- | INIT_OFFSET_MASK);
67229+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67230+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
67231+ else
67232+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
67233+ s->sh_entsize |= INIT_OFFSET_MASK;
67234 DEBUGP("\t%s\n", sname);
67235 }
67236- switch (m) {
67237- case 0: /* executable */
67238- mod->init_size = debug_align(mod->init_size);
67239- mod->init_text_size = mod->init_size;
67240- break;
67241- case 1: /* RO: text and ro-data */
67242- mod->init_size = debug_align(mod->init_size);
67243- mod->init_ro_size = mod->init_size;
67244- break;
67245- case 3: /* whole init */
67246- mod->init_size = debug_align(mod->init_size);
67247- break;
67248- }
67249 }
67250 }
67251
67252@@ -2187,7 +2204,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67253
67254 /* Put symbol section at end of init part of module. */
67255 symsect->sh_flags |= SHF_ALLOC;
67256- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
67257+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
67258 info->index.sym) | INIT_OFFSET_MASK;
67259 DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
67260
67261@@ -2204,19 +2221,19 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67262 }
67263
67264 /* Append room for core symbols at end of core part. */
67265- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
67266- mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
67267+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
67268+ mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
67269
67270 /* Put string table section at end of init part of module. */
67271 strsect->sh_flags |= SHF_ALLOC;
67272- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
67273+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
67274 info->index.str) | INIT_OFFSET_MASK;
67275 DEBUGP("\t%s\n", info->secstrings + strsect->sh_name);
67276
67277 /* Append room for core symbols' strings at end of core part. */
67278- info->stroffs = mod->core_size;
67279+ info->stroffs = mod->core_size_rx;
67280 __set_bit(0, info->strmap);
67281- mod->core_size += bitmap_weight(info->strmap, strsect->sh_size);
67282+ mod->core_size_rx += bitmap_weight(info->strmap, strsect->sh_size);
67283 }
67284
67285 static void add_kallsyms(struct module *mod, const struct load_info *info)
67286@@ -2232,11 +2249,13 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67287 /* Make sure we get permanent strtab: don't use info->strtab. */
67288 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
67289
67290+ pax_open_kernel();
67291+
67292 /* Set types up while we still have access to sections. */
67293 for (i = 0; i < mod->num_symtab; i++)
67294 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
67295
67296- mod->core_symtab = dst = mod->module_core + info->symoffs;
67297+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
67298 src = mod->symtab;
67299 *dst = *src;
67300 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
67301@@ -2249,10 +2268,12 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67302 }
67303 mod->core_num_syms = ndst;
67304
67305- mod->core_strtab = s = mod->module_core + info->stroffs;
67306+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
67307 for (*s = 0, i = 1; i < info->sechdrs[info->index.str].sh_size; ++i)
67308 if (test_bit(i, info->strmap))
67309 *++s = mod->strtab[i];
67310+
67311+ pax_close_kernel();
67312 }
67313 #else
67314 static inline void layout_symtab(struct module *mod, struct load_info *info)
67315@@ -2286,17 +2307,33 @@ void * __weak module_alloc(unsigned long size)
67316 return size == 0 ? NULL : vmalloc_exec(size);
67317 }
67318
67319-static void *module_alloc_update_bounds(unsigned long size)
67320+static void *module_alloc_update_bounds_rw(unsigned long size)
67321 {
67322 void *ret = module_alloc(size);
67323
67324 if (ret) {
67325 mutex_lock(&module_mutex);
67326 /* Update module bounds. */
67327- if ((unsigned long)ret < module_addr_min)
67328- module_addr_min = (unsigned long)ret;
67329- if ((unsigned long)ret + size > module_addr_max)
67330- module_addr_max = (unsigned long)ret + size;
67331+ if ((unsigned long)ret < module_addr_min_rw)
67332+ module_addr_min_rw = (unsigned long)ret;
67333+ if ((unsigned long)ret + size > module_addr_max_rw)
67334+ module_addr_max_rw = (unsigned long)ret + size;
67335+ mutex_unlock(&module_mutex);
67336+ }
67337+ return ret;
67338+}
67339+
67340+static void *module_alloc_update_bounds_rx(unsigned long size)
67341+{
67342+ void *ret = module_alloc_exec(size);
67343+
67344+ if (ret) {
67345+ mutex_lock(&module_mutex);
67346+ /* Update module bounds. */
67347+ if ((unsigned long)ret < module_addr_min_rx)
67348+ module_addr_min_rx = (unsigned long)ret;
67349+ if ((unsigned long)ret + size > module_addr_max_rx)
67350+ module_addr_max_rx = (unsigned long)ret + size;
67351 mutex_unlock(&module_mutex);
67352 }
67353 return ret;
67354@@ -2474,8 +2511,14 @@ static struct module *setup_load_info(struct load_info *info)
67355 static int check_modinfo(struct module *mod, struct load_info *info)
67356 {
67357 const char *modmagic = get_modinfo(info, "vermagic");
67358+ const char *license = get_modinfo(info, "license");
67359 int err;
67360
67361+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
67362+ if (!license || !license_is_gpl_compatible(license))
67363+ return -ENOEXEC;
67364+#endif
67365+
67366 /* This is allowed: modprobe --force will invalidate it. */
67367 if (!modmagic) {
67368 err = try_to_force_load(mod, "bad vermagic");
67369@@ -2498,7 +2541,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
67370 }
67371
67372 /* Set up license info based on the info section */
67373- set_license(mod, get_modinfo(info, "license"));
67374+ set_license(mod, license);
67375
67376 return 0;
67377 }
67378@@ -2592,7 +2635,7 @@ static int move_module(struct module *mod, struct load_info *info)
67379 void *ptr;
67380
67381 /* Do the allocs. */
67382- ptr = module_alloc_update_bounds(mod->core_size);
67383+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
67384 /*
67385 * The pointer to this block is stored in the module structure
67386 * which is inside the block. Just mark it as not being a
67387@@ -2602,23 +2645,50 @@ static int move_module(struct module *mod, struct load_info *info)
67388 if (!ptr)
67389 return -ENOMEM;
67390
67391- memset(ptr, 0, mod->core_size);
67392- mod->module_core = ptr;
67393+ memset(ptr, 0, mod->core_size_rw);
67394+ mod->module_core_rw = ptr;
67395
67396- ptr = module_alloc_update_bounds(mod->init_size);
67397+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
67398 /*
67399 * The pointer to this block is stored in the module structure
67400 * which is inside the block. This block doesn't need to be
67401 * scanned as it contains data and code that will be freed
67402 * after the module is initialized.
67403 */
67404- kmemleak_ignore(ptr);
67405- if (!ptr && mod->init_size) {
67406- module_free(mod, mod->module_core);
67407+ kmemleak_not_leak(ptr);
67408+ if (!ptr && mod->init_size_rw) {
67409+ module_free(mod, mod->module_core_rw);
67410 return -ENOMEM;
67411 }
67412- memset(ptr, 0, mod->init_size);
67413- mod->module_init = ptr;
67414+ memset(ptr, 0, mod->init_size_rw);
67415+ mod->module_init_rw = ptr;
67416+
67417+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
67418+ kmemleak_not_leak(ptr);
67419+ if (!ptr) {
67420+ module_free(mod, mod->module_init_rw);
67421+ module_free(mod, mod->module_core_rw);
67422+ return -ENOMEM;
67423+ }
67424+
67425+ pax_open_kernel();
67426+ memset(ptr, 0, mod->core_size_rx);
67427+ pax_close_kernel();
67428+ mod->module_core_rx = ptr;
67429+
67430+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
67431+ kmemleak_not_leak(ptr);
67432+ if (!ptr && mod->init_size_rx) {
67433+ module_free_exec(mod, mod->module_core_rx);
67434+ module_free(mod, mod->module_init_rw);
67435+ module_free(mod, mod->module_core_rw);
67436+ return -ENOMEM;
67437+ }
67438+
67439+ pax_open_kernel();
67440+ memset(ptr, 0, mod->init_size_rx);
67441+ pax_close_kernel();
67442+ mod->module_init_rx = ptr;
67443
67444 /* Transfer each section which specifies SHF_ALLOC */
67445 DEBUGP("final section addresses:\n");
67446@@ -2629,16 +2699,45 @@ static int move_module(struct module *mod, struct load_info *info)
67447 if (!(shdr->sh_flags & SHF_ALLOC))
67448 continue;
67449
67450- if (shdr->sh_entsize & INIT_OFFSET_MASK)
67451- dest = mod->module_init
67452- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67453- else
67454- dest = mod->module_core + shdr->sh_entsize;
67455+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
67456+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67457+ dest = mod->module_init_rw
67458+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67459+ else
67460+ dest = mod->module_init_rx
67461+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67462+ } else {
67463+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67464+ dest = mod->module_core_rw + shdr->sh_entsize;
67465+ else
67466+ dest = mod->module_core_rx + shdr->sh_entsize;
67467+ }
67468+
67469+ if (shdr->sh_type != SHT_NOBITS) {
67470+
67471+#ifdef CONFIG_PAX_KERNEXEC
67472+#ifdef CONFIG_X86_64
67473+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
67474+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
67475+#endif
67476+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
67477+ pax_open_kernel();
67478+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67479+ pax_close_kernel();
67480+ } else
67481+#endif
67482
67483- if (shdr->sh_type != SHT_NOBITS)
67484 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67485+ }
67486 /* Update sh_addr to point to copy in image. */
67487- shdr->sh_addr = (unsigned long)dest;
67488+
67489+#ifdef CONFIG_PAX_KERNEXEC
67490+ if (shdr->sh_flags & SHF_EXECINSTR)
67491+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
67492+ else
67493+#endif
67494+
67495+ shdr->sh_addr = (unsigned long)dest;
67496 DEBUGP("\t0x%lx %s\n",
67497 shdr->sh_addr, info->secstrings + shdr->sh_name);
67498 }
67499@@ -2689,12 +2788,12 @@ static void flush_module_icache(const struct module *mod)
67500 * Do it before processing of module parameters, so the module
67501 * can provide parameter accessor functions of its own.
67502 */
67503- if (mod->module_init)
67504- flush_icache_range((unsigned long)mod->module_init,
67505- (unsigned long)mod->module_init
67506- + mod->init_size);
67507- flush_icache_range((unsigned long)mod->module_core,
67508- (unsigned long)mod->module_core + mod->core_size);
67509+ if (mod->module_init_rx)
67510+ flush_icache_range((unsigned long)mod->module_init_rx,
67511+ (unsigned long)mod->module_init_rx
67512+ + mod->init_size_rx);
67513+ flush_icache_range((unsigned long)mod->module_core_rx,
67514+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
67515
67516 set_fs(old_fs);
67517 }
67518@@ -2774,8 +2873,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
67519 {
67520 kfree(info->strmap);
67521 percpu_modfree(mod);
67522- module_free(mod, mod->module_init);
67523- module_free(mod, mod->module_core);
67524+ module_free_exec(mod, mod->module_init_rx);
67525+ module_free_exec(mod, mod->module_core_rx);
67526+ module_free(mod, mod->module_init_rw);
67527+ module_free(mod, mod->module_core_rw);
67528 }
67529
67530 int __weak module_finalize(const Elf_Ehdr *hdr,
67531@@ -2839,9 +2940,38 @@ static struct module *load_module(void __user *umod,
67532 if (err)
67533 goto free_unload;
67534
67535+ /* Now copy in args */
67536+ mod->args = strndup_user(uargs, ~0UL >> 1);
67537+ if (IS_ERR(mod->args)) {
67538+ err = PTR_ERR(mod->args);
67539+ goto free_unload;
67540+ }
67541+
67542 /* Set up MODINFO_ATTR fields */
67543 setup_modinfo(mod, &info);
67544
67545+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67546+ {
67547+ char *p, *p2;
67548+
67549+ if (strstr(mod->args, "grsec_modharden_netdev")) {
67550+ 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);
67551+ err = -EPERM;
67552+ goto free_modinfo;
67553+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
67554+ p += strlen("grsec_modharden_normal");
67555+ p2 = strstr(p, "_");
67556+ if (p2) {
67557+ *p2 = '\0';
67558+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
67559+ *p2 = '_';
67560+ }
67561+ err = -EPERM;
67562+ goto free_modinfo;
67563+ }
67564+ }
67565+#endif
67566+
67567 /* Fix up syms, so that st_value is a pointer to location. */
67568 err = simplify_symbols(mod, &info);
67569 if (err < 0)
67570@@ -2857,13 +2987,6 @@ static struct module *load_module(void __user *umod,
67571
67572 flush_module_icache(mod);
67573
67574- /* Now copy in args */
67575- mod->args = strndup_user(uargs, ~0UL >> 1);
67576- if (IS_ERR(mod->args)) {
67577- err = PTR_ERR(mod->args);
67578- goto free_arch_cleanup;
67579- }
67580-
67581 /* Mark state as coming so strong_try_module_get() ignores us. */
67582 mod->state = MODULE_STATE_COMING;
67583
67584@@ -2921,11 +3044,10 @@ static struct module *load_module(void __user *umod,
67585 unlock:
67586 mutex_unlock(&module_mutex);
67587 synchronize_sched();
67588- kfree(mod->args);
67589- free_arch_cleanup:
67590 module_arch_cleanup(mod);
67591 free_modinfo:
67592 free_modinfo(mod);
67593+ kfree(mod->args);
67594 free_unload:
67595 module_unload_free(mod);
67596 free_module:
67597@@ -2966,16 +3088,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
67598 MODULE_STATE_COMING, mod);
67599
67600 /* Set RO and NX regions for core */
67601- set_section_ro_nx(mod->module_core,
67602- mod->core_text_size,
67603- mod->core_ro_size,
67604- mod->core_size);
67605+ set_section_ro_nx(mod->module_core_rx,
67606+ mod->core_size_rx,
67607+ mod->core_size_rx,
67608+ mod->core_size_rx);
67609
67610 /* Set RO and NX regions for init */
67611- set_section_ro_nx(mod->module_init,
67612- mod->init_text_size,
67613- mod->init_ro_size,
67614- mod->init_size);
67615+ set_section_ro_nx(mod->module_init_rx,
67616+ mod->init_size_rx,
67617+ mod->init_size_rx,
67618+ mod->init_size_rx);
67619
67620 do_mod_ctors(mod);
67621 /* Start the module */
67622@@ -3021,11 +3143,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
67623 mod->strtab = mod->core_strtab;
67624 #endif
67625 unset_module_init_ro_nx(mod);
67626- module_free(mod, mod->module_init);
67627- mod->module_init = NULL;
67628- mod->init_size = 0;
67629- mod->init_ro_size = 0;
67630- mod->init_text_size = 0;
67631+ module_free(mod, mod->module_init_rw);
67632+ module_free_exec(mod, mod->module_init_rx);
67633+ mod->module_init_rw = NULL;
67634+ mod->module_init_rx = NULL;
67635+ mod->init_size_rw = 0;
67636+ mod->init_size_rx = 0;
67637 mutex_unlock(&module_mutex);
67638
67639 return 0;
67640@@ -3056,10 +3179,16 @@ static const char *get_ksymbol(struct module *mod,
67641 unsigned long nextval;
67642
67643 /* At worse, next value is at end of module */
67644- if (within_module_init(addr, mod))
67645- nextval = (unsigned long)mod->module_init+mod->init_text_size;
67646+ if (within_module_init_rx(addr, mod))
67647+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
67648+ else if (within_module_init_rw(addr, mod))
67649+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
67650+ else if (within_module_core_rx(addr, mod))
67651+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
67652+ else if (within_module_core_rw(addr, mod))
67653+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
67654 else
67655- nextval = (unsigned long)mod->module_core+mod->core_text_size;
67656+ return NULL;
67657
67658 /* Scan for closest preceding symbol, and next symbol. (ELF
67659 starts real symbols at 1). */
67660@@ -3307,7 +3436,7 @@ static int m_show(struct seq_file *m, void *p)
67661 char buf[8];
67662
67663 seq_printf(m, "%s %u",
67664- mod->name, mod->init_size + mod->core_size);
67665+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
67666 print_unload_info(m, mod);
67667
67668 /* Informative for users. */
67669@@ -3316,7 +3445,7 @@ static int m_show(struct seq_file *m, void *p)
67670 mod->state == MODULE_STATE_COMING ? "Loading":
67671 "Live");
67672 /* Used by oprofile and other similar tools. */
67673- seq_printf(m, " 0x%pK", mod->module_core);
67674+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
67675
67676 /* Taints info */
67677 if (mod->taints)
67678@@ -3352,7 +3481,17 @@ static const struct file_operations proc_modules_operations = {
67679
67680 static int __init proc_modules_init(void)
67681 {
67682+#ifndef CONFIG_GRKERNSEC_HIDESYM
67683+#ifdef CONFIG_GRKERNSEC_PROC_USER
67684+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
67685+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67686+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
67687+#else
67688 proc_create("modules", 0, NULL, &proc_modules_operations);
67689+#endif
67690+#else
67691+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
67692+#endif
67693 return 0;
67694 }
67695 module_init(proc_modules_init);
67696@@ -3411,12 +3550,12 @@ struct module *__module_address(unsigned long addr)
67697 {
67698 struct module *mod;
67699
67700- if (addr < module_addr_min || addr > module_addr_max)
67701+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
67702+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
67703 return NULL;
67704
67705 list_for_each_entry_rcu(mod, &modules, list)
67706- if (within_module_core(addr, mod)
67707- || within_module_init(addr, mod))
67708+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
67709 return mod;
67710 return NULL;
67711 }
67712@@ -3450,11 +3589,20 @@ bool is_module_text_address(unsigned long addr)
67713 */
67714 struct module *__module_text_address(unsigned long addr)
67715 {
67716- struct module *mod = __module_address(addr);
67717+ struct module *mod;
67718+
67719+#ifdef CONFIG_X86_32
67720+ addr = ktla_ktva(addr);
67721+#endif
67722+
67723+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
67724+ return NULL;
67725+
67726+ mod = __module_address(addr);
67727+
67728 if (mod) {
67729 /* Make sure it's within the text section. */
67730- if (!within(addr, mod->module_init, mod->init_text_size)
67731- && !within(addr, mod->module_core, mod->core_text_size))
67732+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
67733 mod = NULL;
67734 }
67735 return mod;
67736diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
67737index 7e3443f..b2a1e6b 100644
67738--- a/kernel/mutex-debug.c
67739+++ b/kernel/mutex-debug.c
67740@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
67741 }
67742
67743 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67744- struct thread_info *ti)
67745+ struct task_struct *task)
67746 {
67747 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
67748
67749 /* Mark the current thread as blocked on the lock: */
67750- ti->task->blocked_on = waiter;
67751+ task->blocked_on = waiter;
67752 }
67753
67754 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67755- struct thread_info *ti)
67756+ struct task_struct *task)
67757 {
67758 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
67759- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
67760- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
67761- ti->task->blocked_on = NULL;
67762+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
67763+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
67764+ task->blocked_on = NULL;
67765
67766 list_del_init(&waiter->list);
67767 waiter->task = NULL;
67768diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
67769index 0799fd3..d06ae3b 100644
67770--- a/kernel/mutex-debug.h
67771+++ b/kernel/mutex-debug.h
67772@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
67773 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
67774 extern void debug_mutex_add_waiter(struct mutex *lock,
67775 struct mutex_waiter *waiter,
67776- struct thread_info *ti);
67777+ struct task_struct *task);
67778 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67779- struct thread_info *ti);
67780+ struct task_struct *task);
67781 extern void debug_mutex_unlock(struct mutex *lock);
67782 extern void debug_mutex_init(struct mutex *lock, const char *name,
67783 struct lock_class_key *key);
67784diff --git a/kernel/mutex.c b/kernel/mutex.c
67785index 89096dd..f91ebc5 100644
67786--- a/kernel/mutex.c
67787+++ b/kernel/mutex.c
67788@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
67789 spin_lock_mutex(&lock->wait_lock, flags);
67790
67791 debug_mutex_lock_common(lock, &waiter);
67792- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
67793+ debug_mutex_add_waiter(lock, &waiter, task);
67794
67795 /* add waiting tasks to the end of the waitqueue (FIFO): */
67796 list_add_tail(&waiter.list, &lock->wait_list);
67797@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
67798 * TASK_UNINTERRUPTIBLE case.)
67799 */
67800 if (unlikely(signal_pending_state(state, task))) {
67801- mutex_remove_waiter(lock, &waiter,
67802- task_thread_info(task));
67803+ mutex_remove_waiter(lock, &waiter, task);
67804 mutex_release(&lock->dep_map, 1, ip);
67805 spin_unlock_mutex(&lock->wait_lock, flags);
67806
67807@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
67808 done:
67809 lock_acquired(&lock->dep_map, ip);
67810 /* got the lock - rejoice! */
67811- mutex_remove_waiter(lock, &waiter, current_thread_info());
67812+ mutex_remove_waiter(lock, &waiter, task);
67813 mutex_set_owner(lock);
67814
67815 /* set it to 0 if there are no waiters left: */
67816diff --git a/kernel/padata.c b/kernel/padata.c
67817index b452599..5d68f4e 100644
67818--- a/kernel/padata.c
67819+++ b/kernel/padata.c
67820@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_instance *pinst,
67821 padata->pd = pd;
67822 padata->cb_cpu = cb_cpu;
67823
67824- if (unlikely(atomic_read(&pd->seq_nr) == pd->max_seq_nr))
67825- atomic_set(&pd->seq_nr, -1);
67826+ if (unlikely(atomic_read_unchecked(&pd->seq_nr) == pd->max_seq_nr))
67827+ atomic_set_unchecked(&pd->seq_nr, -1);
67828
67829- padata->seq_nr = atomic_inc_return(&pd->seq_nr);
67830+ padata->seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
67831
67832 target_cpu = padata_cpu_hash(padata);
67833 queue = per_cpu_ptr(pd->pqueue, target_cpu);
67834@@ -444,7 +444,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
67835 padata_init_pqueues(pd);
67836 padata_init_squeues(pd);
67837 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
67838- atomic_set(&pd->seq_nr, -1);
67839+ atomic_set_unchecked(&pd->seq_nr, -1);
67840 atomic_set(&pd->reorder_objects, 0);
67841 atomic_set(&pd->refcnt, 0);
67842 pd->pinst = pinst;
67843diff --git a/kernel/panic.c b/kernel/panic.c
67844index 3458469..342c500 100644
67845--- a/kernel/panic.c
67846+++ b/kernel/panic.c
67847@@ -78,7 +78,11 @@ NORET_TYPE void panic(const char * fmt, ...)
67848 va_end(args);
67849 printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
67850 #ifdef CONFIG_DEBUG_BUGVERBOSE
67851- dump_stack();
67852+ /*
67853+ * Avoid nested stack-dumping if a panic occurs during oops processing
67854+ */
67855+ if (!oops_in_progress)
67856+ dump_stack();
67857 #endif
67858
67859 /*
67860@@ -382,7 +386,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
67861 const char *board;
67862
67863 printk(KERN_WARNING "------------[ cut here ]------------\n");
67864- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
67865+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
67866 board = dmi_get_system_info(DMI_PRODUCT_NAME);
67867 if (board)
67868 printk(KERN_WARNING "Hardware name: %s\n", board);
67869@@ -437,7 +441,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
67870 */
67871 void __stack_chk_fail(void)
67872 {
67873- panic("stack-protector: Kernel stack is corrupted in: %p\n",
67874+ dump_stack();
67875+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
67876 __builtin_return_address(0));
67877 }
67878 EXPORT_SYMBOL(__stack_chk_fail);
67879diff --git a/kernel/pid.c b/kernel/pid.c
67880index fa5f722..0c93e57 100644
67881--- a/kernel/pid.c
67882+++ b/kernel/pid.c
67883@@ -33,6 +33,7 @@
67884 #include <linux/rculist.h>
67885 #include <linux/bootmem.h>
67886 #include <linux/hash.h>
67887+#include <linux/security.h>
67888 #include <linux/pid_namespace.h>
67889 #include <linux/init_task.h>
67890 #include <linux/syscalls.h>
67891@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
67892
67893 int pid_max = PID_MAX_DEFAULT;
67894
67895-#define RESERVED_PIDS 300
67896+#define RESERVED_PIDS 500
67897
67898 int pid_max_min = RESERVED_PIDS + 1;
67899 int pid_max_max = PID_MAX_LIMIT;
67900@@ -418,10 +419,18 @@ EXPORT_SYMBOL(pid_task);
67901 */
67902 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
67903 {
67904+ struct task_struct *task;
67905+
67906 rcu_lockdep_assert(rcu_read_lock_held(),
67907 "find_task_by_pid_ns() needs rcu_read_lock()"
67908 " protection");
67909- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
67910+
67911+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
67912+
67913+ if (gr_pid_is_chrooted(task))
67914+ return NULL;
67915+
67916+ return task;
67917 }
67918
67919 struct task_struct *find_task_by_vpid(pid_t vnr)
67920@@ -429,6 +438,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
67921 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
67922 }
67923
67924+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
67925+{
67926+ rcu_lockdep_assert(rcu_read_lock_held(),
67927+ "find_task_by_pid_ns() needs rcu_read_lock()"
67928+ " protection");
67929+ return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
67930+}
67931+
67932 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
67933 {
67934 struct pid *pid;
67935diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
67936index e7cb76d..75eceb3 100644
67937--- a/kernel/posix-cpu-timers.c
67938+++ b/kernel/posix-cpu-timers.c
67939@@ -6,6 +6,7 @@
67940 #include <linux/posix-timers.h>
67941 #include <linux/errno.h>
67942 #include <linux/math64.h>
67943+#include <linux/security.h>
67944 #include <asm/uaccess.h>
67945 #include <linux/kernel_stat.h>
67946 #include <trace/events/timer.h>
67947@@ -1606,14 +1607,14 @@ struct k_clock clock_posix_cpu = {
67948
67949 static __init int init_posix_cpu_timers(void)
67950 {
67951- struct k_clock process = {
67952+ static struct k_clock process = {
67953 .clock_getres = process_cpu_clock_getres,
67954 .clock_get = process_cpu_clock_get,
67955 .timer_create = process_cpu_timer_create,
67956 .nsleep = process_cpu_nsleep,
67957 .nsleep_restart = process_cpu_nsleep_restart,
67958 };
67959- struct k_clock thread = {
67960+ static struct k_clock thread = {
67961 .clock_getres = thread_cpu_clock_getres,
67962 .clock_get = thread_cpu_clock_get,
67963 .timer_create = thread_cpu_timer_create,
67964diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
67965index 69185ae..cc2847a 100644
67966--- a/kernel/posix-timers.c
67967+++ b/kernel/posix-timers.c
67968@@ -43,6 +43,7 @@
67969 #include <linux/idr.h>
67970 #include <linux/posix-clock.h>
67971 #include <linux/posix-timers.h>
67972+#include <linux/grsecurity.h>
67973 #include <linux/syscalls.h>
67974 #include <linux/wait.h>
67975 #include <linux/workqueue.h>
67976@@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
67977 * which we beg off on and pass to do_sys_settimeofday().
67978 */
67979
67980-static struct k_clock posix_clocks[MAX_CLOCKS];
67981+static struct k_clock *posix_clocks[MAX_CLOCKS];
67982
67983 /*
67984 * These ones are defined below.
67985@@ -227,7 +228,7 @@ static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
67986 */
67987 static __init int init_posix_timers(void)
67988 {
67989- struct k_clock clock_realtime = {
67990+ static struct k_clock clock_realtime = {
67991 .clock_getres = hrtimer_get_res,
67992 .clock_get = posix_clock_realtime_get,
67993 .clock_set = posix_clock_realtime_set,
67994@@ -239,7 +240,7 @@ static __init int init_posix_timers(void)
67995 .timer_get = common_timer_get,
67996 .timer_del = common_timer_del,
67997 };
67998- struct k_clock clock_monotonic = {
67999+ static struct k_clock clock_monotonic = {
68000 .clock_getres = hrtimer_get_res,
68001 .clock_get = posix_ktime_get_ts,
68002 .nsleep = common_nsleep,
68003@@ -249,19 +250,19 @@ static __init int init_posix_timers(void)
68004 .timer_get = common_timer_get,
68005 .timer_del = common_timer_del,
68006 };
68007- struct k_clock clock_monotonic_raw = {
68008+ static struct k_clock clock_monotonic_raw = {
68009 .clock_getres = hrtimer_get_res,
68010 .clock_get = posix_get_monotonic_raw,
68011 };
68012- struct k_clock clock_realtime_coarse = {
68013+ static struct k_clock clock_realtime_coarse = {
68014 .clock_getres = posix_get_coarse_res,
68015 .clock_get = posix_get_realtime_coarse,
68016 };
68017- struct k_clock clock_monotonic_coarse = {
68018+ static struct k_clock clock_monotonic_coarse = {
68019 .clock_getres = posix_get_coarse_res,
68020 .clock_get = posix_get_monotonic_coarse,
68021 };
68022- struct k_clock clock_boottime = {
68023+ static struct k_clock clock_boottime = {
68024 .clock_getres = hrtimer_get_res,
68025 .clock_get = posix_get_boottime,
68026 .nsleep = common_nsleep,
68027@@ -473,7 +474,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
68028 return;
68029 }
68030
68031- posix_clocks[clock_id] = *new_clock;
68032+ posix_clocks[clock_id] = new_clock;
68033 }
68034 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
68035
68036@@ -519,9 +520,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
68037 return (id & CLOCKFD_MASK) == CLOCKFD ?
68038 &clock_posix_dynamic : &clock_posix_cpu;
68039
68040- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
68041+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
68042 return NULL;
68043- return &posix_clocks[id];
68044+ return posix_clocks[id];
68045 }
68046
68047 static int common_timer_create(struct k_itimer *new_timer)
68048@@ -959,6 +960,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
68049 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
68050 return -EFAULT;
68051
68052+ /* only the CLOCK_REALTIME clock can be set, all other clocks
68053+ have their clock_set fptr set to a nosettime dummy function
68054+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
68055+ call common_clock_set, which calls do_sys_settimeofday, which
68056+ we hook
68057+ */
68058+
68059 return kc->clock_set(which_clock, &new_tp);
68060 }
68061
68062diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
68063index d523593..68197a4 100644
68064--- a/kernel/power/poweroff.c
68065+++ b/kernel/power/poweroff.c
68066@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
68067 .enable_mask = SYSRQ_ENABLE_BOOT,
68068 };
68069
68070-static int pm_sysrq_init(void)
68071+static int __init pm_sysrq_init(void)
68072 {
68073 register_sysrq_key('o', &sysrq_poweroff_op);
68074 return 0;
68075diff --git a/kernel/power/process.c b/kernel/power/process.c
68076index 3d4b954..11af930 100644
68077--- a/kernel/power/process.c
68078+++ b/kernel/power/process.c
68079@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_only)
68080 u64 elapsed_csecs64;
68081 unsigned int elapsed_csecs;
68082 bool wakeup = false;
68083+ bool timedout = false;
68084
68085 do_gettimeofday(&start);
68086
68087@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_only)
68088
68089 while (true) {
68090 todo = 0;
68091+ if (time_after(jiffies, end_time))
68092+ timedout = true;
68093 read_lock(&tasklist_lock);
68094 do_each_thread(g, p) {
68095 if (frozen(p) || !freezable(p))
68096@@ -71,9 +74,13 @@ static int try_to_freeze_tasks(bool sig_only)
68097 * try_to_stop() after schedule() in ptrace/signal
68098 * stop sees TIF_FREEZE.
68099 */
68100- if (!task_is_stopped_or_traced(p) &&
68101- !freezer_should_skip(p))
68102+ if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
68103 todo++;
68104+ if (timedout) {
68105+ printk(KERN_ERR "Task refusing to freeze:\n");
68106+ sched_show_task(p);
68107+ }
68108+ }
68109 } while_each_thread(g, p);
68110 read_unlock(&tasklist_lock);
68111
68112@@ -82,7 +89,7 @@ static int try_to_freeze_tasks(bool sig_only)
68113 todo += wq_busy;
68114 }
68115
68116- if (!todo || time_after(jiffies, end_time))
68117+ if (!todo || timedout)
68118 break;
68119
68120 if (pm_wakeup_pending()) {
68121diff --git a/kernel/printk.c b/kernel/printk.c
68122index 7982a0a..2095fdc 100644
68123--- a/kernel/printk.c
68124+++ b/kernel/printk.c
68125@@ -313,6 +313,11 @@ static int check_syslog_permissions(int type, bool from_file)
68126 if (from_file && type != SYSLOG_ACTION_OPEN)
68127 return 0;
68128
68129+#ifdef CONFIG_GRKERNSEC_DMESG
68130+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
68131+ return -EPERM;
68132+#endif
68133+
68134 if (syslog_action_restricted(type)) {
68135 if (capable(CAP_SYSLOG))
68136 return 0;
68137diff --git a/kernel/profile.c b/kernel/profile.c
68138index 76b8e77..a2930e8 100644
68139--- a/kernel/profile.c
68140+++ b/kernel/profile.c
68141@@ -39,7 +39,7 @@ struct profile_hit {
68142 /* Oprofile timer tick hook */
68143 static int (*timer_hook)(struct pt_regs *) __read_mostly;
68144
68145-static atomic_t *prof_buffer;
68146+static atomic_unchecked_t *prof_buffer;
68147 static unsigned long prof_len, prof_shift;
68148
68149 int prof_on __read_mostly;
68150@@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
68151 hits[i].pc = 0;
68152 continue;
68153 }
68154- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68155+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68156 hits[i].hits = hits[i].pc = 0;
68157 }
68158 }
68159@@ -342,9 +342,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68160 * Add the current hit(s) and flush the write-queue out
68161 * to the global buffer:
68162 */
68163- atomic_add(nr_hits, &prof_buffer[pc]);
68164+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
68165 for (i = 0; i < NR_PROFILE_HIT; ++i) {
68166- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68167+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68168 hits[i].pc = hits[i].hits = 0;
68169 }
68170 out:
68171@@ -419,7 +419,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68172 {
68173 unsigned long pc;
68174 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
68175- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68176+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68177 }
68178 #endif /* !CONFIG_SMP */
68179
68180@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
68181 return -EFAULT;
68182 buf++; p++; count--; read++;
68183 }
68184- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
68185+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
68186 if (copy_to_user(buf, (void *)pnt, count))
68187 return -EFAULT;
68188 read += count;
68189@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
68190 }
68191 #endif
68192 profile_discard_flip_buffers();
68193- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
68194+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
68195 return count;
68196 }
68197
68198diff --git a/kernel/ptrace.c b/kernel/ptrace.c
68199index 78ab24a..332c915 100644
68200--- a/kernel/ptrace.c
68201+++ b/kernel/ptrace.c
68202@@ -172,7 +172,8 @@ int ptrace_check_attach(struct task_struct *child, bool ignore_state)
68203 return ret;
68204 }
68205
68206-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
68207+static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
68208+ unsigned int log)
68209 {
68210 const struct cred *cred = current_cred(), *tcred;
68211
68212@@ -198,7 +199,8 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
68213 cred->gid == tcred->sgid &&
68214 cred->gid == tcred->gid))
68215 goto ok;
68216- if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE))
68217+ if ((!log && ns_capable_nolog(tcred->user->user_ns, CAP_SYS_PTRACE)) ||
68218+ (log && ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE)))
68219 goto ok;
68220 rcu_read_unlock();
68221 return -EPERM;
68222@@ -207,7 +209,9 @@ ok:
68223 smp_rmb();
68224 if (task->mm)
68225 dumpable = get_dumpable(task->mm);
68226- if (!dumpable && !task_ns_capable(task, CAP_SYS_PTRACE))
68227+ if (!dumpable &&
68228+ ((!log && !task_ns_capable_nolog(task, CAP_SYS_PTRACE)) ||
68229+ (log && !task_ns_capable(task, CAP_SYS_PTRACE))))
68230 return -EPERM;
68231
68232 return security_ptrace_access_check(task, mode);
68233@@ -217,7 +221,21 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
68234 {
68235 int err;
68236 task_lock(task);
68237- err = __ptrace_may_access(task, mode);
68238+ err = __ptrace_may_access(task, mode, 0);
68239+ task_unlock(task);
68240+ return !err;
68241+}
68242+
68243+bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode)
68244+{
68245+ return __ptrace_may_access(task, mode, 0);
68246+}
68247+
68248+bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
68249+{
68250+ int err;
68251+ task_lock(task);
68252+ err = __ptrace_may_access(task, mode, 1);
68253 task_unlock(task);
68254 return !err;
68255 }
68256@@ -262,7 +280,7 @@ static int ptrace_attach(struct task_struct *task, long request,
68257 goto out;
68258
68259 task_lock(task);
68260- retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
68261+ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
68262 task_unlock(task);
68263 if (retval)
68264 goto unlock_creds;
68265@@ -277,7 +295,7 @@ static int ptrace_attach(struct task_struct *task, long request,
68266 task->ptrace = PT_PTRACED;
68267 if (seize)
68268 task->ptrace |= PT_SEIZED;
68269- if (task_ns_capable(task, CAP_SYS_PTRACE))
68270+ if (task_ns_capable_nolog(task, CAP_SYS_PTRACE))
68271 task->ptrace |= PT_PTRACE_CAP;
68272
68273 __ptrace_link(task, current);
68274@@ -483,7 +501,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
68275 break;
68276 return -EIO;
68277 }
68278- if (copy_to_user(dst, buf, retval))
68279+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
68280 return -EFAULT;
68281 copied += retval;
68282 src += retval;
68283@@ -680,7 +698,7 @@ int ptrace_request(struct task_struct *child, long request,
68284 bool seized = child->ptrace & PT_SEIZED;
68285 int ret = -EIO;
68286 siginfo_t siginfo, *si;
68287- void __user *datavp = (void __user *) data;
68288+ void __user *datavp = (__force void __user *) data;
68289 unsigned long __user *datalp = datavp;
68290 unsigned long flags;
68291
68292@@ -882,14 +900,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
68293 goto out;
68294 }
68295
68296+ if (gr_handle_ptrace(child, request)) {
68297+ ret = -EPERM;
68298+ goto out_put_task_struct;
68299+ }
68300+
68301 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68302 ret = ptrace_attach(child, request, data);
68303 /*
68304 * Some architectures need to do book-keeping after
68305 * a ptrace attach.
68306 */
68307- if (!ret)
68308+ if (!ret) {
68309 arch_ptrace_attach(child);
68310+ gr_audit_ptrace(child);
68311+ }
68312 goto out_put_task_struct;
68313 }
68314
68315@@ -915,7 +940,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
68316 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
68317 if (copied != sizeof(tmp))
68318 return -EIO;
68319- return put_user(tmp, (unsigned long __user *)data);
68320+ return put_user(tmp, (__force unsigned long __user *)data);
68321 }
68322
68323 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
68324@@ -1025,14 +1050,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
68325 goto out;
68326 }
68327
68328+ if (gr_handle_ptrace(child, request)) {
68329+ ret = -EPERM;
68330+ goto out_put_task_struct;
68331+ }
68332+
68333 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68334 ret = ptrace_attach(child, request, data);
68335 /*
68336 * Some architectures need to do book-keeping after
68337 * a ptrace attach.
68338 */
68339- if (!ret)
68340+ if (!ret) {
68341 arch_ptrace_attach(child);
68342+ gr_audit_ptrace(child);
68343+ }
68344 goto out_put_task_struct;
68345 }
68346
68347diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
68348index 636af6d..8af70ab 100644
68349--- a/kernel/rcutiny.c
68350+++ b/kernel/rcutiny.c
68351@@ -46,7 +46,7 @@
68352 struct rcu_ctrlblk;
68353 static void invoke_rcu_callbacks(void);
68354 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
68355-static void rcu_process_callbacks(struct softirq_action *unused);
68356+static void rcu_process_callbacks(void);
68357 static void __call_rcu(struct rcu_head *head,
68358 void (*func)(struct rcu_head *rcu),
68359 struct rcu_ctrlblk *rcp);
68360@@ -186,7 +186,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
68361 RCU_TRACE(trace_rcu_batch_end(rcp->name, cb_count));
68362 }
68363
68364-static void rcu_process_callbacks(struct softirq_action *unused)
68365+static void rcu_process_callbacks(void)
68366 {
68367 __rcu_process_callbacks(&rcu_sched_ctrlblk);
68368 __rcu_process_callbacks(&rcu_bh_ctrlblk);
68369diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
68370index 764825c..3aa6ac4 100644
68371--- a/kernel/rcutorture.c
68372+++ b/kernel/rcutorture.c
68373@@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
68374 { 0 };
68375 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
68376 { 0 };
68377-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68378-static atomic_t n_rcu_torture_alloc;
68379-static atomic_t n_rcu_torture_alloc_fail;
68380-static atomic_t n_rcu_torture_free;
68381-static atomic_t n_rcu_torture_mberror;
68382-static atomic_t n_rcu_torture_error;
68383+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68384+static atomic_unchecked_t n_rcu_torture_alloc;
68385+static atomic_unchecked_t n_rcu_torture_alloc_fail;
68386+static atomic_unchecked_t n_rcu_torture_free;
68387+static atomic_unchecked_t n_rcu_torture_mberror;
68388+static atomic_unchecked_t n_rcu_torture_error;
68389 static long n_rcu_torture_boost_ktrerror;
68390 static long n_rcu_torture_boost_rterror;
68391 static long n_rcu_torture_boost_failure;
68392@@ -223,11 +223,11 @@ rcu_torture_alloc(void)
68393
68394 spin_lock_bh(&rcu_torture_lock);
68395 if (list_empty(&rcu_torture_freelist)) {
68396- atomic_inc(&n_rcu_torture_alloc_fail);
68397+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
68398 spin_unlock_bh(&rcu_torture_lock);
68399 return NULL;
68400 }
68401- atomic_inc(&n_rcu_torture_alloc);
68402+ atomic_inc_unchecked(&n_rcu_torture_alloc);
68403 p = rcu_torture_freelist.next;
68404 list_del_init(p);
68405 spin_unlock_bh(&rcu_torture_lock);
68406@@ -240,7 +240,7 @@ rcu_torture_alloc(void)
68407 static void
68408 rcu_torture_free(struct rcu_torture *p)
68409 {
68410- atomic_inc(&n_rcu_torture_free);
68411+ atomic_inc_unchecked(&n_rcu_torture_free);
68412 spin_lock_bh(&rcu_torture_lock);
68413 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
68414 spin_unlock_bh(&rcu_torture_lock);
68415@@ -360,7 +360,7 @@ rcu_torture_cb(struct rcu_head *p)
68416 i = rp->rtort_pipe_count;
68417 if (i > RCU_TORTURE_PIPE_LEN)
68418 i = RCU_TORTURE_PIPE_LEN;
68419- atomic_inc(&rcu_torture_wcount[i]);
68420+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68421 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68422 rp->rtort_mbtest = 0;
68423 rcu_torture_free(rp);
68424@@ -407,7 +407,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
68425 i = rp->rtort_pipe_count;
68426 if (i > RCU_TORTURE_PIPE_LEN)
68427 i = RCU_TORTURE_PIPE_LEN;
68428- atomic_inc(&rcu_torture_wcount[i]);
68429+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68430 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68431 rp->rtort_mbtest = 0;
68432 list_del(&rp->rtort_free);
68433@@ -872,7 +872,7 @@ rcu_torture_writer(void *arg)
68434 i = old_rp->rtort_pipe_count;
68435 if (i > RCU_TORTURE_PIPE_LEN)
68436 i = RCU_TORTURE_PIPE_LEN;
68437- atomic_inc(&rcu_torture_wcount[i]);
68438+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68439 old_rp->rtort_pipe_count++;
68440 cur_ops->deferred_free(old_rp);
68441 }
68442@@ -940,7 +940,7 @@ static void rcu_torture_timer(unsigned long unused)
68443 return;
68444 }
68445 if (p->rtort_mbtest == 0)
68446- atomic_inc(&n_rcu_torture_mberror);
68447+ atomic_inc_unchecked(&n_rcu_torture_mberror);
68448 spin_lock(&rand_lock);
68449 cur_ops->read_delay(&rand);
68450 n_rcu_torture_timers++;
68451@@ -1001,7 +1001,7 @@ rcu_torture_reader(void *arg)
68452 continue;
68453 }
68454 if (p->rtort_mbtest == 0)
68455- atomic_inc(&n_rcu_torture_mberror);
68456+ atomic_inc_unchecked(&n_rcu_torture_mberror);
68457 cur_ops->read_delay(&rand);
68458 preempt_disable();
68459 pipe_count = p->rtort_pipe_count;
68460@@ -1060,16 +1060,16 @@ rcu_torture_printk(char *page)
68461 rcu_torture_current,
68462 rcu_torture_current_version,
68463 list_empty(&rcu_torture_freelist),
68464- atomic_read(&n_rcu_torture_alloc),
68465- atomic_read(&n_rcu_torture_alloc_fail),
68466- atomic_read(&n_rcu_torture_free),
68467- atomic_read(&n_rcu_torture_mberror),
68468+ atomic_read_unchecked(&n_rcu_torture_alloc),
68469+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
68470+ atomic_read_unchecked(&n_rcu_torture_free),
68471+ atomic_read_unchecked(&n_rcu_torture_mberror),
68472 n_rcu_torture_boost_ktrerror,
68473 n_rcu_torture_boost_rterror,
68474 n_rcu_torture_boost_failure,
68475 n_rcu_torture_boosts,
68476 n_rcu_torture_timers);
68477- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
68478+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
68479 n_rcu_torture_boost_ktrerror != 0 ||
68480 n_rcu_torture_boost_rterror != 0 ||
68481 n_rcu_torture_boost_failure != 0)
68482@@ -1077,7 +1077,7 @@ rcu_torture_printk(char *page)
68483 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
68484 if (i > 1) {
68485 cnt += sprintf(&page[cnt], "!!! ");
68486- atomic_inc(&n_rcu_torture_error);
68487+ atomic_inc_unchecked(&n_rcu_torture_error);
68488 WARN_ON_ONCE(1);
68489 }
68490 cnt += sprintf(&page[cnt], "Reader Pipe: ");
68491@@ -1091,7 +1091,7 @@ rcu_torture_printk(char *page)
68492 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
68493 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68494 cnt += sprintf(&page[cnt], " %d",
68495- atomic_read(&rcu_torture_wcount[i]));
68496+ atomic_read_unchecked(&rcu_torture_wcount[i]));
68497 }
68498 cnt += sprintf(&page[cnt], "\n");
68499 if (cur_ops->stats)
68500@@ -1401,7 +1401,7 @@ rcu_torture_cleanup(void)
68501
68502 if (cur_ops->cleanup)
68503 cur_ops->cleanup();
68504- if (atomic_read(&n_rcu_torture_error))
68505+ if (atomic_read_unchecked(&n_rcu_torture_error))
68506 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
68507 else
68508 rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
68509@@ -1465,17 +1465,17 @@ rcu_torture_init(void)
68510
68511 rcu_torture_current = NULL;
68512 rcu_torture_current_version = 0;
68513- atomic_set(&n_rcu_torture_alloc, 0);
68514- atomic_set(&n_rcu_torture_alloc_fail, 0);
68515- atomic_set(&n_rcu_torture_free, 0);
68516- atomic_set(&n_rcu_torture_mberror, 0);
68517- atomic_set(&n_rcu_torture_error, 0);
68518+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
68519+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
68520+ atomic_set_unchecked(&n_rcu_torture_free, 0);
68521+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
68522+ atomic_set_unchecked(&n_rcu_torture_error, 0);
68523 n_rcu_torture_boost_ktrerror = 0;
68524 n_rcu_torture_boost_rterror = 0;
68525 n_rcu_torture_boost_failure = 0;
68526 n_rcu_torture_boosts = 0;
68527 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
68528- atomic_set(&rcu_torture_wcount[i], 0);
68529+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
68530 for_each_possible_cpu(cpu) {
68531 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68532 per_cpu(rcu_torture_count, cpu)[i] = 0;
68533diff --git a/kernel/rcutree.c b/kernel/rcutree.c
68534index 6b76d81..7afc1b3 100644
68535--- a/kernel/rcutree.c
68536+++ b/kernel/rcutree.c
68537@@ -367,9 +367,9 @@ void rcu_enter_nohz(void)
68538 trace_rcu_dyntick("Start");
68539 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68540 smp_mb__before_atomic_inc(); /* See above. */
68541- atomic_inc(&rdtp->dynticks);
68542+ atomic_inc_unchecked(&rdtp->dynticks);
68543 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
68544- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68545+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68546 local_irq_restore(flags);
68547 }
68548
68549@@ -391,10 +391,10 @@ void rcu_exit_nohz(void)
68550 return;
68551 }
68552 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
68553- atomic_inc(&rdtp->dynticks);
68554+ atomic_inc_unchecked(&rdtp->dynticks);
68555 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68556 smp_mb__after_atomic_inc(); /* See above. */
68557- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68558+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68559 trace_rcu_dyntick("End");
68560 local_irq_restore(flags);
68561 }
68562@@ -411,14 +411,14 @@ void rcu_nmi_enter(void)
68563 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
68564
68565 if (rdtp->dynticks_nmi_nesting == 0 &&
68566- (atomic_read(&rdtp->dynticks) & 0x1))
68567+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
68568 return;
68569 rdtp->dynticks_nmi_nesting++;
68570 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
68571- atomic_inc(&rdtp->dynticks);
68572+ atomic_inc_unchecked(&rdtp->dynticks);
68573 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68574 smp_mb__after_atomic_inc(); /* See above. */
68575- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68576+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68577 }
68578
68579 /**
68580@@ -437,9 +437,9 @@ void rcu_nmi_exit(void)
68581 return;
68582 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68583 smp_mb__before_atomic_inc(); /* See above. */
68584- atomic_inc(&rdtp->dynticks);
68585+ atomic_inc_unchecked(&rdtp->dynticks);
68586 smp_mb__after_atomic_inc(); /* Force delay to next write. */
68587- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68588+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68589 }
68590
68591 /**
68592@@ -474,7 +474,7 @@ void rcu_irq_exit(void)
68593 */
68594 static int dyntick_save_progress_counter(struct rcu_data *rdp)
68595 {
68596- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
68597+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
68598 return 0;
68599 }
68600
68601@@ -489,7 +489,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
68602 unsigned int curr;
68603 unsigned int snap;
68604
68605- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
68606+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
68607 snap = (unsigned int)rdp->dynticks_snap;
68608
68609 /*
68610@@ -1552,7 +1552,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
68611 /*
68612 * Do RCU core processing for the current CPU.
68613 */
68614-static void rcu_process_callbacks(struct softirq_action *unused)
68615+static void rcu_process_callbacks(void)
68616 {
68617 trace_rcu_utilization("Start RCU core");
68618 __rcu_process_callbacks(&rcu_sched_state,
68619diff --git a/kernel/rcutree.h b/kernel/rcutree.h
68620index 849ce9e..74bc9de 100644
68621--- a/kernel/rcutree.h
68622+++ b/kernel/rcutree.h
68623@@ -86,7 +86,7 @@
68624 struct rcu_dynticks {
68625 int dynticks_nesting; /* Track irq/process nesting level. */
68626 int dynticks_nmi_nesting; /* Track NMI nesting level. */
68627- atomic_t dynticks; /* Even value for dynticks-idle, else odd. */
68628+ atomic_unchecked_t dynticks; /* Even value for dynticks-idle, else odd. */
68629 };
68630
68631 /* RCU's kthread states for tracing. */
68632diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
68633index 4b9b9f8..2326053 100644
68634--- a/kernel/rcutree_plugin.h
68635+++ b/kernel/rcutree_plugin.h
68636@@ -842,7 +842,7 @@ void synchronize_rcu_expedited(void)
68637
68638 /* Clean up and exit. */
68639 smp_mb(); /* ensure expedited GP seen before counter increment. */
68640- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
68641+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
68642 unlock_mb_ret:
68643 mutex_unlock(&sync_rcu_preempt_exp_mutex);
68644 mb_ret:
68645@@ -1815,8 +1815,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
68646
68647 #else /* #ifndef CONFIG_SMP */
68648
68649-static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
68650-static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
68651+static atomic_unchecked_t sync_sched_expedited_started = ATOMIC_INIT(0);
68652+static atomic_unchecked_t sync_sched_expedited_done = ATOMIC_INIT(0);
68653
68654 static int synchronize_sched_expedited_cpu_stop(void *data)
68655 {
68656@@ -1871,7 +1871,7 @@ void synchronize_sched_expedited(void)
68657 int firstsnap, s, snap, trycount = 0;
68658
68659 /* Note that atomic_inc_return() implies full memory barrier. */
68660- firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started);
68661+ firstsnap = snap = atomic_inc_return_unchecked(&sync_sched_expedited_started);
68662 get_online_cpus();
68663
68664 /*
68665@@ -1892,7 +1892,7 @@ void synchronize_sched_expedited(void)
68666 }
68667
68668 /* Check to see if someone else did our work for us. */
68669- s = atomic_read(&sync_sched_expedited_done);
68670+ s = atomic_read_unchecked(&sync_sched_expedited_done);
68671 if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
68672 smp_mb(); /* ensure test happens before caller kfree */
68673 return;
68674@@ -1907,7 +1907,7 @@ void synchronize_sched_expedited(void)
68675 * grace period works for us.
68676 */
68677 get_online_cpus();
68678- snap = atomic_read(&sync_sched_expedited_started) - 1;
68679+ snap = atomic_read_unchecked(&sync_sched_expedited_started) - 1;
68680 smp_mb(); /* ensure read is before try_stop_cpus(). */
68681 }
68682
68683@@ -1918,12 +1918,12 @@ void synchronize_sched_expedited(void)
68684 * than we did beat us to the punch.
68685 */
68686 do {
68687- s = atomic_read(&sync_sched_expedited_done);
68688+ s = atomic_read_unchecked(&sync_sched_expedited_done);
68689 if (UINT_CMP_GE((unsigned)s, (unsigned)snap)) {
68690 smp_mb(); /* ensure test happens before caller kfree */
68691 break;
68692 }
68693- } while (atomic_cmpxchg(&sync_sched_expedited_done, s, snap) != s);
68694+ } while (atomic_cmpxchg_unchecked(&sync_sched_expedited_done, s, snap) != s);
68695
68696 put_online_cpus();
68697 }
68698@@ -1985,7 +1985,7 @@ int rcu_needs_cpu(int cpu)
68699 for_each_online_cpu(thatcpu) {
68700 if (thatcpu == cpu)
68701 continue;
68702- snap = atomic_add_return(0, &per_cpu(rcu_dynticks,
68703+ snap = atomic_add_return_unchecked(0, &per_cpu(rcu_dynticks,
68704 thatcpu).dynticks);
68705 smp_mb(); /* Order sampling of snap with end of grace period. */
68706 if ((snap & 0x1) != 0) {
68707diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
68708index 9feffa4..54058df 100644
68709--- a/kernel/rcutree_trace.c
68710+++ b/kernel/rcutree_trace.c
68711@@ -69,7 +69,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
68712 rdp->qs_pending);
68713 #ifdef CONFIG_NO_HZ
68714 seq_printf(m, " dt=%d/%d/%d df=%lu",
68715- atomic_read(&rdp->dynticks->dynticks),
68716+ atomic_read_unchecked(&rdp->dynticks->dynticks),
68717 rdp->dynticks->dynticks_nesting,
68718 rdp->dynticks->dynticks_nmi_nesting,
68719 rdp->dynticks_fqs);
68720@@ -143,7 +143,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
68721 rdp->qs_pending);
68722 #ifdef CONFIG_NO_HZ
68723 seq_printf(m, ",%d,%d,%d,%lu",
68724- atomic_read(&rdp->dynticks->dynticks),
68725+ atomic_read_unchecked(&rdp->dynticks->dynticks),
68726 rdp->dynticks->dynticks_nesting,
68727 rdp->dynticks->dynticks_nmi_nesting,
68728 rdp->dynticks_fqs);
68729diff --git a/kernel/resource.c b/kernel/resource.c
68730index 7640b3a..5879283 100644
68731--- a/kernel/resource.c
68732+++ b/kernel/resource.c
68733@@ -141,8 +141,18 @@ static const struct file_operations proc_iomem_operations = {
68734
68735 static int __init ioresources_init(void)
68736 {
68737+#ifdef CONFIG_GRKERNSEC_PROC_ADD
68738+#ifdef CONFIG_GRKERNSEC_PROC_USER
68739+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
68740+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
68741+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
68742+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
68743+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
68744+#endif
68745+#else
68746 proc_create("ioports", 0, NULL, &proc_ioports_operations);
68747 proc_create("iomem", 0, NULL, &proc_iomem_operations);
68748+#endif
68749 return 0;
68750 }
68751 __initcall(ioresources_init);
68752diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
68753index 3d9f31c..7fefc9e 100644
68754--- a/kernel/rtmutex-tester.c
68755+++ b/kernel/rtmutex-tester.c
68756@@ -20,7 +20,7 @@
68757 #define MAX_RT_TEST_MUTEXES 8
68758
68759 static spinlock_t rttest_lock;
68760-static atomic_t rttest_event;
68761+static atomic_unchecked_t rttest_event;
68762
68763 struct test_thread_data {
68764 int opcode;
68765@@ -61,7 +61,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68766
68767 case RTTEST_LOCKCONT:
68768 td->mutexes[td->opdata] = 1;
68769- td->event = atomic_add_return(1, &rttest_event);
68770+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68771 return 0;
68772
68773 case RTTEST_RESET:
68774@@ -74,7 +74,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68775 return 0;
68776
68777 case RTTEST_RESETEVENT:
68778- atomic_set(&rttest_event, 0);
68779+ atomic_set_unchecked(&rttest_event, 0);
68780 return 0;
68781
68782 default:
68783@@ -91,9 +91,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68784 return ret;
68785
68786 td->mutexes[id] = 1;
68787- td->event = atomic_add_return(1, &rttest_event);
68788+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68789 rt_mutex_lock(&mutexes[id]);
68790- td->event = atomic_add_return(1, &rttest_event);
68791+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68792 td->mutexes[id] = 4;
68793 return 0;
68794
68795@@ -104,9 +104,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68796 return ret;
68797
68798 td->mutexes[id] = 1;
68799- td->event = atomic_add_return(1, &rttest_event);
68800+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68801 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
68802- td->event = atomic_add_return(1, &rttest_event);
68803+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68804 td->mutexes[id] = ret ? 0 : 4;
68805 return ret ? -EINTR : 0;
68806
68807@@ -115,9 +115,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68808 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
68809 return ret;
68810
68811- td->event = atomic_add_return(1, &rttest_event);
68812+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68813 rt_mutex_unlock(&mutexes[id]);
68814- td->event = atomic_add_return(1, &rttest_event);
68815+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68816 td->mutexes[id] = 0;
68817 return 0;
68818
68819@@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
68820 break;
68821
68822 td->mutexes[dat] = 2;
68823- td->event = atomic_add_return(1, &rttest_event);
68824+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68825 break;
68826
68827 default:
68828@@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
68829 return;
68830
68831 td->mutexes[dat] = 3;
68832- td->event = atomic_add_return(1, &rttest_event);
68833+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68834 break;
68835
68836 case RTTEST_LOCKNOWAIT:
68837@@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
68838 return;
68839
68840 td->mutexes[dat] = 1;
68841- td->event = atomic_add_return(1, &rttest_event);
68842+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68843 return;
68844
68845 default:
68846diff --git a/kernel/sched.c b/kernel/sched.c
68847index d6b149c..896cbb8 100644
68848--- a/kernel/sched.c
68849+++ b/kernel/sched.c
68850@@ -4389,6 +4389,19 @@ pick_next_task(struct rq *rq)
68851 BUG(); /* the idle class will always have a runnable task */
68852 }
68853
68854+#ifdef CONFIG_GRKERNSEC_SETXID
68855+extern void gr_delayed_cred_worker(void);
68856+static inline void gr_cred_schedule(void)
68857+{
68858+ if (unlikely(current->delayed_cred))
68859+ gr_delayed_cred_worker();
68860+}
68861+#else
68862+static inline void gr_cred_schedule(void)
68863+{
68864+}
68865+#endif
68866+
68867 /*
68868 * __schedule() is the main scheduler function.
68869 */
68870@@ -4408,6 +4421,8 @@ need_resched:
68871
68872 schedule_debug(prev);
68873
68874+ gr_cred_schedule();
68875+
68876 if (sched_feat(HRTICK))
68877 hrtick_clear(rq);
68878
68879@@ -5098,6 +5113,8 @@ int can_nice(const struct task_struct *p, const int nice)
68880 /* convert nice value [19,-20] to rlimit style value [1,40] */
68881 int nice_rlim = 20 - nice;
68882
68883+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
68884+
68885 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
68886 capable(CAP_SYS_NICE));
68887 }
68888@@ -5131,7 +5148,8 @@ SYSCALL_DEFINE1(nice, int, increment)
68889 if (nice > 19)
68890 nice = 19;
68891
68892- if (increment < 0 && !can_nice(current, nice))
68893+ if (increment < 0 && (!can_nice(current, nice) ||
68894+ gr_handle_chroot_nice()))
68895 return -EPERM;
68896
68897 retval = security_task_setnice(current, nice);
68898@@ -5288,6 +5306,7 @@ recheck:
68899 unsigned long rlim_rtprio =
68900 task_rlimit(p, RLIMIT_RTPRIO);
68901
68902+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
68903 /* can't set/change the rt policy */
68904 if (policy != p->policy && !rlim_rtprio)
68905 return -EPERM;
68906diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
68907index 429242f..d7cca82 100644
68908--- a/kernel/sched_autogroup.c
68909+++ b/kernel/sched_autogroup.c
68910@@ -7,7 +7,7 @@
68911
68912 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
68913 static struct autogroup autogroup_default;
68914-static atomic_t autogroup_seq_nr;
68915+static atomic_unchecked_t autogroup_seq_nr;
68916
68917 static void __init autogroup_init(struct task_struct *init_task)
68918 {
68919@@ -78,7 +78,7 @@ static inline struct autogroup *autogroup_create(void)
68920
68921 kref_init(&ag->kref);
68922 init_rwsem(&ag->lock);
68923- ag->id = atomic_inc_return(&autogroup_seq_nr);
68924+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
68925 ag->tg = tg;
68926 #ifdef CONFIG_RT_GROUP_SCHED
68927 /*
68928diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
68929index 8a39fa3..34f3dbc 100644
68930--- a/kernel/sched_fair.c
68931+++ b/kernel/sched_fair.c
68932@@ -4801,7 +4801,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
68933 * run_rebalance_domains is triggered when needed from the scheduler tick.
68934 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
68935 */
68936-static void run_rebalance_domains(struct softirq_action *h)
68937+static void run_rebalance_domains(void)
68938 {
68939 int this_cpu = smp_processor_id();
68940 struct rq *this_rq = cpu_rq(this_cpu);
68941diff --git a/kernel/signal.c b/kernel/signal.c
68942index 2065515..aed2987 100644
68943--- a/kernel/signal.c
68944+++ b/kernel/signal.c
68945@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cachep;
68946
68947 int print_fatal_signals __read_mostly;
68948
68949-static void __user *sig_handler(struct task_struct *t, int sig)
68950+static __sighandler_t sig_handler(struct task_struct *t, int sig)
68951 {
68952 return t->sighand->action[sig - 1].sa.sa_handler;
68953 }
68954
68955-static int sig_handler_ignored(void __user *handler, int sig)
68956+static int sig_handler_ignored(__sighandler_t handler, int sig)
68957 {
68958 /* Is it explicitly or implicitly ignored? */
68959 return handler == SIG_IGN ||
68960@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
68961 static int sig_task_ignored(struct task_struct *t, int sig,
68962 int from_ancestor_ns)
68963 {
68964- void __user *handler;
68965+ __sighandler_t handler;
68966
68967 handler = sig_handler(t, sig);
68968
68969@@ -364,6 +364,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
68970 atomic_inc(&user->sigpending);
68971 rcu_read_unlock();
68972
68973+ if (!override_rlimit)
68974+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
68975+
68976 if (override_rlimit ||
68977 atomic_read(&user->sigpending) <=
68978 task_rlimit(t, RLIMIT_SIGPENDING)) {
68979@@ -488,7 +491,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
68980
68981 int unhandled_signal(struct task_struct *tsk, int sig)
68982 {
68983- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
68984+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
68985 if (is_global_init(tsk))
68986 return 1;
68987 if (handler != SIG_IGN && handler != SIG_DFL)
68988@@ -815,6 +818,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
68989 }
68990 }
68991
68992+ /* allow glibc communication via tgkill to other threads in our
68993+ thread group */
68994+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
68995+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
68996+ && gr_handle_signal(t, sig))
68997+ return -EPERM;
68998+
68999 return security_task_kill(t, info, sig, 0);
69000 }
69001
69002@@ -1165,7 +1175,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
69003 return send_signal(sig, info, p, 1);
69004 }
69005
69006-static int
69007+int
69008 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69009 {
69010 return send_signal(sig, info, t, 0);
69011@@ -1202,6 +1212,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69012 unsigned long int flags;
69013 int ret, blocked, ignored;
69014 struct k_sigaction *action;
69015+ int is_unhandled = 0;
69016
69017 spin_lock_irqsave(&t->sighand->siglock, flags);
69018 action = &t->sighand->action[sig-1];
69019@@ -1216,9 +1227,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69020 }
69021 if (action->sa.sa_handler == SIG_DFL)
69022 t->signal->flags &= ~SIGNAL_UNKILLABLE;
69023+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
69024+ is_unhandled = 1;
69025 ret = specific_send_sig_info(sig, info, t);
69026 spin_unlock_irqrestore(&t->sighand->siglock, flags);
69027
69028+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
69029+ normal operation */
69030+ if (is_unhandled) {
69031+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
69032+ gr_handle_crash(t, sig);
69033+ }
69034+
69035 return ret;
69036 }
69037
69038@@ -1285,8 +1305,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
69039 ret = check_kill_permission(sig, info, p);
69040 rcu_read_unlock();
69041
69042- if (!ret && sig)
69043+ if (!ret && sig) {
69044 ret = do_send_sig_info(sig, info, p, true);
69045+ if (!ret)
69046+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
69047+ }
69048
69049 return ret;
69050 }
69051@@ -2754,7 +2777,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
69052 int error = -ESRCH;
69053
69054 rcu_read_lock();
69055- p = find_task_by_vpid(pid);
69056+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
69057+ /* allow glibc communication via tgkill to other threads in our
69058+ thread group */
69059+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
69060+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
69061+ p = find_task_by_vpid_unrestricted(pid);
69062+ else
69063+#endif
69064+ p = find_task_by_vpid(pid);
69065 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
69066 error = check_kill_permission(sig, info, p);
69067 /*
69068diff --git a/kernel/smp.c b/kernel/smp.c
69069index db197d6..17aef0b 100644
69070--- a/kernel/smp.c
69071+++ b/kernel/smp.c
69072@@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
69073 }
69074 EXPORT_SYMBOL(smp_call_function);
69075
69076-void ipi_call_lock(void)
69077+void ipi_call_lock(void) __acquires(call_function.lock)
69078 {
69079 raw_spin_lock(&call_function.lock);
69080 }
69081
69082-void ipi_call_unlock(void)
69083+void ipi_call_unlock(void) __releases(call_function.lock)
69084 {
69085 raw_spin_unlock(&call_function.lock);
69086 }
69087
69088-void ipi_call_lock_irq(void)
69089+void ipi_call_lock_irq(void) __acquires(call_function.lock)
69090 {
69091 raw_spin_lock_irq(&call_function.lock);
69092 }
69093
69094-void ipi_call_unlock_irq(void)
69095+void ipi_call_unlock_irq(void) __releases(call_function.lock)
69096 {
69097 raw_spin_unlock_irq(&call_function.lock);
69098 }
69099diff --git a/kernel/softirq.c b/kernel/softirq.c
69100index 2c71d91..1021f81 100644
69101--- a/kernel/softirq.c
69102+++ b/kernel/softirq.c
69103@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
69104
69105 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
69106
69107-char *softirq_to_name[NR_SOFTIRQS] = {
69108+const char * const softirq_to_name[NR_SOFTIRQS] = {
69109 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
69110 "TASKLET", "SCHED", "HRTIMER", "RCU"
69111 };
69112@@ -235,7 +235,7 @@ restart:
69113 kstat_incr_softirqs_this_cpu(vec_nr);
69114
69115 trace_softirq_entry(vec_nr);
69116- h->action(h);
69117+ h->action();
69118 trace_softirq_exit(vec_nr);
69119 if (unlikely(prev_count != preempt_count())) {
69120 printk(KERN_ERR "huh, entered softirq %u %s %p"
69121@@ -385,9 +385,11 @@ void raise_softirq(unsigned int nr)
69122 local_irq_restore(flags);
69123 }
69124
69125-void open_softirq(int nr, void (*action)(struct softirq_action *))
69126+void open_softirq(int nr, void (*action)(void))
69127 {
69128- softirq_vec[nr].action = action;
69129+ pax_open_kernel();
69130+ *(void **)&softirq_vec[nr].action = action;
69131+ pax_close_kernel();
69132 }
69133
69134 /*
69135@@ -441,7 +443,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
69136
69137 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
69138
69139-static void tasklet_action(struct softirq_action *a)
69140+static void tasklet_action(void)
69141 {
69142 struct tasklet_struct *list;
69143
69144@@ -476,7 +478,7 @@ static void tasklet_action(struct softirq_action *a)
69145 }
69146 }
69147
69148-static void tasklet_hi_action(struct softirq_action *a)
69149+static void tasklet_hi_action(void)
69150 {
69151 struct tasklet_struct *list;
69152
69153diff --git a/kernel/sys.c b/kernel/sys.c
69154index 481611f..0754d86 100644
69155--- a/kernel/sys.c
69156+++ b/kernel/sys.c
69157@@ -158,6 +158,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
69158 error = -EACCES;
69159 goto out;
69160 }
69161+
69162+ if (gr_handle_chroot_setpriority(p, niceval)) {
69163+ error = -EACCES;
69164+ goto out;
69165+ }
69166+
69167 no_nice = security_task_setnice(p, niceval);
69168 if (no_nice) {
69169 error = no_nice;
69170@@ -572,6 +578,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
69171 goto error;
69172 }
69173
69174+ if (gr_check_group_change(new->gid, new->egid, -1))
69175+ goto error;
69176+
69177 if (rgid != (gid_t) -1 ||
69178 (egid != (gid_t) -1 && egid != old->gid))
69179 new->sgid = new->egid;
69180@@ -601,6 +610,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
69181 old = current_cred();
69182
69183 retval = -EPERM;
69184+
69185+ if (gr_check_group_change(gid, gid, gid))
69186+ goto error;
69187+
69188 if (nsown_capable(CAP_SETGID))
69189 new->gid = new->egid = new->sgid = new->fsgid = gid;
69190 else if (gid == old->gid || gid == old->sgid)
69191@@ -618,7 +631,7 @@ error:
69192 /*
69193 * change the user struct in a credentials set to match the new UID
69194 */
69195-static int set_user(struct cred *new)
69196+int set_user(struct cred *new)
69197 {
69198 struct user_struct *new_user;
69199
69200@@ -688,6 +701,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
69201 goto error;
69202 }
69203
69204+ if (gr_check_user_change(new->uid, new->euid, -1))
69205+ goto error;
69206+
69207 if (new->uid != old->uid) {
69208 retval = set_user(new);
69209 if (retval < 0)
69210@@ -732,6 +748,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
69211 old = current_cred();
69212
69213 retval = -EPERM;
69214+
69215+ if (gr_check_crash_uid(uid))
69216+ goto error;
69217+ if (gr_check_user_change(uid, uid, uid))
69218+ goto error;
69219+
69220 if (nsown_capable(CAP_SETUID)) {
69221 new->suid = new->uid = uid;
69222 if (uid != old->uid) {
69223@@ -786,6 +808,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
69224 goto error;
69225 }
69226
69227+ if (gr_check_user_change(ruid, euid, -1))
69228+ goto error;
69229+
69230 if (ruid != (uid_t) -1) {
69231 new->uid = ruid;
69232 if (ruid != old->uid) {
69233@@ -850,6 +875,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
69234 goto error;
69235 }
69236
69237+ if (gr_check_group_change(rgid, egid, -1))
69238+ goto error;
69239+
69240 if (rgid != (gid_t) -1)
69241 new->gid = rgid;
69242 if (egid != (gid_t) -1)
69243@@ -896,6 +924,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69244 old = current_cred();
69245 old_fsuid = old->fsuid;
69246
69247+ if (gr_check_user_change(-1, -1, uid))
69248+ goto error;
69249+
69250 if (uid == old->uid || uid == old->euid ||
69251 uid == old->suid || uid == old->fsuid ||
69252 nsown_capable(CAP_SETUID)) {
69253@@ -906,6 +937,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69254 }
69255 }
69256
69257+error:
69258 abort_creds(new);
69259 return old_fsuid;
69260
69261@@ -932,12 +964,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
69262 if (gid == old->gid || gid == old->egid ||
69263 gid == old->sgid || gid == old->fsgid ||
69264 nsown_capable(CAP_SETGID)) {
69265+ if (gr_check_group_change(-1, -1, gid))
69266+ goto error;
69267+
69268 if (gid != old_fsgid) {
69269 new->fsgid = gid;
69270 goto change_okay;
69271 }
69272 }
69273
69274+error:
69275 abort_creds(new);
69276 return old_fsgid;
69277
69278@@ -1189,7 +1225,10 @@ static int override_release(char __user *release, int len)
69279 }
69280 v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
69281 snprintf(buf, len, "2.6.%u%s", v, rest);
69282- ret = copy_to_user(release, buf, len);
69283+ if (len > sizeof(buf))
69284+ ret = -EFAULT;
69285+ else
69286+ ret = copy_to_user(release, buf, len);
69287 }
69288 return ret;
69289 }
69290@@ -1243,19 +1282,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
69291 return -EFAULT;
69292
69293 down_read(&uts_sem);
69294- error = __copy_to_user(&name->sysname, &utsname()->sysname,
69295+ error = __copy_to_user(name->sysname, &utsname()->sysname,
69296 __OLD_UTS_LEN);
69297 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
69298- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
69299+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
69300 __OLD_UTS_LEN);
69301 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
69302- error |= __copy_to_user(&name->release, &utsname()->release,
69303+ error |= __copy_to_user(name->release, &utsname()->release,
69304 __OLD_UTS_LEN);
69305 error |= __put_user(0, name->release + __OLD_UTS_LEN);
69306- error |= __copy_to_user(&name->version, &utsname()->version,
69307+ error |= __copy_to_user(name->version, &utsname()->version,
69308 __OLD_UTS_LEN);
69309 error |= __put_user(0, name->version + __OLD_UTS_LEN);
69310- error |= __copy_to_user(&name->machine, &utsname()->machine,
69311+ error |= __copy_to_user(name->machine, &utsname()->machine,
69312 __OLD_UTS_LEN);
69313 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
69314 up_read(&uts_sem);
69315@@ -1720,7 +1759,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
69316 error = get_dumpable(me->mm);
69317 break;
69318 case PR_SET_DUMPABLE:
69319- if (arg2 < 0 || arg2 > 1) {
69320+ if (arg2 > 1) {
69321 error = -EINVAL;
69322 break;
69323 }
69324diff --git a/kernel/sysctl.c b/kernel/sysctl.c
69325index ae27196..7506d69 100644
69326--- a/kernel/sysctl.c
69327+++ b/kernel/sysctl.c
69328@@ -86,6 +86,13 @@
69329
69330
69331 #if defined(CONFIG_SYSCTL)
69332+#include <linux/grsecurity.h>
69333+#include <linux/grinternal.h>
69334+
69335+extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
69336+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
69337+ const int op);
69338+extern int gr_handle_chroot_sysctl(const int op);
69339
69340 /* External variables not in a header file. */
69341 extern int sysctl_overcommit_memory;
69342@@ -191,6 +198,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
69343 }
69344
69345 #endif
69346+extern struct ctl_table grsecurity_table[];
69347
69348 static struct ctl_table root_table[];
69349 static struct ctl_table_root sysctl_table_root;
69350@@ -220,6 +228,20 @@ extern struct ctl_table epoll_table[];
69351 int sysctl_legacy_va_layout;
69352 #endif
69353
69354+#ifdef CONFIG_PAX_SOFTMODE
69355+static ctl_table pax_table[] = {
69356+ {
69357+ .procname = "softmode",
69358+ .data = &pax_softmode,
69359+ .maxlen = sizeof(unsigned int),
69360+ .mode = 0600,
69361+ .proc_handler = &proc_dointvec,
69362+ },
69363+
69364+ { }
69365+};
69366+#endif
69367+
69368 /* The default sysctl tables: */
69369
69370 static struct ctl_table root_table[] = {
69371@@ -266,6 +288,22 @@ static int max_extfrag_threshold = 1000;
69372 #endif
69373
69374 static struct ctl_table kern_table[] = {
69375+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
69376+ {
69377+ .procname = "grsecurity",
69378+ .mode = 0500,
69379+ .child = grsecurity_table,
69380+ },
69381+#endif
69382+
69383+#ifdef CONFIG_PAX_SOFTMODE
69384+ {
69385+ .procname = "pax",
69386+ .mode = 0500,
69387+ .child = pax_table,
69388+ },
69389+#endif
69390+
69391 {
69392 .procname = "sched_child_runs_first",
69393 .data = &sysctl_sched_child_runs_first,
69394@@ -550,7 +588,7 @@ static struct ctl_table kern_table[] = {
69395 .data = &modprobe_path,
69396 .maxlen = KMOD_PATH_LEN,
69397 .mode = 0644,
69398- .proc_handler = proc_dostring,
69399+ .proc_handler = proc_dostring_modpriv,
69400 },
69401 {
69402 .procname = "modules_disabled",
69403@@ -717,16 +755,20 @@ static struct ctl_table kern_table[] = {
69404 .extra1 = &zero,
69405 .extra2 = &one,
69406 },
69407+#endif
69408 {
69409 .procname = "kptr_restrict",
69410 .data = &kptr_restrict,
69411 .maxlen = sizeof(int),
69412 .mode = 0644,
69413 .proc_handler = proc_dmesg_restrict,
69414+#ifdef CONFIG_GRKERNSEC_HIDESYM
69415+ .extra1 = &two,
69416+#else
69417 .extra1 = &zero,
69418+#endif
69419 .extra2 = &two,
69420 },
69421-#endif
69422 {
69423 .procname = "ngroups_max",
69424 .data = &ngroups_max,
69425@@ -1216,6 +1258,13 @@ static struct ctl_table vm_table[] = {
69426 .proc_handler = proc_dointvec_minmax,
69427 .extra1 = &zero,
69428 },
69429+ {
69430+ .procname = "heap_stack_gap",
69431+ .data = &sysctl_heap_stack_gap,
69432+ .maxlen = sizeof(sysctl_heap_stack_gap),
69433+ .mode = 0644,
69434+ .proc_handler = proc_doulongvec_minmax,
69435+ },
69436 #else
69437 {
69438 .procname = "nr_trim_pages",
69439@@ -1720,6 +1769,17 @@ static int test_perm(int mode, int op)
69440 int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
69441 {
69442 int mode;
69443+ int error;
69444+
69445+ if (table->parent != NULL && table->parent->procname != NULL &&
69446+ table->procname != NULL &&
69447+ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
69448+ return -EACCES;
69449+ if (gr_handle_chroot_sysctl(op))
69450+ return -EACCES;
69451+ error = gr_handle_sysctl(table, op);
69452+ if (error)
69453+ return error;
69454
69455 if (root->permissions)
69456 mode = root->permissions(root, current->nsproxy, table);
69457@@ -2124,6 +2184,16 @@ int proc_dostring(struct ctl_table *table, int write,
69458 buffer, lenp, ppos);
69459 }
69460
69461+int proc_dostring_modpriv(struct ctl_table *table, int write,
69462+ void __user *buffer, size_t *lenp, loff_t *ppos)
69463+{
69464+ if (write && !capable(CAP_SYS_MODULE))
69465+ return -EPERM;
69466+
69467+ return _proc_do_string(table->data, table->maxlen, write,
69468+ buffer, lenp, ppos);
69469+}
69470+
69471 static size_t proc_skip_spaces(char **buf)
69472 {
69473 size_t ret;
69474@@ -2229,6 +2299,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
69475 len = strlen(tmp);
69476 if (len > *size)
69477 len = *size;
69478+ if (len > sizeof(tmp))
69479+ len = sizeof(tmp);
69480 if (copy_to_user(*buf, tmp, len))
69481 return -EFAULT;
69482 *size -= len;
69483@@ -2545,8 +2617,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
69484 *i = val;
69485 } else {
69486 val = convdiv * (*i) / convmul;
69487- if (!first)
69488+ if (!first) {
69489 err = proc_put_char(&buffer, &left, '\t');
69490+ if (err)
69491+ break;
69492+ }
69493 err = proc_put_long(&buffer, &left, val, false);
69494 if (err)
69495 break;
69496@@ -2941,6 +3016,12 @@ int proc_dostring(struct ctl_table *table, int write,
69497 return -ENOSYS;
69498 }
69499
69500+int proc_dostring_modpriv(struct ctl_table *table, int write,
69501+ void __user *buffer, size_t *lenp, loff_t *ppos)
69502+{
69503+ return -ENOSYS;
69504+}
69505+
69506 int proc_dointvec(struct ctl_table *table, int write,
69507 void __user *buffer, size_t *lenp, loff_t *ppos)
69508 {
69509@@ -2997,6 +3078,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
69510 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
69511 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
69512 EXPORT_SYMBOL(proc_dostring);
69513+EXPORT_SYMBOL(proc_dostring_modpriv);
69514 EXPORT_SYMBOL(proc_doulongvec_minmax);
69515 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
69516 EXPORT_SYMBOL(register_sysctl_table);
69517diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
69518index a650694..aaeeb20 100644
69519--- a/kernel/sysctl_binary.c
69520+++ b/kernel/sysctl_binary.c
69521@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *file,
69522 int i;
69523
69524 set_fs(KERNEL_DS);
69525- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
69526+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
69527 set_fs(old_fs);
69528 if (result < 0)
69529 goto out_kfree;
69530@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *file,
69531 }
69532
69533 set_fs(KERNEL_DS);
69534- result = vfs_write(file, buffer, str - buffer, &pos);
69535+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
69536 set_fs(old_fs);
69537 if (result < 0)
69538 goto out_kfree;
69539@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file *file,
69540 int i;
69541
69542 set_fs(KERNEL_DS);
69543- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
69544+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
69545 set_fs(old_fs);
69546 if (result < 0)
69547 goto out_kfree;
69548@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file *file,
69549 }
69550
69551 set_fs(KERNEL_DS);
69552- result = vfs_write(file, buffer, str - buffer, &pos);
69553+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
69554 set_fs(old_fs);
69555 if (result < 0)
69556 goto out_kfree;
69557@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *file,
69558 int i;
69559
69560 set_fs(KERNEL_DS);
69561- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
69562+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
69563 set_fs(old_fs);
69564 if (result < 0)
69565 goto out;
69566@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struct file *file,
69567 __le16 dnaddr;
69568
69569 set_fs(KERNEL_DS);
69570- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
69571+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
69572 set_fs(old_fs);
69573 if (result < 0)
69574 goto out;
69575@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struct file *file,
69576 le16_to_cpu(dnaddr) & 0x3ff);
69577
69578 set_fs(KERNEL_DS);
69579- result = vfs_write(file, buf, len, &pos);
69580+ result = vfs_write(file, (const char __force_user *)buf, len, &pos);
69581 set_fs(old_fs);
69582 if (result < 0)
69583 goto out;
69584diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
69585index 362da65..ab8ef8c 100644
69586--- a/kernel/sysctl_check.c
69587+++ b/kernel/sysctl_check.c
69588@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
69589 set_fail(&fail, table, "Directory with extra2");
69590 } else {
69591 if ((table->proc_handler == proc_dostring) ||
69592+ (table->proc_handler == proc_dostring_modpriv) ||
69593 (table->proc_handler == proc_dointvec) ||
69594 (table->proc_handler == proc_dointvec_minmax) ||
69595 (table->proc_handler == proc_dointvec_jiffies) ||
69596diff --git a/kernel/taskstats.c b/kernel/taskstats.c
69597index e660464..c8b9e67 100644
69598--- a/kernel/taskstats.c
69599+++ b/kernel/taskstats.c
69600@@ -27,9 +27,12 @@
69601 #include <linux/cgroup.h>
69602 #include <linux/fs.h>
69603 #include <linux/file.h>
69604+#include <linux/grsecurity.h>
69605 #include <net/genetlink.h>
69606 #include <linux/atomic.h>
69607
69608+extern int gr_is_taskstats_denied(int pid);
69609+
69610 /*
69611 * Maximum length of a cpumask that can be specified in
69612 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
69613@@ -556,6 +559,9 @@ err:
69614
69615 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
69616 {
69617+ if (gr_is_taskstats_denied(current->pid))
69618+ return -EACCES;
69619+
69620 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
69621 return cmd_attr_register_cpumask(info);
69622 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
69623diff --git a/kernel/time.c b/kernel/time.c
69624index 73e416d..cfc6f69 100644
69625--- a/kernel/time.c
69626+++ b/kernel/time.c
69627@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
69628 return error;
69629
69630 if (tz) {
69631+ /* we log in do_settimeofday called below, so don't log twice
69632+ */
69633+ if (!tv)
69634+ gr_log_timechange();
69635+
69636 /* SMP safe, global irq locking makes it work. */
69637 sys_tz = *tz;
69638 update_vsyscall_tz();
69639diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
69640index 8a46f5d..bbe6f9c 100644
69641--- a/kernel/time/alarmtimer.c
69642+++ b/kernel/time/alarmtimer.c
69643@@ -773,7 +773,7 @@ static int __init alarmtimer_init(void)
69644 struct platform_device *pdev;
69645 int error = 0;
69646 int i;
69647- struct k_clock alarm_clock = {
69648+ static struct k_clock alarm_clock = {
69649 .clock_getres = alarm_clock_getres,
69650 .clock_get = alarm_clock_get,
69651 .timer_create = alarm_timer_create,
69652diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
69653index fd4a7b1..fae5c2a 100644
69654--- a/kernel/time/tick-broadcast.c
69655+++ b/kernel/time/tick-broadcast.c
69656@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
69657 * then clear the broadcast bit.
69658 */
69659 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
69660- int cpu = smp_processor_id();
69661+ cpu = smp_processor_id();
69662
69663 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
69664 tick_broadcast_clear_oneshot(cpu);
69665diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
69666index 2378413..be455fd 100644
69667--- a/kernel/time/timekeeping.c
69668+++ b/kernel/time/timekeeping.c
69669@@ -14,6 +14,7 @@
69670 #include <linux/init.h>
69671 #include <linux/mm.h>
69672 #include <linux/sched.h>
69673+#include <linux/grsecurity.h>
69674 #include <linux/syscore_ops.h>
69675 #include <linux/clocksource.h>
69676 #include <linux/jiffies.h>
69677@@ -365,6 +366,8 @@ int do_settimeofday(const struct timespec *tv)
69678 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
69679 return -EINVAL;
69680
69681+ gr_log_timechange();
69682+
69683 write_seqlock_irqsave(&xtime_lock, flags);
69684
69685 timekeeping_forward_now();
69686diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
69687index 3258455..f35227d 100644
69688--- a/kernel/time/timer_list.c
69689+++ b/kernel/time/timer_list.c
69690@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
69691
69692 static void print_name_offset(struct seq_file *m, void *sym)
69693 {
69694+#ifdef CONFIG_GRKERNSEC_HIDESYM
69695+ SEQ_printf(m, "<%p>", NULL);
69696+#else
69697 char symname[KSYM_NAME_LEN];
69698
69699 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
69700 SEQ_printf(m, "<%pK>", sym);
69701 else
69702 SEQ_printf(m, "%s", symname);
69703+#endif
69704 }
69705
69706 static void
69707@@ -112,7 +116,11 @@ next_one:
69708 static void
69709 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
69710 {
69711+#ifdef CONFIG_GRKERNSEC_HIDESYM
69712+ SEQ_printf(m, " .base: %p\n", NULL);
69713+#else
69714 SEQ_printf(m, " .base: %pK\n", base);
69715+#endif
69716 SEQ_printf(m, " .index: %d\n",
69717 base->index);
69718 SEQ_printf(m, " .resolution: %Lu nsecs\n",
69719@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
69720 {
69721 struct proc_dir_entry *pe;
69722
69723+#ifdef CONFIG_GRKERNSEC_PROC_ADD
69724+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
69725+#else
69726 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
69727+#endif
69728 if (!pe)
69729 return -ENOMEM;
69730 return 0;
69731diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
69732index 0b537f2..9e71eca 100644
69733--- a/kernel/time/timer_stats.c
69734+++ b/kernel/time/timer_stats.c
69735@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
69736 static unsigned long nr_entries;
69737 static struct entry entries[MAX_ENTRIES];
69738
69739-static atomic_t overflow_count;
69740+static atomic_unchecked_t overflow_count;
69741
69742 /*
69743 * The entries are in a hash-table, for fast lookup:
69744@@ -140,7 +140,7 @@ static void reset_entries(void)
69745 nr_entries = 0;
69746 memset(entries, 0, sizeof(entries));
69747 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
69748- atomic_set(&overflow_count, 0);
69749+ atomic_set_unchecked(&overflow_count, 0);
69750 }
69751
69752 static struct entry *alloc_entry(void)
69753@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
69754 if (likely(entry))
69755 entry->count++;
69756 else
69757- atomic_inc(&overflow_count);
69758+ atomic_inc_unchecked(&overflow_count);
69759
69760 out_unlock:
69761 raw_spin_unlock_irqrestore(lock, flags);
69762@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
69763
69764 static void print_name_offset(struct seq_file *m, unsigned long addr)
69765 {
69766+#ifdef CONFIG_GRKERNSEC_HIDESYM
69767+ seq_printf(m, "<%p>", NULL);
69768+#else
69769 char symname[KSYM_NAME_LEN];
69770
69771 if (lookup_symbol_name(addr, symname) < 0)
69772 seq_printf(m, "<%p>", (void *)addr);
69773 else
69774 seq_printf(m, "%s", symname);
69775+#endif
69776 }
69777
69778 static int tstats_show(struct seq_file *m, void *v)
69779@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
69780
69781 seq_puts(m, "Timer Stats Version: v0.2\n");
69782 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
69783- if (atomic_read(&overflow_count))
69784+ if (atomic_read_unchecked(&overflow_count))
69785 seq_printf(m, "Overflow: %d entries\n",
69786- atomic_read(&overflow_count));
69787+ atomic_read_unchecked(&overflow_count));
69788
69789 for (i = 0; i < nr_entries; i++) {
69790 entry = entries + i;
69791@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
69792 {
69793 struct proc_dir_entry *pe;
69794
69795+#ifdef CONFIG_GRKERNSEC_PROC_ADD
69796+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
69797+#else
69798 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
69799+#endif
69800 if (!pe)
69801 return -ENOMEM;
69802 return 0;
69803diff --git a/kernel/timer.c b/kernel/timer.c
69804index 9c3c62b..441690e 100644
69805--- a/kernel/timer.c
69806+++ b/kernel/timer.c
69807@@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
69808 /*
69809 * This function runs timers and the timer-tq in bottom half context.
69810 */
69811-static void run_timer_softirq(struct softirq_action *h)
69812+static void run_timer_softirq(void)
69813 {
69814 struct tvec_base *base = __this_cpu_read(tvec_bases);
69815
69816diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
69817index 16fc34a..efd8bb8 100644
69818--- a/kernel/trace/blktrace.c
69819+++ b/kernel/trace/blktrace.c
69820@@ -324,7 +324,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
69821 struct blk_trace *bt = filp->private_data;
69822 char buf[16];
69823
69824- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
69825+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
69826
69827 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
69828 }
69829@@ -389,7 +389,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
69830 return 1;
69831
69832 bt = buf->chan->private_data;
69833- atomic_inc(&bt->dropped);
69834+ atomic_inc_unchecked(&bt->dropped);
69835 return 0;
69836 }
69837
69838@@ -490,7 +490,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
69839
69840 bt->dir = dir;
69841 bt->dev = dev;
69842- atomic_set(&bt->dropped, 0);
69843+ atomic_set_unchecked(&bt->dropped, 0);
69844
69845 ret = -EIO;
69846 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
69847diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
69848index 25b4f4d..6f4772d 100644
69849--- a/kernel/trace/ftrace.c
69850+++ b/kernel/trace/ftrace.c
69851@@ -1587,12 +1587,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
69852 if (unlikely(ftrace_disabled))
69853 return 0;
69854
69855+ ret = ftrace_arch_code_modify_prepare();
69856+ FTRACE_WARN_ON(ret);
69857+ if (ret)
69858+ return 0;
69859+
69860 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
69861+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
69862 if (ret) {
69863 ftrace_bug(ret, ip);
69864- return 0;
69865 }
69866- return 1;
69867+ return ret ? 0 : 1;
69868 }
69869
69870 /*
69871@@ -2608,7 +2613,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
69872
69873 int
69874 register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
69875- void *data)
69876+ void *data)
69877 {
69878 struct ftrace_func_probe *entry;
69879 struct ftrace_page *pg;
69880diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
69881index f2bd275..adaf3a2 100644
69882--- a/kernel/trace/trace.c
69883+++ b/kernel/trace/trace.c
69884@@ -4201,10 +4201,9 @@ static const struct file_operations tracing_dyn_info_fops = {
69885 };
69886 #endif
69887
69888-static struct dentry *d_tracer;
69889-
69890 struct dentry *tracing_init_dentry(void)
69891 {
69892+ static struct dentry *d_tracer;
69893 static int once;
69894
69895 if (d_tracer)
69896@@ -4224,10 +4223,9 @@ struct dentry *tracing_init_dentry(void)
69897 return d_tracer;
69898 }
69899
69900-static struct dentry *d_percpu;
69901-
69902 struct dentry *tracing_dentry_percpu(void)
69903 {
69904+ static struct dentry *d_percpu;
69905 static int once;
69906 struct dentry *d_tracer;
69907
69908diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
69909index c212a7f..7b02394 100644
69910--- a/kernel/trace/trace_events.c
69911+++ b/kernel/trace/trace_events.c
69912@@ -1299,10 +1299,6 @@ static LIST_HEAD(ftrace_module_file_list);
69913 struct ftrace_module_file_ops {
69914 struct list_head list;
69915 struct module *mod;
69916- struct file_operations id;
69917- struct file_operations enable;
69918- struct file_operations format;
69919- struct file_operations filter;
69920 };
69921
69922 static struct ftrace_module_file_ops *
69923@@ -1323,17 +1319,12 @@ trace_create_file_ops(struct module *mod)
69924
69925 file_ops->mod = mod;
69926
69927- file_ops->id = ftrace_event_id_fops;
69928- file_ops->id.owner = mod;
69929-
69930- file_ops->enable = ftrace_enable_fops;
69931- file_ops->enable.owner = mod;
69932-
69933- file_ops->filter = ftrace_event_filter_fops;
69934- file_ops->filter.owner = mod;
69935-
69936- file_ops->format = ftrace_event_format_fops;
69937- file_ops->format.owner = mod;
69938+ pax_open_kernel();
69939+ *(void **)&mod->trace_id.owner = mod;
69940+ *(void **)&mod->trace_enable.owner = mod;
69941+ *(void **)&mod->trace_filter.owner = mod;
69942+ *(void **)&mod->trace_format.owner = mod;
69943+ pax_close_kernel();
69944
69945 list_add(&file_ops->list, &ftrace_module_file_list);
69946
69947@@ -1357,8 +1348,8 @@ static void trace_module_add_events(struct module *mod)
69948
69949 for_each_event(call, start, end) {
69950 __trace_add_event_call(*call, mod,
69951- &file_ops->id, &file_ops->enable,
69952- &file_ops->filter, &file_ops->format);
69953+ &mod->trace_id, &mod->trace_enable,
69954+ &mod->trace_filter, &mod->trace_format);
69955 }
69956 }
69957
69958diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
69959index 00d527c..7c5b1a3 100644
69960--- a/kernel/trace/trace_kprobe.c
69961+++ b/kernel/trace/trace_kprobe.c
69962@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
69963 long ret;
69964 int maxlen = get_rloc_len(*(u32 *)dest);
69965 u8 *dst = get_rloc_data(dest);
69966- u8 *src = addr;
69967+ const u8 __user *src = (const u8 __force_user *)addr;
69968 mm_segment_t old_fs = get_fs();
69969 if (!maxlen)
69970 return;
69971@@ -229,7 +229,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
69972 pagefault_disable();
69973 do
69974 ret = __copy_from_user_inatomic(dst++, src++, 1);
69975- while (dst[-1] && ret == 0 && src - (u8 *)addr < maxlen);
69976+ while (dst[-1] && ret == 0 && src - (const u8 __force_user *)addr < maxlen);
69977 dst[-1] = '\0';
69978 pagefault_enable();
69979 set_fs(old_fs);
69980@@ -238,7 +238,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
69981 ((u8 *)get_rloc_data(dest))[0] = '\0';
69982 *(u32 *)dest = make_data_rloc(0, get_rloc_offs(*(u32 *)dest));
69983 } else
69984- *(u32 *)dest = make_data_rloc(src - (u8 *)addr,
69985+ *(u32 *)dest = make_data_rloc(src - (const u8 __force_user *)addr,
69986 get_rloc_offs(*(u32 *)dest));
69987 }
69988 /* Return the length of string -- including null terminal byte */
69989@@ -252,7 +252,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs *regs,
69990 set_fs(KERNEL_DS);
69991 pagefault_disable();
69992 do {
69993- ret = __copy_from_user_inatomic(&c, (u8 *)addr + len, 1);
69994+ ret = __copy_from_user_inatomic(&c, (const u8 __force_user *)addr + len, 1);
69995 len++;
69996 } while (c && ret == 0 && len < MAX_STRING_SIZE);
69997 pagefault_enable();
69998diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
69999index fd3c8aa..5f324a6 100644
70000--- a/kernel/trace/trace_mmiotrace.c
70001+++ b/kernel/trace/trace_mmiotrace.c
70002@@ -24,7 +24,7 @@ struct header_iter {
70003 static struct trace_array *mmio_trace_array;
70004 static bool overrun_detected;
70005 static unsigned long prev_overruns;
70006-static atomic_t dropped_count;
70007+static atomic_unchecked_t dropped_count;
70008
70009 static void mmio_reset_data(struct trace_array *tr)
70010 {
70011@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
70012
70013 static unsigned long count_overruns(struct trace_iterator *iter)
70014 {
70015- unsigned long cnt = atomic_xchg(&dropped_count, 0);
70016+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
70017 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
70018
70019 if (over > prev_overruns)
70020@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
70021 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
70022 sizeof(*entry), 0, pc);
70023 if (!event) {
70024- atomic_inc(&dropped_count);
70025+ atomic_inc_unchecked(&dropped_count);
70026 return;
70027 }
70028 entry = ring_buffer_event_data(event);
70029@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
70030 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
70031 sizeof(*entry), 0, pc);
70032 if (!event) {
70033- atomic_inc(&dropped_count);
70034+ atomic_inc_unchecked(&dropped_count);
70035 return;
70036 }
70037 entry = ring_buffer_event_data(event);
70038diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
70039index 5199930..26c73a0 100644
70040--- a/kernel/trace/trace_output.c
70041+++ b/kernel/trace/trace_output.c
70042@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
70043
70044 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
70045 if (!IS_ERR(p)) {
70046- p = mangle_path(s->buffer + s->len, p, "\n");
70047+ p = mangle_path(s->buffer + s->len, p, "\n\\");
70048 if (p) {
70049 s->len = p - s->buffer;
70050 return 1;
70051diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
70052index 77575b3..6e623d1 100644
70053--- a/kernel/trace/trace_stack.c
70054+++ b/kernel/trace/trace_stack.c
70055@@ -50,7 +50,7 @@ static inline void check_stack(void)
70056 return;
70057
70058 /* we do not handle interrupt stacks yet */
70059- if (!object_is_on_stack(&this_size))
70060+ if (!object_starts_on_stack(&this_size))
70061 return;
70062
70063 local_irq_save(flags);
70064diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
70065index 209b379..7f76423 100644
70066--- a/kernel/trace/trace_workqueue.c
70067+++ b/kernel/trace/trace_workqueue.c
70068@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
70069 int cpu;
70070 pid_t pid;
70071 /* Can be inserted from interrupt or user context, need to be atomic */
70072- atomic_t inserted;
70073+ atomic_unchecked_t inserted;
70074 /*
70075 * Don't need to be atomic, works are serialized in a single workqueue thread
70076 * on a single CPU.
70077@@ -60,7 +60,7 @@ probe_workqueue_insertion(void *ignore,
70078 spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
70079 list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
70080 if (node->pid == wq_thread->pid) {
70081- atomic_inc(&node->inserted);
70082+ atomic_inc_unchecked(&node->inserted);
70083 goto found;
70084 }
70085 }
70086@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
70087 tsk = get_pid_task(pid, PIDTYPE_PID);
70088 if (tsk) {
70089 seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
70090- atomic_read(&cws->inserted), cws->executed,
70091+ atomic_read_unchecked(&cws->inserted), cws->executed,
70092 tsk->comm);
70093 put_task_struct(tsk);
70094 }
70095diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
70096index 82928f5..92da771 100644
70097--- a/lib/Kconfig.debug
70098+++ b/lib/Kconfig.debug
70099@@ -1103,6 +1103,7 @@ config LATENCYTOP
70100 depends on DEBUG_KERNEL
70101 depends on STACKTRACE_SUPPORT
70102 depends on PROC_FS
70103+ depends on !GRKERNSEC_HIDESYM
70104 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
70105 select KALLSYMS
70106 select KALLSYMS_ALL
70107diff --git a/lib/bitmap.c b/lib/bitmap.c
70108index 0d4a127..33a06c7 100644
70109--- a/lib/bitmap.c
70110+++ b/lib/bitmap.c
70111@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
70112 {
70113 int c, old_c, totaldigits, ndigits, nchunks, nbits;
70114 u32 chunk;
70115- const char __user __force *ubuf = (const char __user __force *)buf;
70116+ const char __user *ubuf = (const char __force_user *)buf;
70117
70118 bitmap_zero(maskp, nmaskbits);
70119
70120@@ -504,7 +504,7 @@ int bitmap_parse_user(const char __user *ubuf,
70121 {
70122 if (!access_ok(VERIFY_READ, ubuf, ulen))
70123 return -EFAULT;
70124- return __bitmap_parse((const char __force *)ubuf,
70125+ return __bitmap_parse((const char __force_kernel *)ubuf,
70126 ulen, 1, maskp, nmaskbits);
70127
70128 }
70129@@ -596,7 +596,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
70130 {
70131 unsigned a, b;
70132 int c, old_c, totaldigits;
70133- const char __user __force *ubuf = (const char __user __force *)buf;
70134+ const char __user *ubuf = (const char __force_user *)buf;
70135 int exp_digit, in_range;
70136
70137 totaldigits = c = 0;
70138@@ -696,7 +696,7 @@ int bitmap_parselist_user(const char __user *ubuf,
70139 {
70140 if (!access_ok(VERIFY_READ, ubuf, ulen))
70141 return -EFAULT;
70142- return __bitmap_parselist((const char __force *)ubuf,
70143+ return __bitmap_parselist((const char __force_kernel *)ubuf,
70144 ulen, 1, maskp, nmaskbits);
70145 }
70146 EXPORT_SYMBOL(bitmap_parselist_user);
70147diff --git a/lib/bug.c b/lib/bug.c
70148index 1955209..cbbb2ad 100644
70149--- a/lib/bug.c
70150+++ b/lib/bug.c
70151@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
70152 return BUG_TRAP_TYPE_NONE;
70153
70154 bug = find_bug(bugaddr);
70155+ if (!bug)
70156+ return BUG_TRAP_TYPE_NONE;
70157
70158 file = NULL;
70159 line = 0;
70160diff --git a/lib/debugobjects.c b/lib/debugobjects.c
70161index a78b7c6..2c73084 100644
70162--- a/lib/debugobjects.c
70163+++ b/lib/debugobjects.c
70164@@ -284,7 +284,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
70165 if (limit > 4)
70166 return;
70167
70168- is_on_stack = object_is_on_stack(addr);
70169+ is_on_stack = object_starts_on_stack(addr);
70170 if (is_on_stack == onstack)
70171 return;
70172
70173diff --git a/lib/devres.c b/lib/devres.c
70174index 7c0e953..f642b5c 100644
70175--- a/lib/devres.c
70176+++ b/lib/devres.c
70177@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
70178 void devm_iounmap(struct device *dev, void __iomem *addr)
70179 {
70180 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
70181- (void *)addr));
70182+ (void __force *)addr));
70183 iounmap(addr);
70184 }
70185 EXPORT_SYMBOL(devm_iounmap);
70186@@ -141,7 +141,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
70187 {
70188 ioport_unmap(addr);
70189 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
70190- devm_ioport_map_match, (void *)addr));
70191+ devm_ioport_map_match, (void __force *)addr));
70192 }
70193 EXPORT_SYMBOL(devm_ioport_unmap);
70194
70195diff --git a/lib/dma-debug.c b/lib/dma-debug.c
70196index fea790a..ebb0e82 100644
70197--- a/lib/dma-debug.c
70198+++ b/lib/dma-debug.c
70199@@ -925,7 +925,7 @@ out:
70200
70201 static void check_for_stack(struct device *dev, void *addr)
70202 {
70203- if (object_is_on_stack(addr))
70204+ if (object_starts_on_stack(addr))
70205 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
70206 "stack [addr=%p]\n", addr);
70207 }
70208diff --git a/lib/extable.c b/lib/extable.c
70209index 4cac81e..63e9b8f 100644
70210--- a/lib/extable.c
70211+++ b/lib/extable.c
70212@@ -13,6 +13,7 @@
70213 #include <linux/init.h>
70214 #include <linux/sort.h>
70215 #include <asm/uaccess.h>
70216+#include <asm/pgtable.h>
70217
70218 #ifndef ARCH_HAS_SORT_EXTABLE
70219 /*
70220@@ -36,8 +37,10 @@ static int cmp_ex(const void *a, const void *b)
70221 void sort_extable(struct exception_table_entry *start,
70222 struct exception_table_entry *finish)
70223 {
70224+ pax_open_kernel();
70225 sort(start, finish - start, sizeof(struct exception_table_entry),
70226 cmp_ex, NULL);
70227+ pax_close_kernel();
70228 }
70229
70230 #ifdef CONFIG_MODULES
70231diff --git a/lib/inflate.c b/lib/inflate.c
70232index 013a761..c28f3fc 100644
70233--- a/lib/inflate.c
70234+++ b/lib/inflate.c
70235@@ -269,7 +269,7 @@ static void free(void *where)
70236 malloc_ptr = free_mem_ptr;
70237 }
70238 #else
70239-#define malloc(a) kmalloc(a, GFP_KERNEL)
70240+#define malloc(a) kmalloc((a), GFP_KERNEL)
70241 #define free(a) kfree(a)
70242 #endif
70243
70244diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
70245index bd2bea9..6b3c95e 100644
70246--- a/lib/is_single_threaded.c
70247+++ b/lib/is_single_threaded.c
70248@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
70249 struct task_struct *p, *t;
70250 bool ret;
70251
70252+ if (!mm)
70253+ return true;
70254+
70255 if (atomic_read(&task->signal->live) != 1)
70256 return false;
70257
70258diff --git a/lib/kref.c b/lib/kref.c
70259index 3efb882..8492f4c 100644
70260--- a/lib/kref.c
70261+++ b/lib/kref.c
70262@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
70263 */
70264 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
70265 {
70266- WARN_ON(release == NULL);
70267+ BUG_ON(release == NULL);
70268 WARN_ON(release == (void (*)(struct kref *))kfree);
70269
70270 if (atomic_dec_and_test(&kref->refcount)) {
70271diff --git a/lib/radix-tree.c b/lib/radix-tree.c
70272index d9df745..e73c2fe 100644
70273--- a/lib/radix-tree.c
70274+++ b/lib/radix-tree.c
70275@@ -80,7 +80,7 @@ struct radix_tree_preload {
70276 int nr;
70277 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
70278 };
70279-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
70280+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
70281
70282 static inline void *ptr_to_indirect(void *ptr)
70283 {
70284diff --git a/lib/vsprintf.c b/lib/vsprintf.c
70285index 993599e..f1dbc14 100644
70286--- a/lib/vsprintf.c
70287+++ b/lib/vsprintf.c
70288@@ -16,6 +16,9 @@
70289 * - scnprintf and vscnprintf
70290 */
70291
70292+#ifdef CONFIG_GRKERNSEC_HIDESYM
70293+#define __INCLUDED_BY_HIDESYM 1
70294+#endif
70295 #include <stdarg.h>
70296 #include <linux/module.h>
70297 #include <linux/types.h>
70298@@ -413,7 +416,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
70299 char sym[KSYM_SYMBOL_LEN];
70300 if (ext == 'B')
70301 sprint_backtrace(sym, value);
70302- else if (ext != 'f' && ext != 's')
70303+ else if (ext != 'f' && ext != 's' && ext != 'a')
70304 sprint_symbol(sym, value);
70305 else
70306 kallsyms_lookup(value, NULL, NULL, NULL, sym);
70307@@ -777,7 +780,11 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
70308 return string(buf, end, uuid, spec);
70309 }
70310
70311+#ifdef CONFIG_GRKERNSEC_HIDESYM
70312+int kptr_restrict __read_mostly = 2;
70313+#else
70314 int kptr_restrict __read_mostly;
70315+#endif
70316
70317 /*
70318 * Show a '%p' thing. A kernel extension is that the '%p' is followed
70319@@ -791,6 +798,8 @@ int kptr_restrict __read_mostly;
70320 * - 'S' For symbolic direct pointers with offset
70321 * - 's' For symbolic direct pointers without offset
70322 * - 'B' For backtraced symbolic direct pointers with offset
70323+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
70324+ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
70325 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
70326 * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
70327 * - 'M' For a 6-byte MAC address, it prints the address in the
70328@@ -835,12 +844,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70329 {
70330 if (!ptr && *fmt != 'K') {
70331 /*
70332- * Print (null) with the same width as a pointer so it makes
70333+ * Print (nil) with the same width as a pointer so it makes
70334 * tabular output look nice.
70335 */
70336 if (spec.field_width == -1)
70337 spec.field_width = 2 * sizeof(void *);
70338- return string(buf, end, "(null)", spec);
70339+ return string(buf, end, "(nil)", spec);
70340 }
70341
70342 switch (*fmt) {
70343@@ -850,6 +859,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70344 /* Fallthrough */
70345 case 'S':
70346 case 's':
70347+#ifdef CONFIG_GRKERNSEC_HIDESYM
70348+ break;
70349+#else
70350+ return symbol_string(buf, end, ptr, spec, *fmt);
70351+#endif
70352+ case 'A':
70353+ case 'a':
70354 case 'B':
70355 return symbol_string(buf, end, ptr, spec, *fmt);
70356 case 'R':
70357@@ -878,9 +894,15 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70358 case 'U':
70359 return uuid_string(buf, end, ptr, spec, fmt);
70360 case 'V':
70361- return buf + vsnprintf(buf, end > buf ? end - buf : 0,
70362- ((struct va_format *)ptr)->fmt,
70363- *(((struct va_format *)ptr)->va));
70364+ {
70365+ va_list va;
70366+
70367+ va_copy(va, *((struct va_format *)ptr)->va);
70368+ buf += vsnprintf(buf, end > buf ? end - buf : 0,
70369+ ((struct va_format *)ptr)->fmt, va);
70370+ va_end(va);
70371+ return buf;
70372+ }
70373 case 'K':
70374 /*
70375 * %pK cannot be used in IRQ context because its test
70376@@ -1608,11 +1630,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70377 typeof(type) value; \
70378 if (sizeof(type) == 8) { \
70379 args = PTR_ALIGN(args, sizeof(u32)); \
70380- *(u32 *)&value = *(u32 *)args; \
70381- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
70382+ *(u32 *)&value = *(const u32 *)args; \
70383+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
70384 } else { \
70385 args = PTR_ALIGN(args, sizeof(type)); \
70386- value = *(typeof(type) *)args; \
70387+ value = *(const typeof(type) *)args; \
70388 } \
70389 args += sizeof(type); \
70390 value; \
70391@@ -1675,7 +1697,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70392 case FORMAT_TYPE_STR: {
70393 const char *str_arg = args;
70394 args += strlen(str_arg) + 1;
70395- str = string(str, end, (char *)str_arg, spec);
70396+ str = string(str, end, str_arg, spec);
70397 break;
70398 }
70399
70400diff --git a/localversion-grsec b/localversion-grsec
70401new file mode 100644
70402index 0000000..7cd6065
70403--- /dev/null
70404+++ b/localversion-grsec
70405@@ -0,0 +1 @@
70406+-grsec
70407diff --git a/mm/Kconfig b/mm/Kconfig
70408index 011b110..b492af2 100644
70409--- a/mm/Kconfig
70410+++ b/mm/Kconfig
70411@@ -241,10 +241,10 @@ config KSM
70412 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
70413
70414 config DEFAULT_MMAP_MIN_ADDR
70415- int "Low address space to protect from user allocation"
70416+ int "Low address space to protect from user allocation"
70417 depends on MMU
70418- default 4096
70419- help
70420+ default 65536
70421+ help
70422 This is the portion of low virtual memory which should be protected
70423 from userspace allocation. Keeping a user from writing to low pages
70424 can help reduce the impact of kernel NULL pointer bugs.
70425diff --git a/mm/filemap.c b/mm/filemap.c
70426index 03c5b0e..a01e793 100644
70427--- a/mm/filemap.c
70428+++ b/mm/filemap.c
70429@@ -1770,7 +1770,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
70430 struct address_space *mapping = file->f_mapping;
70431
70432 if (!mapping->a_ops->readpage)
70433- return -ENOEXEC;
70434+ return -ENODEV;
70435 file_accessed(file);
70436 vma->vm_ops = &generic_file_vm_ops;
70437 vma->vm_flags |= VM_CAN_NONLINEAR;
70438@@ -2176,6 +2176,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
70439 *pos = i_size_read(inode);
70440
70441 if (limit != RLIM_INFINITY) {
70442+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
70443 if (*pos >= limit) {
70444 send_sig(SIGXFSZ, current, 0);
70445 return -EFBIG;
70446diff --git a/mm/fremap.c b/mm/fremap.c
70447index 9ed4fd4..c42648d 100644
70448--- a/mm/fremap.c
70449+++ b/mm/fremap.c
70450@@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
70451 retry:
70452 vma = find_vma(mm, start);
70453
70454+#ifdef CONFIG_PAX_SEGMEXEC
70455+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
70456+ goto out;
70457+#endif
70458+
70459 /*
70460 * Make sure the vma is shared, that it supports prefaulting,
70461 * and that the remapped range is valid and fully within
70462diff --git a/mm/highmem.c b/mm/highmem.c
70463index 57d82c6..e9e0552 100644
70464--- a/mm/highmem.c
70465+++ b/mm/highmem.c
70466@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
70467 * So no dangers, even with speculative execution.
70468 */
70469 page = pte_page(pkmap_page_table[i]);
70470+ pax_open_kernel();
70471 pte_clear(&init_mm, (unsigned long)page_address(page),
70472 &pkmap_page_table[i]);
70473-
70474+ pax_close_kernel();
70475 set_page_address(page, NULL);
70476 need_flush = 1;
70477 }
70478@@ -186,9 +187,11 @@ start:
70479 }
70480 }
70481 vaddr = PKMAP_ADDR(last_pkmap_nr);
70482+
70483+ pax_open_kernel();
70484 set_pte_at(&init_mm, vaddr,
70485 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
70486-
70487+ pax_close_kernel();
70488 pkmap_count[last_pkmap_nr] = 1;
70489 set_page_address(page, (void *)vaddr);
70490
70491diff --git a/mm/huge_memory.c b/mm/huge_memory.c
70492index 8f005e9..1cb1036 100644
70493--- a/mm/huge_memory.c
70494+++ b/mm/huge_memory.c
70495@@ -704,7 +704,7 @@ out:
70496 * run pte_offset_map on the pmd, if an huge pmd could
70497 * materialize from under us from a different thread.
70498 */
70499- if (unlikely(__pte_alloc(mm, vma, pmd, address)))
70500+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
70501 return VM_FAULT_OOM;
70502 /* if an huge pmd materialized from under us just retry later */
70503 if (unlikely(pmd_trans_huge(*pmd)))
70504diff --git a/mm/hugetlb.c b/mm/hugetlb.c
70505index 2316840..b418671 100644
70506--- a/mm/hugetlb.c
70507+++ b/mm/hugetlb.c
70508@@ -2347,6 +2347,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
70509 return 1;
70510 }
70511
70512+#ifdef CONFIG_PAX_SEGMEXEC
70513+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
70514+{
70515+ struct mm_struct *mm = vma->vm_mm;
70516+ struct vm_area_struct *vma_m;
70517+ unsigned long address_m;
70518+ pte_t *ptep_m;
70519+
70520+ vma_m = pax_find_mirror_vma(vma);
70521+ if (!vma_m)
70522+ return;
70523+
70524+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
70525+ address_m = address + SEGMEXEC_TASK_SIZE;
70526+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
70527+ get_page(page_m);
70528+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
70529+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
70530+}
70531+#endif
70532+
70533 /*
70534 * Hugetlb_cow() should be called with page lock of the original hugepage held.
70535 */
70536@@ -2450,6 +2471,11 @@ retry_avoidcopy:
70537 make_huge_pte(vma, new_page, 1));
70538 page_remove_rmap(old_page);
70539 hugepage_add_new_anon_rmap(new_page, vma, address);
70540+
70541+#ifdef CONFIG_PAX_SEGMEXEC
70542+ pax_mirror_huge_pte(vma, address, new_page);
70543+#endif
70544+
70545 /* Make the old page be freed below */
70546 new_page = old_page;
70547 mmu_notifier_invalidate_range_end(mm,
70548@@ -2601,6 +2627,10 @@ retry:
70549 && (vma->vm_flags & VM_SHARED)));
70550 set_huge_pte_at(mm, address, ptep, new_pte);
70551
70552+#ifdef CONFIG_PAX_SEGMEXEC
70553+ pax_mirror_huge_pte(vma, address, page);
70554+#endif
70555+
70556 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
70557 /* Optimization, do the COW without a second fault */
70558 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
70559@@ -2630,6 +2660,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70560 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
70561 struct hstate *h = hstate_vma(vma);
70562
70563+#ifdef CONFIG_PAX_SEGMEXEC
70564+ struct vm_area_struct *vma_m;
70565+#endif
70566+
70567 ptep = huge_pte_offset(mm, address);
70568 if (ptep) {
70569 entry = huge_ptep_get(ptep);
70570@@ -2641,6 +2675,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70571 VM_FAULT_SET_HINDEX(h - hstates);
70572 }
70573
70574+#ifdef CONFIG_PAX_SEGMEXEC
70575+ vma_m = pax_find_mirror_vma(vma);
70576+ if (vma_m) {
70577+ unsigned long address_m;
70578+
70579+ if (vma->vm_start > vma_m->vm_start) {
70580+ address_m = address;
70581+ address -= SEGMEXEC_TASK_SIZE;
70582+ vma = vma_m;
70583+ h = hstate_vma(vma);
70584+ } else
70585+ address_m = address + SEGMEXEC_TASK_SIZE;
70586+
70587+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
70588+ return VM_FAULT_OOM;
70589+ address_m &= HPAGE_MASK;
70590+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
70591+ }
70592+#endif
70593+
70594 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
70595 if (!ptep)
70596 return VM_FAULT_OOM;
70597diff --git a/mm/internal.h b/mm/internal.h
70598index 2189af4..f2ca332 100644
70599--- a/mm/internal.h
70600+++ b/mm/internal.h
70601@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
70602 * in mm/page_alloc.c
70603 */
70604 extern void __free_pages_bootmem(struct page *page, unsigned int order);
70605+extern void free_compound_page(struct page *page);
70606 extern void prep_compound_page(struct page *page, unsigned long order);
70607 #ifdef CONFIG_MEMORY_FAILURE
70608 extern bool is_free_buddy_page(struct page *page);
70609diff --git a/mm/kmemleak.c b/mm/kmemleak.c
70610index f3b2a00..61da94d 100644
70611--- a/mm/kmemleak.c
70612+++ b/mm/kmemleak.c
70613@@ -357,7 +357,7 @@ static void print_unreferenced(struct seq_file *seq,
70614
70615 for (i = 0; i < object->trace_len; i++) {
70616 void *ptr = (void *)object->trace[i];
70617- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
70618+ seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
70619 }
70620 }
70621
70622diff --git a/mm/maccess.c b/mm/maccess.c
70623index d53adf9..03a24bf 100644
70624--- a/mm/maccess.c
70625+++ b/mm/maccess.c
70626@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
70627 set_fs(KERNEL_DS);
70628 pagefault_disable();
70629 ret = __copy_from_user_inatomic(dst,
70630- (__force const void __user *)src, size);
70631+ (const void __force_user *)src, size);
70632 pagefault_enable();
70633 set_fs(old_fs);
70634
70635@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
70636
70637 set_fs(KERNEL_DS);
70638 pagefault_disable();
70639- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
70640+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
70641 pagefault_enable();
70642 set_fs(old_fs);
70643
70644diff --git a/mm/madvise.c b/mm/madvise.c
70645index 74bf193..feb6fd3 100644
70646--- a/mm/madvise.c
70647+++ b/mm/madvise.c
70648@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
70649 pgoff_t pgoff;
70650 unsigned long new_flags = vma->vm_flags;
70651
70652+#ifdef CONFIG_PAX_SEGMEXEC
70653+ struct vm_area_struct *vma_m;
70654+#endif
70655+
70656 switch (behavior) {
70657 case MADV_NORMAL:
70658 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
70659@@ -110,6 +114,13 @@ success:
70660 /*
70661 * vm_flags is protected by the mmap_sem held in write mode.
70662 */
70663+
70664+#ifdef CONFIG_PAX_SEGMEXEC
70665+ vma_m = pax_find_mirror_vma(vma);
70666+ if (vma_m)
70667+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
70668+#endif
70669+
70670 vma->vm_flags = new_flags;
70671
70672 out:
70673@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
70674 struct vm_area_struct ** prev,
70675 unsigned long start, unsigned long end)
70676 {
70677+
70678+#ifdef CONFIG_PAX_SEGMEXEC
70679+ struct vm_area_struct *vma_m;
70680+#endif
70681+
70682 *prev = vma;
70683 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
70684 return -EINVAL;
70685@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
70686 zap_page_range(vma, start, end - start, &details);
70687 } else
70688 zap_page_range(vma, start, end - start, NULL);
70689+
70690+#ifdef CONFIG_PAX_SEGMEXEC
70691+ vma_m = pax_find_mirror_vma(vma);
70692+ if (vma_m) {
70693+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
70694+ struct zap_details details = {
70695+ .nonlinear_vma = vma_m,
70696+ .last_index = ULONG_MAX,
70697+ };
70698+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
70699+ } else
70700+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
70701+ }
70702+#endif
70703+
70704 return 0;
70705 }
70706
70707@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
70708 if (end < start)
70709 goto out;
70710
70711+#ifdef CONFIG_PAX_SEGMEXEC
70712+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
70713+ if (end > SEGMEXEC_TASK_SIZE)
70714+ goto out;
70715+ } else
70716+#endif
70717+
70718+ if (end > TASK_SIZE)
70719+ goto out;
70720+
70721 error = 0;
70722 if (end == start)
70723 goto out;
70724diff --git a/mm/memory-failure.c b/mm/memory-failure.c
70725index 06d3479..0778eef 100644
70726--- a/mm/memory-failure.c
70727+++ b/mm/memory-failure.c
70728@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
70729
70730 int sysctl_memory_failure_recovery __read_mostly = 1;
70731
70732-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
70733+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
70734
70735 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
70736
70737@@ -202,7 +202,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
70738 si.si_signo = SIGBUS;
70739 si.si_errno = 0;
70740 si.si_code = BUS_MCEERR_AO;
70741- si.si_addr = (void *)addr;
70742+ si.si_addr = (void __user *)addr;
70743 #ifdef __ARCH_SI_TRAPNO
70744 si.si_trapno = trapno;
70745 #endif
70746@@ -1010,7 +1010,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70747 }
70748
70749 nr_pages = 1 << compound_trans_order(hpage);
70750- atomic_long_add(nr_pages, &mce_bad_pages);
70751+ atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
70752
70753 /*
70754 * We need/can do nothing about count=0 pages.
70755@@ -1040,7 +1040,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70756 if (!PageHWPoison(hpage)
70757 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
70758 || (p != hpage && TestSetPageHWPoison(hpage))) {
70759- atomic_long_sub(nr_pages, &mce_bad_pages);
70760+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70761 return 0;
70762 }
70763 set_page_hwpoison_huge_page(hpage);
70764@@ -1098,7 +1098,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70765 }
70766 if (hwpoison_filter(p)) {
70767 if (TestClearPageHWPoison(p))
70768- atomic_long_sub(nr_pages, &mce_bad_pages);
70769+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70770 unlock_page(hpage);
70771 put_page(hpage);
70772 return 0;
70773@@ -1315,7 +1315,7 @@ int unpoison_memory(unsigned long pfn)
70774 return 0;
70775 }
70776 if (TestClearPageHWPoison(p))
70777- atomic_long_sub(nr_pages, &mce_bad_pages);
70778+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70779 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
70780 return 0;
70781 }
70782@@ -1329,7 +1329,7 @@ int unpoison_memory(unsigned long pfn)
70783 */
70784 if (TestClearPageHWPoison(page)) {
70785 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
70786- atomic_long_sub(nr_pages, &mce_bad_pages);
70787+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70788 freeit = 1;
70789 if (PageHuge(page))
70790 clear_page_hwpoison_huge_page(page);
70791@@ -1442,7 +1442,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
70792 }
70793 done:
70794 if (!PageHWPoison(hpage))
70795- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
70796+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
70797 set_page_hwpoison_huge_page(hpage);
70798 dequeue_hwpoisoned_huge_page(hpage);
70799 /* keep elevated page count for bad page */
70800@@ -1573,7 +1573,7 @@ int soft_offline_page(struct page *page, int flags)
70801 return ret;
70802
70803 done:
70804- atomic_long_add(1, &mce_bad_pages);
70805+ atomic_long_add_unchecked(1, &mce_bad_pages);
70806 SetPageHWPoison(page);
70807 /* keep elevated page count for bad page */
70808 return ret;
70809diff --git a/mm/memory.c b/mm/memory.c
70810index 829d437..3d3926a 100644
70811--- a/mm/memory.c
70812+++ b/mm/memory.c
70813@@ -457,8 +457,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
70814 return;
70815
70816 pmd = pmd_offset(pud, start);
70817+
70818+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
70819 pud_clear(pud);
70820 pmd_free_tlb(tlb, pmd, start);
70821+#endif
70822+
70823 }
70824
70825 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
70826@@ -489,9 +493,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
70827 if (end - 1 > ceiling - 1)
70828 return;
70829
70830+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
70831 pud = pud_offset(pgd, start);
70832 pgd_clear(pgd);
70833 pud_free_tlb(tlb, pud, start);
70834+#endif
70835+
70836 }
70837
70838 /*
70839@@ -1566,12 +1573,6 @@ no_page_table:
70840 return page;
70841 }
70842
70843-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
70844-{
70845- return stack_guard_page_start(vma, addr) ||
70846- stack_guard_page_end(vma, addr+PAGE_SIZE);
70847-}
70848-
70849 /**
70850 * __get_user_pages() - pin user pages in memory
70851 * @tsk: task_struct of target task
70852@@ -1644,10 +1645,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
70853 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
70854 i = 0;
70855
70856- do {
70857+ while (nr_pages) {
70858 struct vm_area_struct *vma;
70859
70860- vma = find_extend_vma(mm, start);
70861+ vma = find_vma(mm, start);
70862 if (!vma && in_gate_area(mm, start)) {
70863 unsigned long pg = start & PAGE_MASK;
70864 pgd_t *pgd;
70865@@ -1695,7 +1696,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
70866 goto next_page;
70867 }
70868
70869- if (!vma ||
70870+ if (!vma || start < vma->vm_start ||
70871 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
70872 !(vm_flags & vma->vm_flags))
70873 return i ? : -EFAULT;
70874@@ -1722,11 +1723,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
70875 int ret;
70876 unsigned int fault_flags = 0;
70877
70878- /* For mlock, just skip the stack guard page. */
70879- if (foll_flags & FOLL_MLOCK) {
70880- if (stack_guard_page(vma, start))
70881- goto next_page;
70882- }
70883 if (foll_flags & FOLL_WRITE)
70884 fault_flags |= FAULT_FLAG_WRITE;
70885 if (nonblocking)
70886@@ -1800,7 +1796,7 @@ next_page:
70887 start += PAGE_SIZE;
70888 nr_pages--;
70889 } while (nr_pages && start < vma->vm_end);
70890- } while (nr_pages);
70891+ }
70892 return i;
70893 }
70894 EXPORT_SYMBOL(__get_user_pages);
70895@@ -2007,6 +2003,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
70896 page_add_file_rmap(page);
70897 set_pte_at(mm, addr, pte, mk_pte(page, prot));
70898
70899+#ifdef CONFIG_PAX_SEGMEXEC
70900+ pax_mirror_file_pte(vma, addr, page, ptl);
70901+#endif
70902+
70903 retval = 0;
70904 pte_unmap_unlock(pte, ptl);
70905 return retval;
70906@@ -2041,10 +2041,22 @@ out:
70907 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
70908 struct page *page)
70909 {
70910+
70911+#ifdef CONFIG_PAX_SEGMEXEC
70912+ struct vm_area_struct *vma_m;
70913+#endif
70914+
70915 if (addr < vma->vm_start || addr >= vma->vm_end)
70916 return -EFAULT;
70917 if (!page_count(page))
70918 return -EINVAL;
70919+
70920+#ifdef CONFIG_PAX_SEGMEXEC
70921+ vma_m = pax_find_mirror_vma(vma);
70922+ if (vma_m)
70923+ vma_m->vm_flags |= VM_INSERTPAGE;
70924+#endif
70925+
70926 vma->vm_flags |= VM_INSERTPAGE;
70927 return insert_page(vma, addr, page, vma->vm_page_prot);
70928 }
70929@@ -2130,6 +2142,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
70930 unsigned long pfn)
70931 {
70932 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
70933+ BUG_ON(vma->vm_mirror);
70934
70935 if (addr < vma->vm_start || addr >= vma->vm_end)
70936 return -EFAULT;
70937@@ -2445,6 +2458,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
70938 copy_user_highpage(dst, src, va, vma);
70939 }
70940
70941+#ifdef CONFIG_PAX_SEGMEXEC
70942+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
70943+{
70944+ struct mm_struct *mm = vma->vm_mm;
70945+ spinlock_t *ptl;
70946+ pte_t *pte, entry;
70947+
70948+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
70949+ entry = *pte;
70950+ if (!pte_present(entry)) {
70951+ if (!pte_none(entry)) {
70952+ BUG_ON(pte_file(entry));
70953+ free_swap_and_cache(pte_to_swp_entry(entry));
70954+ pte_clear_not_present_full(mm, address, pte, 0);
70955+ }
70956+ } else {
70957+ struct page *page;
70958+
70959+ flush_cache_page(vma, address, pte_pfn(entry));
70960+ entry = ptep_clear_flush(vma, address, pte);
70961+ BUG_ON(pte_dirty(entry));
70962+ page = vm_normal_page(vma, address, entry);
70963+ if (page) {
70964+ update_hiwater_rss(mm);
70965+ if (PageAnon(page))
70966+ dec_mm_counter_fast(mm, MM_ANONPAGES);
70967+ else
70968+ dec_mm_counter_fast(mm, MM_FILEPAGES);
70969+ page_remove_rmap(page);
70970+ page_cache_release(page);
70971+ }
70972+ }
70973+ pte_unmap_unlock(pte, ptl);
70974+}
70975+
70976+/* PaX: if vma is mirrored, synchronize the mirror's PTE
70977+ *
70978+ * the ptl of the lower mapped page is held on entry and is not released on exit
70979+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
70980+ */
70981+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
70982+{
70983+ struct mm_struct *mm = vma->vm_mm;
70984+ unsigned long address_m;
70985+ spinlock_t *ptl_m;
70986+ struct vm_area_struct *vma_m;
70987+ pmd_t *pmd_m;
70988+ pte_t *pte_m, entry_m;
70989+
70990+ BUG_ON(!page_m || !PageAnon(page_m));
70991+
70992+ vma_m = pax_find_mirror_vma(vma);
70993+ if (!vma_m)
70994+ return;
70995+
70996+ BUG_ON(!PageLocked(page_m));
70997+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
70998+ address_m = address + SEGMEXEC_TASK_SIZE;
70999+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71000+ pte_m = pte_offset_map(pmd_m, address_m);
71001+ ptl_m = pte_lockptr(mm, pmd_m);
71002+ if (ptl != ptl_m) {
71003+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71004+ if (!pte_none(*pte_m))
71005+ goto out;
71006+ }
71007+
71008+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71009+ page_cache_get(page_m);
71010+ page_add_anon_rmap(page_m, vma_m, address_m);
71011+ inc_mm_counter_fast(mm, MM_ANONPAGES);
71012+ set_pte_at(mm, address_m, pte_m, entry_m);
71013+ update_mmu_cache(vma_m, address_m, entry_m);
71014+out:
71015+ if (ptl != ptl_m)
71016+ spin_unlock(ptl_m);
71017+ pte_unmap(pte_m);
71018+ unlock_page(page_m);
71019+}
71020+
71021+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71022+{
71023+ struct mm_struct *mm = vma->vm_mm;
71024+ unsigned long address_m;
71025+ spinlock_t *ptl_m;
71026+ struct vm_area_struct *vma_m;
71027+ pmd_t *pmd_m;
71028+ pte_t *pte_m, entry_m;
71029+
71030+ BUG_ON(!page_m || PageAnon(page_m));
71031+
71032+ vma_m = pax_find_mirror_vma(vma);
71033+ if (!vma_m)
71034+ return;
71035+
71036+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71037+ address_m = address + SEGMEXEC_TASK_SIZE;
71038+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71039+ pte_m = pte_offset_map(pmd_m, address_m);
71040+ ptl_m = pte_lockptr(mm, pmd_m);
71041+ if (ptl != ptl_m) {
71042+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71043+ if (!pte_none(*pte_m))
71044+ goto out;
71045+ }
71046+
71047+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71048+ page_cache_get(page_m);
71049+ page_add_file_rmap(page_m);
71050+ inc_mm_counter_fast(mm, MM_FILEPAGES);
71051+ set_pte_at(mm, address_m, pte_m, entry_m);
71052+ update_mmu_cache(vma_m, address_m, entry_m);
71053+out:
71054+ if (ptl != ptl_m)
71055+ spin_unlock(ptl_m);
71056+ pte_unmap(pte_m);
71057+}
71058+
71059+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
71060+{
71061+ struct mm_struct *mm = vma->vm_mm;
71062+ unsigned long address_m;
71063+ spinlock_t *ptl_m;
71064+ struct vm_area_struct *vma_m;
71065+ pmd_t *pmd_m;
71066+ pte_t *pte_m, entry_m;
71067+
71068+ vma_m = pax_find_mirror_vma(vma);
71069+ if (!vma_m)
71070+ return;
71071+
71072+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71073+ address_m = address + SEGMEXEC_TASK_SIZE;
71074+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71075+ pte_m = pte_offset_map(pmd_m, address_m);
71076+ ptl_m = pte_lockptr(mm, pmd_m);
71077+ if (ptl != ptl_m) {
71078+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71079+ if (!pte_none(*pte_m))
71080+ goto out;
71081+ }
71082+
71083+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
71084+ set_pte_at(mm, address_m, pte_m, entry_m);
71085+out:
71086+ if (ptl != ptl_m)
71087+ spin_unlock(ptl_m);
71088+ pte_unmap(pte_m);
71089+}
71090+
71091+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
71092+{
71093+ struct page *page_m;
71094+ pte_t entry;
71095+
71096+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
71097+ goto out;
71098+
71099+ entry = *pte;
71100+ page_m = vm_normal_page(vma, address, entry);
71101+ if (!page_m)
71102+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
71103+ else if (PageAnon(page_m)) {
71104+ if (pax_find_mirror_vma(vma)) {
71105+ pte_unmap_unlock(pte, ptl);
71106+ lock_page(page_m);
71107+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
71108+ if (pte_same(entry, *pte))
71109+ pax_mirror_anon_pte(vma, address, page_m, ptl);
71110+ else
71111+ unlock_page(page_m);
71112+ }
71113+ } else
71114+ pax_mirror_file_pte(vma, address, page_m, ptl);
71115+
71116+out:
71117+ pte_unmap_unlock(pte, ptl);
71118+}
71119+#endif
71120+
71121 /*
71122 * This routine handles present pages, when users try to write
71123 * to a shared page. It is done by copying the page to a new address
71124@@ -2656,6 +2849,12 @@ gotten:
71125 */
71126 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71127 if (likely(pte_same(*page_table, orig_pte))) {
71128+
71129+#ifdef CONFIG_PAX_SEGMEXEC
71130+ if (pax_find_mirror_vma(vma))
71131+ BUG_ON(!trylock_page(new_page));
71132+#endif
71133+
71134 if (old_page) {
71135 if (!PageAnon(old_page)) {
71136 dec_mm_counter_fast(mm, MM_FILEPAGES);
71137@@ -2707,6 +2906,10 @@ gotten:
71138 page_remove_rmap(old_page);
71139 }
71140
71141+#ifdef CONFIG_PAX_SEGMEXEC
71142+ pax_mirror_anon_pte(vma, address, new_page, ptl);
71143+#endif
71144+
71145 /* Free the old page.. */
71146 new_page = old_page;
71147 ret |= VM_FAULT_WRITE;
71148@@ -2986,6 +3189,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
71149 swap_free(entry);
71150 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
71151 try_to_free_swap(page);
71152+
71153+#ifdef CONFIG_PAX_SEGMEXEC
71154+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
71155+#endif
71156+
71157 unlock_page(page);
71158 if (swapcache) {
71159 /*
71160@@ -3009,6 +3217,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
71161
71162 /* No need to invalidate - it was non-present before */
71163 update_mmu_cache(vma, address, page_table);
71164+
71165+#ifdef CONFIG_PAX_SEGMEXEC
71166+ pax_mirror_anon_pte(vma, address, page, ptl);
71167+#endif
71168+
71169 unlock:
71170 pte_unmap_unlock(page_table, ptl);
71171 out:
71172@@ -3028,40 +3241,6 @@ out_release:
71173 }
71174
71175 /*
71176- * This is like a special single-page "expand_{down|up}wards()",
71177- * except we must first make sure that 'address{-|+}PAGE_SIZE'
71178- * doesn't hit another vma.
71179- */
71180-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
71181-{
71182- address &= PAGE_MASK;
71183- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
71184- struct vm_area_struct *prev = vma->vm_prev;
71185-
71186- /*
71187- * Is there a mapping abutting this one below?
71188- *
71189- * That's only ok if it's the same stack mapping
71190- * that has gotten split..
71191- */
71192- if (prev && prev->vm_end == address)
71193- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
71194-
71195- expand_downwards(vma, address - PAGE_SIZE);
71196- }
71197- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
71198- struct vm_area_struct *next = vma->vm_next;
71199-
71200- /* As VM_GROWSDOWN but s/below/above/ */
71201- if (next && next->vm_start == address + PAGE_SIZE)
71202- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
71203-
71204- expand_upwards(vma, address + PAGE_SIZE);
71205- }
71206- return 0;
71207-}
71208-
71209-/*
71210 * We enter with non-exclusive mmap_sem (to exclude vma changes,
71211 * but allow concurrent faults), and pte mapped but not yet locked.
71212 * We return with mmap_sem still held, but pte unmapped and unlocked.
71213@@ -3070,27 +3249,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71214 unsigned long address, pte_t *page_table, pmd_t *pmd,
71215 unsigned int flags)
71216 {
71217- struct page *page;
71218+ struct page *page = NULL;
71219 spinlock_t *ptl;
71220 pte_t entry;
71221
71222- pte_unmap(page_table);
71223-
71224- /* Check if we need to add a guard page to the stack */
71225- if (check_stack_guard_page(vma, address) < 0)
71226- return VM_FAULT_SIGBUS;
71227-
71228- /* Use the zero-page for reads */
71229 if (!(flags & FAULT_FLAG_WRITE)) {
71230 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
71231 vma->vm_page_prot));
71232- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71233+ ptl = pte_lockptr(mm, pmd);
71234+ spin_lock(ptl);
71235 if (!pte_none(*page_table))
71236 goto unlock;
71237 goto setpte;
71238 }
71239
71240 /* Allocate our own private page. */
71241+ pte_unmap(page_table);
71242+
71243 if (unlikely(anon_vma_prepare(vma)))
71244 goto oom;
71245 page = alloc_zeroed_user_highpage_movable(vma, address);
71246@@ -3109,6 +3284,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71247 if (!pte_none(*page_table))
71248 goto release;
71249
71250+#ifdef CONFIG_PAX_SEGMEXEC
71251+ if (pax_find_mirror_vma(vma))
71252+ BUG_ON(!trylock_page(page));
71253+#endif
71254+
71255 inc_mm_counter_fast(mm, MM_ANONPAGES);
71256 page_add_new_anon_rmap(page, vma, address);
71257 setpte:
71258@@ -3116,6 +3296,12 @@ setpte:
71259
71260 /* No need to invalidate - it was non-present before */
71261 update_mmu_cache(vma, address, page_table);
71262+
71263+#ifdef CONFIG_PAX_SEGMEXEC
71264+ if (page)
71265+ pax_mirror_anon_pte(vma, address, page, ptl);
71266+#endif
71267+
71268 unlock:
71269 pte_unmap_unlock(page_table, ptl);
71270 return 0;
71271@@ -3259,6 +3445,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71272 */
71273 /* Only go through if we didn't race with anybody else... */
71274 if (likely(pte_same(*page_table, orig_pte))) {
71275+
71276+#ifdef CONFIG_PAX_SEGMEXEC
71277+ if (anon && pax_find_mirror_vma(vma))
71278+ BUG_ON(!trylock_page(page));
71279+#endif
71280+
71281 flush_icache_page(vma, page);
71282 entry = mk_pte(page, vma->vm_page_prot);
71283 if (flags & FAULT_FLAG_WRITE)
71284@@ -3278,6 +3470,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71285
71286 /* no need to invalidate: a not-present page won't be cached */
71287 update_mmu_cache(vma, address, page_table);
71288+
71289+#ifdef CONFIG_PAX_SEGMEXEC
71290+ if (anon)
71291+ pax_mirror_anon_pte(vma, address, page, ptl);
71292+ else
71293+ pax_mirror_file_pte(vma, address, page, ptl);
71294+#endif
71295+
71296 } else {
71297 if (cow_page)
71298 mem_cgroup_uncharge_page(cow_page);
71299@@ -3431,6 +3631,12 @@ int handle_pte_fault(struct mm_struct *mm,
71300 if (flags & FAULT_FLAG_WRITE)
71301 flush_tlb_fix_spurious_fault(vma, address);
71302 }
71303+
71304+#ifdef CONFIG_PAX_SEGMEXEC
71305+ pax_mirror_pte(vma, address, pte, pmd, ptl);
71306+ return 0;
71307+#endif
71308+
71309 unlock:
71310 pte_unmap_unlock(pte, ptl);
71311 return 0;
71312@@ -3447,6 +3653,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71313 pmd_t *pmd;
71314 pte_t *pte;
71315
71316+#ifdef CONFIG_PAX_SEGMEXEC
71317+ struct vm_area_struct *vma_m;
71318+#endif
71319+
71320 __set_current_state(TASK_RUNNING);
71321
71322 count_vm_event(PGFAULT);
71323@@ -3458,6 +3668,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71324 if (unlikely(is_vm_hugetlb_page(vma)))
71325 return hugetlb_fault(mm, vma, address, flags);
71326
71327+#ifdef CONFIG_PAX_SEGMEXEC
71328+ vma_m = pax_find_mirror_vma(vma);
71329+ if (vma_m) {
71330+ unsigned long address_m;
71331+ pgd_t *pgd_m;
71332+ pud_t *pud_m;
71333+ pmd_t *pmd_m;
71334+
71335+ if (vma->vm_start > vma_m->vm_start) {
71336+ address_m = address;
71337+ address -= SEGMEXEC_TASK_SIZE;
71338+ vma = vma_m;
71339+ } else
71340+ address_m = address + SEGMEXEC_TASK_SIZE;
71341+
71342+ pgd_m = pgd_offset(mm, address_m);
71343+ pud_m = pud_alloc(mm, pgd_m, address_m);
71344+ if (!pud_m)
71345+ return VM_FAULT_OOM;
71346+ pmd_m = pmd_alloc(mm, pud_m, address_m);
71347+ if (!pmd_m)
71348+ return VM_FAULT_OOM;
71349+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
71350+ return VM_FAULT_OOM;
71351+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
71352+ }
71353+#endif
71354+
71355 pgd = pgd_offset(mm, address);
71356 pud = pud_alloc(mm, pgd, address);
71357 if (!pud)
71358@@ -3487,7 +3725,7 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71359 * run pte_offset_map on the pmd, if an huge pmd could
71360 * materialize from under us from a different thread.
71361 */
71362- if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
71363+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
71364 return VM_FAULT_OOM;
71365 /* if an huge pmd materialized from under us just retry later */
71366 if (unlikely(pmd_trans_huge(*pmd)))
71367@@ -3591,7 +3829,7 @@ static int __init gate_vma_init(void)
71368 gate_vma.vm_start = FIXADDR_USER_START;
71369 gate_vma.vm_end = FIXADDR_USER_END;
71370 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
71371- gate_vma.vm_page_prot = __P101;
71372+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
71373 /*
71374 * Make sure the vDSO gets into every core dump.
71375 * Dumping its contents makes post-mortem fully interpretable later
71376diff --git a/mm/mempolicy.c b/mm/mempolicy.c
71377index c3fdbcb..2e8ef90 100644
71378--- a/mm/mempolicy.c
71379+++ b/mm/mempolicy.c
71380@@ -640,6 +640,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71381 unsigned long vmstart;
71382 unsigned long vmend;
71383
71384+#ifdef CONFIG_PAX_SEGMEXEC
71385+ struct vm_area_struct *vma_m;
71386+#endif
71387+
71388 vma = find_vma_prev(mm, start, &prev);
71389 if (!vma || vma->vm_start > start)
71390 return -EFAULT;
71391@@ -678,6 +682,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71392 err = policy_vma(vma, new_pol);
71393 if (err)
71394 goto out;
71395+
71396+#ifdef CONFIG_PAX_SEGMEXEC
71397+ vma_m = pax_find_mirror_vma(vma);
71398+ if (vma_m) {
71399+ err = policy_vma(vma_m, new_pol);
71400+ if (err)
71401+ goto out;
71402+ }
71403+#endif
71404+
71405 }
71406
71407 out:
71408@@ -1111,6 +1125,17 @@ static long do_mbind(unsigned long start, unsigned long len,
71409
71410 if (end < start)
71411 return -EINVAL;
71412+
71413+#ifdef CONFIG_PAX_SEGMEXEC
71414+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
71415+ if (end > SEGMEXEC_TASK_SIZE)
71416+ return -EINVAL;
71417+ } else
71418+#endif
71419+
71420+ if (end > TASK_SIZE)
71421+ return -EINVAL;
71422+
71423 if (end == start)
71424 return 0;
71425
71426@@ -1329,6 +1354,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71427 if (!mm)
71428 goto out;
71429
71430+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71431+ if (mm != current->mm &&
71432+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71433+ err = -EPERM;
71434+ goto out;
71435+ }
71436+#endif
71437+
71438 /*
71439 * Check if this process has the right to modify the specified
71440 * process. The right exists if the process has administrative
71441@@ -1338,8 +1371,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71442 rcu_read_lock();
71443 tcred = __task_cred(task);
71444 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
71445- cred->uid != tcred->suid && cred->uid != tcred->uid &&
71446- !capable(CAP_SYS_NICE)) {
71447+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
71448 rcu_read_unlock();
71449 err = -EPERM;
71450 goto out;
71451diff --git a/mm/migrate.c b/mm/migrate.c
71452index 177aca4..ab3a744 100644
71453--- a/mm/migrate.c
71454+++ b/mm/migrate.c
71455@@ -1313,6 +1313,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
71456 if (!mm)
71457 return -EINVAL;
71458
71459+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71460+ if (mm != current->mm &&
71461+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71462+ err = -EPERM;
71463+ goto out;
71464+ }
71465+#endif
71466+
71467 /*
71468 * Check if this process has the right to modify the specified
71469 * process. The right exists if the process has administrative
71470@@ -1322,8 +1330,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
71471 rcu_read_lock();
71472 tcred = __task_cred(task);
71473 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
71474- cred->uid != tcred->suid && cred->uid != tcred->uid &&
71475- !capable(CAP_SYS_NICE)) {
71476+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
71477 rcu_read_unlock();
71478 err = -EPERM;
71479 goto out;
71480diff --git a/mm/mlock.c b/mm/mlock.c
71481index 4f4f53b..9511904 100644
71482--- a/mm/mlock.c
71483+++ b/mm/mlock.c
71484@@ -13,6 +13,7 @@
71485 #include <linux/pagemap.h>
71486 #include <linux/mempolicy.h>
71487 #include <linux/syscalls.h>
71488+#include <linux/security.h>
71489 #include <linux/sched.h>
71490 #include <linux/export.h>
71491 #include <linux/rmap.h>
71492@@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
71493 return -EINVAL;
71494 if (end == start)
71495 return 0;
71496+ if (end > TASK_SIZE)
71497+ return -EINVAL;
71498+
71499 vma = find_vma_prev(current->mm, start, &prev);
71500 if (!vma || vma->vm_start > start)
71501 return -ENOMEM;
71502@@ -395,6 +399,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
71503 for (nstart = start ; ; ) {
71504 vm_flags_t newflags;
71505
71506+#ifdef CONFIG_PAX_SEGMEXEC
71507+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
71508+ break;
71509+#endif
71510+
71511 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
71512
71513 newflags = vma->vm_flags | VM_LOCKED;
71514@@ -500,6 +509,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
71515 lock_limit >>= PAGE_SHIFT;
71516
71517 /* check against resource limits */
71518+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
71519 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
71520 error = do_mlock(start, len, 1);
71521 up_write(&current->mm->mmap_sem);
71522@@ -523,17 +533,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
71523 static int do_mlockall(int flags)
71524 {
71525 struct vm_area_struct * vma, * prev = NULL;
71526- unsigned int def_flags = 0;
71527
71528 if (flags & MCL_FUTURE)
71529- def_flags = VM_LOCKED;
71530- current->mm->def_flags = def_flags;
71531+ current->mm->def_flags |= VM_LOCKED;
71532+ else
71533+ current->mm->def_flags &= ~VM_LOCKED;
71534 if (flags == MCL_FUTURE)
71535 goto out;
71536
71537 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
71538 vm_flags_t newflags;
71539
71540+#ifdef CONFIG_PAX_SEGMEXEC
71541+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
71542+ break;
71543+#endif
71544+
71545+ BUG_ON(vma->vm_end > TASK_SIZE);
71546 newflags = vma->vm_flags | VM_LOCKED;
71547 if (!(flags & MCL_CURRENT))
71548 newflags &= ~VM_LOCKED;
71549@@ -566,6 +582,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
71550 lock_limit >>= PAGE_SHIFT;
71551
71552 ret = -ENOMEM;
71553+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
71554 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
71555 capable(CAP_IPC_LOCK))
71556 ret = do_mlockall(flags);
71557diff --git a/mm/mmap.c b/mm/mmap.c
71558index eae90af..c930262 100644
71559--- a/mm/mmap.c
71560+++ b/mm/mmap.c
71561@@ -46,6 +46,16 @@
71562 #define arch_rebalance_pgtables(addr, len) (addr)
71563 #endif
71564
71565+static inline void verify_mm_writelocked(struct mm_struct *mm)
71566+{
71567+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
71568+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
71569+ up_read(&mm->mmap_sem);
71570+ BUG();
71571+ }
71572+#endif
71573+}
71574+
71575 static void unmap_region(struct mm_struct *mm,
71576 struct vm_area_struct *vma, struct vm_area_struct *prev,
71577 unsigned long start, unsigned long end);
71578@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struct *mm,
71579 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
71580 *
71581 */
71582-pgprot_t protection_map[16] = {
71583+pgprot_t protection_map[16] __read_only = {
71584 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
71585 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
71586 };
71587
71588-pgprot_t vm_get_page_prot(unsigned long vm_flags)
71589+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
71590 {
71591- return __pgprot(pgprot_val(protection_map[vm_flags &
71592+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
71593 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
71594 pgprot_val(arch_vm_get_page_prot(vm_flags)));
71595+
71596+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71597+ if (!(__supported_pte_mask & _PAGE_NX) &&
71598+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
71599+ (vm_flags & (VM_READ | VM_WRITE)))
71600+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
71601+#endif
71602+
71603+ return prot;
71604 }
71605 EXPORT_SYMBOL(vm_get_page_prot);
71606
71607 int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS; /* heuristic overcommit */
71608 int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
71609 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
71610+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
71611 /*
71612 * Make sure vm_committed_as in one cacheline and not cacheline shared with
71613 * other variables. It can be updated by several CPUs frequently.
71614@@ -228,6 +248,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
71615 struct vm_area_struct *next = vma->vm_next;
71616
71617 might_sleep();
71618+ BUG_ON(vma->vm_mirror);
71619 if (vma->vm_ops && vma->vm_ops->close)
71620 vma->vm_ops->close(vma);
71621 if (vma->vm_file) {
71622@@ -272,6 +293,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
71623 * not page aligned -Ram Gupta
71624 */
71625 rlim = rlimit(RLIMIT_DATA);
71626+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
71627 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
71628 (mm->end_data - mm->start_data) > rlim)
71629 goto out;
71630@@ -689,6 +711,12 @@ static int
71631 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
71632 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
71633 {
71634+
71635+#ifdef CONFIG_PAX_SEGMEXEC
71636+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
71637+ return 0;
71638+#endif
71639+
71640 if (is_mergeable_vma(vma, file, vm_flags) &&
71641 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
71642 if (vma->vm_pgoff == vm_pgoff)
71643@@ -708,6 +736,12 @@ static int
71644 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
71645 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
71646 {
71647+
71648+#ifdef CONFIG_PAX_SEGMEXEC
71649+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
71650+ return 0;
71651+#endif
71652+
71653 if (is_mergeable_vma(vma, file, vm_flags) &&
71654 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
71655 pgoff_t vm_pglen;
71656@@ -750,13 +784,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
71657 struct vm_area_struct *vma_merge(struct mm_struct *mm,
71658 struct vm_area_struct *prev, unsigned long addr,
71659 unsigned long end, unsigned long vm_flags,
71660- struct anon_vma *anon_vma, struct file *file,
71661+ struct anon_vma *anon_vma, struct file *file,
71662 pgoff_t pgoff, struct mempolicy *policy)
71663 {
71664 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
71665 struct vm_area_struct *area, *next;
71666 int err;
71667
71668+#ifdef CONFIG_PAX_SEGMEXEC
71669+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
71670+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
71671+
71672+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
71673+#endif
71674+
71675 /*
71676 * We later require that vma->vm_flags == vm_flags,
71677 * so this tests vma->vm_flags & VM_SPECIAL, too.
71678@@ -772,6 +813,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71679 if (next && next->vm_end == end) /* cases 6, 7, 8 */
71680 next = next->vm_next;
71681
71682+#ifdef CONFIG_PAX_SEGMEXEC
71683+ if (prev)
71684+ prev_m = pax_find_mirror_vma(prev);
71685+ if (area)
71686+ area_m = pax_find_mirror_vma(area);
71687+ if (next)
71688+ next_m = pax_find_mirror_vma(next);
71689+#endif
71690+
71691 /*
71692 * Can it merge with the predecessor?
71693 */
71694@@ -791,9 +841,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71695 /* cases 1, 6 */
71696 err = vma_adjust(prev, prev->vm_start,
71697 next->vm_end, prev->vm_pgoff, NULL);
71698- } else /* cases 2, 5, 7 */
71699+
71700+#ifdef CONFIG_PAX_SEGMEXEC
71701+ if (!err && prev_m)
71702+ err = vma_adjust(prev_m, prev_m->vm_start,
71703+ next_m->vm_end, prev_m->vm_pgoff, NULL);
71704+#endif
71705+
71706+ } else { /* cases 2, 5, 7 */
71707 err = vma_adjust(prev, prev->vm_start,
71708 end, prev->vm_pgoff, NULL);
71709+
71710+#ifdef CONFIG_PAX_SEGMEXEC
71711+ if (!err && prev_m)
71712+ err = vma_adjust(prev_m, prev_m->vm_start,
71713+ end_m, prev_m->vm_pgoff, NULL);
71714+#endif
71715+
71716+ }
71717 if (err)
71718 return NULL;
71719 khugepaged_enter_vma_merge(prev);
71720@@ -807,12 +872,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71721 mpol_equal(policy, vma_policy(next)) &&
71722 can_vma_merge_before(next, vm_flags,
71723 anon_vma, file, pgoff+pglen)) {
71724- if (prev && addr < prev->vm_end) /* case 4 */
71725+ if (prev && addr < prev->vm_end) { /* case 4 */
71726 err = vma_adjust(prev, prev->vm_start,
71727 addr, prev->vm_pgoff, NULL);
71728- else /* cases 3, 8 */
71729+
71730+#ifdef CONFIG_PAX_SEGMEXEC
71731+ if (!err && prev_m)
71732+ err = vma_adjust(prev_m, prev_m->vm_start,
71733+ addr_m, prev_m->vm_pgoff, NULL);
71734+#endif
71735+
71736+ } else { /* cases 3, 8 */
71737 err = vma_adjust(area, addr, next->vm_end,
71738 next->vm_pgoff - pglen, NULL);
71739+
71740+#ifdef CONFIG_PAX_SEGMEXEC
71741+ if (!err && area_m)
71742+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
71743+ next_m->vm_pgoff - pglen, NULL);
71744+#endif
71745+
71746+ }
71747 if (err)
71748 return NULL;
71749 khugepaged_enter_vma_merge(area);
71750@@ -921,14 +1001,11 @@ none:
71751 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
71752 struct file *file, long pages)
71753 {
71754- const unsigned long stack_flags
71755- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
71756-
71757 if (file) {
71758 mm->shared_vm += pages;
71759 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
71760 mm->exec_vm += pages;
71761- } else if (flags & stack_flags)
71762+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
71763 mm->stack_vm += pages;
71764 if (flags & (VM_RESERVED|VM_IO))
71765 mm->reserved_vm += pages;
71766@@ -955,7 +1032,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71767 * (the exception is when the underlying filesystem is noexec
71768 * mounted, in which case we dont add PROT_EXEC.)
71769 */
71770- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
71771+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
71772 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
71773 prot |= PROT_EXEC;
71774
71775@@ -981,7 +1058,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71776 /* Obtain the address to map to. we verify (or select) it and ensure
71777 * that it represents a valid section of the address space.
71778 */
71779- addr = get_unmapped_area(file, addr, len, pgoff, flags);
71780+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
71781 if (addr & ~PAGE_MASK)
71782 return addr;
71783
71784@@ -992,6 +1069,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71785 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
71786 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
71787
71788+#ifdef CONFIG_PAX_MPROTECT
71789+ if (mm->pax_flags & MF_PAX_MPROTECT) {
71790+#ifndef CONFIG_PAX_MPROTECT_COMPAT
71791+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
71792+ gr_log_rwxmmap(file);
71793+
71794+#ifdef CONFIG_PAX_EMUPLT
71795+ vm_flags &= ~VM_EXEC;
71796+#else
71797+ return -EPERM;
71798+#endif
71799+
71800+ }
71801+
71802+ if (!(vm_flags & VM_EXEC))
71803+ vm_flags &= ~VM_MAYEXEC;
71804+#else
71805+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
71806+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
71807+#endif
71808+ else
71809+ vm_flags &= ~VM_MAYWRITE;
71810+ }
71811+#endif
71812+
71813+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71814+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
71815+ vm_flags &= ~VM_PAGEEXEC;
71816+#endif
71817+
71818 if (flags & MAP_LOCKED)
71819 if (!can_do_mlock())
71820 return -EPERM;
71821@@ -1003,6 +1110,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71822 locked += mm->locked_vm;
71823 lock_limit = rlimit(RLIMIT_MEMLOCK);
71824 lock_limit >>= PAGE_SHIFT;
71825+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
71826 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
71827 return -EAGAIN;
71828 }
71829@@ -1073,6 +1181,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71830 if (error)
71831 return error;
71832
71833+ if (!gr_acl_handle_mmap(file, prot))
71834+ return -EACCES;
71835+
71836 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
71837 }
71838 EXPORT_SYMBOL(do_mmap_pgoff);
71839@@ -1153,7 +1264,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
71840 vm_flags_t vm_flags = vma->vm_flags;
71841
71842 /* If it was private or non-writable, the write bit is already clear */
71843- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
71844+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
71845 return 0;
71846
71847 /* The backer wishes to know when pages are first written to? */
71848@@ -1202,14 +1313,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
71849 unsigned long charged = 0;
71850 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
71851
71852+#ifdef CONFIG_PAX_SEGMEXEC
71853+ struct vm_area_struct *vma_m = NULL;
71854+#endif
71855+
71856+ /*
71857+ * mm->mmap_sem is required to protect against another thread
71858+ * changing the mappings in case we sleep.
71859+ */
71860+ verify_mm_writelocked(mm);
71861+
71862 /* Clear old maps */
71863 error = -ENOMEM;
71864-munmap_back:
71865 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
71866 if (vma && vma->vm_start < addr + len) {
71867 if (do_munmap(mm, addr, len))
71868 return -ENOMEM;
71869- goto munmap_back;
71870+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
71871+ BUG_ON(vma && vma->vm_start < addr + len);
71872 }
71873
71874 /* Check against address space limit. */
71875@@ -1258,6 +1379,16 @@ munmap_back:
71876 goto unacct_error;
71877 }
71878
71879+#ifdef CONFIG_PAX_SEGMEXEC
71880+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
71881+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
71882+ if (!vma_m) {
71883+ error = -ENOMEM;
71884+ goto free_vma;
71885+ }
71886+ }
71887+#endif
71888+
71889 vma->vm_mm = mm;
71890 vma->vm_start = addr;
71891 vma->vm_end = addr + len;
71892@@ -1266,8 +1397,9 @@ munmap_back:
71893 vma->vm_pgoff = pgoff;
71894 INIT_LIST_HEAD(&vma->anon_vma_chain);
71895
71896+ error = -EINVAL; /* when rejecting VM_GROWSDOWN|VM_GROWSUP */
71897+
71898 if (file) {
71899- error = -EINVAL;
71900 if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
71901 goto free_vma;
71902 if (vm_flags & VM_DENYWRITE) {
71903@@ -1281,6 +1413,19 @@ munmap_back:
71904 error = file->f_op->mmap(file, vma);
71905 if (error)
71906 goto unmap_and_free_vma;
71907+
71908+#ifdef CONFIG_PAX_SEGMEXEC
71909+ if (vma_m && (vm_flags & VM_EXECUTABLE))
71910+ added_exe_file_vma(mm);
71911+#endif
71912+
71913+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71914+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
71915+ vma->vm_flags |= VM_PAGEEXEC;
71916+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
71917+ }
71918+#endif
71919+
71920 if (vm_flags & VM_EXECUTABLE)
71921 added_exe_file_vma(mm);
71922
71923@@ -1293,6 +1438,8 @@ munmap_back:
71924 pgoff = vma->vm_pgoff;
71925 vm_flags = vma->vm_flags;
71926 } else if (vm_flags & VM_SHARED) {
71927+ if (unlikely(vm_flags & (VM_GROWSDOWN|VM_GROWSUP)))
71928+ goto free_vma;
71929 error = shmem_zero_setup(vma);
71930 if (error)
71931 goto free_vma;
71932@@ -1316,6 +1463,11 @@ munmap_back:
71933 vma_link(mm, vma, prev, rb_link, rb_parent);
71934 file = vma->vm_file;
71935
71936+#ifdef CONFIG_PAX_SEGMEXEC
71937+ if (vma_m)
71938+ BUG_ON(pax_mirror_vma(vma_m, vma));
71939+#endif
71940+
71941 /* Once vma denies write, undo our temporary denial count */
71942 if (correct_wcount)
71943 atomic_inc(&inode->i_writecount);
71944@@ -1324,6 +1476,7 @@ out:
71945
71946 mm->total_vm += len >> PAGE_SHIFT;
71947 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
71948+ track_exec_limit(mm, addr, addr + len, vm_flags);
71949 if (vm_flags & VM_LOCKED) {
71950 if (!mlock_vma_pages_range(vma, addr, addr + len))
71951 mm->locked_vm += (len >> PAGE_SHIFT);
71952@@ -1341,6 +1494,12 @@ unmap_and_free_vma:
71953 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
71954 charged = 0;
71955 free_vma:
71956+
71957+#ifdef CONFIG_PAX_SEGMEXEC
71958+ if (vma_m)
71959+ kmem_cache_free(vm_area_cachep, vma_m);
71960+#endif
71961+
71962 kmem_cache_free(vm_area_cachep, vma);
71963 unacct_error:
71964 if (charged)
71965@@ -1348,6 +1507,44 @@ unacct_error:
71966 return error;
71967 }
71968
71969+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
71970+{
71971+ if (!vma) {
71972+#ifdef CONFIG_STACK_GROWSUP
71973+ if (addr > sysctl_heap_stack_gap)
71974+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
71975+ else
71976+ vma = find_vma(current->mm, 0);
71977+ if (vma && (vma->vm_flags & VM_GROWSUP))
71978+ return false;
71979+#endif
71980+ return true;
71981+ }
71982+
71983+ if (addr + len > vma->vm_start)
71984+ return false;
71985+
71986+ if (vma->vm_flags & VM_GROWSDOWN)
71987+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
71988+#ifdef CONFIG_STACK_GROWSUP
71989+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
71990+ return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
71991+#endif
71992+
71993+ return true;
71994+}
71995+
71996+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
71997+{
71998+ if (vma->vm_start < len)
71999+ return -ENOMEM;
72000+ if (!(vma->vm_flags & VM_GROWSDOWN))
72001+ return vma->vm_start - len;
72002+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
72003+ return vma->vm_start - len - sysctl_heap_stack_gap;
72004+ return -ENOMEM;
72005+}
72006+
72007 /* Get an address range which is currently unmapped.
72008 * For shmat() with addr=0.
72009 *
72010@@ -1374,18 +1571,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
72011 if (flags & MAP_FIXED)
72012 return addr;
72013
72014+#ifdef CONFIG_PAX_RANDMMAP
72015+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72016+#endif
72017+
72018 if (addr) {
72019 addr = PAGE_ALIGN(addr);
72020- vma = find_vma(mm, addr);
72021- if (TASK_SIZE - len >= addr &&
72022- (!vma || addr + len <= vma->vm_start))
72023- return addr;
72024+ if (TASK_SIZE - len >= addr) {
72025+ vma = find_vma(mm, addr);
72026+ if (check_heap_stack_gap(vma, addr, len))
72027+ return addr;
72028+ }
72029 }
72030 if (len > mm->cached_hole_size) {
72031- start_addr = addr = mm->free_area_cache;
72032+ start_addr = addr = mm->free_area_cache;
72033 } else {
72034- start_addr = addr = TASK_UNMAPPED_BASE;
72035- mm->cached_hole_size = 0;
72036+ start_addr = addr = mm->mmap_base;
72037+ mm->cached_hole_size = 0;
72038 }
72039
72040 full_search:
72041@@ -1396,34 +1598,40 @@ full_search:
72042 * Start a new search - just in case we missed
72043 * some holes.
72044 */
72045- if (start_addr != TASK_UNMAPPED_BASE) {
72046- addr = TASK_UNMAPPED_BASE;
72047- start_addr = addr;
72048+ if (start_addr != mm->mmap_base) {
72049+ start_addr = addr = mm->mmap_base;
72050 mm->cached_hole_size = 0;
72051 goto full_search;
72052 }
72053 return -ENOMEM;
72054 }
72055- if (!vma || addr + len <= vma->vm_start) {
72056- /*
72057- * Remember the place where we stopped the search:
72058- */
72059- mm->free_area_cache = addr + len;
72060- return addr;
72061- }
72062+ if (check_heap_stack_gap(vma, addr, len))
72063+ break;
72064 if (addr + mm->cached_hole_size < vma->vm_start)
72065 mm->cached_hole_size = vma->vm_start - addr;
72066 addr = vma->vm_end;
72067 }
72068+
72069+ /*
72070+ * Remember the place where we stopped the search:
72071+ */
72072+ mm->free_area_cache = addr + len;
72073+ return addr;
72074 }
72075 #endif
72076
72077 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
72078 {
72079+
72080+#ifdef CONFIG_PAX_SEGMEXEC
72081+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72082+ return;
72083+#endif
72084+
72085 /*
72086 * Is this a new hole at the lowest possible address?
72087 */
72088- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
72089+ if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
72090 mm->free_area_cache = addr;
72091 mm->cached_hole_size = ~0UL;
72092 }
72093@@ -1441,7 +1649,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72094 {
72095 struct vm_area_struct *vma;
72096 struct mm_struct *mm = current->mm;
72097- unsigned long addr = addr0;
72098+ unsigned long base = mm->mmap_base, addr = addr0;
72099
72100 /* requested length too big for entire address space */
72101 if (len > TASK_SIZE)
72102@@ -1450,13 +1658,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72103 if (flags & MAP_FIXED)
72104 return addr;
72105
72106+#ifdef CONFIG_PAX_RANDMMAP
72107+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72108+#endif
72109+
72110 /* requesting a specific address */
72111 if (addr) {
72112 addr = PAGE_ALIGN(addr);
72113- vma = find_vma(mm, addr);
72114- if (TASK_SIZE - len >= addr &&
72115- (!vma || addr + len <= vma->vm_start))
72116- return addr;
72117+ if (TASK_SIZE - len >= addr) {
72118+ vma = find_vma(mm, addr);
72119+ if (check_heap_stack_gap(vma, addr, len))
72120+ return addr;
72121+ }
72122 }
72123
72124 /* check if free_area_cache is useful for us */
72125@@ -1471,7 +1684,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72126 /* make sure it can fit in the remaining address space */
72127 if (addr > len) {
72128 vma = find_vma(mm, addr-len);
72129- if (!vma || addr <= vma->vm_start)
72130+ if (check_heap_stack_gap(vma, addr - len, len))
72131 /* remember the address as a hint for next time */
72132 return (mm->free_area_cache = addr-len);
72133 }
72134@@ -1488,7 +1701,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72135 * return with success:
72136 */
72137 vma = find_vma(mm, addr);
72138- if (!vma || addr+len <= vma->vm_start)
72139+ if (check_heap_stack_gap(vma, addr, len))
72140 /* remember the address as a hint for next time */
72141 return (mm->free_area_cache = addr);
72142
72143@@ -1497,8 +1710,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72144 mm->cached_hole_size = vma->vm_start - addr;
72145
72146 /* try just below the current vma->vm_start */
72147- addr = vma->vm_start-len;
72148- } while (len < vma->vm_start);
72149+ addr = skip_heap_stack_gap(vma, len);
72150+ } while (!IS_ERR_VALUE(addr));
72151
72152 bottomup:
72153 /*
72154@@ -1507,13 +1720,21 @@ bottomup:
72155 * can happen with large stack limits and large mmap()
72156 * allocations.
72157 */
72158+ mm->mmap_base = TASK_UNMAPPED_BASE;
72159+
72160+#ifdef CONFIG_PAX_RANDMMAP
72161+ if (mm->pax_flags & MF_PAX_RANDMMAP)
72162+ mm->mmap_base += mm->delta_mmap;
72163+#endif
72164+
72165+ mm->free_area_cache = mm->mmap_base;
72166 mm->cached_hole_size = ~0UL;
72167- mm->free_area_cache = TASK_UNMAPPED_BASE;
72168 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
72169 /*
72170 * Restore the topdown base:
72171 */
72172- mm->free_area_cache = mm->mmap_base;
72173+ mm->mmap_base = base;
72174+ mm->free_area_cache = base;
72175 mm->cached_hole_size = ~0UL;
72176
72177 return addr;
72178@@ -1522,6 +1743,12 @@ bottomup:
72179
72180 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72181 {
72182+
72183+#ifdef CONFIG_PAX_SEGMEXEC
72184+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72185+ return;
72186+#endif
72187+
72188 /*
72189 * Is this a new hole at the highest possible address?
72190 */
72191@@ -1529,8 +1756,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72192 mm->free_area_cache = addr;
72193
72194 /* dont allow allocations above current base */
72195- if (mm->free_area_cache > mm->mmap_base)
72196+ if (mm->free_area_cache > mm->mmap_base) {
72197 mm->free_area_cache = mm->mmap_base;
72198+ mm->cached_hole_size = ~0UL;
72199+ }
72200 }
72201
72202 unsigned long
72203@@ -1603,40 +1832,50 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
72204
72205 EXPORT_SYMBOL(find_vma);
72206
72207-/* Same as find_vma, but also return a pointer to the previous VMA in *pprev. */
72208+/*
72209+ * Same as find_vma, but also return a pointer to the previous VMA in *pprev.
72210+ */
72211 struct vm_area_struct *
72212 find_vma_prev(struct mm_struct *mm, unsigned long addr,
72213 struct vm_area_struct **pprev)
72214 {
72215- struct vm_area_struct *vma = NULL, *prev = NULL;
72216- struct rb_node *rb_node;
72217- if (!mm)
72218- goto out;
72219-
72220- /* Guard against addr being lower than the first VMA */
72221- vma = mm->mmap;
72222-
72223- /* Go through the RB tree quickly. */
72224- rb_node = mm->mm_rb.rb_node;
72225-
72226- while (rb_node) {
72227- struct vm_area_struct *vma_tmp;
72228- vma_tmp = rb_entry(rb_node, struct vm_area_struct, vm_rb);
72229-
72230- if (addr < vma_tmp->vm_end) {
72231- rb_node = rb_node->rb_left;
72232- } else {
72233- prev = vma_tmp;
72234- if (!prev->vm_next || (addr < prev->vm_next->vm_end))
72235- break;
72236+ struct vm_area_struct *vma;
72237+
72238+ vma = find_vma(mm, addr);
72239+ if (vma) {
72240+ *pprev = vma->vm_prev;
72241+ } else {
72242+ struct rb_node *rb_node = mm->mm_rb.rb_node;
72243+ *pprev = NULL;
72244+ while (rb_node) {
72245+ *pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb);
72246 rb_node = rb_node->rb_right;
72247 }
72248 }
72249+ return vma;
72250+}
72251+
72252+#ifdef CONFIG_PAX_SEGMEXEC
72253+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
72254+{
72255+ struct vm_area_struct *vma_m;
72256
72257-out:
72258- *pprev = prev;
72259- return prev ? prev->vm_next : vma;
72260+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
72261+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
72262+ BUG_ON(vma->vm_mirror);
72263+ return NULL;
72264+ }
72265+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
72266+ vma_m = vma->vm_mirror;
72267+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
72268+ BUG_ON(vma->vm_file != vma_m->vm_file);
72269+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
72270+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
72271+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
72272+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
72273+ return vma_m;
72274 }
72275+#endif
72276
72277 /*
72278 * Verify that the stack growth is acceptable and
72279@@ -1654,6 +1893,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72280 return -ENOMEM;
72281
72282 /* Stack limit test */
72283+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
72284 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
72285 return -ENOMEM;
72286
72287@@ -1664,6 +1904,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72288 locked = mm->locked_vm + grow;
72289 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
72290 limit >>= PAGE_SHIFT;
72291+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72292 if (locked > limit && !capable(CAP_IPC_LOCK))
72293 return -ENOMEM;
72294 }
72295@@ -1694,37 +1935,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72296 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
72297 * vma is the last one with address > vma->vm_end. Have to extend vma.
72298 */
72299+#ifndef CONFIG_IA64
72300+static
72301+#endif
72302 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72303 {
72304 int error;
72305+ bool locknext;
72306
72307 if (!(vma->vm_flags & VM_GROWSUP))
72308 return -EFAULT;
72309
72310+ /* Also guard against wrapping around to address 0. */
72311+ if (address < PAGE_ALIGN(address+1))
72312+ address = PAGE_ALIGN(address+1);
72313+ else
72314+ return -ENOMEM;
72315+
72316 /*
72317 * We must make sure the anon_vma is allocated
72318 * so that the anon_vma locking is not a noop.
72319 */
72320 if (unlikely(anon_vma_prepare(vma)))
72321 return -ENOMEM;
72322+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
72323+ if (locknext && anon_vma_prepare(vma->vm_next))
72324+ return -ENOMEM;
72325 vma_lock_anon_vma(vma);
72326+ if (locknext)
72327+ vma_lock_anon_vma(vma->vm_next);
72328
72329 /*
72330 * vma->vm_start/vm_end cannot change under us because the caller
72331 * is required to hold the mmap_sem in read mode. We need the
72332- * anon_vma lock to serialize against concurrent expand_stacks.
72333- * Also guard against wrapping around to address 0.
72334+ * anon_vma locks to serialize against concurrent expand_stacks
72335+ * and expand_upwards.
72336 */
72337- if (address < PAGE_ALIGN(address+4))
72338- address = PAGE_ALIGN(address+4);
72339- else {
72340- vma_unlock_anon_vma(vma);
72341- return -ENOMEM;
72342- }
72343 error = 0;
72344
72345 /* Somebody else might have raced and expanded it already */
72346- if (address > vma->vm_end) {
72347+ 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)
72348+ error = -ENOMEM;
72349+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
72350 unsigned long size, grow;
72351
72352 size = address - vma->vm_start;
72353@@ -1739,6 +1991,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72354 }
72355 }
72356 }
72357+ if (locknext)
72358+ vma_unlock_anon_vma(vma->vm_next);
72359 vma_unlock_anon_vma(vma);
72360 khugepaged_enter_vma_merge(vma);
72361 return error;
72362@@ -1752,6 +2006,8 @@ int expand_downwards(struct vm_area_struct *vma,
72363 unsigned long address)
72364 {
72365 int error;
72366+ bool lockprev = false;
72367+ struct vm_area_struct *prev;
72368
72369 /*
72370 * We must make sure the anon_vma is allocated
72371@@ -1765,6 +2021,15 @@ int expand_downwards(struct vm_area_struct *vma,
72372 if (error)
72373 return error;
72374
72375+ prev = vma->vm_prev;
72376+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
72377+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
72378+#endif
72379+ if (lockprev && anon_vma_prepare(prev))
72380+ return -ENOMEM;
72381+ if (lockprev)
72382+ vma_lock_anon_vma(prev);
72383+
72384 vma_lock_anon_vma(vma);
72385
72386 /*
72387@@ -1774,9 +2039,17 @@ int expand_downwards(struct vm_area_struct *vma,
72388 */
72389
72390 /* Somebody else might have raced and expanded it already */
72391- if (address < vma->vm_start) {
72392+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
72393+ error = -ENOMEM;
72394+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
72395 unsigned long size, grow;
72396
72397+#ifdef CONFIG_PAX_SEGMEXEC
72398+ struct vm_area_struct *vma_m;
72399+
72400+ vma_m = pax_find_mirror_vma(vma);
72401+#endif
72402+
72403 size = vma->vm_end - address;
72404 grow = (vma->vm_start - address) >> PAGE_SHIFT;
72405
72406@@ -1786,11 +2059,22 @@ int expand_downwards(struct vm_area_struct *vma,
72407 if (!error) {
72408 vma->vm_start = address;
72409 vma->vm_pgoff -= grow;
72410+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
72411+
72412+#ifdef CONFIG_PAX_SEGMEXEC
72413+ if (vma_m) {
72414+ vma_m->vm_start -= grow << PAGE_SHIFT;
72415+ vma_m->vm_pgoff -= grow;
72416+ }
72417+#endif
72418+
72419 perf_event_mmap(vma);
72420 }
72421 }
72422 }
72423 vma_unlock_anon_vma(vma);
72424+ if (lockprev)
72425+ vma_unlock_anon_vma(prev);
72426 khugepaged_enter_vma_merge(vma);
72427 return error;
72428 }
72429@@ -1860,6 +2144,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
72430 do {
72431 long nrpages = vma_pages(vma);
72432
72433+#ifdef CONFIG_PAX_SEGMEXEC
72434+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
72435+ vma = remove_vma(vma);
72436+ continue;
72437+ }
72438+#endif
72439+
72440 mm->total_vm -= nrpages;
72441 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
72442 vma = remove_vma(vma);
72443@@ -1905,6 +2196,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
72444 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
72445 vma->vm_prev = NULL;
72446 do {
72447+
72448+#ifdef CONFIG_PAX_SEGMEXEC
72449+ if (vma->vm_mirror) {
72450+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
72451+ vma->vm_mirror->vm_mirror = NULL;
72452+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
72453+ vma->vm_mirror = NULL;
72454+ }
72455+#endif
72456+
72457 rb_erase(&vma->vm_rb, &mm->mm_rb);
72458 mm->map_count--;
72459 tail_vma = vma;
72460@@ -1933,14 +2234,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72461 struct vm_area_struct *new;
72462 int err = -ENOMEM;
72463
72464+#ifdef CONFIG_PAX_SEGMEXEC
72465+ struct vm_area_struct *vma_m, *new_m = NULL;
72466+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
72467+#endif
72468+
72469 if (is_vm_hugetlb_page(vma) && (addr &
72470 ~(huge_page_mask(hstate_vma(vma)))))
72471 return -EINVAL;
72472
72473+#ifdef CONFIG_PAX_SEGMEXEC
72474+ vma_m = pax_find_mirror_vma(vma);
72475+#endif
72476+
72477 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72478 if (!new)
72479 goto out_err;
72480
72481+#ifdef CONFIG_PAX_SEGMEXEC
72482+ if (vma_m) {
72483+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72484+ if (!new_m) {
72485+ kmem_cache_free(vm_area_cachep, new);
72486+ goto out_err;
72487+ }
72488+ }
72489+#endif
72490+
72491 /* most fields are the same, copy all, and then fixup */
72492 *new = *vma;
72493
72494@@ -1953,6 +2273,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72495 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
72496 }
72497
72498+#ifdef CONFIG_PAX_SEGMEXEC
72499+ if (vma_m) {
72500+ *new_m = *vma_m;
72501+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
72502+ new_m->vm_mirror = new;
72503+ new->vm_mirror = new_m;
72504+
72505+ if (new_below)
72506+ new_m->vm_end = addr_m;
72507+ else {
72508+ new_m->vm_start = addr_m;
72509+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
72510+ }
72511+ }
72512+#endif
72513+
72514 pol = mpol_dup(vma_policy(vma));
72515 if (IS_ERR(pol)) {
72516 err = PTR_ERR(pol);
72517@@ -1978,6 +2314,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72518 else
72519 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
72520
72521+#ifdef CONFIG_PAX_SEGMEXEC
72522+ if (!err && vma_m) {
72523+ if (anon_vma_clone(new_m, vma_m))
72524+ goto out_free_mpol;
72525+
72526+ mpol_get(pol);
72527+ vma_set_policy(new_m, pol);
72528+
72529+ if (new_m->vm_file) {
72530+ get_file(new_m->vm_file);
72531+ if (vma_m->vm_flags & VM_EXECUTABLE)
72532+ added_exe_file_vma(mm);
72533+ }
72534+
72535+ if (new_m->vm_ops && new_m->vm_ops->open)
72536+ new_m->vm_ops->open(new_m);
72537+
72538+ if (new_below)
72539+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
72540+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
72541+ else
72542+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
72543+
72544+ if (err) {
72545+ if (new_m->vm_ops && new_m->vm_ops->close)
72546+ new_m->vm_ops->close(new_m);
72547+ if (new_m->vm_file) {
72548+ if (vma_m->vm_flags & VM_EXECUTABLE)
72549+ removed_exe_file_vma(mm);
72550+ fput(new_m->vm_file);
72551+ }
72552+ mpol_put(pol);
72553+ }
72554+ }
72555+#endif
72556+
72557 /* Success. */
72558 if (!err)
72559 return 0;
72560@@ -1990,10 +2362,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72561 removed_exe_file_vma(mm);
72562 fput(new->vm_file);
72563 }
72564- unlink_anon_vmas(new);
72565 out_free_mpol:
72566 mpol_put(pol);
72567 out_free_vma:
72568+
72569+#ifdef CONFIG_PAX_SEGMEXEC
72570+ if (new_m) {
72571+ unlink_anon_vmas(new_m);
72572+ kmem_cache_free(vm_area_cachep, new_m);
72573+ }
72574+#endif
72575+
72576+ unlink_anon_vmas(new);
72577 kmem_cache_free(vm_area_cachep, new);
72578 out_err:
72579 return err;
72580@@ -2006,6 +2386,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72581 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72582 unsigned long addr, int new_below)
72583 {
72584+
72585+#ifdef CONFIG_PAX_SEGMEXEC
72586+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
72587+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
72588+ if (mm->map_count >= sysctl_max_map_count-1)
72589+ return -ENOMEM;
72590+ } else
72591+#endif
72592+
72593 if (mm->map_count >= sysctl_max_map_count)
72594 return -ENOMEM;
72595
72596@@ -2017,11 +2406,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72597 * work. This now handles partial unmappings.
72598 * Jeremy Fitzhardinge <jeremy@goop.org>
72599 */
72600+#ifdef CONFIG_PAX_SEGMEXEC
72601 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72602 {
72603+ int ret = __do_munmap(mm, start, len);
72604+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
72605+ return ret;
72606+
72607+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
72608+}
72609+
72610+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72611+#else
72612+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72613+#endif
72614+{
72615 unsigned long end;
72616 struct vm_area_struct *vma, *prev, *last;
72617
72618+ /*
72619+ * mm->mmap_sem is required to protect against another thread
72620+ * changing the mappings in case we sleep.
72621+ */
72622+ verify_mm_writelocked(mm);
72623+
72624 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
72625 return -EINVAL;
72626
72627@@ -2096,6 +2504,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72628 /* Fix up all other VM information */
72629 remove_vma_list(mm, vma);
72630
72631+ track_exec_limit(mm, start, end, 0UL);
72632+
72633 return 0;
72634 }
72635
72636@@ -2108,22 +2518,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
72637
72638 profile_munmap(addr);
72639
72640+#ifdef CONFIG_PAX_SEGMEXEC
72641+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
72642+ (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
72643+ return -EINVAL;
72644+#endif
72645+
72646 down_write(&mm->mmap_sem);
72647 ret = do_munmap(mm, addr, len);
72648 up_write(&mm->mmap_sem);
72649 return ret;
72650 }
72651
72652-static inline void verify_mm_writelocked(struct mm_struct *mm)
72653-{
72654-#ifdef CONFIG_DEBUG_VM
72655- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
72656- WARN_ON(1);
72657- up_read(&mm->mmap_sem);
72658- }
72659-#endif
72660-}
72661-
72662 /*
72663 * this is really a simplified "do_mmap". it only handles
72664 * anonymous maps. eventually we may be able to do some
72665@@ -2137,6 +2543,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72666 struct rb_node ** rb_link, * rb_parent;
72667 pgoff_t pgoff = addr >> PAGE_SHIFT;
72668 int error;
72669+ unsigned long charged;
72670
72671 len = PAGE_ALIGN(len);
72672 if (!len)
72673@@ -2148,16 +2555,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72674
72675 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
72676
72677+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
72678+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72679+ flags &= ~VM_EXEC;
72680+
72681+#ifdef CONFIG_PAX_MPROTECT
72682+ if (mm->pax_flags & MF_PAX_MPROTECT)
72683+ flags &= ~VM_MAYEXEC;
72684+#endif
72685+
72686+ }
72687+#endif
72688+
72689 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
72690 if (error & ~PAGE_MASK)
72691 return error;
72692
72693+ charged = len >> PAGE_SHIFT;
72694+
72695 /*
72696 * mlock MCL_FUTURE?
72697 */
72698 if (mm->def_flags & VM_LOCKED) {
72699 unsigned long locked, lock_limit;
72700- locked = len >> PAGE_SHIFT;
72701+ locked = charged;
72702 locked += mm->locked_vm;
72703 lock_limit = rlimit(RLIMIT_MEMLOCK);
72704 lock_limit >>= PAGE_SHIFT;
72705@@ -2174,22 +2595,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72706 /*
72707 * Clear old maps. this also does some error checking for us
72708 */
72709- munmap_back:
72710 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72711 if (vma && vma->vm_start < addr + len) {
72712 if (do_munmap(mm, addr, len))
72713 return -ENOMEM;
72714- goto munmap_back;
72715+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72716+ BUG_ON(vma && vma->vm_start < addr + len);
72717 }
72718
72719 /* Check against address space limits *after* clearing old maps... */
72720- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
72721+ if (!may_expand_vm(mm, charged))
72722 return -ENOMEM;
72723
72724 if (mm->map_count > sysctl_max_map_count)
72725 return -ENOMEM;
72726
72727- if (security_vm_enough_memory(len >> PAGE_SHIFT))
72728+ if (security_vm_enough_memory(charged))
72729 return -ENOMEM;
72730
72731 /* Can we just expand an old private anonymous mapping? */
72732@@ -2203,7 +2624,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72733 */
72734 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72735 if (!vma) {
72736- vm_unacct_memory(len >> PAGE_SHIFT);
72737+ vm_unacct_memory(charged);
72738 return -ENOMEM;
72739 }
72740
72741@@ -2217,11 +2638,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72742 vma_link(mm, vma, prev, rb_link, rb_parent);
72743 out:
72744 perf_event_mmap(vma);
72745- mm->total_vm += len >> PAGE_SHIFT;
72746+ mm->total_vm += charged;
72747 if (flags & VM_LOCKED) {
72748 if (!mlock_vma_pages_range(vma, addr, addr + len))
72749- mm->locked_vm += (len >> PAGE_SHIFT);
72750+ mm->locked_vm += charged;
72751 }
72752+ track_exec_limit(mm, addr, addr + len, flags);
72753 return addr;
72754 }
72755
72756@@ -2268,8 +2690,10 @@ void exit_mmap(struct mm_struct *mm)
72757 * Walk the list again, actually closing and freeing it,
72758 * with preemption enabled, without holding any MM locks.
72759 */
72760- while (vma)
72761+ while (vma) {
72762+ vma->vm_mirror = NULL;
72763 vma = remove_vma(vma);
72764+ }
72765
72766 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
72767 }
72768@@ -2283,6 +2707,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
72769 struct vm_area_struct * __vma, * prev;
72770 struct rb_node ** rb_link, * rb_parent;
72771
72772+#ifdef CONFIG_PAX_SEGMEXEC
72773+ struct vm_area_struct *vma_m = NULL;
72774+#endif
72775+
72776+ if (security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1))
72777+ return -EPERM;
72778+
72779 /*
72780 * The vm_pgoff of a purely anonymous vma should be irrelevant
72781 * until its first write fault, when page's anon_vma and index
72782@@ -2305,7 +2736,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
72783 if ((vma->vm_flags & VM_ACCOUNT) &&
72784 security_vm_enough_memory_mm(mm, vma_pages(vma)))
72785 return -ENOMEM;
72786+
72787+#ifdef CONFIG_PAX_SEGMEXEC
72788+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
72789+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72790+ if (!vma_m)
72791+ return -ENOMEM;
72792+ }
72793+#endif
72794+
72795 vma_link(mm, vma, prev, rb_link, rb_parent);
72796+
72797+#ifdef CONFIG_PAX_SEGMEXEC
72798+ if (vma_m)
72799+ BUG_ON(pax_mirror_vma(vma_m, vma));
72800+#endif
72801+
72802 return 0;
72803 }
72804
72805@@ -2323,6 +2769,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
72806 struct rb_node **rb_link, *rb_parent;
72807 struct mempolicy *pol;
72808
72809+ BUG_ON(vma->vm_mirror);
72810+
72811 /*
72812 * If anonymous vma has not yet been faulted, update new pgoff
72813 * to match new location, to increase its chance of merging.
72814@@ -2373,6 +2821,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
72815 return NULL;
72816 }
72817
72818+#ifdef CONFIG_PAX_SEGMEXEC
72819+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
72820+{
72821+ struct vm_area_struct *prev_m;
72822+ struct rb_node **rb_link_m, *rb_parent_m;
72823+ struct mempolicy *pol_m;
72824+
72825+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
72826+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
72827+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
72828+ *vma_m = *vma;
72829+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
72830+ if (anon_vma_clone(vma_m, vma))
72831+ return -ENOMEM;
72832+ pol_m = vma_policy(vma_m);
72833+ mpol_get(pol_m);
72834+ vma_set_policy(vma_m, pol_m);
72835+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
72836+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
72837+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
72838+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
72839+ if (vma_m->vm_file)
72840+ get_file(vma_m->vm_file);
72841+ if (vma_m->vm_ops && vma_m->vm_ops->open)
72842+ vma_m->vm_ops->open(vma_m);
72843+ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
72844+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
72845+ vma_m->vm_mirror = vma;
72846+ vma->vm_mirror = vma_m;
72847+ return 0;
72848+}
72849+#endif
72850+
72851 /*
72852 * Return true if the calling process may expand its vm space by the passed
72853 * number of pages
72854@@ -2383,7 +2864,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
72855 unsigned long lim;
72856
72857 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
72858-
72859+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
72860 if (cur + npages > lim)
72861 return 0;
72862 return 1;
72863@@ -2454,6 +2935,22 @@ int install_special_mapping(struct mm_struct *mm,
72864 vma->vm_start = addr;
72865 vma->vm_end = addr + len;
72866
72867+#ifdef CONFIG_PAX_MPROTECT
72868+ if (mm->pax_flags & MF_PAX_MPROTECT) {
72869+#ifndef CONFIG_PAX_MPROTECT_COMPAT
72870+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
72871+ return -EPERM;
72872+ if (!(vm_flags & VM_EXEC))
72873+ vm_flags &= ~VM_MAYEXEC;
72874+#else
72875+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
72876+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
72877+#endif
72878+ else
72879+ vm_flags &= ~VM_MAYWRITE;
72880+ }
72881+#endif
72882+
72883 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
72884 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
72885
72886diff --git a/mm/mprotect.c b/mm/mprotect.c
72887index 5a688a2..27e031c 100644
72888--- a/mm/mprotect.c
72889+++ b/mm/mprotect.c
72890@@ -23,10 +23,16 @@
72891 #include <linux/mmu_notifier.h>
72892 #include <linux/migrate.h>
72893 #include <linux/perf_event.h>
72894+
72895+#ifdef CONFIG_PAX_MPROTECT
72896+#include <linux/elf.h>
72897+#endif
72898+
72899 #include <asm/uaccess.h>
72900 #include <asm/pgtable.h>
72901 #include <asm/cacheflush.h>
72902 #include <asm/tlbflush.h>
72903+#include <asm/mmu_context.h>
72904
72905 #ifndef pgprot_modify
72906 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
72907@@ -141,6 +147,48 @@ static void change_protection(struct vm_area_struct *vma,
72908 flush_tlb_range(vma, start, end);
72909 }
72910
72911+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
72912+/* called while holding the mmap semaphor for writing except stack expansion */
72913+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
72914+{
72915+ unsigned long oldlimit, newlimit = 0UL;
72916+
72917+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
72918+ return;
72919+
72920+ spin_lock(&mm->page_table_lock);
72921+ oldlimit = mm->context.user_cs_limit;
72922+ if ((prot & VM_EXEC) && oldlimit < end)
72923+ /* USER_CS limit moved up */
72924+ newlimit = end;
72925+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
72926+ /* USER_CS limit moved down */
72927+ newlimit = start;
72928+
72929+ if (newlimit) {
72930+ mm->context.user_cs_limit = newlimit;
72931+
72932+#ifdef CONFIG_SMP
72933+ wmb();
72934+ cpus_clear(mm->context.cpu_user_cs_mask);
72935+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
72936+#endif
72937+
72938+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
72939+ }
72940+ spin_unlock(&mm->page_table_lock);
72941+ if (newlimit == end) {
72942+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
72943+
72944+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
72945+ if (is_vm_hugetlb_page(vma))
72946+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
72947+ else
72948+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
72949+ }
72950+}
72951+#endif
72952+
72953 int
72954 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
72955 unsigned long start, unsigned long end, unsigned long newflags)
72956@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
72957 int error;
72958 int dirty_accountable = 0;
72959
72960+#ifdef CONFIG_PAX_SEGMEXEC
72961+ struct vm_area_struct *vma_m = NULL;
72962+ unsigned long start_m, end_m;
72963+
72964+ start_m = start + SEGMEXEC_TASK_SIZE;
72965+ end_m = end + SEGMEXEC_TASK_SIZE;
72966+#endif
72967+
72968 if (newflags == oldflags) {
72969 *pprev = vma;
72970 return 0;
72971 }
72972
72973+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
72974+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
72975+
72976+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
72977+ return -ENOMEM;
72978+
72979+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
72980+ return -ENOMEM;
72981+ }
72982+
72983 /*
72984 * If we make a private mapping writable we increase our commit;
72985 * but (without finer accounting) cannot reduce our commit if we
72986@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
72987 }
72988 }
72989
72990+#ifdef CONFIG_PAX_SEGMEXEC
72991+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
72992+ if (start != vma->vm_start) {
72993+ error = split_vma(mm, vma, start, 1);
72994+ if (error)
72995+ goto fail;
72996+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
72997+ *pprev = (*pprev)->vm_next;
72998+ }
72999+
73000+ if (end != vma->vm_end) {
73001+ error = split_vma(mm, vma, end, 0);
73002+ if (error)
73003+ goto fail;
73004+ }
73005+
73006+ if (pax_find_mirror_vma(vma)) {
73007+ error = __do_munmap(mm, start_m, end_m - start_m);
73008+ if (error)
73009+ goto fail;
73010+ } else {
73011+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73012+ if (!vma_m) {
73013+ error = -ENOMEM;
73014+ goto fail;
73015+ }
73016+ vma->vm_flags = newflags;
73017+ error = pax_mirror_vma(vma_m, vma);
73018+ if (error) {
73019+ vma->vm_flags = oldflags;
73020+ goto fail;
73021+ }
73022+ }
73023+ }
73024+#endif
73025+
73026 /*
73027 * First try to merge with previous and/or next vma.
73028 */
73029@@ -204,9 +306,21 @@ success:
73030 * vm_flags and vm_page_prot are protected by the mmap_sem
73031 * held in write mode.
73032 */
73033+
73034+#ifdef CONFIG_PAX_SEGMEXEC
73035+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
73036+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
73037+#endif
73038+
73039 vma->vm_flags = newflags;
73040+
73041+#ifdef CONFIG_PAX_MPROTECT
73042+ if (mm->binfmt && mm->binfmt->handle_mprotect)
73043+ mm->binfmt->handle_mprotect(vma, newflags);
73044+#endif
73045+
73046 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
73047- vm_get_page_prot(newflags));
73048+ vm_get_page_prot(vma->vm_flags));
73049
73050 if (vma_wants_writenotify(vma)) {
73051 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
73052@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73053 end = start + len;
73054 if (end <= start)
73055 return -ENOMEM;
73056+
73057+#ifdef CONFIG_PAX_SEGMEXEC
73058+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
73059+ if (end > SEGMEXEC_TASK_SIZE)
73060+ return -EINVAL;
73061+ } else
73062+#endif
73063+
73064+ if (end > TASK_SIZE)
73065+ return -EINVAL;
73066+
73067 if (!arch_validate_prot(prot))
73068 return -EINVAL;
73069
73070@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73071 /*
73072 * Does the application expect PROT_READ to imply PROT_EXEC:
73073 */
73074- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
73075+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
73076 prot |= PROT_EXEC;
73077
73078 vm_flags = calc_vm_prot_bits(prot);
73079@@ -287,6 +412,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73080 if (start > vma->vm_start)
73081 prev = vma;
73082
73083+#ifdef CONFIG_PAX_MPROTECT
73084+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
73085+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
73086+#endif
73087+
73088 for (nstart = start ; ; ) {
73089 unsigned long newflags;
73090
73091@@ -296,6 +426,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73092
73093 /* newflags >> 4 shift VM_MAY% in place of VM_% */
73094 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
73095+ if (prot & (PROT_WRITE | PROT_EXEC))
73096+ gr_log_rwxmprotect(vma->vm_file);
73097+
73098+ error = -EACCES;
73099+ goto out;
73100+ }
73101+
73102+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
73103 error = -EACCES;
73104 goto out;
73105 }
73106@@ -310,6 +448,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73107 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
73108 if (error)
73109 goto out;
73110+
73111+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
73112+
73113 nstart = tmp;
73114
73115 if (nstart < prev->vm_end)
73116diff --git a/mm/mremap.c b/mm/mremap.c
73117index d6959cb..18a402a 100644
73118--- a/mm/mremap.c
73119+++ b/mm/mremap.c
73120@@ -106,6 +106,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
73121 continue;
73122 pte = ptep_get_and_clear(mm, old_addr, old_pte);
73123 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
73124+
73125+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73126+ if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
73127+ pte = pte_exprotect(pte);
73128+#endif
73129+
73130 set_pte_at(mm, new_addr, new_pte, pte);
73131 }
73132
73133@@ -290,6 +296,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
73134 if (is_vm_hugetlb_page(vma))
73135 goto Einval;
73136
73137+#ifdef CONFIG_PAX_SEGMEXEC
73138+ if (pax_find_mirror_vma(vma))
73139+ goto Einval;
73140+#endif
73141+
73142 /* We can't remap across vm area boundaries */
73143 if (old_len > vma->vm_end - addr)
73144 goto Efault;
73145@@ -346,20 +357,25 @@ static unsigned long mremap_to(unsigned long addr,
73146 unsigned long ret = -EINVAL;
73147 unsigned long charged = 0;
73148 unsigned long map_flags;
73149+ unsigned long pax_task_size = TASK_SIZE;
73150
73151 if (new_addr & ~PAGE_MASK)
73152 goto out;
73153
73154- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
73155+#ifdef CONFIG_PAX_SEGMEXEC
73156+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
73157+ pax_task_size = SEGMEXEC_TASK_SIZE;
73158+#endif
73159+
73160+ pax_task_size -= PAGE_SIZE;
73161+
73162+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
73163 goto out;
73164
73165 /* Check if the location we're moving into overlaps the
73166 * old location at all, and fail if it does.
73167 */
73168- if ((new_addr <= addr) && (new_addr+new_len) > addr)
73169- goto out;
73170-
73171- if ((addr <= new_addr) && (addr+old_len) > new_addr)
73172+ if (addr + old_len > new_addr && new_addr + new_len > addr)
73173 goto out;
73174
73175 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
73176@@ -431,6 +447,7 @@ unsigned long do_mremap(unsigned long addr,
73177 struct vm_area_struct *vma;
73178 unsigned long ret = -EINVAL;
73179 unsigned long charged = 0;
73180+ unsigned long pax_task_size = TASK_SIZE;
73181
73182 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
73183 goto out;
73184@@ -449,6 +466,17 @@ unsigned long do_mremap(unsigned long addr,
73185 if (!new_len)
73186 goto out;
73187
73188+#ifdef CONFIG_PAX_SEGMEXEC
73189+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
73190+ pax_task_size = SEGMEXEC_TASK_SIZE;
73191+#endif
73192+
73193+ pax_task_size -= PAGE_SIZE;
73194+
73195+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
73196+ old_len > pax_task_size || addr > pax_task_size-old_len)
73197+ goto out;
73198+
73199 if (flags & MREMAP_FIXED) {
73200 if (flags & MREMAP_MAYMOVE)
73201 ret = mremap_to(addr, old_len, new_addr, new_len);
73202@@ -498,6 +526,7 @@ unsigned long do_mremap(unsigned long addr,
73203 addr + new_len);
73204 }
73205 ret = addr;
73206+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
73207 goto out;
73208 }
73209 }
73210@@ -524,7 +553,13 @@ unsigned long do_mremap(unsigned long addr,
73211 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
73212 if (ret)
73213 goto out;
73214+
73215+ map_flags = vma->vm_flags;
73216 ret = move_vma(vma, addr, old_len, new_len, new_addr);
73217+ if (!(ret & ~PAGE_MASK)) {
73218+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
73219+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
73220+ }
73221 }
73222 out:
73223 if (ret & ~PAGE_MASK)
73224diff --git a/mm/nobootmem.c b/mm/nobootmem.c
73225index 7fa41b4..6087460 100644
73226--- a/mm/nobootmem.c
73227+++ b/mm/nobootmem.c
73228@@ -110,19 +110,30 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
73229 unsigned long __init free_all_memory_core_early(int nodeid)
73230 {
73231 int i;
73232- u64 start, end;
73233+ u64 start, end, startrange, endrange;
73234 unsigned long count = 0;
73235- struct range *range = NULL;
73236+ struct range *range = NULL, rangerange = { 0, 0 };
73237 int nr_range;
73238
73239 nr_range = get_free_all_memory_range(&range, nodeid);
73240+ startrange = __pa(range) >> PAGE_SHIFT;
73241+ endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
73242
73243 for (i = 0; i < nr_range; i++) {
73244 start = range[i].start;
73245 end = range[i].end;
73246+ if (start <= endrange && startrange < end) {
73247+ BUG_ON(rangerange.start | rangerange.end);
73248+ rangerange = range[i];
73249+ continue;
73250+ }
73251 count += end - start;
73252 __free_pages_memory(start, end);
73253 }
73254+ start = rangerange.start;
73255+ end = rangerange.end;
73256+ count += end - start;
73257+ __free_pages_memory(start, end);
73258
73259 return count;
73260 }
73261diff --git a/mm/nommu.c b/mm/nommu.c
73262index f59e170..34e2a2b 100644
73263--- a/mm/nommu.c
73264+++ b/mm/nommu.c
73265@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
73266 int sysctl_overcommit_ratio = 50; /* default is 50% */
73267 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
73268 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
73269-int heap_stack_gap = 0;
73270
73271 atomic_long_t mmap_pages_allocated;
73272
73273@@ -827,15 +826,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
73274 EXPORT_SYMBOL(find_vma);
73275
73276 /*
73277- * find a VMA
73278- * - we don't extend stack VMAs under NOMMU conditions
73279- */
73280-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
73281-{
73282- return find_vma(mm, addr);
73283-}
73284-
73285-/*
73286 * expand a stack to a given address
73287 * - not supported under NOMMU conditions
73288 */
73289@@ -1555,6 +1545,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
73290
73291 /* most fields are the same, copy all, and then fixup */
73292 *new = *vma;
73293+ INIT_LIST_HEAD(&new->anon_vma_chain);
73294 *region = *vma->vm_region;
73295 new->vm_region = region;
73296
73297diff --git a/mm/page_alloc.c b/mm/page_alloc.c
73298index 485be89..c059ad3 100644
73299--- a/mm/page_alloc.c
73300+++ b/mm/page_alloc.c
73301@@ -341,7 +341,7 @@ out:
73302 * This usage means that zero-order pages may not be compound.
73303 */
73304
73305-static void free_compound_page(struct page *page)
73306+void free_compound_page(struct page *page)
73307 {
73308 __free_pages_ok(page, compound_order(page));
73309 }
73310@@ -654,6 +654,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73311 int i;
73312 int bad = 0;
73313
73314+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73315+ unsigned long index = 1UL << order;
73316+#endif
73317+
73318 trace_mm_page_free_direct(page, order);
73319 kmemcheck_free_shadow(page, order);
73320
73321@@ -669,6 +673,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73322 debug_check_no_obj_freed(page_address(page),
73323 PAGE_SIZE << order);
73324 }
73325+
73326+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73327+ for (; index; --index)
73328+ sanitize_highpage(page + index - 1);
73329+#endif
73330+
73331 arch_free_page(page, order);
73332 kernel_map_pages(page, 1 << order, 0);
73333
73334@@ -784,8 +794,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
73335 arch_alloc_page(page, order);
73336 kernel_map_pages(page, 1 << order, 1);
73337
73338+#ifndef CONFIG_PAX_MEMORY_SANITIZE
73339 if (gfp_flags & __GFP_ZERO)
73340 prep_zero_page(page, order, gfp_flags);
73341+#endif
73342
73343 if (order && (gfp_flags & __GFP_COMP))
73344 prep_compound_page(page, order);
73345@@ -3357,7 +3369,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
73346 unsigned long pfn;
73347
73348 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
73349+#ifdef CONFIG_X86_32
73350+ /* boot failures in VMware 8 on 32bit vanilla since
73351+ this change */
73352+ if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn)))
73353+#else
73354 if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
73355+#endif
73356 return 1;
73357 }
73358 return 0;
73359diff --git a/mm/percpu.c b/mm/percpu.c
73360index 716eb4a..8d10419 100644
73361--- a/mm/percpu.c
73362+++ b/mm/percpu.c
73363@@ -121,7 +121,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
73364 static unsigned int pcpu_high_unit_cpu __read_mostly;
73365
73366 /* the address of the first chunk which starts with the kernel static area */
73367-void *pcpu_base_addr __read_mostly;
73368+void *pcpu_base_addr __read_only;
73369 EXPORT_SYMBOL_GPL(pcpu_base_addr);
73370
73371 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
73372diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
73373index e920aa3..137702a 100644
73374--- a/mm/process_vm_access.c
73375+++ b/mm/process_vm_access.c
73376@@ -13,6 +13,7 @@
73377 #include <linux/uio.h>
73378 #include <linux/sched.h>
73379 #include <linux/highmem.h>
73380+#include <linux/security.h>
73381 #include <linux/ptrace.h>
73382 #include <linux/slab.h>
73383 #include <linux/syscalls.h>
73384@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73385 size_t iov_l_curr_offset = 0;
73386 ssize_t iov_len;
73387
73388+ return -ENOSYS; // PaX: until properly audited
73389+
73390 /*
73391 * Work out how many pages of struct pages we're going to need
73392 * when eventually calling get_user_pages
73393 */
73394 for (i = 0; i < riovcnt; i++) {
73395 iov_len = rvec[i].iov_len;
73396- if (iov_len > 0) {
73397- nr_pages_iov = ((unsigned long)rvec[i].iov_base
73398- + iov_len)
73399- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
73400- / PAGE_SIZE + 1;
73401- nr_pages = max(nr_pages, nr_pages_iov);
73402- }
73403+ if (iov_len <= 0)
73404+ continue;
73405+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
73406+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
73407+ nr_pages = max(nr_pages, nr_pages_iov);
73408 }
73409
73410 if (nr_pages == 0)
73411@@ -298,23 +299,23 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73412 goto free_proc_pages;
73413 }
73414
73415- task_lock(task);
73416- if (__ptrace_may_access(task, PTRACE_MODE_ATTACH)) {
73417- task_unlock(task);
73418+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
73419 rc = -EPERM;
73420 goto put_task_struct;
73421 }
73422- mm = task->mm;
73423
73424- if (!mm || (task->flags & PF_KTHREAD)) {
73425- task_unlock(task);
73426- rc = -EINVAL;
73427+ mm = mm_access(task, PTRACE_MODE_ATTACH);
73428+ if (!mm || IS_ERR(mm)) {
73429+ rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
73430+ /*
73431+ * Explicitly map EACCES to EPERM as EPERM is a more a
73432+ * appropriate error code for process_vw_readv/writev
73433+ */
73434+ if (rc == -EACCES)
73435+ rc = -EPERM;
73436 goto put_task_struct;
73437 }
73438
73439- atomic_inc(&mm->mm_users);
73440- task_unlock(task);
73441-
73442 for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) {
73443 rc = process_vm_rw_single_vec(
73444 (unsigned long)rvec[i].iov_base, rvec[i].iov_len,
73445diff --git a/mm/rmap.c b/mm/rmap.c
73446index a4fd368..e0ffec7 100644
73447--- a/mm/rmap.c
73448+++ b/mm/rmap.c
73449@@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73450 struct anon_vma *anon_vma = vma->anon_vma;
73451 struct anon_vma_chain *avc;
73452
73453+#ifdef CONFIG_PAX_SEGMEXEC
73454+ struct anon_vma_chain *avc_m = NULL;
73455+#endif
73456+
73457 might_sleep();
73458 if (unlikely(!anon_vma)) {
73459 struct mm_struct *mm = vma->vm_mm;
73460@@ -161,6 +165,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73461 if (!avc)
73462 goto out_enomem;
73463
73464+#ifdef CONFIG_PAX_SEGMEXEC
73465+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
73466+ if (!avc_m)
73467+ goto out_enomem_free_avc;
73468+#endif
73469+
73470 anon_vma = find_mergeable_anon_vma(vma);
73471 allocated = NULL;
73472 if (!anon_vma) {
73473@@ -174,6 +184,21 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73474 /* page_table_lock to protect against threads */
73475 spin_lock(&mm->page_table_lock);
73476 if (likely(!vma->anon_vma)) {
73477+
73478+#ifdef CONFIG_PAX_SEGMEXEC
73479+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
73480+
73481+ if (vma_m) {
73482+ BUG_ON(vma_m->anon_vma);
73483+ vma_m->anon_vma = anon_vma;
73484+ avc_m->anon_vma = anon_vma;
73485+ avc_m->vma = vma;
73486+ list_add(&avc_m->same_vma, &vma_m->anon_vma_chain);
73487+ list_add(&avc_m->same_anon_vma, &anon_vma->head);
73488+ avc_m = NULL;
73489+ }
73490+#endif
73491+
73492 vma->anon_vma = anon_vma;
73493 avc->anon_vma = anon_vma;
73494 avc->vma = vma;
73495@@ -187,12 +212,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73496
73497 if (unlikely(allocated))
73498 put_anon_vma(allocated);
73499+
73500+#ifdef CONFIG_PAX_SEGMEXEC
73501+ if (unlikely(avc_m))
73502+ anon_vma_chain_free(avc_m);
73503+#endif
73504+
73505 if (unlikely(avc))
73506 anon_vma_chain_free(avc);
73507 }
73508 return 0;
73509
73510 out_enomem_free_avc:
73511+
73512+#ifdef CONFIG_PAX_SEGMEXEC
73513+ if (avc_m)
73514+ anon_vma_chain_free(avc_m);
73515+#endif
73516+
73517 anon_vma_chain_free(avc);
73518 out_enomem:
73519 return -ENOMEM;
73520@@ -243,7 +280,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
73521 * Attach the anon_vmas from src to dst.
73522 * Returns 0 on success, -ENOMEM on failure.
73523 */
73524-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
73525+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
73526 {
73527 struct anon_vma_chain *avc, *pavc;
73528 struct anon_vma *root = NULL;
73529@@ -276,7 +313,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
73530 * the corresponding VMA in the parent process is attached to.
73531 * Returns 0 on success, non-zero on failure.
73532 */
73533-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
73534+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
73535 {
73536 struct anon_vma_chain *avc;
73537 struct anon_vma *anon_vma;
73538diff --git a/mm/shmem.c b/mm/shmem.c
73539index 6c253f7..367e20a 100644
73540--- a/mm/shmem.c
73541+++ b/mm/shmem.c
73542@@ -31,7 +31,7 @@
73543 #include <linux/export.h>
73544 #include <linux/swap.h>
73545
73546-static struct vfsmount *shm_mnt;
73547+struct vfsmount *shm_mnt;
73548
73549 #ifdef CONFIG_SHMEM
73550 /*
73551@@ -74,7 +74,7 @@ static struct vfsmount *shm_mnt;
73552 #define BOGO_DIRENT_SIZE 20
73553
73554 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
73555-#define SHORT_SYMLINK_LEN 128
73556+#define SHORT_SYMLINK_LEN 64
73557
73558 struct shmem_xattr {
73559 struct list_head list; /* anchored by shmem_inode_info->xattr_list */
73560@@ -2180,8 +2180,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
73561 int err = -ENOMEM;
73562
73563 /* Round up to L1_CACHE_BYTES to resist false sharing */
73564- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
73565- L1_CACHE_BYTES), GFP_KERNEL);
73566+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
73567 if (!sbinfo)
73568 return -ENOMEM;
73569
73570diff --git a/mm/slab.c b/mm/slab.c
73571index 83311c9a..fcf8f86 100644
73572--- a/mm/slab.c
73573+++ b/mm/slab.c
73574@@ -151,7 +151,7 @@
73575
73576 /* Legal flag mask for kmem_cache_create(). */
73577 #if DEBUG
73578-# define CREATE_MASK (SLAB_RED_ZONE | \
73579+# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
73580 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
73581 SLAB_CACHE_DMA | \
73582 SLAB_STORE_USER | \
73583@@ -159,7 +159,7 @@
73584 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73585 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
73586 #else
73587-# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
73588+# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
73589 SLAB_CACHE_DMA | \
73590 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
73591 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73592@@ -288,7 +288,7 @@ struct kmem_list3 {
73593 * Need this for bootstrapping a per node allocator.
73594 */
73595 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
73596-static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
73597+static struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
73598 #define CACHE_CACHE 0
73599 #define SIZE_AC MAX_NUMNODES
73600 #define SIZE_L3 (2 * MAX_NUMNODES)
73601@@ -389,10 +389,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
73602 if ((x)->max_freeable < i) \
73603 (x)->max_freeable = i; \
73604 } while (0)
73605-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
73606-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
73607-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
73608-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
73609+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
73610+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
73611+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
73612+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
73613 #else
73614 #define STATS_INC_ACTIVE(x) do { } while (0)
73615 #define STATS_DEC_ACTIVE(x) do { } while (0)
73616@@ -538,7 +538,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
73617 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
73618 */
73619 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
73620- const struct slab *slab, void *obj)
73621+ const struct slab *slab, const void *obj)
73622 {
73623 u32 offset = (obj - slab->s_mem);
73624 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
73625@@ -564,7 +564,7 @@ struct cache_names {
73626 static struct cache_names __initdata cache_names[] = {
73627 #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
73628 #include <linux/kmalloc_sizes.h>
73629- {NULL,}
73630+ {NULL}
73631 #undef CACHE
73632 };
73633
73634@@ -1572,7 +1572,7 @@ void __init kmem_cache_init(void)
73635 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
73636 sizes[INDEX_AC].cs_size,
73637 ARCH_KMALLOC_MINALIGN,
73638- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73639+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73640 NULL);
73641
73642 if (INDEX_AC != INDEX_L3) {
73643@@ -1580,7 +1580,7 @@ void __init kmem_cache_init(void)
73644 kmem_cache_create(names[INDEX_L3].name,
73645 sizes[INDEX_L3].cs_size,
73646 ARCH_KMALLOC_MINALIGN,
73647- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73648+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73649 NULL);
73650 }
73651
73652@@ -1598,7 +1598,7 @@ void __init kmem_cache_init(void)
73653 sizes->cs_cachep = kmem_cache_create(names->name,
73654 sizes->cs_size,
73655 ARCH_KMALLOC_MINALIGN,
73656- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73657+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73658 NULL);
73659 }
73660 #ifdef CONFIG_ZONE_DMA
73661@@ -4322,10 +4322,10 @@ static int s_show(struct seq_file *m, void *p)
73662 }
73663 /* cpu stats */
73664 {
73665- unsigned long allochit = atomic_read(&cachep->allochit);
73666- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
73667- unsigned long freehit = atomic_read(&cachep->freehit);
73668- unsigned long freemiss = atomic_read(&cachep->freemiss);
73669+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
73670+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
73671+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
73672+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
73673
73674 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
73675 allochit, allocmiss, freehit, freemiss);
73676@@ -4584,13 +4584,62 @@ static int __init slab_proc_init(void)
73677 {
73678 proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
73679 #ifdef CONFIG_DEBUG_SLAB_LEAK
73680- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
73681+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
73682 #endif
73683 return 0;
73684 }
73685 module_init(slab_proc_init);
73686 #endif
73687
73688+void check_object_size(const void *ptr, unsigned long n, bool to)
73689+{
73690+
73691+#ifdef CONFIG_PAX_USERCOPY
73692+ struct page *page;
73693+ struct kmem_cache *cachep = NULL;
73694+ struct slab *slabp;
73695+ unsigned int objnr;
73696+ unsigned long offset;
73697+ const char *type;
73698+
73699+ if (!n)
73700+ return;
73701+
73702+ type = "<null>";
73703+ if (ZERO_OR_NULL_PTR(ptr))
73704+ goto report;
73705+
73706+ if (!virt_addr_valid(ptr))
73707+ return;
73708+
73709+ page = virt_to_head_page(ptr);
73710+
73711+ type = "<process stack>";
73712+ if (!PageSlab(page)) {
73713+ if (object_is_on_stack(ptr, n) == -1)
73714+ goto report;
73715+ return;
73716+ }
73717+
73718+ cachep = page_get_cache(page);
73719+ type = cachep->name;
73720+ if (!(cachep->flags & SLAB_USERCOPY))
73721+ goto report;
73722+
73723+ slabp = page_get_slab(page);
73724+ objnr = obj_to_index(cachep, slabp, ptr);
73725+ BUG_ON(objnr >= cachep->num);
73726+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
73727+ if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
73728+ return;
73729+
73730+report:
73731+ pax_report_usercopy(ptr, n, to, type);
73732+#endif
73733+
73734+}
73735+EXPORT_SYMBOL(check_object_size);
73736+
73737 /**
73738 * ksize - get the actual amount of memory allocated for a given object
73739 * @objp: Pointer to the object
73740diff --git a/mm/slob.c b/mm/slob.c
73741index 8105be4..e045f96 100644
73742--- a/mm/slob.c
73743+++ b/mm/slob.c
73744@@ -29,7 +29,7 @@
73745 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
73746 * alloc_pages() directly, allocating compound pages so the page order
73747 * does not have to be separately tracked, and also stores the exact
73748- * allocation size in page->private so that it can be used to accurately
73749+ * allocation size in slob_page->size so that it can be used to accurately
73750 * provide ksize(). These objects are detected in kfree() because slob_page()
73751 * is false for them.
73752 *
73753@@ -58,6 +58,7 @@
73754 */
73755
73756 #include <linux/kernel.h>
73757+#include <linux/sched.h>
73758 #include <linux/slab.h>
73759 #include <linux/mm.h>
73760 #include <linux/swap.h> /* struct reclaim_state */
73761@@ -102,7 +103,8 @@ struct slob_page {
73762 unsigned long flags; /* mandatory */
73763 atomic_t _count; /* mandatory */
73764 slobidx_t units; /* free units left in page */
73765- unsigned long pad[2];
73766+ unsigned long pad[1];
73767+ unsigned long size; /* size when >=PAGE_SIZE */
73768 slob_t *free; /* first free slob_t in page */
73769 struct list_head list; /* linked list of free pages */
73770 };
73771@@ -135,7 +137,7 @@ static LIST_HEAD(free_slob_large);
73772 */
73773 static inline int is_slob_page(struct slob_page *sp)
73774 {
73775- return PageSlab((struct page *)sp);
73776+ return PageSlab((struct page *)sp) && !sp->size;
73777 }
73778
73779 static inline void set_slob_page(struct slob_page *sp)
73780@@ -150,7 +152,7 @@ static inline void clear_slob_page(struct slob_page *sp)
73781
73782 static inline struct slob_page *slob_page(const void *addr)
73783 {
73784- return (struct slob_page *)virt_to_page(addr);
73785+ return (struct slob_page *)virt_to_head_page(addr);
73786 }
73787
73788 /*
73789@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
73790 /*
73791 * Return the size of a slob block.
73792 */
73793-static slobidx_t slob_units(slob_t *s)
73794+static slobidx_t slob_units(const slob_t *s)
73795 {
73796 if (s->units > 0)
73797 return s->units;
73798@@ -220,7 +222,7 @@ static slobidx_t slob_units(slob_t *s)
73799 /*
73800 * Return the next free slob block pointer after this one.
73801 */
73802-static slob_t *slob_next(slob_t *s)
73803+static slob_t *slob_next(const slob_t *s)
73804 {
73805 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
73806 slobidx_t next;
73807@@ -235,7 +237,7 @@ static slob_t *slob_next(slob_t *s)
73808 /*
73809 * Returns true if s is the last free block in its page.
73810 */
73811-static int slob_last(slob_t *s)
73812+static int slob_last(const slob_t *s)
73813 {
73814 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
73815 }
73816@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
73817 if (!page)
73818 return NULL;
73819
73820+ set_slob_page(page);
73821 return page_address(page);
73822 }
73823
73824@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
73825 if (!b)
73826 return NULL;
73827 sp = slob_page(b);
73828- set_slob_page(sp);
73829
73830 spin_lock_irqsave(&slob_lock, flags);
73831 sp->units = SLOB_UNITS(PAGE_SIZE);
73832 sp->free = b;
73833+ sp->size = 0;
73834 INIT_LIST_HEAD(&sp->list);
73835 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
73836 set_slob_page_free(sp, slob_list);
73837@@ -476,10 +479,9 @@ out:
73838 * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
73839 */
73840
73841-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73842+static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
73843 {
73844- unsigned int *m;
73845- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73846+ slob_t *m;
73847 void *ret;
73848
73849 gfp &= gfp_allowed_mask;
73850@@ -494,7 +496,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73851
73852 if (!m)
73853 return NULL;
73854- *m = size;
73855+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
73856+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
73857+ m[0].units = size;
73858+ m[1].units = align;
73859 ret = (void *)m + align;
73860
73861 trace_kmalloc_node(_RET_IP_, ret,
73862@@ -506,16 +511,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73863 gfp |= __GFP_COMP;
73864 ret = slob_new_pages(gfp, order, node);
73865 if (ret) {
73866- struct page *page;
73867- page = virt_to_page(ret);
73868- page->private = size;
73869+ struct slob_page *sp;
73870+ sp = slob_page(ret);
73871+ sp->size = size;
73872 }
73873
73874 trace_kmalloc_node(_RET_IP_, ret,
73875 size, PAGE_SIZE << order, gfp, node);
73876 }
73877
73878- kmemleak_alloc(ret, size, 1, gfp);
73879+ return ret;
73880+}
73881+
73882+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73883+{
73884+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73885+ void *ret = __kmalloc_node_align(size, gfp, node, align);
73886+
73887+ if (!ZERO_OR_NULL_PTR(ret))
73888+ kmemleak_alloc(ret, size, 1, gfp);
73889 return ret;
73890 }
73891 EXPORT_SYMBOL(__kmalloc_node);
73892@@ -533,13 +547,92 @@ void kfree(const void *block)
73893 sp = slob_page(block);
73894 if (is_slob_page(sp)) {
73895 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73896- unsigned int *m = (unsigned int *)(block - align);
73897- slob_free(m, *m + align);
73898- } else
73899+ slob_t *m = (slob_t *)(block - align);
73900+ slob_free(m, m[0].units + align);
73901+ } else {
73902+ clear_slob_page(sp);
73903+ free_slob_page(sp);
73904+ sp->size = 0;
73905 put_page(&sp->page);
73906+ }
73907 }
73908 EXPORT_SYMBOL(kfree);
73909
73910+void check_object_size(const void *ptr, unsigned long n, bool to)
73911+{
73912+
73913+#ifdef CONFIG_PAX_USERCOPY
73914+ struct slob_page *sp;
73915+ const slob_t *free;
73916+ const void *base;
73917+ unsigned long flags;
73918+ const char *type;
73919+
73920+ if (!n)
73921+ return;
73922+
73923+ type = "<null>";
73924+ if (ZERO_OR_NULL_PTR(ptr))
73925+ goto report;
73926+
73927+ if (!virt_addr_valid(ptr))
73928+ return;
73929+
73930+ type = "<process stack>";
73931+ sp = slob_page(ptr);
73932+ if (!PageSlab((struct page *)sp)) {
73933+ if (object_is_on_stack(ptr, n) == -1)
73934+ goto report;
73935+ return;
73936+ }
73937+
73938+ type = "<slob>";
73939+ if (sp->size) {
73940+ base = page_address(&sp->page);
73941+ if (base <= ptr && n <= sp->size - (ptr - base))
73942+ return;
73943+ goto report;
73944+ }
73945+
73946+ /* some tricky double walking to find the chunk */
73947+ spin_lock_irqsave(&slob_lock, flags);
73948+ base = (void *)((unsigned long)ptr & PAGE_MASK);
73949+ free = sp->free;
73950+
73951+ while (!slob_last(free) && (void *)free <= ptr) {
73952+ base = free + slob_units(free);
73953+ free = slob_next(free);
73954+ }
73955+
73956+ while (base < (void *)free) {
73957+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
73958+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
73959+ int offset;
73960+
73961+ if (ptr < base + align)
73962+ break;
73963+
73964+ offset = ptr - base - align;
73965+ if (offset >= m) {
73966+ base += size;
73967+ continue;
73968+ }
73969+
73970+ if (n > m - offset)
73971+ break;
73972+
73973+ spin_unlock_irqrestore(&slob_lock, flags);
73974+ return;
73975+ }
73976+
73977+ spin_unlock_irqrestore(&slob_lock, flags);
73978+report:
73979+ pax_report_usercopy(ptr, n, to, type);
73980+#endif
73981+
73982+}
73983+EXPORT_SYMBOL(check_object_size);
73984+
73985 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
73986 size_t ksize(const void *block)
73987 {
73988@@ -552,10 +645,10 @@ size_t ksize(const void *block)
73989 sp = slob_page(block);
73990 if (is_slob_page(sp)) {
73991 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73992- unsigned int *m = (unsigned int *)(block - align);
73993- return SLOB_UNITS(*m) * SLOB_UNIT;
73994+ slob_t *m = (slob_t *)(block - align);
73995+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
73996 } else
73997- return sp->page.private;
73998+ return sp->size;
73999 }
74000 EXPORT_SYMBOL(ksize);
74001
74002@@ -571,8 +664,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74003 {
74004 struct kmem_cache *c;
74005
74006+#ifdef CONFIG_PAX_USERCOPY
74007+ c = __kmalloc_node_align(sizeof(struct kmem_cache),
74008+ GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
74009+#else
74010 c = slob_alloc(sizeof(struct kmem_cache),
74011 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
74012+#endif
74013
74014 if (c) {
74015 c->name = name;
74016@@ -614,17 +712,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
74017
74018 lockdep_trace_alloc(flags);
74019
74020+#ifdef CONFIG_PAX_USERCOPY
74021+ b = __kmalloc_node_align(c->size, flags, node, c->align);
74022+#else
74023 if (c->size < PAGE_SIZE) {
74024 b = slob_alloc(c->size, flags, c->align, node);
74025 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74026 SLOB_UNITS(c->size) * SLOB_UNIT,
74027 flags, node);
74028 } else {
74029+ struct slob_page *sp;
74030+
74031 b = slob_new_pages(flags, get_order(c->size), node);
74032+ sp = slob_page(b);
74033+ sp->size = c->size;
74034 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74035 PAGE_SIZE << get_order(c->size),
74036 flags, node);
74037 }
74038+#endif
74039
74040 if (c->ctor)
74041 c->ctor(b);
74042@@ -636,10 +742,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
74043
74044 static void __kmem_cache_free(void *b, int size)
74045 {
74046- if (size < PAGE_SIZE)
74047+ struct slob_page *sp = slob_page(b);
74048+
74049+ if (is_slob_page(sp))
74050 slob_free(b, size);
74051- else
74052+ else {
74053+ clear_slob_page(sp);
74054+ free_slob_page(sp);
74055+ sp->size = 0;
74056 slob_free_pages(b, get_order(size));
74057+ }
74058 }
74059
74060 static void kmem_rcu_free(struct rcu_head *head)
74061@@ -652,17 +764,31 @@ static void kmem_rcu_free(struct rcu_head *head)
74062
74063 void kmem_cache_free(struct kmem_cache *c, void *b)
74064 {
74065+ int size = c->size;
74066+
74067+#ifdef CONFIG_PAX_USERCOPY
74068+ if (size + c->align < PAGE_SIZE) {
74069+ size += c->align;
74070+ b -= c->align;
74071+ }
74072+#endif
74073+
74074 kmemleak_free_recursive(b, c->flags);
74075 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
74076 struct slob_rcu *slob_rcu;
74077- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
74078- slob_rcu->size = c->size;
74079+ slob_rcu = b + (size - sizeof(struct slob_rcu));
74080+ slob_rcu->size = size;
74081 call_rcu(&slob_rcu->head, kmem_rcu_free);
74082 } else {
74083- __kmem_cache_free(b, c->size);
74084+ __kmem_cache_free(b, size);
74085 }
74086
74087+#ifdef CONFIG_PAX_USERCOPY
74088+ trace_kfree(_RET_IP_, b);
74089+#else
74090 trace_kmem_cache_free(_RET_IP_, b);
74091+#endif
74092+
74093 }
74094 EXPORT_SYMBOL(kmem_cache_free);
74095
74096diff --git a/mm/slub.c b/mm/slub.c
74097index 1a919f0..1739c9b 100644
74098--- a/mm/slub.c
74099+++ b/mm/slub.c
74100@@ -208,7 +208,7 @@ struct track {
74101
74102 enum track_item { TRACK_ALLOC, TRACK_FREE };
74103
74104-#ifdef CONFIG_SYSFS
74105+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74106 static int sysfs_slab_add(struct kmem_cache *);
74107 static int sysfs_slab_alias(struct kmem_cache *, const char *);
74108 static void sysfs_slab_remove(struct kmem_cache *);
74109@@ -530,7 +530,7 @@ static void print_track(const char *s, struct track *t)
74110 if (!t->addr)
74111 return;
74112
74113- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
74114+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
74115 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
74116 #ifdef CONFIG_STACKTRACE
74117 {
74118@@ -2559,6 +2559,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
74119
74120 page = virt_to_head_page(x);
74121
74122+ BUG_ON(!PageSlab(page));
74123+
74124 slab_free(s, page, x, _RET_IP_);
74125
74126 trace_kmem_cache_free(_RET_IP_, x);
74127@@ -2592,7 +2594,7 @@ static int slub_min_objects;
74128 * Merge control. If this is set then no merging of slab caches will occur.
74129 * (Could be removed. This was introduced to pacify the merge skeptics.)
74130 */
74131-static int slub_nomerge;
74132+static int slub_nomerge = 1;
74133
74134 /*
74135 * Calculate the order of allocation given an slab object size.
74136@@ -3042,7 +3044,7 @@ static int kmem_cache_open(struct kmem_cache *s,
74137 else
74138 s->cpu_partial = 30;
74139
74140- s->refcount = 1;
74141+ atomic_set(&s->refcount, 1);
74142 #ifdef CONFIG_NUMA
74143 s->remote_node_defrag_ratio = 1000;
74144 #endif
74145@@ -3146,8 +3148,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
74146 void kmem_cache_destroy(struct kmem_cache *s)
74147 {
74148 down_write(&slub_lock);
74149- s->refcount--;
74150- if (!s->refcount) {
74151+ if (atomic_dec_and_test(&s->refcount)) {
74152 list_del(&s->list);
74153 up_write(&slub_lock);
74154 if (kmem_cache_close(s)) {
74155@@ -3358,6 +3359,50 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
74156 EXPORT_SYMBOL(__kmalloc_node);
74157 #endif
74158
74159+void check_object_size(const void *ptr, unsigned long n, bool to)
74160+{
74161+
74162+#ifdef CONFIG_PAX_USERCOPY
74163+ struct page *page;
74164+ struct kmem_cache *s = NULL;
74165+ unsigned long offset;
74166+ const char *type;
74167+
74168+ if (!n)
74169+ return;
74170+
74171+ type = "<null>";
74172+ if (ZERO_OR_NULL_PTR(ptr))
74173+ goto report;
74174+
74175+ if (!virt_addr_valid(ptr))
74176+ return;
74177+
74178+ page = virt_to_head_page(ptr);
74179+
74180+ type = "<process stack>";
74181+ if (!PageSlab(page)) {
74182+ if (object_is_on_stack(ptr, n) == -1)
74183+ goto report;
74184+ return;
74185+ }
74186+
74187+ s = page->slab;
74188+ type = s->name;
74189+ if (!(s->flags & SLAB_USERCOPY))
74190+ goto report;
74191+
74192+ offset = (ptr - page_address(page)) % s->size;
74193+ if (offset <= s->objsize && n <= s->objsize - offset)
74194+ return;
74195+
74196+report:
74197+ pax_report_usercopy(ptr, n, to, type);
74198+#endif
74199+
74200+}
74201+EXPORT_SYMBOL(check_object_size);
74202+
74203 size_t ksize(const void *object)
74204 {
74205 struct page *page;
74206@@ -3632,7 +3677,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
74207 int node;
74208
74209 list_add(&s->list, &slab_caches);
74210- s->refcount = -1;
74211+ atomic_set(&s->refcount, -1);
74212
74213 for_each_node_state(node, N_NORMAL_MEMORY) {
74214 struct kmem_cache_node *n = get_node(s, node);
74215@@ -3749,17 +3794,17 @@ void __init kmem_cache_init(void)
74216
74217 /* Caches that are not of the two-to-the-power-of size */
74218 if (KMALLOC_MIN_SIZE <= 32) {
74219- kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, 0);
74220+ kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, SLAB_USERCOPY);
74221 caches++;
74222 }
74223
74224 if (KMALLOC_MIN_SIZE <= 64) {
74225- kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, 0);
74226+ kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, SLAB_USERCOPY);
74227 caches++;
74228 }
74229
74230 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
74231- kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, 0);
74232+ kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, SLAB_USERCOPY);
74233 caches++;
74234 }
74235
74236@@ -3827,7 +3872,7 @@ static int slab_unmergeable(struct kmem_cache *s)
74237 /*
74238 * We may have set a slab to be unmergeable during bootstrap.
74239 */
74240- if (s->refcount < 0)
74241+ if (atomic_read(&s->refcount) < 0)
74242 return 1;
74243
74244 return 0;
74245@@ -3886,7 +3931,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74246 down_write(&slub_lock);
74247 s = find_mergeable(size, align, flags, name, ctor);
74248 if (s) {
74249- s->refcount++;
74250+ atomic_inc(&s->refcount);
74251 /*
74252 * Adjust the object sizes so that we clear
74253 * the complete object on kzalloc.
74254@@ -3895,7 +3940,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74255 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
74256
74257 if (sysfs_slab_alias(s, name)) {
74258- s->refcount--;
74259+ atomic_dec(&s->refcount);
74260 goto err;
74261 }
74262 up_write(&slub_lock);
74263@@ -4023,7 +4068,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
74264 }
74265 #endif
74266
74267-#ifdef CONFIG_SYSFS
74268+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74269 static int count_inuse(struct page *page)
74270 {
74271 return page->inuse;
74272@@ -4410,12 +4455,12 @@ static void resiliency_test(void)
74273 validate_slab_cache(kmalloc_caches[9]);
74274 }
74275 #else
74276-#ifdef CONFIG_SYSFS
74277+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74278 static void resiliency_test(void) {};
74279 #endif
74280 #endif
74281
74282-#ifdef CONFIG_SYSFS
74283+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74284 enum slab_stat_type {
74285 SL_ALL, /* All slabs */
74286 SL_PARTIAL, /* Only partially allocated slabs */
74287@@ -4656,7 +4701,7 @@ SLAB_ATTR_RO(ctor);
74288
74289 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
74290 {
74291- return sprintf(buf, "%d\n", s->refcount - 1);
74292+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
74293 }
74294 SLAB_ATTR_RO(aliases);
74295
74296@@ -5223,6 +5268,7 @@ static char *create_unique_id(struct kmem_cache *s)
74297 return name;
74298 }
74299
74300+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74301 static int sysfs_slab_add(struct kmem_cache *s)
74302 {
74303 int err;
74304@@ -5285,6 +5331,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
74305 kobject_del(&s->kobj);
74306 kobject_put(&s->kobj);
74307 }
74308+#endif
74309
74310 /*
74311 * Need to buffer aliases during bootup until sysfs becomes
74312@@ -5298,6 +5345,7 @@ struct saved_alias {
74313
74314 static struct saved_alias *alias_list;
74315
74316+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74317 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74318 {
74319 struct saved_alias *al;
74320@@ -5320,6 +5368,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74321 alias_list = al;
74322 return 0;
74323 }
74324+#endif
74325
74326 static int __init slab_sysfs_init(void)
74327 {
74328diff --git a/mm/swap.c b/mm/swap.c
74329index 55b266d..a532537 100644
74330--- a/mm/swap.c
74331+++ b/mm/swap.c
74332@@ -31,6 +31,7 @@
74333 #include <linux/backing-dev.h>
74334 #include <linux/memcontrol.h>
74335 #include <linux/gfp.h>
74336+#include <linux/hugetlb.h>
74337
74338 #include "internal.h"
74339
74340@@ -71,6 +72,8 @@ static void __put_compound_page(struct page *page)
74341
74342 __page_cache_release(page);
74343 dtor = get_compound_page_dtor(page);
74344+ if (!PageHuge(page))
74345+ BUG_ON(dtor != free_compound_page);
74346 (*dtor)(page);
74347 }
74348
74349diff --git a/mm/swapfile.c b/mm/swapfile.c
74350index b1cd120..aaae885 100644
74351--- a/mm/swapfile.c
74352+++ b/mm/swapfile.c
74353@@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
74354
74355 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
74356 /* Activity counter to indicate that a swapon or swapoff has occurred */
74357-static atomic_t proc_poll_event = ATOMIC_INIT(0);
74358+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
74359
74360 static inline unsigned char swap_count(unsigned char ent)
74361 {
74362@@ -1670,7 +1670,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
74363 }
74364 filp_close(swap_file, NULL);
74365 err = 0;
74366- atomic_inc(&proc_poll_event);
74367+ atomic_inc_unchecked(&proc_poll_event);
74368 wake_up_interruptible(&proc_poll_wait);
74369
74370 out_dput:
74371@@ -1686,8 +1686,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
74372
74373 poll_wait(file, &proc_poll_wait, wait);
74374
74375- if (seq->poll_event != atomic_read(&proc_poll_event)) {
74376- seq->poll_event = atomic_read(&proc_poll_event);
74377+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
74378+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74379 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
74380 }
74381
74382@@ -1785,7 +1785,7 @@ static int swaps_open(struct inode *inode, struct file *file)
74383 return ret;
74384
74385 seq = file->private_data;
74386- seq->poll_event = atomic_read(&proc_poll_event);
74387+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74388 return 0;
74389 }
74390
74391@@ -2123,7 +2123,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
74392 (p->flags & SWP_DISCARDABLE) ? "D" : "");
74393
74394 mutex_unlock(&swapon_mutex);
74395- atomic_inc(&proc_poll_event);
74396+ atomic_inc_unchecked(&proc_poll_event);
74397 wake_up_interruptible(&proc_poll_wait);
74398
74399 if (S_ISREG(inode->i_mode))
74400diff --git a/mm/util.c b/mm/util.c
74401index 136ac4f..f917fa9 100644
74402--- a/mm/util.c
74403+++ b/mm/util.c
74404@@ -243,6 +243,12 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
74405 void arch_pick_mmap_layout(struct mm_struct *mm)
74406 {
74407 mm->mmap_base = TASK_UNMAPPED_BASE;
74408+
74409+#ifdef CONFIG_PAX_RANDMMAP
74410+ if (mm->pax_flags & MF_PAX_RANDMMAP)
74411+ mm->mmap_base += mm->delta_mmap;
74412+#endif
74413+
74414 mm->get_unmapped_area = arch_get_unmapped_area;
74415 mm->unmap_area = arch_unmap_area;
74416 }
74417diff --git a/mm/vmalloc.c b/mm/vmalloc.c
74418index 27be2f0..633e5cc 100644
74419--- a/mm/vmalloc.c
74420+++ b/mm/vmalloc.c
74421@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
74422
74423 pte = pte_offset_kernel(pmd, addr);
74424 do {
74425- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74426- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74427+
74428+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74429+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
74430+ BUG_ON(!pte_exec(*pte));
74431+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
74432+ continue;
74433+ }
74434+#endif
74435+
74436+ {
74437+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74438+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74439+ }
74440 } while (pte++, addr += PAGE_SIZE, addr != end);
74441 }
74442
74443@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74444 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
74445 {
74446 pte_t *pte;
74447+ int ret = -ENOMEM;
74448
74449 /*
74450 * nr is a running index into the array which helps higher level
74451@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74452 pte = pte_alloc_kernel(pmd, addr);
74453 if (!pte)
74454 return -ENOMEM;
74455+
74456+ pax_open_kernel();
74457 do {
74458 struct page *page = pages[*nr];
74459
74460- if (WARN_ON(!pte_none(*pte)))
74461- return -EBUSY;
74462- if (WARN_ON(!page))
74463- return -ENOMEM;
74464+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74465+ if (pgprot_val(prot) & _PAGE_NX)
74466+#endif
74467+
74468+ if (WARN_ON(!pte_none(*pte))) {
74469+ ret = -EBUSY;
74470+ goto out;
74471+ }
74472+ if (WARN_ON(!page)) {
74473+ ret = -ENOMEM;
74474+ goto out;
74475+ }
74476 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
74477 (*nr)++;
74478 } while (pte++, addr += PAGE_SIZE, addr != end);
74479- return 0;
74480+ ret = 0;
74481+out:
74482+ pax_close_kernel();
74483+ return ret;
74484 }
74485
74486 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
74487@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x)
74488 * and fall back on vmalloc() if that fails. Others
74489 * just put it in the vmalloc space.
74490 */
74491-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
74492+#ifdef CONFIG_MODULES
74493+#ifdef MODULES_VADDR
74494 unsigned long addr = (unsigned long)x;
74495 if (addr >= MODULES_VADDR && addr < MODULES_END)
74496 return 1;
74497 #endif
74498+
74499+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74500+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
74501+ return 1;
74502+#endif
74503+
74504+#endif
74505+
74506 return is_vmalloc_addr(x);
74507 }
74508
74509@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
74510
74511 if (!pgd_none(*pgd)) {
74512 pud_t *pud = pud_offset(pgd, addr);
74513+#ifdef CONFIG_X86
74514+ if (!pud_large(*pud))
74515+#endif
74516 if (!pud_none(*pud)) {
74517 pmd_t *pmd = pmd_offset(pud, addr);
74518+#ifdef CONFIG_X86
74519+ if (!pmd_large(*pmd))
74520+#endif
74521 if (!pmd_none(*pmd)) {
74522 pte_t *ptep, pte;
74523
74524@@ -1294,6 +1334,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
74525 struct vm_struct *area;
74526
74527 BUG_ON(in_interrupt());
74528+
74529+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74530+ if (flags & VM_KERNEXEC) {
74531+ if (start != VMALLOC_START || end != VMALLOC_END)
74532+ return NULL;
74533+ start = (unsigned long)MODULES_EXEC_VADDR;
74534+ end = (unsigned long)MODULES_EXEC_END;
74535+ }
74536+#endif
74537+
74538 if (flags & VM_IOREMAP) {
74539 int bit = fls(size);
74540
74541@@ -1526,6 +1576,11 @@ void *vmap(struct page **pages, unsigned int count,
74542 if (count > totalram_pages)
74543 return NULL;
74544
74545+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74546+ if (!(pgprot_val(prot) & _PAGE_NX))
74547+ flags |= VM_KERNEXEC;
74548+#endif
74549+
74550 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
74551 __builtin_return_address(0));
74552 if (!area)
74553@@ -1627,6 +1682,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
74554 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
74555 goto fail;
74556
74557+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74558+ if (!(pgprot_val(prot) & _PAGE_NX))
74559+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
74560+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
74561+ else
74562+#endif
74563+
74564 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
74565 start, end, node, gfp_mask, caller);
74566 if (!area)
74567@@ -1800,10 +1862,9 @@ EXPORT_SYMBOL(vzalloc_node);
74568 * For tight control over page level allocator and protection flags
74569 * use __vmalloc() instead.
74570 */
74571-
74572 void *vmalloc_exec(unsigned long size)
74573 {
74574- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
74575+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
74576 -1, __builtin_return_address(0));
74577 }
74578
74579@@ -2098,6 +2159,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
74580 unsigned long uaddr = vma->vm_start;
74581 unsigned long usize = vma->vm_end - vma->vm_start;
74582
74583+ BUG_ON(vma->vm_mirror);
74584+
74585 if ((PAGE_SIZE-1) & (unsigned long)addr)
74586 return -EINVAL;
74587
74588diff --git a/mm/vmstat.c b/mm/vmstat.c
74589index 8fd603b..cf0d930 100644
74590--- a/mm/vmstat.c
74591+++ b/mm/vmstat.c
74592@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
74593 *
74594 * vm_stat contains the global counters
74595 */
74596-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
74597+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
74598 EXPORT_SYMBOL(vm_stat);
74599
74600 #ifdef CONFIG_SMP
74601@@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
74602 v = p->vm_stat_diff[i];
74603 p->vm_stat_diff[i] = 0;
74604 local_irq_restore(flags);
74605- atomic_long_add(v, &zone->vm_stat[i]);
74606+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
74607 global_diff[i] += v;
74608 #ifdef CONFIG_NUMA
74609 /* 3 seconds idle till flush */
74610@@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
74611
74612 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
74613 if (global_diff[i])
74614- atomic_long_add(global_diff[i], &vm_stat[i]);
74615+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
74616 }
74617
74618 #endif
74619@@ -1208,10 +1208,20 @@ static int __init setup_vmstat(void)
74620 start_cpu_timer(cpu);
74621 #endif
74622 #ifdef CONFIG_PROC_FS
74623- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
74624- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
74625- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
74626- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
74627+ {
74628+ mode_t gr_mode = S_IRUGO;
74629+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74630+ gr_mode = S_IRUSR;
74631+#endif
74632+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
74633+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
74634+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74635+ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
74636+#else
74637+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
74638+#endif
74639+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
74640+ }
74641 #endif
74642 return 0;
74643 }
74644diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
74645index 5471628..cef8398 100644
74646--- a/net/8021q/vlan.c
74647+++ b/net/8021q/vlan.c
74648@@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
74649 err = -EPERM;
74650 if (!capable(CAP_NET_ADMIN))
74651 break;
74652- if ((args.u.name_type >= 0) &&
74653- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
74654+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
74655 struct vlan_net *vn;
74656
74657 vn = net_generic(net, vlan_net_id);
74658diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
74659index fdfdb57..38d368c 100644
74660--- a/net/9p/trans_fd.c
74661+++ b/net/9p/trans_fd.c
74662@@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
74663 oldfs = get_fs();
74664 set_fs(get_ds());
74665 /* The cast to a user pointer is valid due to the set_fs() */
74666- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
74667+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
74668 set_fs(oldfs);
74669
74670 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
74671diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
74672index f41f026..fe76ea8 100644
74673--- a/net/atm/atm_misc.c
74674+++ b/net/atm/atm_misc.c
74675@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
74676 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
74677 return 1;
74678 atm_return(vcc, truesize);
74679- atomic_inc(&vcc->stats->rx_drop);
74680+ atomic_inc_unchecked(&vcc->stats->rx_drop);
74681 return 0;
74682 }
74683 EXPORT_SYMBOL(atm_charge);
74684@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
74685 }
74686 }
74687 atm_return(vcc, guess);
74688- atomic_inc(&vcc->stats->rx_drop);
74689+ atomic_inc_unchecked(&vcc->stats->rx_drop);
74690 return NULL;
74691 }
74692 EXPORT_SYMBOL(atm_alloc_charge);
74693@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
74694
74695 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
74696 {
74697-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
74698+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
74699 __SONET_ITEMS
74700 #undef __HANDLE_ITEM
74701 }
74702@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
74703
74704 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
74705 {
74706-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
74707+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
74708 __SONET_ITEMS
74709 #undef __HANDLE_ITEM
74710 }
74711diff --git a/net/atm/lec.h b/net/atm/lec.h
74712index dfc0719..47c5322 100644
74713--- a/net/atm/lec.h
74714+++ b/net/atm/lec.h
74715@@ -48,7 +48,7 @@ struct lane2_ops {
74716 const u8 *tlvs, u32 sizeoftlvs);
74717 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
74718 const u8 *tlvs, u32 sizeoftlvs);
74719-};
74720+} __no_const;
74721
74722 /*
74723 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
74724diff --git a/net/atm/mpc.h b/net/atm/mpc.h
74725index 0919a88..a23d54e 100644
74726--- a/net/atm/mpc.h
74727+++ b/net/atm/mpc.h
74728@@ -33,7 +33,7 @@ struct mpoa_client {
74729 struct mpc_parameters parameters; /* parameters for this client */
74730
74731 const struct net_device_ops *old_ops;
74732- struct net_device_ops new_ops;
74733+ net_device_ops_no_const new_ops;
74734 };
74735
74736
74737diff --git a/net/atm/proc.c b/net/atm/proc.c
74738index 0d020de..011c7bb 100644
74739--- a/net/atm/proc.c
74740+++ b/net/atm/proc.c
74741@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
74742 const struct k_atm_aal_stats *stats)
74743 {
74744 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
74745- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
74746- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
74747- atomic_read(&stats->rx_drop));
74748+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
74749+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
74750+ atomic_read_unchecked(&stats->rx_drop));
74751 }
74752
74753 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
74754diff --git a/net/atm/resources.c b/net/atm/resources.c
74755index 23f45ce..c748f1a 100644
74756--- a/net/atm/resources.c
74757+++ b/net/atm/resources.c
74758@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
74759 static void copy_aal_stats(struct k_atm_aal_stats *from,
74760 struct atm_aal_stats *to)
74761 {
74762-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
74763+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
74764 __AAL_STAT_ITEMS
74765 #undef __HANDLE_ITEM
74766 }
74767@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
74768 static void subtract_aal_stats(struct k_atm_aal_stats *from,
74769 struct atm_aal_stats *to)
74770 {
74771-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
74772+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
74773 __AAL_STAT_ITEMS
74774 #undef __HANDLE_ITEM
74775 }
74776diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
74777index 3512e25..2b33401 100644
74778--- a/net/batman-adv/bat_iv_ogm.c
74779+++ b/net/batman-adv/bat_iv_ogm.c
74780@@ -541,7 +541,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
74781
74782 /* change sequence number to network order */
74783 batman_ogm_packet->seqno =
74784- htonl((uint32_t)atomic_read(&hard_iface->seqno));
74785+ htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
74786
74787 batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
74788 batman_ogm_packet->tt_crc = htons((uint16_t)
74789@@ -561,7 +561,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
74790 else
74791 batman_ogm_packet->gw_flags = NO_FLAGS;
74792
74793- atomic_inc(&hard_iface->seqno);
74794+ atomic_inc_unchecked(&hard_iface->seqno);
74795
74796 slide_own_bcast_window(hard_iface);
74797 bat_ogm_queue_add(bat_priv, hard_iface->packet_buff,
74798@@ -922,7 +922,7 @@ static void bat_ogm_process(const struct ethhdr *ethhdr,
74799 return;
74800
74801 /* could be changed by schedule_own_packet() */
74802- if_incoming_seqno = atomic_read(&if_incoming->seqno);
74803+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->seqno);
74804
74805 has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
74806
74807diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
74808index 7704df4..beb4e16 100644
74809--- a/net/batman-adv/hard-interface.c
74810+++ b/net/batman-adv/hard-interface.c
74811@@ -326,8 +326,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
74812 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
74813 dev_add_pack(&hard_iface->batman_adv_ptype);
74814
74815- atomic_set(&hard_iface->seqno, 1);
74816- atomic_set(&hard_iface->frag_seqno, 1);
74817+ atomic_set_unchecked(&hard_iface->seqno, 1);
74818+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
74819 bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
74820 hard_iface->net_dev->name);
74821
74822diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
74823index f9cc957..efd9dae 100644
74824--- a/net/batman-adv/soft-interface.c
74825+++ b/net/batman-adv/soft-interface.c
74826@@ -634,7 +634,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
74827
74828 /* set broadcast sequence number */
74829 bcast_packet->seqno =
74830- htonl(atomic_inc_return(&bat_priv->bcast_seqno));
74831+ htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
74832
74833 add_bcast_packet_to_list(bat_priv, skb, 1);
74834
74835@@ -828,7 +828,7 @@ struct net_device *softif_create(const char *name)
74836 atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
74837
74838 atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
74839- atomic_set(&bat_priv->bcast_seqno, 1);
74840+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
74841 atomic_set(&bat_priv->ttvn, 0);
74842 atomic_set(&bat_priv->tt_local_changes, 0);
74843 atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
74844diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
74845index ab8d0fe..ceba3fd 100644
74846--- a/net/batman-adv/types.h
74847+++ b/net/batman-adv/types.h
74848@@ -38,8 +38,8 @@ struct hard_iface {
74849 int16_t if_num;
74850 char if_status;
74851 struct net_device *net_dev;
74852- atomic_t seqno;
74853- atomic_t frag_seqno;
74854+ atomic_unchecked_t seqno;
74855+ atomic_unchecked_t frag_seqno;
74856 unsigned char *packet_buff;
74857 int packet_len;
74858 struct kobject *hardif_obj;
74859@@ -154,7 +154,7 @@ struct bat_priv {
74860 atomic_t orig_interval; /* uint */
74861 atomic_t hop_penalty; /* uint */
74862 atomic_t log_level; /* uint */
74863- atomic_t bcast_seqno;
74864+ atomic_unchecked_t bcast_seqno;
74865 atomic_t bcast_queue_left;
74866 atomic_t batman_queue_left;
74867 atomic_t ttvn; /* translation table version number */
74868diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
74869index 07d1c1d..7e9bea9 100644
74870--- a/net/batman-adv/unicast.c
74871+++ b/net/batman-adv/unicast.c
74872@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
74873 frag1->flags = UNI_FRAG_HEAD | large_tail;
74874 frag2->flags = large_tail;
74875
74876- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
74877+ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
74878 frag1->seqno = htons(seqno - 1);
74879 frag2->seqno = htons(seqno);
74880
74881diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
74882index c1c597e..05ebb40 100644
74883--- a/net/bluetooth/hci_conn.c
74884+++ b/net/bluetooth/hci_conn.c
74885@@ -234,7 +234,7 @@ void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16])
74886 memset(&cp, 0, sizeof(cp));
74887
74888 cp.handle = cpu_to_le16(conn->handle);
74889- memcpy(cp.ltk, ltk, sizeof(ltk));
74890+ memcpy(cp.ltk, ltk, sizeof(cp.ltk));
74891
74892 hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
74893 }
74894diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
74895index 17b5b1c..826d872 100644
74896--- a/net/bluetooth/l2cap_core.c
74897+++ b/net/bluetooth/l2cap_core.c
74898@@ -2176,8 +2176,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
74899 break;
74900
74901 case L2CAP_CONF_RFC:
74902- if (olen == sizeof(rfc))
74903- memcpy(&rfc, (void *)val, olen);
74904+ if (olen != sizeof(rfc))
74905+ break;
74906+
74907+ memcpy(&rfc, (void *)val, olen);
74908
74909 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
74910 rfc.mode != chan->mode)
74911@@ -2265,8 +2267,10 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
74912
74913 switch (type) {
74914 case L2CAP_CONF_RFC:
74915- if (olen == sizeof(rfc))
74916- memcpy(&rfc, (void *)val, olen);
74917+ if (olen != sizeof(rfc))
74918+ break;
74919+
74920+ memcpy(&rfc, (void *)val, olen);
74921 goto done;
74922 }
74923 }
74924diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
74925index a5f4e57..910ee6d 100644
74926--- a/net/bridge/br_multicast.c
74927+++ b/net/bridge/br_multicast.c
74928@@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
74929 nexthdr = ip6h->nexthdr;
74930 offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
74931
74932- if (offset < 0 || nexthdr != IPPROTO_ICMPV6)
74933+ if (nexthdr != IPPROTO_ICMPV6)
74934 return 0;
74935
74936 /* Okay, we found ICMPv6 header */
74937diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
74938index 5864cc4..121f3a30 100644
74939--- a/net/bridge/netfilter/ebtables.c
74940+++ b/net/bridge/netfilter/ebtables.c
74941@@ -1513,7 +1513,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
74942 tmp.valid_hooks = t->table->valid_hooks;
74943 }
74944 mutex_unlock(&ebt_mutex);
74945- if (copy_to_user(user, &tmp, *len) != 0){
74946+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
74947 BUGPRINT("c2u Didn't work\n");
74948 ret = -EFAULT;
74949 break;
74950diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
74951index a986280..13444a1 100644
74952--- a/net/caif/caif_socket.c
74953+++ b/net/caif/caif_socket.c
74954@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
74955 #ifdef CONFIG_DEBUG_FS
74956 struct debug_fs_counter {
74957 atomic_t caif_nr_socks;
74958- atomic_t caif_sock_create;
74959- atomic_t num_connect_req;
74960- atomic_t num_connect_resp;
74961- atomic_t num_connect_fail_resp;
74962- atomic_t num_disconnect;
74963- atomic_t num_remote_shutdown_ind;
74964- atomic_t num_tx_flow_off_ind;
74965- atomic_t num_tx_flow_on_ind;
74966- atomic_t num_rx_flow_off;
74967- atomic_t num_rx_flow_on;
74968+ atomic_unchecked_t caif_sock_create;
74969+ atomic_unchecked_t num_connect_req;
74970+ atomic_unchecked_t num_connect_resp;
74971+ atomic_unchecked_t num_connect_fail_resp;
74972+ atomic_unchecked_t num_disconnect;
74973+ atomic_unchecked_t num_remote_shutdown_ind;
74974+ atomic_unchecked_t num_tx_flow_off_ind;
74975+ atomic_unchecked_t num_tx_flow_on_ind;
74976+ atomic_unchecked_t num_rx_flow_off;
74977+ atomic_unchecked_t num_rx_flow_on;
74978 };
74979 static struct debug_fs_counter cnt;
74980 #define dbfs_atomic_inc(v) atomic_inc_return(v)
74981+#define dbfs_atomic_inc_unchecked(v) atomic_inc_return_unchecked(v)
74982 #define dbfs_atomic_dec(v) atomic_dec_return(v)
74983 #else
74984 #define dbfs_atomic_inc(v) 0
74985@@ -161,7 +162,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
74986 atomic_read(&cf_sk->sk.sk_rmem_alloc),
74987 sk_rcvbuf_lowwater(cf_sk));
74988 set_rx_flow_off(cf_sk);
74989- dbfs_atomic_inc(&cnt.num_rx_flow_off);
74990+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
74991 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
74992 }
74993
74994@@ -172,7 +173,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
74995 set_rx_flow_off(cf_sk);
74996 if (net_ratelimit())
74997 pr_debug("sending flow OFF due to rmem_schedule\n");
74998- dbfs_atomic_inc(&cnt.num_rx_flow_off);
74999+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
75000 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
75001 }
75002 skb->dev = NULL;
75003@@ -233,14 +234,14 @@ static void caif_ctrl_cb(struct cflayer *layr,
75004 switch (flow) {
75005 case CAIF_CTRLCMD_FLOW_ON_IND:
75006 /* OK from modem to start sending again */
75007- dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
75008+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_on_ind);
75009 set_tx_flow_on(cf_sk);
75010 cf_sk->sk.sk_state_change(&cf_sk->sk);
75011 break;
75012
75013 case CAIF_CTRLCMD_FLOW_OFF_IND:
75014 /* Modem asks us to shut up */
75015- dbfs_atomic_inc(&cnt.num_tx_flow_off_ind);
75016+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_off_ind);
75017 set_tx_flow_off(cf_sk);
75018 cf_sk->sk.sk_state_change(&cf_sk->sk);
75019 break;
75020@@ -249,7 +250,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75021 /* We're now connected */
75022 caif_client_register_refcnt(&cf_sk->layer,
75023 cfsk_hold, cfsk_put);
75024- dbfs_atomic_inc(&cnt.num_connect_resp);
75025+ dbfs_atomic_inc_unchecked(&cnt.num_connect_resp);
75026 cf_sk->sk.sk_state = CAIF_CONNECTED;
75027 set_tx_flow_on(cf_sk);
75028 cf_sk->sk.sk_state_change(&cf_sk->sk);
75029@@ -263,7 +264,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75030
75031 case CAIF_CTRLCMD_INIT_FAIL_RSP:
75032 /* Connect request failed */
75033- dbfs_atomic_inc(&cnt.num_connect_fail_resp);
75034+ dbfs_atomic_inc_unchecked(&cnt.num_connect_fail_resp);
75035 cf_sk->sk.sk_err = ECONNREFUSED;
75036 cf_sk->sk.sk_state = CAIF_DISCONNECTED;
75037 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
75038@@ -277,7 +278,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75039
75040 case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
75041 /* Modem has closed this connection, or device is down. */
75042- dbfs_atomic_inc(&cnt.num_remote_shutdown_ind);
75043+ dbfs_atomic_inc_unchecked(&cnt.num_remote_shutdown_ind);
75044 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
75045 cf_sk->sk.sk_err = ECONNRESET;
75046 set_rx_flow_on(cf_sk);
75047@@ -297,7 +298,7 @@ static void caif_check_flow_release(struct sock *sk)
75048 return;
75049
75050 if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) {
75051- dbfs_atomic_inc(&cnt.num_rx_flow_on);
75052+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_on);
75053 set_rx_flow_on(cf_sk);
75054 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ);
75055 }
75056@@ -854,7 +855,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
75057 /*ifindex = id of the interface.*/
75058 cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;
75059
75060- dbfs_atomic_inc(&cnt.num_connect_req);
75061+ dbfs_atomic_inc_unchecked(&cnt.num_connect_req);
75062 cf_sk->layer.receive = caif_sktrecv_cb;
75063
75064 err = caif_connect_client(sock_net(sk), &cf_sk->conn_req,
75065@@ -943,7 +944,7 @@ static int caif_release(struct socket *sock)
75066 spin_unlock_bh(&sk->sk_receive_queue.lock);
75067 sock->sk = NULL;
75068
75069- dbfs_atomic_inc(&cnt.num_disconnect);
75070+ dbfs_atomic_inc_unchecked(&cnt.num_disconnect);
75071
75072 WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
75073 if (cf_sk->debugfs_socket_dir != NULL)
75074@@ -1122,7 +1123,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol,
75075 cf_sk->conn_req.protocol = protocol;
75076 /* Increase the number of sockets created. */
75077 dbfs_atomic_inc(&cnt.caif_nr_socks);
75078- num = dbfs_atomic_inc(&cnt.caif_sock_create);
75079+ num = dbfs_atomic_inc_unchecked(&cnt.caif_sock_create);
75080 #ifdef CONFIG_DEBUG_FS
75081 if (!IS_ERR(debugfsdir)) {
75082
75083diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
75084index 5cf5222..6f704ad 100644
75085--- a/net/caif/cfctrl.c
75086+++ b/net/caif/cfctrl.c
75087@@ -9,6 +9,7 @@
75088 #include <linux/stddef.h>
75089 #include <linux/spinlock.h>
75090 #include <linux/slab.h>
75091+#include <linux/sched.h>
75092 #include <net/caif/caif_layer.h>
75093 #include <net/caif/cfpkt.h>
75094 #include <net/caif/cfctrl.h>
75095@@ -42,8 +43,8 @@ struct cflayer *cfctrl_create(void)
75096 memset(&dev_info, 0, sizeof(dev_info));
75097 dev_info.id = 0xff;
75098 cfsrvl_init(&this->serv, 0, &dev_info, false);
75099- atomic_set(&this->req_seq_no, 1);
75100- atomic_set(&this->rsp_seq_no, 1);
75101+ atomic_set_unchecked(&this->req_seq_no, 1);
75102+ atomic_set_unchecked(&this->rsp_seq_no, 1);
75103 this->serv.layer.receive = cfctrl_recv;
75104 sprintf(this->serv.layer.name, "ctrl");
75105 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
75106@@ -129,8 +130,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
75107 struct cfctrl_request_info *req)
75108 {
75109 spin_lock_bh(&ctrl->info_list_lock);
75110- atomic_inc(&ctrl->req_seq_no);
75111- req->sequence_no = atomic_read(&ctrl->req_seq_no);
75112+ atomic_inc_unchecked(&ctrl->req_seq_no);
75113+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
75114 list_add_tail(&req->list, &ctrl->list);
75115 spin_unlock_bh(&ctrl->info_list_lock);
75116 }
75117@@ -148,7 +149,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
75118 if (p != first)
75119 pr_warn("Requests are not received in order\n");
75120
75121- atomic_set(&ctrl->rsp_seq_no,
75122+ atomic_set_unchecked(&ctrl->rsp_seq_no,
75123 p->sequence_no);
75124 list_del(&p->list);
75125 goto out;
75126diff --git a/net/can/gw.c b/net/can/gw.c
75127index 3d79b12..8de85fa 100644
75128--- a/net/can/gw.c
75129+++ b/net/can/gw.c
75130@@ -96,7 +96,7 @@ struct cf_mod {
75131 struct {
75132 void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);
75133 void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);
75134- } csumfunc;
75135+ } __no_const csumfunc;
75136 };
75137
75138
75139diff --git a/net/compat.c b/net/compat.c
75140index 6def90e..c6992fa 100644
75141--- a/net/compat.c
75142+++ b/net/compat.c
75143@@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
75144 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
75145 __get_user(kmsg->msg_flags, &umsg->msg_flags))
75146 return -EFAULT;
75147- kmsg->msg_name = compat_ptr(tmp1);
75148- kmsg->msg_iov = compat_ptr(tmp2);
75149- kmsg->msg_control = compat_ptr(tmp3);
75150+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
75151+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
75152+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
75153 return 0;
75154 }
75155
75156@@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75157
75158 if (kern_msg->msg_namelen) {
75159 if (mode == VERIFY_READ) {
75160- int err = move_addr_to_kernel(kern_msg->msg_name,
75161+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
75162 kern_msg->msg_namelen,
75163 kern_address);
75164 if (err < 0)
75165@@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75166 kern_msg->msg_name = NULL;
75167
75168 tot_len = iov_from_user_compat_to_kern(kern_iov,
75169- (struct compat_iovec __user *)kern_msg->msg_iov,
75170+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
75171 kern_msg->msg_iovlen);
75172 if (tot_len >= 0)
75173 kern_msg->msg_iov = kern_iov;
75174@@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75175
75176 #define CMSG_COMPAT_FIRSTHDR(msg) \
75177 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
75178- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
75179+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
75180 (struct compat_cmsghdr __user *)NULL)
75181
75182 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
75183 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
75184 (ucmlen) <= (unsigned long) \
75185 ((mhdr)->msg_controllen - \
75186- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
75187+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
75188
75189 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
75190 struct compat_cmsghdr __user *cmsg, int cmsg_len)
75191 {
75192 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
75193- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
75194+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
75195 msg->msg_controllen)
75196 return NULL;
75197 return (struct compat_cmsghdr __user *)ptr;
75198@@ -221,7 +221,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
75199 {
75200 struct compat_timeval ctv;
75201 struct compat_timespec cts[3];
75202- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75203+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75204 struct compat_cmsghdr cmhdr;
75205 int cmlen;
75206
75207@@ -273,7 +273,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
75208
75209 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
75210 {
75211- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75212+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75213 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
75214 int fdnum = scm->fp->count;
75215 struct file **fp = scm->fp->fp;
75216@@ -370,7 +370,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
75217 return -EFAULT;
75218 old_fs = get_fs();
75219 set_fs(KERNEL_DS);
75220- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
75221+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
75222 set_fs(old_fs);
75223
75224 return err;
75225@@ -431,7 +431,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
75226 len = sizeof(ktime);
75227 old_fs = get_fs();
75228 set_fs(KERNEL_DS);
75229- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
75230+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
75231 set_fs(old_fs);
75232
75233 if (!err) {
75234@@ -566,7 +566,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75235 case MCAST_JOIN_GROUP:
75236 case MCAST_LEAVE_GROUP:
75237 {
75238- struct compat_group_req __user *gr32 = (void *)optval;
75239+ struct compat_group_req __user *gr32 = (void __user *)optval;
75240 struct group_req __user *kgr =
75241 compat_alloc_user_space(sizeof(struct group_req));
75242 u32 interface;
75243@@ -587,7 +587,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75244 case MCAST_BLOCK_SOURCE:
75245 case MCAST_UNBLOCK_SOURCE:
75246 {
75247- struct compat_group_source_req __user *gsr32 = (void *)optval;
75248+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
75249 struct group_source_req __user *kgsr = compat_alloc_user_space(
75250 sizeof(struct group_source_req));
75251 u32 interface;
75252@@ -608,7 +608,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75253 }
75254 case MCAST_MSFILTER:
75255 {
75256- struct compat_group_filter __user *gf32 = (void *)optval;
75257+ struct compat_group_filter __user *gf32 = (void __user *)optval;
75258 struct group_filter __user *kgf;
75259 u32 interface, fmode, numsrc;
75260
75261@@ -646,7 +646,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
75262 char __user *optval, int __user *optlen,
75263 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
75264 {
75265- struct compat_group_filter __user *gf32 = (void *)optval;
75266+ struct compat_group_filter __user *gf32 = (void __user *)optval;
75267 struct group_filter __user *kgf;
75268 int __user *koptlen;
75269 u32 interface, fmode, numsrc;
75270diff --git a/net/core/datagram.c b/net/core/datagram.c
75271index 68bbf9f..5ef0d12 100644
75272--- a/net/core/datagram.c
75273+++ b/net/core/datagram.c
75274@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
75275 }
75276
75277 kfree_skb(skb);
75278- atomic_inc(&sk->sk_drops);
75279+ atomic_inc_unchecked(&sk->sk_drops);
75280 sk_mem_reclaim_partial(sk);
75281
75282 return err;
75283diff --git a/net/core/dev.c b/net/core/dev.c
75284index c56cacf..b28e35f 100644
75285--- a/net/core/dev.c
75286+++ b/net/core/dev.c
75287@@ -1139,10 +1139,14 @@ void dev_load(struct net *net, const char *name)
75288 if (no_module && capable(CAP_NET_ADMIN))
75289 no_module = request_module("netdev-%s", name);
75290 if (no_module && capable(CAP_SYS_MODULE)) {
75291+#ifdef CONFIG_GRKERNSEC_MODHARDEN
75292+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
75293+#else
75294 if (!request_module("%s", name))
75295 pr_err("Loading kernel module for a network device "
75296 "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
75297 "instead\n", name);
75298+#endif
75299 }
75300 }
75301 EXPORT_SYMBOL(dev_load);
75302@@ -1573,7 +1577,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
75303 {
75304 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
75305 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
75306- atomic_long_inc(&dev->rx_dropped);
75307+ atomic_long_inc_unchecked(&dev->rx_dropped);
75308 kfree_skb(skb);
75309 return NET_RX_DROP;
75310 }
75311@@ -1583,7 +1587,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
75312 nf_reset(skb);
75313
75314 if (unlikely(!is_skb_forwardable(dev, skb))) {
75315- atomic_long_inc(&dev->rx_dropped);
75316+ atomic_long_inc_unchecked(&dev->rx_dropped);
75317 kfree_skb(skb);
75318 return NET_RX_DROP;
75319 }
75320@@ -2036,7 +2040,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
75321
75322 struct dev_gso_cb {
75323 void (*destructor)(struct sk_buff *skb);
75324-};
75325+} __no_const;
75326
75327 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
75328
75329@@ -2970,7 +2974,7 @@ enqueue:
75330
75331 local_irq_restore(flags);
75332
75333- atomic_long_inc(&skb->dev->rx_dropped);
75334+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75335 kfree_skb(skb);
75336 return NET_RX_DROP;
75337 }
75338@@ -3044,7 +3048,7 @@ int netif_rx_ni(struct sk_buff *skb)
75339 }
75340 EXPORT_SYMBOL(netif_rx_ni);
75341
75342-static void net_tx_action(struct softirq_action *h)
75343+static void net_tx_action(void)
75344 {
75345 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75346
75347@@ -3333,7 +3337,7 @@ ncls:
75348 if (pt_prev) {
75349 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
75350 } else {
75351- atomic_long_inc(&skb->dev->rx_dropped);
75352+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75353 kfree_skb(skb);
75354 /* Jamal, now you will not able to escape explaining
75355 * me how you were going to use this. :-)
75356@@ -3897,7 +3901,7 @@ void netif_napi_del(struct napi_struct *napi)
75357 }
75358 EXPORT_SYMBOL(netif_napi_del);
75359
75360-static void net_rx_action(struct softirq_action *h)
75361+static void net_rx_action(void)
75362 {
75363 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75364 unsigned long time_limit = jiffies + 2;
75365@@ -5955,7 +5959,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
75366 } else {
75367 netdev_stats_to_stats64(storage, &dev->stats);
75368 }
75369- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
75370+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
75371 return storage;
75372 }
75373 EXPORT_SYMBOL(dev_get_stats);
75374diff --git a/net/core/flow.c b/net/core/flow.c
75375index e318c7e..168b1d0 100644
75376--- a/net/core/flow.c
75377+++ b/net/core/flow.c
75378@@ -61,7 +61,7 @@ struct flow_cache {
75379 struct timer_list rnd_timer;
75380 };
75381
75382-atomic_t flow_cache_genid = ATOMIC_INIT(0);
75383+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
75384 EXPORT_SYMBOL(flow_cache_genid);
75385 static struct flow_cache flow_cache_global;
75386 static struct kmem_cache *flow_cachep __read_mostly;
75387@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
75388
75389 static int flow_entry_valid(struct flow_cache_entry *fle)
75390 {
75391- if (atomic_read(&flow_cache_genid) != fle->genid)
75392+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
75393 return 0;
75394 if (fle->object && !fle->object->ops->check(fle->object))
75395 return 0;
75396@@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
75397 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
75398 fcp->hash_count++;
75399 }
75400- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
75401+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
75402 flo = fle->object;
75403 if (!flo)
75404 goto ret_object;
75405@@ -280,7 +280,7 @@ nocache:
75406 }
75407 flo = resolver(net, key, family, dir, flo, ctx);
75408 if (fle) {
75409- fle->genid = atomic_read(&flow_cache_genid);
75410+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
75411 if (!IS_ERR(flo))
75412 fle->object = flo;
75413 else
75414diff --git a/net/core/iovec.c b/net/core/iovec.c
75415index c40f27e..7f49254 100644
75416--- a/net/core/iovec.c
75417+++ b/net/core/iovec.c
75418@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
75419 if (m->msg_namelen) {
75420 if (mode == VERIFY_READ) {
75421 void __user *namep;
75422- namep = (void __user __force *) m->msg_name;
75423+ namep = (void __force_user *) m->msg_name;
75424 err = move_addr_to_kernel(namep, m->msg_namelen,
75425 address);
75426 if (err < 0)
75427@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
75428 }
75429
75430 size = m->msg_iovlen * sizeof(struct iovec);
75431- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
75432+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
75433 return -EFAULT;
75434
75435 m->msg_iov = iov;
75436diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
75437index 9083e82..1673203 100644
75438--- a/net/core/rtnetlink.c
75439+++ b/net/core/rtnetlink.c
75440@@ -57,7 +57,7 @@ struct rtnl_link {
75441 rtnl_doit_func doit;
75442 rtnl_dumpit_func dumpit;
75443 rtnl_calcit_func calcit;
75444-};
75445+} __no_const;
75446
75447 static DEFINE_MUTEX(rtnl_mutex);
75448 static u16 min_ifinfo_dump_size;
75449diff --git a/net/core/scm.c b/net/core/scm.c
75450index ff52ad0..aff1c0f 100644
75451--- a/net/core/scm.c
75452+++ b/net/core/scm.c
75453@@ -220,7 +220,7 @@ EXPORT_SYMBOL(__scm_send);
75454 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75455 {
75456 struct cmsghdr __user *cm
75457- = (__force struct cmsghdr __user *)msg->msg_control;
75458+ = (struct cmsghdr __force_user *)msg->msg_control;
75459 struct cmsghdr cmhdr;
75460 int cmlen = CMSG_LEN(len);
75461 int err;
75462@@ -243,7 +243,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75463 err = -EFAULT;
75464 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
75465 goto out;
75466- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
75467+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
75468 goto out;
75469 cmlen = CMSG_SPACE(len);
75470 if (msg->msg_controllen < cmlen)
75471@@ -259,7 +259,7 @@ EXPORT_SYMBOL(put_cmsg);
75472 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75473 {
75474 struct cmsghdr __user *cm
75475- = (__force struct cmsghdr __user*)msg->msg_control;
75476+ = (struct cmsghdr __force_user *)msg->msg_control;
75477
75478 int fdmax = 0;
75479 int fdnum = scm->fp->count;
75480@@ -279,7 +279,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75481 if (fdnum < fdmax)
75482 fdmax = fdnum;
75483
75484- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
75485+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
75486 i++, cmfptr++)
75487 {
75488 int new_fd;
75489diff --git a/net/core/sock.c b/net/core/sock.c
75490index b23f174..b9a0d26 100644
75491--- a/net/core/sock.c
75492+++ b/net/core/sock.c
75493@@ -289,7 +289,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75494 struct sk_buff_head *list = &sk->sk_receive_queue;
75495
75496 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
75497- atomic_inc(&sk->sk_drops);
75498+ atomic_inc_unchecked(&sk->sk_drops);
75499 trace_sock_rcvqueue_full(sk, skb);
75500 return -ENOMEM;
75501 }
75502@@ -299,7 +299,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75503 return err;
75504
75505 if (!sk_rmem_schedule(sk, skb->truesize)) {
75506- atomic_inc(&sk->sk_drops);
75507+ atomic_inc_unchecked(&sk->sk_drops);
75508 return -ENOBUFS;
75509 }
75510
75511@@ -319,7 +319,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75512 skb_dst_force(skb);
75513
75514 spin_lock_irqsave(&list->lock, flags);
75515- skb->dropcount = atomic_read(&sk->sk_drops);
75516+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
75517 __skb_queue_tail(list, skb);
75518 spin_unlock_irqrestore(&list->lock, flags);
75519
75520@@ -339,7 +339,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
75521 skb->dev = NULL;
75522
75523 if (sk_rcvqueues_full(sk, skb)) {
75524- atomic_inc(&sk->sk_drops);
75525+ atomic_inc_unchecked(&sk->sk_drops);
75526 goto discard_and_relse;
75527 }
75528 if (nested)
75529@@ -357,7 +357,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
75530 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
75531 } else if (sk_add_backlog(sk, skb)) {
75532 bh_unlock_sock(sk);
75533- atomic_inc(&sk->sk_drops);
75534+ atomic_inc_unchecked(&sk->sk_drops);
75535 goto discard_and_relse;
75536 }
75537
75538@@ -917,7 +917,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75539 if (len > sizeof(peercred))
75540 len = sizeof(peercred);
75541 cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
75542- if (copy_to_user(optval, &peercred, len))
75543+ if (len > sizeof(peercred) || copy_to_user(optval, &peercred, len))
75544 return -EFAULT;
75545 goto lenout;
75546 }
75547@@ -930,7 +930,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75548 return -ENOTCONN;
75549 if (lv < len)
75550 return -EINVAL;
75551- if (copy_to_user(optval, address, len))
75552+ if (len > sizeof(address) || copy_to_user(optval, address, len))
75553 return -EFAULT;
75554 goto lenout;
75555 }
75556@@ -963,7 +963,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75557
75558 if (len > lv)
75559 len = lv;
75560- if (copy_to_user(optval, &v, len))
75561+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
75562 return -EFAULT;
75563 lenout:
75564 if (put_user(len, optlen))
75565@@ -2020,7 +2020,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
75566 */
75567 smp_wmb();
75568 atomic_set(&sk->sk_refcnt, 1);
75569- atomic_set(&sk->sk_drops, 0);
75570+ atomic_set_unchecked(&sk->sk_drops, 0);
75571 }
75572 EXPORT_SYMBOL(sock_init_data);
75573
75574diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
75575index 02e75d1..9a57a7c 100644
75576--- a/net/decnet/sysctl_net_decnet.c
75577+++ b/net/decnet/sysctl_net_decnet.c
75578@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
75579
75580 if (len > *lenp) len = *lenp;
75581
75582- if (copy_to_user(buffer, addr, len))
75583+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
75584 return -EFAULT;
75585
75586 *lenp = len;
75587@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
75588
75589 if (len > *lenp) len = *lenp;
75590
75591- if (copy_to_user(buffer, devname, len))
75592+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
75593 return -EFAULT;
75594
75595 *lenp = len;
75596diff --git a/net/econet/Kconfig b/net/econet/Kconfig
75597index 39a2d29..f39c0fe 100644
75598--- a/net/econet/Kconfig
75599+++ b/net/econet/Kconfig
75600@@ -4,7 +4,7 @@
75601
75602 config ECONET
75603 tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
75604- depends on EXPERIMENTAL && INET
75605+ depends on EXPERIMENTAL && INET && BROKEN
75606 ---help---
75607 Econet is a fairly old and slow networking protocol mainly used by
75608 Acorn computers to access file and print servers. It uses native
75609diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
75610index 36d1440..44ff28b 100644
75611--- a/net/ipv4/ah4.c
75612+++ b/net/ipv4/ah4.c
75613@@ -19,6 +19,8 @@ struct ah_skb_cb {
75614 #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
75615
75616 static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75617+ unsigned int size) __size_overflow(3);
75618+static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75619 unsigned int size)
75620 {
75621 unsigned int len;
75622diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
75623index 92fc5f6..b790d91 100644
75624--- a/net/ipv4/fib_frontend.c
75625+++ b/net/ipv4/fib_frontend.c
75626@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
75627 #ifdef CONFIG_IP_ROUTE_MULTIPATH
75628 fib_sync_up(dev);
75629 #endif
75630- atomic_inc(&net->ipv4.dev_addr_genid);
75631+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75632 rt_cache_flush(dev_net(dev), -1);
75633 break;
75634 case NETDEV_DOWN:
75635 fib_del_ifaddr(ifa, NULL);
75636- atomic_inc(&net->ipv4.dev_addr_genid);
75637+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75638 if (ifa->ifa_dev->ifa_list == NULL) {
75639 /* Last address was deleted from this interface.
75640 * Disable IP.
75641@@ -1011,7 +1011,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
75642 #ifdef CONFIG_IP_ROUTE_MULTIPATH
75643 fib_sync_up(dev);
75644 #endif
75645- atomic_inc(&net->ipv4.dev_addr_genid);
75646+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75647 rt_cache_flush(dev_net(dev), -1);
75648 break;
75649 case NETDEV_DOWN:
75650diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
75651index 80106d8..232e898 100644
75652--- a/net/ipv4/fib_semantics.c
75653+++ b/net/ipv4/fib_semantics.c
75654@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
75655 nh->nh_saddr = inet_select_addr(nh->nh_dev,
75656 nh->nh_gw,
75657 nh->nh_parent->fib_scope);
75658- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
75659+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
75660
75661 return nh->nh_saddr;
75662 }
75663diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
75664index ccee270..db23c3c 100644
75665--- a/net/ipv4/inet_diag.c
75666+++ b/net/ipv4/inet_diag.c
75667@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct sock *sk,
75668 r->idiag_retrans = 0;
75669
75670 r->id.idiag_if = sk->sk_bound_dev_if;
75671+
75672+#ifdef CONFIG_GRKERNSEC_HIDESYM
75673+ r->id.idiag_cookie[0] = 0;
75674+ r->id.idiag_cookie[1] = 0;
75675+#else
75676 r->id.idiag_cookie[0] = (u32)(unsigned long)sk;
75677 r->id.idiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
75678+#endif
75679
75680 r->id.idiag_sport = inet->inet_sport;
75681 r->id.idiag_dport = inet->inet_dport;
75682@@ -210,8 +216,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
75683 r->idiag_family = tw->tw_family;
75684 r->idiag_retrans = 0;
75685 r->id.idiag_if = tw->tw_bound_dev_if;
75686+
75687+#ifdef CONFIG_GRKERNSEC_HIDESYM
75688+ r->id.idiag_cookie[0] = 0;
75689+ r->id.idiag_cookie[1] = 0;
75690+#else
75691 r->id.idiag_cookie[0] = (u32)(unsigned long)tw;
75692 r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
75693+#endif
75694+
75695 r->id.idiag_sport = tw->tw_sport;
75696 r->id.idiag_dport = tw->tw_dport;
75697 r->id.idiag_src[0] = tw->tw_rcv_saddr;
75698@@ -294,12 +307,14 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
75699 if (sk == NULL)
75700 goto unlock;
75701
75702+#ifndef CONFIG_GRKERNSEC_HIDESYM
75703 err = -ESTALE;
75704 if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||
75705 req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&
75706 ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||
75707 (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))
75708 goto out;
75709+#endif
75710
75711 err = -ENOMEM;
75712 rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
75713@@ -589,8 +604,14 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
75714 r->idiag_retrans = req->retrans;
75715
75716 r->id.idiag_if = sk->sk_bound_dev_if;
75717+
75718+#ifdef CONFIG_GRKERNSEC_HIDESYM
75719+ r->id.idiag_cookie[0] = 0;
75720+ r->id.idiag_cookie[1] = 0;
75721+#else
75722 r->id.idiag_cookie[0] = (u32)(unsigned long)req;
75723 r->id.idiag_cookie[1] = (u32)(((unsigned long)req >> 31) >> 1);
75724+#endif
75725
75726 tmo = req->expires - jiffies;
75727 if (tmo < 0)
75728diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
75729index 984ec65..97ac518 100644
75730--- a/net/ipv4/inet_hashtables.c
75731+++ b/net/ipv4/inet_hashtables.c
75732@@ -18,12 +18,15 @@
75733 #include <linux/sched.h>
75734 #include <linux/slab.h>
75735 #include <linux/wait.h>
75736+#include <linux/security.h>
75737
75738 #include <net/inet_connection_sock.h>
75739 #include <net/inet_hashtables.h>
75740 #include <net/secure_seq.h>
75741 #include <net/ip.h>
75742
75743+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
75744+
75745 /*
75746 * Allocate and initialize a new local port bind bucket.
75747 * The bindhash mutex for snum's hash chain must be held here.
75748@@ -530,6 +533,8 @@ ok:
75749 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
75750 spin_unlock(&head->lock);
75751
75752+ gr_update_task_in_ip_table(current, inet_sk(sk));
75753+
75754 if (tw) {
75755 inet_twsk_deschedule(tw, death_row);
75756 while (twrefcnt) {
75757diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
75758index 86f13c67..59a35b5 100644
75759--- a/net/ipv4/inetpeer.c
75760+++ b/net/ipv4/inetpeer.c
75761@@ -436,8 +436,8 @@ relookup:
75762 if (p) {
75763 p->daddr = *daddr;
75764 atomic_set(&p->refcnt, 1);
75765- atomic_set(&p->rid, 0);
75766- atomic_set(&p->ip_id_count,
75767+ atomic_set_unchecked(&p->rid, 0);
75768+ atomic_set_unchecked(&p->ip_id_count,
75769 (daddr->family == AF_INET) ?
75770 secure_ip_id(daddr->addr.a4) :
75771 secure_ipv6_id(daddr->addr.a6));
75772diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
75773index fdaabf2..0ec3205 100644
75774--- a/net/ipv4/ip_fragment.c
75775+++ b/net/ipv4/ip_fragment.c
75776@@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
75777 return 0;
75778
75779 start = qp->rid;
75780- end = atomic_inc_return(&peer->rid);
75781+ end = atomic_inc_return_unchecked(&peer->rid);
75782 qp->rid = end;
75783
75784 rc = qp->q.fragments && (end - start) > max;
75785diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
75786index 09ff51b..d3968eb 100644
75787--- a/net/ipv4/ip_sockglue.c
75788+++ b/net/ipv4/ip_sockglue.c
75789@@ -1111,7 +1111,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
75790 len = min_t(unsigned int, len, opt->optlen);
75791 if (put_user(len, optlen))
75792 return -EFAULT;
75793- if (copy_to_user(optval, opt->__data, len))
75794+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
75795+ copy_to_user(optval, opt->__data, len))
75796 return -EFAULT;
75797 return 0;
75798 }
75799@@ -1239,7 +1240,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
75800 if (sk->sk_type != SOCK_STREAM)
75801 return -ENOPROTOOPT;
75802
75803- msg.msg_control = optval;
75804+ msg.msg_control = (void __force_kernel *)optval;
75805 msg.msg_controllen = len;
75806 msg.msg_flags = flags;
75807
75808diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
75809index 99ec116..c5628fe 100644
75810--- a/net/ipv4/ipconfig.c
75811+++ b/net/ipv4/ipconfig.c
75812@@ -318,7 +318,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
75813
75814 mm_segment_t oldfs = get_fs();
75815 set_fs(get_ds());
75816- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
75817+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
75818 set_fs(oldfs);
75819 return res;
75820 }
75821@@ -329,7 +329,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
75822
75823 mm_segment_t oldfs = get_fs();
75824 set_fs(get_ds());
75825- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
75826+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
75827 set_fs(oldfs);
75828 return res;
75829 }
75830@@ -340,7 +340,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
75831
75832 mm_segment_t oldfs = get_fs();
75833 set_fs(get_ds());
75834- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
75835+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
75836 set_fs(oldfs);
75837 return res;
75838 }
75839diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
75840index fd7a3f6..e5be655 100644
75841--- a/net/ipv4/netfilter/arp_tables.c
75842+++ b/net/ipv4/netfilter/arp_tables.c
75843@@ -984,6 +984,11 @@ static int __do_replace(struct net *net, const char *name,
75844 unsigned int valid_hooks,
75845 struct xt_table_info *newinfo,
75846 unsigned int num_counters,
75847+ void __user *counters_ptr) __size_overflow(5);
75848+static int __do_replace(struct net *net, const char *name,
75849+ unsigned int valid_hooks,
75850+ struct xt_table_info *newinfo,
75851+ unsigned int num_counters,
75852 void __user *counters_ptr)
75853 {
75854 int ret;
75855@@ -1104,6 +1109,8 @@ static int do_replace(struct net *net, const void __user *user,
75856 }
75857
75858 static int do_add_counters(struct net *net, const void __user *user,
75859+ unsigned int len, int compat) __size_overflow(3);
75860+static int do_add_counters(struct net *net, const void __user *user,
75861 unsigned int len, int compat)
75862 {
75863 unsigned int i, curcpu;
75864diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
75865index 24e556e..a8daf7a 100644
75866--- a/net/ipv4/netfilter/ip_tables.c
75867+++ b/net/ipv4/netfilter/ip_tables.c
75868@@ -1172,6 +1172,10 @@ get_entries(struct net *net, struct ipt_get_entries __user *uptr,
75869 static int
75870 __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
75871 struct xt_table_info *newinfo, unsigned int num_counters,
75872+ void __user *counters_ptr) __size_overflow(5);
75873+static int
75874+__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
75875+ struct xt_table_info *newinfo, unsigned int num_counters,
75876 void __user *counters_ptr)
75877 {
75878 int ret;
75879@@ -1293,6 +1297,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
75880
75881 static int
75882 do_add_counters(struct net *net, const void __user *user,
75883+ unsigned int len, int compat) __size_overflow(3);
75884+static int
75885+do_add_counters(struct net *net, const void __user *user,
75886 unsigned int len, int compat)
75887 {
75888 unsigned int i, curcpu;
75889diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
75890index 2133c30..0e8047e 100644
75891--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
75892+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
75893@@ -435,6 +435,10 @@ static unsigned char asn1_subid_decode(struct asn1_ctx *ctx,
75894 static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
75895 unsigned char *eoc,
75896 unsigned long **oid,
75897+ unsigned int *len) __size_overflow(2);
75898+static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
75899+ unsigned char *eoc,
75900+ unsigned long **oid,
75901 unsigned int *len)
75902 {
75903 unsigned long subid;
75904diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
75905index 43d4c3b..1914409 100644
75906--- a/net/ipv4/ping.c
75907+++ b/net/ipv4/ping.c
75908@@ -836,7 +836,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
75909 sk_rmem_alloc_get(sp),
75910 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
75911 atomic_read(&sp->sk_refcnt), sp,
75912- atomic_read(&sp->sk_drops), len);
75913+ atomic_read_unchecked(&sp->sk_drops), len);
75914 }
75915
75916 static int ping_seq_show(struct seq_file *seq, void *v)
75917diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
75918index 007e2eb..85a18a0 100644
75919--- a/net/ipv4/raw.c
75920+++ b/net/ipv4/raw.c
75921@@ -303,7 +303,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
75922 int raw_rcv(struct sock *sk, struct sk_buff *skb)
75923 {
75924 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
75925- atomic_inc(&sk->sk_drops);
75926+ atomic_inc_unchecked(&sk->sk_drops);
75927 kfree_skb(skb);
75928 return NET_RX_DROP;
75929 }
75930@@ -738,16 +738,20 @@ static int raw_init(struct sock *sk)
75931
75932 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
75933 {
75934+ struct icmp_filter filter;
75935+
75936 if (optlen > sizeof(struct icmp_filter))
75937 optlen = sizeof(struct icmp_filter);
75938- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
75939+ if (copy_from_user(&filter, optval, optlen))
75940 return -EFAULT;
75941+ raw_sk(sk)->filter = filter;
75942 return 0;
75943 }
75944
75945 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
75946 {
75947 int len, ret = -EFAULT;
75948+ struct icmp_filter filter;
75949
75950 if (get_user(len, optlen))
75951 goto out;
75952@@ -757,8 +761,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
75953 if (len > sizeof(struct icmp_filter))
75954 len = sizeof(struct icmp_filter);
75955 ret = -EFAULT;
75956- if (put_user(len, optlen) ||
75957- copy_to_user(optval, &raw_sk(sk)->filter, len))
75958+ filter = raw_sk(sk)->filter;
75959+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
75960 goto out;
75961 ret = 0;
75962 out: return ret;
75963@@ -986,7 +990,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
75964 sk_wmem_alloc_get(sp),
75965 sk_rmem_alloc_get(sp),
75966 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
75967- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
75968+ atomic_read(&sp->sk_refcnt),
75969+#ifdef CONFIG_GRKERNSEC_HIDESYM
75970+ NULL,
75971+#else
75972+ sp,
75973+#endif
75974+ atomic_read_unchecked(&sp->sk_drops));
75975 }
75976
75977 static int raw_seq_show(struct seq_file *seq, void *v)
75978diff --git a/net/ipv4/route.c b/net/ipv4/route.c
75979index 94cdbc5..0cb0063 100644
75980--- a/net/ipv4/route.c
75981+++ b/net/ipv4/route.c
75982@@ -313,7 +313,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
75983
75984 static inline int rt_genid(struct net *net)
75985 {
75986- return atomic_read(&net->ipv4.rt_genid);
75987+ return atomic_read_unchecked(&net->ipv4.rt_genid);
75988 }
75989
75990 #ifdef CONFIG_PROC_FS
75991@@ -937,7 +937,7 @@ static void rt_cache_invalidate(struct net *net)
75992 unsigned char shuffle;
75993
75994 get_random_bytes(&shuffle, sizeof(shuffle));
75995- atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
75996+ atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
75997 redirect_genid++;
75998 }
75999
76000@@ -3022,7 +3022,7 @@ static int rt_fill_info(struct net *net,
76001 error = rt->dst.error;
76002 if (peer) {
76003 inet_peer_refcheck(rt->peer);
76004- id = atomic_read(&peer->ip_id_count) & 0xffff;
76005+ id = atomic_read_unchecked(&peer->ip_id_count) & 0xffff;
76006 if (peer->tcp_ts_stamp) {
76007 ts = peer->tcp_ts;
76008 tsage = get_seconds() - peer->tcp_ts_stamp;
76009diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
76010index eb90aa8..22bf114 100644
76011--- a/net/ipv4/tcp_ipv4.c
76012+++ b/net/ipv4/tcp_ipv4.c
76013@@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
76014 int sysctl_tcp_low_latency __read_mostly;
76015 EXPORT_SYMBOL(sysctl_tcp_low_latency);
76016
76017+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76018+extern int grsec_enable_blackhole;
76019+#endif
76020
76021 #ifdef CONFIG_TCP_MD5SIG
76022 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
76023@@ -1632,6 +1635,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
76024 return 0;
76025
76026 reset:
76027+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76028+ if (!grsec_enable_blackhole)
76029+#endif
76030 tcp_v4_send_reset(rsk, skb);
76031 discard:
76032 kfree_skb(skb);
76033@@ -1694,12 +1700,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
76034 TCP_SKB_CB(skb)->sacked = 0;
76035
76036 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76037- if (!sk)
76038+ if (!sk) {
76039+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76040+ ret = 1;
76041+#endif
76042 goto no_tcp_socket;
76043-
76044+ }
76045 process:
76046- if (sk->sk_state == TCP_TIME_WAIT)
76047+ if (sk->sk_state == TCP_TIME_WAIT) {
76048+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76049+ ret = 2;
76050+#endif
76051 goto do_time_wait;
76052+ }
76053
76054 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
76055 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76056@@ -1749,6 +1762,10 @@ no_tcp_socket:
76057 bad_packet:
76058 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76059 } else {
76060+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76061+ if (!grsec_enable_blackhole || (ret == 1 &&
76062+ (skb->dev->flags & IFF_LOOPBACK)))
76063+#endif
76064 tcp_v4_send_reset(NULL, skb);
76065 }
76066
76067@@ -2409,7 +2426,11 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
76068 0, /* non standard timer */
76069 0, /* open_requests have no inode */
76070 atomic_read(&sk->sk_refcnt),
76071+#ifdef CONFIG_GRKERNSEC_HIDESYM
76072+ NULL,
76073+#else
76074 req,
76075+#endif
76076 len);
76077 }
76078
76079@@ -2459,7 +2480,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
76080 sock_i_uid(sk),
76081 icsk->icsk_probes_out,
76082 sock_i_ino(sk),
76083- atomic_read(&sk->sk_refcnt), sk,
76084+ atomic_read(&sk->sk_refcnt),
76085+#ifdef CONFIG_GRKERNSEC_HIDESYM
76086+ NULL,
76087+#else
76088+ sk,
76089+#endif
76090 jiffies_to_clock_t(icsk->icsk_rto),
76091 jiffies_to_clock_t(icsk->icsk_ack.ato),
76092 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
76093@@ -2487,7 +2513,13 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
76094 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
76095 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
76096 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76097- atomic_read(&tw->tw_refcnt), tw, len);
76098+ atomic_read(&tw->tw_refcnt),
76099+#ifdef CONFIG_GRKERNSEC_HIDESYM
76100+ NULL,
76101+#else
76102+ tw,
76103+#endif
76104+ len);
76105 }
76106
76107 #define TMPSZ 150
76108diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
76109index 66363b6..b0654a3 100644
76110--- a/net/ipv4/tcp_minisocks.c
76111+++ b/net/ipv4/tcp_minisocks.c
76112@@ -27,6 +27,10 @@
76113 #include <net/inet_common.h>
76114 #include <net/xfrm.h>
76115
76116+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76117+extern int grsec_enable_blackhole;
76118+#endif
76119+
76120 int sysctl_tcp_syncookies __read_mostly = 1;
76121 EXPORT_SYMBOL(sysctl_tcp_syncookies);
76122
76123@@ -751,6 +755,10 @@ listen_overflow:
76124
76125 embryonic_reset:
76126 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
76127+
76128+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76129+ if (!grsec_enable_blackhole)
76130+#endif
76131 if (!(flg & TCP_FLAG_RST))
76132 req->rsk_ops->send_reset(sk, skb);
76133
76134diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
76135index 85ee7eb..53277ab 100644
76136--- a/net/ipv4/tcp_probe.c
76137+++ b/net/ipv4/tcp_probe.c
76138@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
76139 if (cnt + width >= len)
76140 break;
76141
76142- if (copy_to_user(buf + cnt, tbuf, width))
76143+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
76144 return -EFAULT;
76145 cnt += width;
76146 }
76147diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
76148index 2e0f0af..e2948bf 100644
76149--- a/net/ipv4/tcp_timer.c
76150+++ b/net/ipv4/tcp_timer.c
76151@@ -22,6 +22,10 @@
76152 #include <linux/gfp.h>
76153 #include <net/tcp.h>
76154
76155+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76156+extern int grsec_lastack_retries;
76157+#endif
76158+
76159 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
76160 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
76161 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
76162@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock *sk)
76163 }
76164 }
76165
76166+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76167+ if ((sk->sk_state == TCP_LAST_ACK) &&
76168+ (grsec_lastack_retries > 0) &&
76169+ (grsec_lastack_retries < retry_until))
76170+ retry_until = grsec_lastack_retries;
76171+#endif
76172+
76173 if (retransmits_timed_out(sk, retry_until,
76174 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
76175 /* Has it gone just too far? */
76176diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
76177index 5a65eea..bd913a1 100644
76178--- a/net/ipv4/udp.c
76179+++ b/net/ipv4/udp.c
76180@@ -86,6 +86,7 @@
76181 #include <linux/types.h>
76182 #include <linux/fcntl.h>
76183 #include <linux/module.h>
76184+#include <linux/security.h>
76185 #include <linux/socket.h>
76186 #include <linux/sockios.h>
76187 #include <linux/igmp.h>
76188@@ -108,6 +109,10 @@
76189 #include <trace/events/udp.h>
76190 #include "udp_impl.h"
76191
76192+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76193+extern int grsec_enable_blackhole;
76194+#endif
76195+
76196 struct udp_table udp_table __read_mostly;
76197 EXPORT_SYMBOL(udp_table);
76198
76199@@ -565,6 +570,9 @@ found:
76200 return s;
76201 }
76202
76203+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
76204+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
76205+
76206 /*
76207 * This routine is called by the ICMP module when it gets some
76208 * sort of error condition. If err < 0 then the socket should
76209@@ -856,9 +864,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
76210 dport = usin->sin_port;
76211 if (dport == 0)
76212 return -EINVAL;
76213+
76214+ err = gr_search_udp_sendmsg(sk, usin);
76215+ if (err)
76216+ return err;
76217 } else {
76218 if (sk->sk_state != TCP_ESTABLISHED)
76219 return -EDESTADDRREQ;
76220+
76221+ err = gr_search_udp_sendmsg(sk, NULL);
76222+ if (err)
76223+ return err;
76224+
76225 daddr = inet->inet_daddr;
76226 dport = inet->inet_dport;
76227 /* Open fast path for connected socket.
76228@@ -1099,7 +1116,7 @@ static unsigned int first_packet_length(struct sock *sk)
76229 udp_lib_checksum_complete(skb)) {
76230 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76231 IS_UDPLITE(sk));
76232- atomic_inc(&sk->sk_drops);
76233+ atomic_inc_unchecked(&sk->sk_drops);
76234 __skb_unlink(skb, rcvq);
76235 __skb_queue_tail(&list_kill, skb);
76236 }
76237@@ -1185,6 +1202,10 @@ try_again:
76238 if (!skb)
76239 goto out;
76240
76241+ err = gr_search_udp_recvmsg(sk, skb);
76242+ if (err)
76243+ goto out_free;
76244+
76245 ulen = skb->len - sizeof(struct udphdr);
76246 copied = len;
76247 if (copied > ulen)
76248@@ -1487,7 +1508,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
76249
76250 drop:
76251 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76252- atomic_inc(&sk->sk_drops);
76253+ atomic_inc_unchecked(&sk->sk_drops);
76254 kfree_skb(skb);
76255 return -1;
76256 }
76257@@ -1506,7 +1527,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76258 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
76259
76260 if (!skb1) {
76261- atomic_inc(&sk->sk_drops);
76262+ atomic_inc_unchecked(&sk->sk_drops);
76263 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
76264 IS_UDPLITE(sk));
76265 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76266@@ -1675,6 +1696,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76267 goto csum_error;
76268
76269 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
76270+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76271+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76272+#endif
76273 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
76274
76275 /*
76276@@ -2098,8 +2122,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
76277 sk_wmem_alloc_get(sp),
76278 sk_rmem_alloc_get(sp),
76279 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76280- atomic_read(&sp->sk_refcnt), sp,
76281- atomic_read(&sp->sk_drops), len);
76282+ atomic_read(&sp->sk_refcnt),
76283+#ifdef CONFIG_GRKERNSEC_HIDESYM
76284+ NULL,
76285+#else
76286+ sp,
76287+#endif
76288+ atomic_read_unchecked(&sp->sk_drops), len);
76289 }
76290
76291 int udp4_seq_show(struct seq_file *seq, void *v)
76292diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
76293index 836c4ea..cbb74dc 100644
76294--- a/net/ipv6/addrconf.c
76295+++ b/net/ipv6/addrconf.c
76296@@ -2149,7 +2149,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
76297 p.iph.ihl = 5;
76298 p.iph.protocol = IPPROTO_IPV6;
76299 p.iph.ttl = 64;
76300- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
76301+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
76302
76303 if (ops->ndo_do_ioctl) {
76304 mm_segment_t oldfs = get_fs();
76305diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
76306index 4c0f894..fca5d15 100644
76307--- a/net/ipv6/ah6.c
76308+++ b/net/ipv6/ah6.c
76309@@ -56,6 +56,8 @@ struct ah_skb_cb {
76310 #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
76311
76312 static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
76313+ unsigned int size) __size_overflow(3);
76314+static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
76315 unsigned int size)
76316 {
76317 unsigned int len;
76318diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
76319index 1567fb1..29af910 100644
76320--- a/net/ipv6/inet6_connection_sock.c
76321+++ b/net/ipv6/inet6_connection_sock.c
76322@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
76323 #ifdef CONFIG_XFRM
76324 {
76325 struct rt6_info *rt = (struct rt6_info *)dst;
76326- rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
76327+ rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
76328 }
76329 #endif
76330 }
76331@@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
76332 #ifdef CONFIG_XFRM
76333 if (dst) {
76334 struct rt6_info *rt = (struct rt6_info *)dst;
76335- if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
76336+ if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
76337 __sk_dst_reset(sk);
76338 dst = NULL;
76339 }
76340diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
76341index 26cb08c..8af9877 100644
76342--- a/net/ipv6/ipv6_sockglue.c
76343+++ b/net/ipv6/ipv6_sockglue.c
76344@@ -960,7 +960,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
76345 if (sk->sk_type != SOCK_STREAM)
76346 return -ENOPROTOOPT;
76347
76348- msg.msg_control = optval;
76349+ msg.msg_control = (void __force_kernel *)optval;
76350 msg.msg_controllen = len;
76351 msg.msg_flags = flags;
76352
76353diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
76354index 94874b0..dc413fa 100644
76355--- a/net/ipv6/netfilter/ip6_tables.c
76356+++ b/net/ipv6/netfilter/ip6_tables.c
76357@@ -1194,6 +1194,10 @@ get_entries(struct net *net, struct ip6t_get_entries __user *uptr,
76358 static int
76359 __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76360 struct xt_table_info *newinfo, unsigned int num_counters,
76361+ void __user *counters_ptr) __size_overflow(5);
76362+static int
76363+__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76364+ struct xt_table_info *newinfo, unsigned int num_counters,
76365 void __user *counters_ptr)
76366 {
76367 int ret;
76368@@ -1315,6 +1319,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
76369
76370 static int
76371 do_add_counters(struct net *net, const void __user *user, unsigned int len,
76372+ int compat) __size_overflow(3);
76373+static int
76374+do_add_counters(struct net *net, const void __user *user, unsigned int len,
76375 int compat)
76376 {
76377 unsigned int i, curcpu;
76378diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
76379index 361ebf3..d5628fb 100644
76380--- a/net/ipv6/raw.c
76381+++ b/net/ipv6/raw.c
76382@@ -377,7 +377,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
76383 {
76384 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
76385 skb_checksum_complete(skb)) {
76386- atomic_inc(&sk->sk_drops);
76387+ atomic_inc_unchecked(&sk->sk_drops);
76388 kfree_skb(skb);
76389 return NET_RX_DROP;
76390 }
76391@@ -404,7 +404,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76392 struct raw6_sock *rp = raw6_sk(sk);
76393
76394 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
76395- atomic_inc(&sk->sk_drops);
76396+ atomic_inc_unchecked(&sk->sk_drops);
76397 kfree_skb(skb);
76398 return NET_RX_DROP;
76399 }
76400@@ -428,7 +428,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76401
76402 if (inet->hdrincl) {
76403 if (skb_checksum_complete(skb)) {
76404- atomic_inc(&sk->sk_drops);
76405+ atomic_inc_unchecked(&sk->sk_drops);
76406 kfree_skb(skb);
76407 return NET_RX_DROP;
76408 }
76409@@ -601,7 +601,7 @@ out:
76410 return err;
76411 }
76412
76413-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
76414+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
76415 struct flowi6 *fl6, struct dst_entry **dstp,
76416 unsigned int flags)
76417 {
76418@@ -909,12 +909,15 @@ do_confirm:
76419 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
76420 char __user *optval, int optlen)
76421 {
76422+ struct icmp6_filter filter;
76423+
76424 switch (optname) {
76425 case ICMPV6_FILTER:
76426 if (optlen > sizeof(struct icmp6_filter))
76427 optlen = sizeof(struct icmp6_filter);
76428- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
76429+ if (copy_from_user(&filter, optval, optlen))
76430 return -EFAULT;
76431+ raw6_sk(sk)->filter = filter;
76432 return 0;
76433 default:
76434 return -ENOPROTOOPT;
76435@@ -927,6 +930,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76436 char __user *optval, int __user *optlen)
76437 {
76438 int len;
76439+ struct icmp6_filter filter;
76440
76441 switch (optname) {
76442 case ICMPV6_FILTER:
76443@@ -938,7 +942,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76444 len = sizeof(struct icmp6_filter);
76445 if (put_user(len, optlen))
76446 return -EFAULT;
76447- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
76448+ filter = raw6_sk(sk)->filter;
76449+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
76450 return -EFAULT;
76451 return 0;
76452 default:
76453@@ -1245,7 +1250,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
76454 0, 0L, 0,
76455 sock_i_uid(sp), 0,
76456 sock_i_ino(sp),
76457- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76458+ atomic_read(&sp->sk_refcnt),
76459+#ifdef CONFIG_GRKERNSEC_HIDESYM
76460+ NULL,
76461+#else
76462+ sp,
76463+#endif
76464+ atomic_read_unchecked(&sp->sk_drops));
76465 }
76466
76467 static int raw6_seq_show(struct seq_file *seq, void *v)
76468diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
76469index b859e4a..f9d1589 100644
76470--- a/net/ipv6/tcp_ipv6.c
76471+++ b/net/ipv6/tcp_ipv6.c
76472@@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
76473 }
76474 #endif
76475
76476+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76477+extern int grsec_enable_blackhole;
76478+#endif
76479+
76480 static void tcp_v6_hash(struct sock *sk)
76481 {
76482 if (sk->sk_state != TCP_CLOSE) {
76483@@ -1651,6 +1655,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
76484 return 0;
76485
76486 reset:
76487+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76488+ if (!grsec_enable_blackhole)
76489+#endif
76490 tcp_v6_send_reset(sk, skb);
76491 discard:
76492 if (opt_skb)
76493@@ -1730,12 +1737,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
76494 TCP_SKB_CB(skb)->sacked = 0;
76495
76496 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76497- if (!sk)
76498+ if (!sk) {
76499+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76500+ ret = 1;
76501+#endif
76502 goto no_tcp_socket;
76503+ }
76504
76505 process:
76506- if (sk->sk_state == TCP_TIME_WAIT)
76507+ if (sk->sk_state == TCP_TIME_WAIT) {
76508+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76509+ ret = 2;
76510+#endif
76511 goto do_time_wait;
76512+ }
76513
76514 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
76515 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76516@@ -1783,6 +1798,10 @@ no_tcp_socket:
76517 bad_packet:
76518 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76519 } else {
76520+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76521+ if (!grsec_enable_blackhole || (ret == 1 &&
76522+ (skb->dev->flags & IFF_LOOPBACK)))
76523+#endif
76524 tcp_v6_send_reset(NULL, skb);
76525 }
76526
76527@@ -2043,7 +2062,13 @@ static void get_openreq6(struct seq_file *seq,
76528 uid,
76529 0, /* non standard timer */
76530 0, /* open_requests have no inode */
76531- 0, req);
76532+ 0,
76533+#ifdef CONFIG_GRKERNSEC_HIDESYM
76534+ NULL
76535+#else
76536+ req
76537+#endif
76538+ );
76539 }
76540
76541 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76542@@ -2093,7 +2118,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76543 sock_i_uid(sp),
76544 icsk->icsk_probes_out,
76545 sock_i_ino(sp),
76546- atomic_read(&sp->sk_refcnt), sp,
76547+ atomic_read(&sp->sk_refcnt),
76548+#ifdef CONFIG_GRKERNSEC_HIDESYM
76549+ NULL,
76550+#else
76551+ sp,
76552+#endif
76553 jiffies_to_clock_t(icsk->icsk_rto),
76554 jiffies_to_clock_t(icsk->icsk_ack.ato),
76555 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
76556@@ -2128,7 +2158,13 @@ static void get_timewait6_sock(struct seq_file *seq,
76557 dest->s6_addr32[2], dest->s6_addr32[3], destp,
76558 tw->tw_substate, 0, 0,
76559 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76560- atomic_read(&tw->tw_refcnt), tw);
76561+ atomic_read(&tw->tw_refcnt),
76562+#ifdef CONFIG_GRKERNSEC_HIDESYM
76563+ NULL
76564+#else
76565+ tw
76566+#endif
76567+ );
76568 }
76569
76570 static int tcp6_seq_show(struct seq_file *seq, void *v)
76571diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
76572index 8c25419..47a51ae 100644
76573--- a/net/ipv6/udp.c
76574+++ b/net/ipv6/udp.c
76575@@ -50,6 +50,10 @@
76576 #include <linux/seq_file.h>
76577 #include "udp_impl.h"
76578
76579+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76580+extern int grsec_enable_blackhole;
76581+#endif
76582+
76583 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
76584 {
76585 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
76586@@ -549,7 +553,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
76587
76588 return 0;
76589 drop:
76590- atomic_inc(&sk->sk_drops);
76591+ atomic_inc_unchecked(&sk->sk_drops);
76592 drop_no_sk_drops_inc:
76593 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76594 kfree_skb(skb);
76595@@ -625,7 +629,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76596 continue;
76597 }
76598 drop:
76599- atomic_inc(&sk->sk_drops);
76600+ atomic_inc_unchecked(&sk->sk_drops);
76601 UDP6_INC_STATS_BH(sock_net(sk),
76602 UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
76603 UDP6_INC_STATS_BH(sock_net(sk),
76604@@ -780,6 +784,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76605 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
76606 proto == IPPROTO_UDPLITE);
76607
76608+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76609+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76610+#endif
76611 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
76612
76613 kfree_skb(skb);
76614@@ -796,7 +803,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76615 if (!sock_owned_by_user(sk))
76616 udpv6_queue_rcv_skb(sk, skb);
76617 else if (sk_add_backlog(sk, skb)) {
76618- atomic_inc(&sk->sk_drops);
76619+ atomic_inc_unchecked(&sk->sk_drops);
76620 bh_unlock_sock(sk);
76621 sock_put(sk);
76622 goto discard;
76623@@ -1407,8 +1414,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
76624 0, 0L, 0,
76625 sock_i_uid(sp), 0,
76626 sock_i_ino(sp),
76627- atomic_read(&sp->sk_refcnt), sp,
76628- atomic_read(&sp->sk_drops));
76629+ atomic_read(&sp->sk_refcnt),
76630+#ifdef CONFIG_GRKERNSEC_HIDESYM
76631+ NULL,
76632+#else
76633+ sp,
76634+#endif
76635+ atomic_read_unchecked(&sp->sk_drops));
76636 }
76637
76638 int udp6_seq_show(struct seq_file *seq, void *v)
76639diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
76640index 253695d..9481ce8 100644
76641--- a/net/irda/ircomm/ircomm_tty.c
76642+++ b/net/irda/ircomm/ircomm_tty.c
76643@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76644 add_wait_queue(&self->open_wait, &wait);
76645
76646 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
76647- __FILE__,__LINE__, tty->driver->name, self->open_count );
76648+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76649
76650 /* As far as I can see, we protect open_count - Jean II */
76651 spin_lock_irqsave(&self->spinlock, flags);
76652 if (!tty_hung_up_p(filp)) {
76653 extra_count = 1;
76654- self->open_count--;
76655+ local_dec(&self->open_count);
76656 }
76657 spin_unlock_irqrestore(&self->spinlock, flags);
76658- self->blocked_open++;
76659+ local_inc(&self->blocked_open);
76660
76661 while (1) {
76662 if (tty->termios->c_cflag & CBAUD) {
76663@@ -331,7 +331,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76664 }
76665
76666 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
76667- __FILE__,__LINE__, tty->driver->name, self->open_count );
76668+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76669
76670 schedule();
76671 }
76672@@ -342,13 +342,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76673 if (extra_count) {
76674 /* ++ is not atomic, so this should be protected - Jean II */
76675 spin_lock_irqsave(&self->spinlock, flags);
76676- self->open_count++;
76677+ local_inc(&self->open_count);
76678 spin_unlock_irqrestore(&self->spinlock, flags);
76679 }
76680- self->blocked_open--;
76681+ local_dec(&self->blocked_open);
76682
76683 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
76684- __FILE__,__LINE__, tty->driver->name, self->open_count);
76685+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
76686
76687 if (!retval)
76688 self->flags |= ASYNC_NORMAL_ACTIVE;
76689@@ -417,14 +417,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
76690 }
76691 /* ++ is not atomic, so this should be protected - Jean II */
76692 spin_lock_irqsave(&self->spinlock, flags);
76693- self->open_count++;
76694+ local_inc(&self->open_count);
76695
76696 tty->driver_data = self;
76697 self->tty = tty;
76698 spin_unlock_irqrestore(&self->spinlock, flags);
76699
76700 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
76701- self->line, self->open_count);
76702+ self->line, local_read(&self->open_count));
76703
76704 /* Not really used by us, but lets do it anyway */
76705 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
76706@@ -510,7 +510,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76707 return;
76708 }
76709
76710- if ((tty->count == 1) && (self->open_count != 1)) {
76711+ if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
76712 /*
76713 * Uh, oh. tty->count is 1, which means that the tty
76714 * structure will be freed. state->count should always
76715@@ -520,16 +520,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76716 */
76717 IRDA_DEBUG(0, "%s(), bad serial port count; "
76718 "tty->count is 1, state->count is %d\n", __func__ ,
76719- self->open_count);
76720- self->open_count = 1;
76721+ local_read(&self->open_count));
76722+ local_set(&self->open_count, 1);
76723 }
76724
76725- if (--self->open_count < 0) {
76726+ if (local_dec_return(&self->open_count) < 0) {
76727 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
76728- __func__, self->line, self->open_count);
76729- self->open_count = 0;
76730+ __func__, self->line, local_read(&self->open_count));
76731+ local_set(&self->open_count, 0);
76732 }
76733- if (self->open_count) {
76734+ if (local_read(&self->open_count)) {
76735 spin_unlock_irqrestore(&self->spinlock, flags);
76736
76737 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
76738@@ -561,7 +561,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76739 tty->closing = 0;
76740 self->tty = NULL;
76741
76742- if (self->blocked_open) {
76743+ if (local_read(&self->blocked_open)) {
76744 if (self->close_delay)
76745 schedule_timeout_interruptible(self->close_delay);
76746 wake_up_interruptible(&self->open_wait);
76747@@ -1013,7 +1013,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
76748 spin_lock_irqsave(&self->spinlock, flags);
76749 self->flags &= ~ASYNC_NORMAL_ACTIVE;
76750 self->tty = NULL;
76751- self->open_count = 0;
76752+ local_set(&self->open_count, 0);
76753 spin_unlock_irqrestore(&self->spinlock, flags);
76754
76755 wake_up_interruptible(&self->open_wait);
76756@@ -1360,7 +1360,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
76757 seq_putc(m, '\n');
76758
76759 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
76760- seq_printf(m, "Open count: %d\n", self->open_count);
76761+ seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
76762 seq_printf(m, "Max data size: %d\n", self->max_data_size);
76763 seq_printf(m, "Max header size: %d\n", self->max_header_size);
76764
76765diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
76766index 274d150..656a144 100644
76767--- a/net/iucv/af_iucv.c
76768+++ b/net/iucv/af_iucv.c
76769@@ -787,10 +787,10 @@ static int iucv_sock_autobind(struct sock *sk)
76770
76771 write_lock_bh(&iucv_sk_list.lock);
76772
76773- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
76774+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
76775 while (__iucv_get_sock_by_name(name)) {
76776 sprintf(name, "%08x",
76777- atomic_inc_return(&iucv_sk_list.autobind_name));
76778+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
76779 }
76780
76781 write_unlock_bh(&iucv_sk_list.lock);
76782diff --git a/net/key/af_key.c b/net/key/af_key.c
76783index 1e733e9..3d73c9f 100644
76784--- a/net/key/af_key.c
76785+++ b/net/key/af_key.c
76786@@ -3016,10 +3016,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
76787 static u32 get_acqseq(void)
76788 {
76789 u32 res;
76790- static atomic_t acqseq;
76791+ static atomic_unchecked_t acqseq;
76792
76793 do {
76794- res = atomic_inc_return(&acqseq);
76795+ res = atomic_inc_return_unchecked(&acqseq);
76796 } while (!res);
76797 return res;
76798 }
76799diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
76800index 73495f1..ad51356 100644
76801--- a/net/mac80211/ieee80211_i.h
76802+++ b/net/mac80211/ieee80211_i.h
76803@@ -27,6 +27,7 @@
76804 #include <net/ieee80211_radiotap.h>
76805 #include <net/cfg80211.h>
76806 #include <net/mac80211.h>
76807+#include <asm/local.h>
76808 #include "key.h"
76809 #include "sta_info.h"
76810
76811@@ -764,7 +765,7 @@ struct ieee80211_local {
76812 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
76813 spinlock_t queue_stop_reason_lock;
76814
76815- int open_count;
76816+ local_t open_count;
76817 int monitors, cooked_mntrs;
76818 /* number of interfaces with corresponding FIF_ flags */
76819 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
76820diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
76821index 30d7355..e260095 100644
76822--- a/net/mac80211/iface.c
76823+++ b/net/mac80211/iface.c
76824@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76825 break;
76826 }
76827
76828- if (local->open_count == 0) {
76829+ if (local_read(&local->open_count) == 0) {
76830 res = drv_start(local);
76831 if (res)
76832 goto err_del_bss;
76833@@ -235,7 +235,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76834 memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
76835
76836 if (!is_valid_ether_addr(dev->dev_addr)) {
76837- if (!local->open_count)
76838+ if (!local_read(&local->open_count))
76839 drv_stop(local);
76840 return -EADDRNOTAVAIL;
76841 }
76842@@ -327,7 +327,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76843 mutex_unlock(&local->mtx);
76844
76845 if (coming_up)
76846- local->open_count++;
76847+ local_inc(&local->open_count);
76848
76849 if (hw_reconf_flags) {
76850 ieee80211_hw_config(local, hw_reconf_flags);
76851@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76852 err_del_interface:
76853 drv_remove_interface(local, &sdata->vif);
76854 err_stop:
76855- if (!local->open_count)
76856+ if (!local_read(&local->open_count))
76857 drv_stop(local);
76858 err_del_bss:
76859 sdata->bss = NULL;
76860@@ -472,7 +472,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
76861 }
76862
76863 if (going_down)
76864- local->open_count--;
76865+ local_dec(&local->open_count);
76866
76867 switch (sdata->vif.type) {
76868 case NL80211_IFTYPE_AP_VLAN:
76869@@ -531,7 +531,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
76870
76871 ieee80211_recalc_ps(local, -1);
76872
76873- if (local->open_count == 0) {
76874+ if (local_read(&local->open_count) == 0) {
76875 if (local->ops->napi_poll)
76876 napi_disable(&local->napi);
76877 ieee80211_clear_tx_pending(local);
76878diff --git a/net/mac80211/main.c b/net/mac80211/main.c
76879index 7d9b21d..0687004 100644
76880--- a/net/mac80211/main.c
76881+++ b/net/mac80211/main.c
76882@@ -163,7 +163,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
76883 local->hw.conf.power_level = power;
76884 }
76885
76886- if (changed && local->open_count) {
76887+ if (changed && local_read(&local->open_count)) {
76888 ret = drv_config(local, changed);
76889 /*
76890 * Goal:
76891diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
76892index 9ee7164..56c5061 100644
76893--- a/net/mac80211/pm.c
76894+++ b/net/mac80211/pm.c
76895@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
76896 struct ieee80211_sub_if_data *sdata;
76897 struct sta_info *sta;
76898
76899- if (!local->open_count)
76900+ if (!local_read(&local->open_count))
76901 goto suspend;
76902
76903 ieee80211_scan_cancel(local);
76904@@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
76905 cancel_work_sync(&local->dynamic_ps_enable_work);
76906 del_timer_sync(&local->dynamic_ps_timer);
76907
76908- local->wowlan = wowlan && local->open_count;
76909+ local->wowlan = wowlan && local_read(&local->open_count);
76910 if (local->wowlan) {
76911 int err = drv_suspend(local, wowlan);
76912 if (err < 0) {
76913@@ -129,7 +129,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
76914 }
76915
76916 /* stop hardware - this must stop RX */
76917- if (local->open_count)
76918+ if (local_read(&local->open_count))
76919 ieee80211_stop_device(local);
76920
76921 suspend:
76922diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
76923index 7d84b87..6a69cd9 100644
76924--- a/net/mac80211/rate.c
76925+++ b/net/mac80211/rate.c
76926@@ -401,7 +401,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
76927
76928 ASSERT_RTNL();
76929
76930- if (local->open_count)
76931+ if (local_read(&local->open_count))
76932 return -EBUSY;
76933
76934 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
76935diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
76936index c97a065..ff61928 100644
76937--- a/net/mac80211/rc80211_pid_debugfs.c
76938+++ b/net/mac80211/rc80211_pid_debugfs.c
76939@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
76940
76941 spin_unlock_irqrestore(&events->lock, status);
76942
76943- if (copy_to_user(buf, pb, p))
76944+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
76945 return -EFAULT;
76946
76947 return p;
76948diff --git a/net/mac80211/util.c b/net/mac80211/util.c
76949index d5230ec..c604b21 100644
76950--- a/net/mac80211/util.c
76951+++ b/net/mac80211/util.c
76952@@ -1000,7 +1000,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
76953 drv_set_coverage_class(local, hw->wiphy->coverage_class);
76954
76955 /* everything else happens only if HW was up & running */
76956- if (!local->open_count)
76957+ if (!local_read(&local->open_count))
76958 goto wake_up;
76959
76960 /*
76961diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
76962index d5597b7..ab6d39c 100644
76963--- a/net/netfilter/Kconfig
76964+++ b/net/netfilter/Kconfig
76965@@ -779,6 +779,16 @@ config NETFILTER_XT_MATCH_ESP
76966
76967 To compile it as a module, choose M here. If unsure, say N.
76968
76969+config NETFILTER_XT_MATCH_GRADM
76970+ tristate '"gradm" match support'
76971+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
76972+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
76973+ ---help---
76974+ The gradm match allows to match on grsecurity RBAC being enabled.
76975+ It is useful when iptables rules are applied early on bootup to
76976+ prevent connections to the machine (except from a trusted host)
76977+ while the RBAC system is disabled.
76978+
76979 config NETFILTER_XT_MATCH_HASHLIMIT
76980 tristate '"hashlimit" match support'
76981 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
76982diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
76983index 1a02853..5d8c22e 100644
76984--- a/net/netfilter/Makefile
76985+++ b/net/netfilter/Makefile
76986@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
76987 obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
76988 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
76989 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
76990+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
76991 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
76992 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
76993 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
76994diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
76995index 29fa5ba..8debc79 100644
76996--- a/net/netfilter/ipvs/ip_vs_conn.c
76997+++ b/net/netfilter/ipvs/ip_vs_conn.c
76998@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
76999 /* Increase the refcnt counter of the dest */
77000 atomic_inc(&dest->refcnt);
77001
77002- conn_flags = atomic_read(&dest->conn_flags);
77003+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
77004 if (cp->protocol != IPPROTO_UDP)
77005 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
77006 /* Bind with the destination and its corresponding transmitter */
77007@@ -869,7 +869,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
77008 atomic_set(&cp->refcnt, 1);
77009
77010 atomic_set(&cp->n_control, 0);
77011- atomic_set(&cp->in_pkts, 0);
77012+ atomic_set_unchecked(&cp->in_pkts, 0);
77013
77014 atomic_inc(&ipvs->conn_count);
77015 if (flags & IP_VS_CONN_F_NO_CPORT)
77016@@ -1149,7 +1149,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
77017
77018 /* Don't drop the entry if its number of incoming packets is not
77019 located in [0, 8] */
77020- i = atomic_read(&cp->in_pkts);
77021+ i = atomic_read_unchecked(&cp->in_pkts);
77022 if (i > 8 || i < 0) return 0;
77023
77024 if (!todrop_rate[i]) return 0;
77025diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
77026index 6dc7d7d..e45913a 100644
77027--- a/net/netfilter/ipvs/ip_vs_core.c
77028+++ b/net/netfilter/ipvs/ip_vs_core.c
77029@@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
77030 ret = cp->packet_xmit(skb, cp, pd->pp);
77031 /* do not touch skb anymore */
77032
77033- atomic_inc(&cp->in_pkts);
77034+ atomic_inc_unchecked(&cp->in_pkts);
77035 ip_vs_conn_put(cp);
77036 return ret;
77037 }
77038@@ -1611,7 +1611,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
77039 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
77040 pkts = sysctl_sync_threshold(ipvs);
77041 else
77042- pkts = atomic_add_return(1, &cp->in_pkts);
77043+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77044
77045 if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
77046 cp->protocol == IPPROTO_SCTP) {
77047diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
77048index e1a66cf..0910076 100644
77049--- a/net/netfilter/ipvs/ip_vs_ctl.c
77050+++ b/net/netfilter/ipvs/ip_vs_ctl.c
77051@@ -788,7 +788,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
77052 ip_vs_rs_hash(ipvs, dest);
77053 write_unlock_bh(&ipvs->rs_lock);
77054 }
77055- atomic_set(&dest->conn_flags, conn_flags);
77056+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
77057
77058 /* bind the service */
77059 if (!dest->svc) {
77060@@ -2028,7 +2028,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
77061 " %-7s %-6d %-10d %-10d\n",
77062 &dest->addr.in6,
77063 ntohs(dest->port),
77064- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77065+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77066 atomic_read(&dest->weight),
77067 atomic_read(&dest->activeconns),
77068 atomic_read(&dest->inactconns));
77069@@ -2039,7 +2039,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
77070 "%-7s %-6d %-10d %-10d\n",
77071 ntohl(dest->addr.ip),
77072 ntohs(dest->port),
77073- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77074+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77075 atomic_read(&dest->weight),
77076 atomic_read(&dest->activeconns),
77077 atomic_read(&dest->inactconns));
77078@@ -2509,7 +2509,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
77079
77080 entry.addr = dest->addr.ip;
77081 entry.port = dest->port;
77082- entry.conn_flags = atomic_read(&dest->conn_flags);
77083+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
77084 entry.weight = atomic_read(&dest->weight);
77085 entry.u_threshold = dest->u_threshold;
77086 entry.l_threshold = dest->l_threshold;
77087@@ -3042,7 +3042,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
77088 NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
77089
77090 NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
77091- atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
77092+ atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
77093 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
77094 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
77095 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
77096diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
77097index 2b6678c0..aaa41fc 100644
77098--- a/net/netfilter/ipvs/ip_vs_sync.c
77099+++ b/net/netfilter/ipvs/ip_vs_sync.c
77100@@ -649,7 +649,7 @@ control:
77101 * i.e only increment in_pkts for Templates.
77102 */
77103 if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
77104- int pkts = atomic_add_return(1, &cp->in_pkts);
77105+ int pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77106
77107 if (pkts % sysctl_sync_period(ipvs) != 1)
77108 return;
77109@@ -795,7 +795,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
77110
77111 if (opt)
77112 memcpy(&cp->in_seq, opt, sizeof(*opt));
77113- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
77114+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
77115 cp->state = state;
77116 cp->old_state = cp->state;
77117 /*
77118diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
77119index aa2d720..d8aa111 100644
77120--- a/net/netfilter/ipvs/ip_vs_xmit.c
77121+++ b/net/netfilter/ipvs/ip_vs_xmit.c
77122@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
77123 else
77124 rc = NF_ACCEPT;
77125 /* do not touch skb anymore */
77126- atomic_inc(&cp->in_pkts);
77127+ atomic_inc_unchecked(&cp->in_pkts);
77128 goto out;
77129 }
77130
77131@@ -1272,7 +1272,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
77132 else
77133 rc = NF_ACCEPT;
77134 /* do not touch skb anymore */
77135- atomic_inc(&cp->in_pkts);
77136+ atomic_inc_unchecked(&cp->in_pkts);
77137 goto out;
77138 }
77139
77140diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
77141index 66b2c54..c7884e3 100644
77142--- a/net/netfilter/nfnetlink_log.c
77143+++ b/net/netfilter/nfnetlink_log.c
77144@@ -70,7 +70,7 @@ struct nfulnl_instance {
77145 };
77146
77147 static DEFINE_SPINLOCK(instances_lock);
77148-static atomic_t global_seq;
77149+static atomic_unchecked_t global_seq;
77150
77151 #define INSTANCE_BUCKETS 16
77152 static struct hlist_head instance_table[INSTANCE_BUCKETS];
77153@@ -502,7 +502,7 @@ __build_packet_message(struct nfulnl_instance *inst,
77154 /* global sequence number */
77155 if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
77156 NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
77157- htonl(atomic_inc_return(&global_seq)));
77158+ htonl(atomic_inc_return_unchecked(&global_seq)));
77159
77160 if (data_len) {
77161 struct nlattr *nla;
77162diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
77163new file mode 100644
77164index 0000000..6905327
77165--- /dev/null
77166+++ b/net/netfilter/xt_gradm.c
77167@@ -0,0 +1,51 @@
77168+/*
77169+ * gradm match for netfilter
77170